Stephen Rothwell [sfr@xxxxxxxxxxxxxxxx] wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> drivers/net/ethernet/ibm/ibmvnic.c
> drivers/net/ethernet/ibm/ibmvnic.h
>
> between commit:
>
> 4a41c421f367 ("ibmvnic: serialize access to work queue on remove")
>
> from the net tree and commits:
>
> bab08bedcdc3 ("ibmvnic: fix block comments")
> a369d96ca554 ("ibmvnic: add comments for spinlock_t definitions")
>
> from the net-next 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.
The changes look good to me. Thanks.
Sukadev
