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

Hi all, Today's linux-next merge of the netfilter-next tree got a conflict in: net/netfilter/nf_tables_netdev.c between commit: c73c24849011 ("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment") from the net tree and commit: ddc8b6027ad0 ("netfilter: introduce nft_set_pkt

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

Hi all, Today's linux-next merge of the netfilter-next tree got a conflict in: include/net/netfilter/nf_tables_core.h between commit: e240cd0df481 ("netfilter: nf_tables: place all set backends in one single module") from the net tree and commit: da8f7d227adc ("netfilter: nf_tables: ha

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 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: nf_tables_netdev: remove redundant ip_hdr > assignment") >

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

[ remove other unrelated dev groups ] Hi pablo, 2016-09-29 9:20 GMT+08:00 Stephen Rothwell : > Hi all, > > On Tue, 13 Sep 2016 10:12:50 +1000 Stephen Rothwell > wrote: >> >> Today's linux-next merge of the netfilter-next tree got a conflict in: >> >> net/netfilter/nf_tables_netdev.c >> >> bet