Re: linux-next: manual merge of the staging tree with thedriver-core tree

[Greg KH]

On Fri, Apr 27, 2012 at 02:31:14PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/Kconfig drivers/Makefile between commit de55d8716ac5 ("Extcon
> (external connector): import Android's switch class and modify") from the
> driver-core tree and commits a980e046098b ("IIO: Move the core files to
> drivers/iio") and db3b9e990e75 ("Staging: VME: move VME drivers out of
> staging") from the staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks, that looks correct.

greg k-h
--
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/