Re: linux-next: manual merge of the dt-rh tree with the mips tree

On Thu, Mar 26, 2015 at 11:56 PM, Scott Branden wrote: > Rob, > > Apologies that the mips tree is deleting files that I was synchronizing names > on. Would you like me to provide new patch that doesn't touch files that > mips tree is now deleting? No, it is fine. I'd rather not rebase my tree.

Re: linux-next: manual merge of the dt-rh tree with the mips tree

Rob, Apologies that the mips tree is deleting files that I was synchronizing names on. Would you like me to provide new patch that doesn't touch files that mips tree is now deleting? Scott > On Mar 26, 2015, at 9:26 PM, Stephen Rothwell wrote: > > -- To unsubscribe from this list: send the

linux-next: manual merge of the dt-rh tree with the mips tree

Hi Rob, Today's linux-next merge of the dt-rh tree got conflicts in Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt and Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt between commits b43a3ff04e59 ("MIPS: BMIPS: Delete the irqchip driver from irq.c") and faf18d2dd323