On Thu, Feb 22, 2018 at 9:40 PM, Marcelo Ricardo Leitner
> On Thu, Feb 22, 2018 at 06:08:05PM -0500, Paul Moore wrote:
>> On Wed, Feb 21, 2018 at 3:45 PM, Paul Moore <p...@paul-moore.com> wrote:
>> > On February 21, 2018 9:33:51 AM Marcelo Ricardo Leitner
>> > <marcelo.leit...@gmail.com> wrote:
>> >> On Tue, Feb 20, 2018 at 07:15:27PM +0000, Richard Haines wrote:
>> >>> Add ip option support to allow LSM security modules to utilise CIPSO/IPv4
>> >>> and CALIPSO/IPv6 services.
>> >>> Signed-off-by: Richard Haines <richard_c_hai...@btinternet.com>
>> >> LGTM too, thanks!
>> >> Acked-by: Marcelo Ricardo Leitner <marcelo.leit...@gmail.com>
>> > I agree, thanks everyone for all the work, review, and patience behind
>> > this patchset! I'll work on merging this into selinux/next and I'll send
>> > a note when it's done.
>> I just merged the four patches (1,3,4 from the v6 patchset, 2 from the
>> v7 patchset) in selinux/next and did a quick sanity test on the kernel
>> (booted, no basic SELinux regressions). Additional testing help is
>> always appreciated ...
> I'll try it early next week.
> Any ideas on when this is going to appear on Dave's net-next tree?
> We have a lot of SCTP changes to be posted on this cycle and would be
> nice if we could avoid merge conflicts.
It's merged into the SELinux tree, next branch; see the links below.
Last I checked DaveM doesn't pull the selinux/next into his net-next
tree (that would be a little funny for historical reasons).
Any idea on how bad the merge conflicts are?
>> * git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
>> * https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git