linux-next: manual merge of the net tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net tree got a conflict in:

  net/smc/af_smc.c

between commit:

  a11e1d432b51 ("Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL")

from Linus' tree and commit:

  24ac3a08e658 ("net/smc: rebuild nonblocking connect")

from the net tree.

I did the obvious syntactic fix up but, given that the commit that the
net tree commit is fixing ie being reverted, I wonder if the net tree
commit is needed (or correct?) any more.

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.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp0PGMOyOrzc.pgp
Description: OpenPGP digital signature