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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  net/netfilter/ipset/ip_set_hash_gen.h

between commit:

  f66ee0410b1c ("netfilter: ipset: Fix "INFO: rcu detected stall in hash_xxx" reports")

from Linus' tree and commit:

  9fabbf56abfe ("netfilter: Replace zero-length array with flexible-array member")

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/ipset/ip_set_hash_gen.h
index e52d7b7597a0,f1edc5b9b4ce..1ee43752d6d3
--- a/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
@@@ -105,11 -75,9 +105,11 @@@ struct htable_gc 
  /* The hash table: the table size stored here in order to make resizing easy */
  struct htable {
  	atomic_t ref;		/* References for resizing */
 -	atomic_t uref;		/* References for dumping */
 +	atomic_t uref;		/* References for dumping and gc */
  	u8 htable_bits;		/* size of hash table == 2^htable_bits */
 +	u32 maxelem;		/* Maxelem per region */
 +	struct ip_set_region *hregion;	/* Region locks and ext sizes */
- 	struct hbucket __rcu *bucket[0]; /* hashtable buckets */
+ 	struct hbucket __rcu *bucket[]; /* hashtable buckets */
  };
  
  #define hbucket(h, i)		((h)->bucket[i])

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