From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: NetFilter <netfilter-devel@vger.kernel.org>,
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>,
Matteo Croce <mcroce@redhat.com>, Julian Anastasov <ja@ssi.bg>
Subject: Re: linux-next: manual merge of the net-next tree with the netfilter tree
Date: Thu, 16 Aug 2018 02:08:51 +0200 [thread overview]
Message-ID: <20180816000851.if2neqxzbjlsd45n@salvia> (raw)
In-Reply-To: <20180816094723.07452406@canb.auug.org.au>
On Thu, Aug 16, 2018 at 09:47:23AM +1000, Stephen Rothwell wrote:
> On Tue, 7 Aug 2018 12:49:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
[...]
> This is now a conflict between Linus' tree and the netfilter tree.
Will rebase nf.git here, so next pull request already deals with this
here to make it easier for upstream maintainers.
@Matteo, let me know if this is a problem in your case, you may have
references to the original commits in your backport queue probably.
Thanks for the heads up and sorry for the inconvenience.
next prev parent reply other threads:[~2018-08-16 0:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-07 2:49 linux-next: manual merge of the net-next tree with the netfilter tree Stephen Rothwell
2018-08-15 23:47 ` Stephen Rothwell
2018-08-16 0:08 ` Pablo Neira Ayuso [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-12-10 2:11 Stephen Rothwell
2016-11-09 23:56 Stephen Rothwell
2016-11-10 0:31 ` Pablo Neira Ayuso
2016-11-13 4:43 ` David Miller
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=20180816000851.if2neqxzbjlsd45n@salvia \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=ja@ssi.bg \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mcroce@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--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).