Re: linux-next: manual merge of the devicetree tree with the mtdtree

[Grant Likely]

On Wed, Jan 05, 2011 at 01:40:22PM +1100, Stephen Rothwell wrote:
> 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.

Thanks Stephen.  I've taken a look at both patches, and I agree that
is the correct resolution.

g.



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