On Tue, Apr 05, 2016 at 01:03:26PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/iio/gyro/bmg160_core.c
>
> between commit:
>
> b475c59b113d ("iio: gyro: bmg160: fix buffer read values")
>
> from the staging.current tree and commit:
>
> 7e3d1eb123d8 ("iio: accel: bmg160: optimize transfers in trigger handler")
>
> from the staging tree.
>
> I fixed it up (I used the version from the staging tree) 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.
Jonathan warned me about this, thanks for resolving it in your tree.
I'll fix it up in mine once they merge back together in a few weeks.
thanks,
greg k-h
