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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/netfilter/nf_tables_api.c

between commit:

  3c5e44622011 ("netfilter: nf_tables: memleak in hw offload abort path")

from the net tree and commit:

  ef4b65e53cc7 ("netfilter: nfnetlink: add struct nfgenmsg to struct nfnl_info and use it")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted 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_tables_api.c
index fcb15b8904e8,d6214242fe7f..000000000000
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@@ -3249,9 -3236,9 +3242,9 @@@ static int nf_tables_newrule(struct sk_
  	u8 genmask = nft_genmask_next(info->net);
  	struct nft_rule *rule, *old_rule = NULL;
  	struct nft_expr_info *expr_info = NULL;
+ 	u8 family = info->nfmsg->nfgen_family;
 +	struct nft_flow_rule *flow = NULL;
- 	int family = nfmsg->nfgen_family;
  	struct net *net = info->net;
 -	struct nft_flow_rule *flow;
  	struct nft_userdata *udata;
  	struct nft_table *table;
  	struct nft_chain *chain;

Attachment: pgpleOCwh0_Us.pgp
Description: OpenPGP digital signature