On 14/06/16 06:04, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/iio/industrialio-trigger.c
>
> between commit:
>
> 995438233579 ("iio: Fix error handling in iio_trigger_attach_poll_func")
>
> from the staging.current tree and commit:
>
> ef2d71d6b7fb ("iio: triggers: Make trigger ops structure explicitly non optional.")
>
> 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.
>
Thanks Stephen,
Looks great.
Jonathan
--
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
