Re: [GIT] Networking

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: [GIT] Networking
Date	2016-10-06 05:00 +0200
Message-ID	<sp74B-2qb-3@gated-at.bofh.it> (permalink)
References	<soNfz-4TI-3@gated-at.bofh.it> <sp30Z-8gt-3@gated-at.bofh.it> <sp30Z-8gt-1@gated-at.bofh.it> <sp5ct-17c-5@gated-at.bofh.it> <sp6rT-2cz-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Re: [GIT] Networking Linus Torvalds <torvalds@linux-foundation.org> - 2016-10-06 00:40 +0200
  Re: [GIT] Networking Pablo Neira Ayuso <pablo@netfilter.org> - 2016-10-06 02:20 +0200
    Re: [GIT] Networking David Miller <davem@davemloft.net> - 2016-10-06 02:30 +0200
  Re: [GIT] Networking Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-06 03:00 +0200
    Re: [GIT] Networking Linus Torvalds <torvalds@linux-foundation.org> - 2016-10-06 04:20 +0200
      Re: [GIT] Networking David Miller <davem@davemloft.net> - 2016-10-06 05:00 +0200
        Re: [GIT] Networking Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-06 07:10 +0200
      Re: [GIT] Networking Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-06 05:00 +0200

csiph-web