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

[Mark Brown]

Hi all,

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

  net/netfilter/nft_set_rbtree.c

between commit:

  598adea720b97 ("netfilter: revert nft_set_rbtree: validate open interval overlap")

from the net tree and commit:

  3aea466a43998 ("netfilter: nft_set_rbtree: don't disable bh when acquiring tree lock")

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.

(resolution should be the one supplied by Matthieu Baerts)

diff --cc net/netfilter/nft_set_rbtree.c
index fe8bd497d74a7,e429053766545..0000000000000
--- a/net/netfilter/nft_set_rbtree.c
+++ b/net/netfilter/nft_set_rbtree.c
@@@ -639,9 -684,13 +639,9 @@@ static int nft_rbtree_insert(const stru
  
  		cond_resched();
  
- 		write_lock_bh(&priv->lock);
+ 		write_lock(&priv->lock);
 -		err = __nft_rbtree_insert(net, set, rbe, elem_priv, tstamp, last);
 +		err = __nft_rbtree_insert(net, set, rbe, elem_priv, tstamp);
- 		write_unlock_bh(&priv->lock);
+ 		write_unlock(&priv->lock);
 -
 -		if (nft_rbtree_interval_end(rbe))
 -			priv->start_rbe_cookie = 0;
 -
  	} while (err == -EAGAIN);
  
  	return err;

Attachment: signature.asc
Description: PGP signature