linux-kernel - linux-next: manual merge of the devicetree tree with the 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-next>] [day] [month] [year] [list]

Message-Id: <20110105134022.106d9e0b.sfr@canb.auug.org.au>
Date:	Wed, 5 Jan 2011 13:40:22 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Artem Bityutskiy <Artem.Bityutskiy@...ia.com>,
	David Woodhouse <dwmw2@...radead.org>,
	Rob Herring <rob.herring@...xeda.com>
Subject: linux-next: manual merge of the devicetree tree with the mtd tree

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
drivers/mtd/Kconfig between commit
b7b6e08f9265db56129931983fc6c06d62c9f4f9 (mtd: Fix MTD_OF_PARTS for all
arch and minor tidy of MTD_PARTITIONS"") from the mtd tree and commit
236cdc7bc718566a7e7cb9f763b51a8dcad88cbe ("of: make drivers depend on
CONFIG_OF instead of CONFIG_PPC_OF") from the devicetree tree.

I just used the version from the mtd tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped