From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: David Miller <davem@davemloft.net>,
NetFilter <netfilter-devel@vger.kernel.org>,
Network Development <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Pablo Neira Ayuso <pablo@netfilter.org>,
Liping Zhang <liping.zhang@spreadtrum.com>
Subject: Re: [GIT] Networking
Date: Thu, 6 Oct 2016 13:51:52 +1100 [thread overview]
Message-ID: <20161006135152.3fd229cb@canb.auug.org.au> (raw)
In-Reply-To: <CA+55aFz0jv3xAQTwrspM3HkXQLVv_H4QuHf9a0Fq2Zm+=_sDtQ@mail.gmail.com>
Hi Linus,
On Wed, 5 Oct 2016 19:14:21 -0700 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> On Wed, Oct 5, 2016 at 5:52 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Except that commit effectively moved that function from
> > net/netfilter/nf_tables_netdev.c to
> > include/net/netfilter/nf_tables_ipv4.h while commit c73c24849011
> > ("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment")
> > removed the assignment in the original file (and has been in your tree
> > since v4.8-rc7) and that is where I originally actually got a conflict.
>
> Oh, interesting. Why didn't I get the conflict there then?
>
> I'm guessing (but too lazy to actually look up the history), that
> David ended up doing that merge and that ends up being why I never saw
> a conflict.
Yeah, commit b50afd203a5e ("Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") actually
merges v4.8 into the net-next tree.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2016-10-06 2:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20161005.014437.1946431553783736769.davem@davemloft.net>
2016-10-05 22:29 ` [GIT] Networking Stephen Rothwell
2016-10-05 22:37 ` Linus Torvalds
2016-10-06 0:09 ` Pablo Neira Ayuso
2016-10-06 0:26 ` David Miller
2016-10-06 0:52 ` Stephen Rothwell
2016-10-06 2:14 ` Linus Torvalds
2016-10-06 2:51 ` Stephen Rothwell [this message]
2016-10-06 2:56 ` David Miller
2016-10-06 5:07 ` Stephen Rothwell
2013-11-11 20:47 David Miller
-- strict thread matches above, loose matches on Subject: below --
2011-03-16 21:21 David Miller
2011-01-12 0:24 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=20161006135152.3fd229cb@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=liping.zhang@spreadtrum.com \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=torvalds@linux-foundation.org \
/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).