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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

Hi all,

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

  net/netfilter/nf_flow_table_offload.c

between commit:

  978703f42549 ("netfilter: flowtable: Add API for registering to flow table events")

from the net-next tree and commit:

  1f412791407b ("netfilter: flowtable: Use nf_flow_offload_tuple for stats as well")

from the netfilter-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_flow_table_offload.c
index 42b73a084a63,482a7284e122..000000000000
--- a/net/netfilter/nf_flow_table_offload.c
+++ b/net/netfilter/nf_flow_table_offload.c
@@@ -596,8 -619,10 +597,11 @@@ static int nf_flow_offload_tuple(struc
  
  		i++;
  	}
 +	mutex_unlock(&flowtable->flow_block_lock);
  
+ 	if (cmd == FLOW_CLS_STATS)
+ 		memcpy(stats, &cls_flow.stats, sizeof(*stats));
+ 
  	return i;
  }
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]