From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Moore <paul@paul-moore.com>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Richard Haines <richard_c_haines@btinternet.com>,
Xin Long <lucien.xin@gmail.com>
Subject: Re: linux-next: manual merge of the selinux tree with the net-next tree
Date: Fri, 9 Mar 2018 09:52:45 -0300 [thread overview]
Message-ID: <20180309125244.GA5105@localhost.localdomain> (raw)
In-Reply-To: <20180308130703.7365f733@canb.auug.org.au>
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
next prev parent reply other threads:[~2018-03-09 12:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-05 1:40 linux-next: manual merge of the selinux tree with the net-next tree Stephen Rothwell
2018-03-05 7:03 ` Xin Long
2018-03-07 16:34 ` Paul Moore
2018-03-07 16:41 ` David Miller
2018-03-07 17:27 ` Paul Moore
2018-03-07 17:45 ` David Miller
2018-03-07 20:20 ` Paul Moore
2018-03-07 20:24 ` David Miller
2018-03-07 20:26 ` David Miller
2018-03-07 23:28 ` Paul Moore
2018-03-08 2:07 ` Stephen Rothwell
2018-03-08 13:00 ` Paul Moore
2018-03-08 13:12 ` Xin Long
2018-03-08 13:29 ` Xin Long
2018-03-09 12:52 ` Marcelo Ricardo Leitner [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-01-05 4:12 Stephen Rothwell
2012-01-05 21:25 ` Paul Moore
2012-01-05 22:15 ` Stephen Rothwell
2012-01-05 22:51 ` Eric Paris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180309125244.GA5105@localhost.localdomain \
--to=marcelo.leitner@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lucien.xin@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=richard_c_haines@btinternet.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).