On Sat, Apr 7, 2018 at 7:07 AM, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > On Tue, Apr 3, 2018 at 6:37 PM, Paul Moore <paul@xxxxxxxxxxxxxx> wrote: >> >> Everything passes the selinux-testsuite, but there are a few known >> merge conflicts. The first is with the netdev tree and is in >> net/sctp/socket.c. Unfortunately it is a bit ugly, thankfully Stephen >> Rothwell has already done the heavy lifting in resolving the merge for >> you, and the SCTP folks have given his merge patch a thumbs-up. > > I ended up re-doing the merge, and it looks like some more sctp > changes happened after Stephen's merge anyway, so mine didn't end up > quite like his. > You're right, a sctp fix went into net-next after Stephen's that merge. https://patchwork.ozlabs.org/patch/884469/ (v1) https://patchwork.ozlabs.org/patch/884971/ (v2) Which caused the resolution to have changed again. I've checked the new resolution on your tree, the SCTP part is all good. Thanks.
