linux-kernel - Re: linux-next: manual merge of the selinux tree with the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20180309125244.GA5105@localhost.localdomain>
Date:   Fri, 9 Mar 2018 09:52:45 -0300
From:   Marcelo Ricardo Leitner <marcelo.leitner@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Paul Moore <paul@...l-moore.com>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Richard Haines <richard_c_haines@...nternet.com>,
        Xin Long <lucien.xin@...il.com>
Subject: Re: linux-next: manual merge of the selinux tree with the net-next
 tree

On Thu, Mar 08, 2018 at 01:07:03PM +1100, Stephen Rothwell wrote:
> The resolution now looks like below (there were more changes to this
> file in the net-next tree).  It will keep changing every time this file
> is touched :-(

Ugh, sorry for that, Stephen.

Considering how much of a hassle this already is, I'll hold off the
mtu refactoring I have and only post it when all this reaches Linus'
tree.  This refactoring is touching nearly every single line that the
SELinux patches touched too (where it added accounting for the IP
options) and the fixup would be a complete nightmare.

Probably I won't be able to post the sctp_outq_flush refactoring too,
but I have to check that more carefully.

  Marcelo