linux-kernel - Re: linux-next: manual merge of the dt-rh tree with the l2-mtd tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 06 Jul 2012 07:18:31 -0500
From:	Rob Herring <robherring2@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Josh Wu <josh.wu@...el.com>, Hong Xu <hong.xu@...el.com>,
	Artem Bityutskiy <dedekind1@...il.com>,
	Uwe Kleine-König 
	<u.kleine-koenig@...gutronix.de>
Subject: Re: linux-next: manual merge of the dt-rh tree with the l2-mtd tree

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/