| Message ID | 20200303112614.546aa34f@canb.auug.org.au |
|---|---|
| State | Not Applicable |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | linux-next: manual merge of the netfilter-next tree with Linus' tree | expand |
diff --cc net/netfilter/ipset/ip_set_hash_gen.h index e52d7b7597a0,f1edc5b9b4ce..1ee43752d6d3 --- a/net/netfilter/ipset/ip_set_hash_gen.h
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.