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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 695 bytes --]

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 ("MIPS: BMIPS: Update DT bindings to reflect
new SoC support") from the mips tree and commit 23a71fd616bf
("dt-bindings: brcm: rationalize Broadcom documentation naming") from
the dt-rh tree.

I fixed it up (the mips tree commits removed the files) and can carry
the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Scott Branden]

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 <sfr@canb.auug.org.au> wrote:
> 
> <mime-attachment>

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

[Rob Herring]

On Thu, Mar 26, 2015 at 11:56 PM, Scott Branden <sbranden@broadcom.com> 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.

Rob