Re: [GIT] Networking

2016-10-05 Thread Stephen Rothwell
Hi Dave, On Wed, 05 Oct 2016 22:56:12 -0400 (EDT) David Miller wrote: > > Yes, this is where the change got lost. No worries. > I have all of the fixups queued up in my net tree and will send in a pull > request later. Thanks. -- Cheers, Stephen Rothwell -- To

Re: [GIT] Networking

2016-10-05 Thread David Miller
From: Stephen Rothwell Date: Thu, 6 Oct 2016 13:51:52 +1100 > 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

Re: [GIT] Networking

2016-10-05 Thread Stephen Rothwell
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 > >

Re: [GIT] Networking

2016-10-05 Thread Linus Torvalds
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

Re: [GIT] Networking

2016-10-05 Thread Stephen Rothwell
Hi Linus, On Wed, 5 Oct 2016 15:37:17 -0700 Linus Torvalds wrote: > > On Wed, Oct 5, 2016 at 3:29 PM, Stephen Rothwell > wrote: > > > > I have been carrying the following merge fix patch (for the merge of > > the net-next tree with Linus'

Re: [GIT] Networking

2016-10-05 Thread David Miller
From: Pablo Neira Ayuso Date: Thu, 6 Oct 2016 02:09:45 +0200 > On Wed, Oct 05, 2016 at 03:37:17PM -0700, Linus Torvalds wrote: >> On Wed, Oct 5, 2016 at 3:29 PM, Stephen Rothwell >> wrote: >> > >> > I have been carrying the following merge fix patch

Re: [GIT] Networking

2016-10-05 Thread Pablo Neira Ayuso
On Wed, Oct 05, 2016 at 03:37:17PM -0700, Linus Torvalds wrote: > On Wed, Oct 5, 2016 at 3:29 PM, Stephen Rothwell > wrote: > > > > I have been carrying the following merge fix patch (for the merge of > > the net-next tree with Linus' tree) for a while now which seems to

Re: [GIT] Networking

2016-10-05 Thread Linus Torvalds
On Wed, Oct 5, 2016 at 3:29 PM, Stephen Rothwell wrote: > > I have been carrying the following merge fix patch (for the merge of > the net-next tree with Linus' tree) for a while now which seems to have > got missed: Ugh. It doesn't seem to be a merge error, because that

Re: [GIT] Networking

2016-10-05 Thread Stephen Rothwell
Hi Linus, Dave, On Wed, 05 Oct 2016 01:44:37 -0400 (EDT) David Miller wrote: > I have been carrying the following merge fix patch (for the merge of the net-next tree with Linus' tree) for a while now which seems to have got missed: From: Stephen Rothwell