From: David Miller <davem@davemloft.net>
To: pablo@netfilter.org
Cc: sfr@canb.auug.org.au, netdev@vger.kernel.org,
netfilter-devel@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, xiyou.wangcong@gmail.com,
johannes.berg@intel.com
Subject: Re: linux-next: manual merge of the net-next tree with the netfilter tree
Date: Sat, 12 Nov 2016 23:43:00 -0500 (EST) [thread overview]
Message-ID: <20161112.234300.1975552998082760798.davem@davemloft.net> (raw)
In-Reply-To: <20161110003117.GA4285@salvia>
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 10 Nov 2016 01:31:17 +0100
> I think I cannot help to address this conflict myself.
>
> 8fbfef7f505b is in my nf tree, while 489111e5c25b is in net-next. So
> you will hit this conflict by when you pull net into net-next.
>
> So please keep this patch from Stephen to resolve the conflict in your
> radar to solve this.
I will, thank you.
next prev parent reply other threads:[~2016-11-13 4:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-09 23:56 linux-next: manual merge of the net-next tree with the netfilter tree Stephen Rothwell
2016-11-10 0:31 ` Pablo Neira Ayuso
2016-11-13 4:43 ` David Miller [this message]
2018-08-07 2:49 Stephen Rothwell
2018-08-15 23:47 ` Stephen Rothwell
2018-08-16 0:08 ` Pablo Neira Ayuso
2020-12-10 2:11 Stephen Rothwell
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=20161112.234300.1975552998082760798.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=sfr@canb.auug.org.au \
--cc=xiyou.wangcong@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.