On Mon, Dec 04, 2017 at 12:50:45PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/iio/adc/meson_saradc.c
>
> between commit:
>
> d85eed9f5763 ("iio: adc: meson-saradc: initialize the bandgap correctly on older SoCs")
>
> from the staging.current tree and commit:
>
> 930df4d853a8 ("iio: adc: meson-saradc: remove irrelevant clock "sana"")
>
> 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.
This should now be resolved in my staging-next branch.
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
