On 27 April 2016 05:54:00 BST, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>Hi Greg,
>
>Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/iio/magnetometer/ak8975.c
>
>between commit:
>
> 05be8d4101d9 ("iio: ak8975: fix maybe-uninitialized warning")
>
>from the staging.current tree and commit:
>
> 97eacb9166f4 ("iio:ak8975: add mounting matrix support")
>
>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.
Hi Stephen,
Sorry, I clearly failed to check my own trees didn't clash before sending the pull to Greg.
Fix looks good, thanks
Jonathan
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
--
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
