lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Thu, 6 Oct 2016 13:51:52 +1100
From:   Stephen Rothwell <>
To:     Linus Torvalds <>
Cc:     David Miller <>,
        NetFilter <>,
        Network Development <>,
        Linux Kernel Mailing List <>,
        Pablo Neira Ayuso <>,
        Liping Zhang <>
Subject: Re: [GIT] Networking

Hi Linus,

On Wed, 5 Oct 2016 19:14:21 -0700 Linus Torvalds <> wrote:
> On Wed, Oct 5, 2016 at 5:52 PM, Stephen Rothwell <> 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://") actually
merges v4.8 into the net-next tree.

Stephen Rothwell

Powered by blists - more mailing lists