On Mon, May 01, 2017 at 02:09:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/Makefile
>
> between commit:
>
> f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")
>
> from the usb tree and commit:
>
> 051420a997a5 ("staging: bcm2835-audio: Move driver under vc04_services")
> abefd6741d54 ("staging: ccree: introduce CryptoCell HW driver")
>
> from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
I'm the maintainer of both :)
Anyway, I knew this was going to happen, I'll take your fix when the
merge happens, thanks.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
