Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sctp/input.c
between commit:
c74bfbdba0e8 ("sctp: load transport header after sk_filter")
from the net tree and commit:
3acb50c18d8d ("sctp: delay as much as possible skb_linearize")
from the net-next tree.
I fixed it up (I just used the net-next version) 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
