* linux-next: manual merge of the dt-rh tree with the mips tree
@ 2015-03-27 4:25 Stephen Rothwell
2015-03-27 4:56 ` Scott Branden
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2015-03-27 4:25 UTC (permalink / raw)
To: Rob Herring, Ralf Baechle
Cc: linux-next, linux-kernel, Scott Branden, Kevin Cernekee
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the dt-rh tree with the mips tree
2015-03-27 4:25 linux-next: manual merge of the dt-rh tree with the mips tree Stephen Rothwell
@ 2015-03-27 4:56 ` Scott Branden
2015-03-27 5:00 ` Rob Herring
0 siblings, 1 reply; 3+ messages in thread
From: Scott Branden @ 2015-03-27 4:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rob Herring, Ralf Baechle, linux-next, linux-kernel, Kevin Cernekee
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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the dt-rh tree with the mips tree
2015-03-27 4:56 ` Scott Branden
@ 2015-03-27 5:00 ` Rob Herring
0 siblings, 0 replies; 3+ messages in thread
From: Rob Herring @ 2015-03-27 5:00 UTC (permalink / raw)
To: Scott Branden
Cc: Stephen Rothwell, Ralf Baechle, linux-next, linux-kernel, Kevin Cernekee
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-27 5:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-27 4:25 linux-next: manual merge of the dt-rh tree with the mips tree Stephen Rothwell
2015-03-27 4:56 ` Scott Branden
2015-03-27 5:00 ` Rob Herring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).