[GIT PULL] SELinux patches for v4.17
lucien.xin at gmail.com
Sun Apr 8 06:13:49 UTC 2018
On Sat, Apr 7, 2018 at 7:07 AM, Linus Torvalds
<torvalds at linux-foundation.org> wrote:
> On Tue, Apr 3, 2018 at 6:37 PM, Paul Moore <paul at paul-moore.com> 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.
Which caused the resolution to have changed again.
I've checked the new resolution on your tree, the SCTP part is all good.
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
More information about the Linux-security-module-archive