linux-next: manual merge of the net-next tree with Linus' tree
From: Stephen Rothwell
Date: Tue May 02 2017 - 21:07:21 EST
Today's linux-next merge of the net-next tree got a conflict in:
26202873bb51 ("avr32: remove support for AVR32 architecture")
from Linus' tree and commits:
a2d133b1d465 ("sock: introduce SO_MEMINFO getsockopt")
6d4339028b35 ("net: Introduce SO_INCOMING_NAPI_ID"
5daab9db7b65 ("New getsockopt option to get socket cookie")
from the net-next tree.
I fixed it up (I removed the file) 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.