linux-next: manual merge of the rcu tree with the netfilter-next tree

. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/netfilter/nf_conntrack_core.c index 071b97fcbefb,13b7e5159660.. --- a/net/netfilter/nf_conntrack_core.c

Re: [GIT] Networking

Hi Linus, On Wed, 5 Oct 2016 19:14:21 -0700 Linus Torvalds <torva...@linux-foundation.org> wrote: > > On Wed, Oct 5, 2016 at 5:52 PM, Stephen Rothwell <s...@canb.auug.org.au> > wrote: > > > > Except that commit effectively moved that function from >

Re: [GIT] Networking

Hi Linus, Dave, On Wed, 05 Oct 2016 01:44:37 -0400 (EDT) David Miller <da...@davemloft.net> 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 Ro

Re: [GIT] Networking

Hi Linus, On Wed, 5 Oct 2016 15:37:17 -0700 Linus Torvalds <torva...@linux-foundation.org> wrote: > > On Wed, Oct 5, 2016 at 3:29 PM, Stephen Rothwell <s...@canb.auug.org.au> > wrote: > > > > I have been carrying the following merge fix patch (for the merge of

Re: [GIT] Networking

Hi Dave, On Wed, 05 Oct 2016 22:56:12 -0400 (EDT) David Miller <da...@davemloft.net> 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

Re: linux-next: manual merge of the netfilter-next tree with the net tree

Hi all, On Tue, 13 Sep 2016 10:12:50 +1000 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > Today's linux-next merge of the netfilter-next tree got a conflict in: > > net/netfilter/nf_tables_netdev.c > > between commit: > > c73c24849011 ("netfilter:

linux-next: manual merge of the net-next tree with the netfilter tree

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/netfilter/ipvs/ip_vs_ctl.c index a6e44ef2ec9a,6b85ded4f91d.. --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_v

linux-next: build warnings after merge of the netfilter-next tree

lared here __wsum fsum, tsum; ^ Introduced by commit 556c291b3a1b ("netfilter: nft_payload: layer 4 checksum adjustment for pseudoheader fields") -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in t

Re: linux-next: build warning after merge of the netfilter-next tree

this, slipped through. Should I submit a fix or how do you > want to handle this? That's up to Pablo, but presumably you should send him a followup patch. -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: linux-next: build failure after merge of the netfilter tree

Hi Willem, On Wed, 17 May 2017 11:29:19 -0400 Willem de Bruijn <willemdebruijn.ker...@gmail.com> wrote: > > Full patch out for review at http://patchwork.ozlabs.org/patch/763655/ I have used that in linux-next today instead of my cludge. -- Cheers, Stephen Rothwell -- To unsu

linux-next: build failure after merge of the netfilter tree

OMPAT case C_SIZE will always be zero, but the compiler is still looking for the macro :-( I added this cludge patch (I am sure it can be done better): From: Stephen Rothwell <s...@canb.auug.org.au> Date: Wed, 17 May 2017 13:36:26 +1000 Subject: [PATCH] netfilter: xtables: fix for zero padding

Re: linux-next: build warning after merge of the netfilter-next tree

Hi Pablo, On Thu, 9 Nov 2017 00:40:14 +0100 Pablo Neira Ayuso <pa...@netfilter.org> wrote: > > On Wed, Nov 08, 2017 at 07:00:52PM +1100, Stephen Rothwell wrote: > > > > On Tue, 7 Nov 2017 11:02:48 +1100 Stephen Rothwell <s...@canb.auug.org.au> > >

Re: linux-next: build warning after merge of the netfilter-next tree

Hi Pablo, On Thu, 16 Nov 2017 15:18:00 +0100 Pablo Neira Ayuso <pa...@netfilter.org> wrote: > > The patch is already at davem's tree. It's flying there. Excellent, thanks. -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe netfilter-d

linux-next: build warning after merge of the netfilter-next tree

*ct) ^ Introduced by commit 5caaed151a68 ("netfilter: conntrack: don't cache nlattr_tuple_size result in nla_size") -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to major

Re: linux-next: build warning after merge of the netfilter-next tree

Hi Dave, On Tue, 7 Nov 2017 11:02:48 +1100 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > Hi all, > > After merging the netfilter-next tree, today's linux-next build (powerpc > ppc64_defconfig) produced this warning: > > net/netfilter/nf_conntrac

linux-next: manual merge of the netfilter-next tree with the netfilter tree

ubmitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/netfilter/nf_conntrack_h323_asn1.c index dc6347342e34,475fc8a9b477..

Re: linux-next: manual merge of the vfs tree with the netfilter tree

ill necessary > independent of the commit from the vfs tree. Rats. I will see what I can do about that. > > I fixed it up (see below) > > Did you mean to paste in the fixed-up patch below this message? Ah, well actually the diff ended up empty (since I used one side of the confl

linux-next: manual merge of the vfs tree with the netfilter tree

intainers (or have you done so and it just hasn't been picked up yet)? -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

linux-next: Signed-off-by missing for commit in the netfilter-next tree

Hi all, Commit 75e72f05418a ("netfilter: nft_numgen: enable hashing of one element") is missing a Signed-off-by from its committer. -- Cheers, Stephen Rothwell pgptGWck_fdoi.pgp Description: OpenPGP digital signature

linux-next: build warning after merge of the netfilter-next tree

print infrastructure from xt_osf") -- Cheers, Stephen Rothwell pgpF18A_zRJ0t.pgp Description: OpenPGP digital signature

Re: linux-next: build warning after merge of the netfilter-next tree

Hi all, On Mon, 7 May 2018 10:55:19 +1000 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > After merging the netfilter-next tree, today's linux-next build (x86_64 > allmodconfig) produced this warning: > > ./usr/include/linux/netfilter/nf_osf.h:25: found __[us]{8,16,3

linux-next: Signed-off-by missing for commit in the netfilter tree

Hi all, Commit ecb5a282f87d ("netfilter: nf_tables: fix memory leak on error exit return") is missing a Signed-off-by from its committer. -- Cheers, Stephen Rothwell pgpg1b1h1E1kL.pgp Description: OpenPGP digital signature

linux-next: Signed-off-by missing for commit in the netfilter tree

Hi all, Commit d8ed9600581d ("netfilter: remove useless prototype") is missing a Signed-off-by from its committer. -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majord...@vger.kerne

linux-next: build warning after merge of the netfilter-next tree

not what you want Introduced by commit 9faa679ee7ec ("netfilter: move reroute indirection to struct nf_ipv6_ops") -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majord...@vger.kernel.org