* linux-next: manual merge of the dt-rh tree with the l2-mtd tree
@ 2012-07-06 4:51 Stephen Rothwell
2012-07-06 12:18 ` Rob Herring
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-07-06 4:51 UTC (permalink / raw)
To: Rob Herring
Cc: linux-next, linux-kernel, Josh Wu, Hong Xu, Artem Bityutskiy,
"Uwe Kleine-König"
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in
Documentation/devicetree/bindings/mtd/atmel-nand.txt between commit
348d200508b1 ("mtd: at91: add dt parameters for Atmel PMECC") from the
l2-mtd tree and commit e7e88f9f8aeb ("of: fix a few typos in the binding
documentation") from the dt-rh tree.
The former replaced the text (and fixed the typo) fixed by the latter, so
I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the dt-rh tree with the l2-mtd tree
2012-07-06 4:51 linux-next: manual merge of the dt-rh tree with the l2-mtd tree Stephen Rothwell
@ 2012-07-06 12:18 ` Rob Herring
0 siblings, 0 replies; 2+ messages in thread
From: Rob Herring @ 2012-07-06 12:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Josh Wu, Hong Xu, Artem Bityutskiy,
Uwe Kleine-König
On 07/05/2012 11:51 PM, Stephen Rothwell wrote:
> Hi Rob,
>
> Today's linux-next merge of the dt-rh tree got a conflict in
> Documentation/devicetree/bindings/mtd/atmel-nand.txt between commit
> 348d200508b1 ("mtd: at91: add dt parameters for Atmel PMECC") from the
> l2-mtd tree and commit e7e88f9f8aeb ("of: fix a few typos in the binding
> documentation") from the dt-rh tree.
>
> The former replaced the text (and fixed the typo) fixed by the latter, so
> I used that.
I've dropped the conflicting hunk from that patch.
Rob
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-06 12:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-06 4:51 linux-next: manual merge of the dt-rh tree with the l2-mtd tree Stephen Rothwell
2012-07-06 12:18 ` 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).