From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932113AbeCIMww (ORCPT ); Fri, 9 Mar 2018 07:52:52 -0500 Received: from mail-vk0-f47.google.com ([209.85.213.47]:34799 "EHLO mail-vk0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751059AbeCIMwt (ORCPT ); Fri, 9 Mar 2018 07:52:49 -0500 X-Google-Smtp-Source: AG47ELseTlUsdMg/BPxHe4B+V3OPtBCbFw4NKRtBb0sMEpbjmoraRpmOJHjOsxx+sQ2gOcjdX10OFQ== Date: Fri, 9 Mar 2018 09:52:45 -0300 From: Marcelo Ricardo Leitner To: Stephen Rothwell Cc: Paul Moore , David Miller , Networking , Linux-Next Mailing List , Linux Kernel Mailing List , Richard Haines , Xin Long Subject: Re: linux-next: manual merge of the selinux tree with the net-next tree Message-ID: <20180309125244.GA5105@localhost.localdomain> References: <20180305124054.09966cb0@canb.auug.org.au> <20180308130703.7365f733@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180308130703.7365f733@canb.auug.org.au> User-Agent: Mutt/1.9.2 (2017-12-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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