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/core/devmem.c

between commit:

  a70f891e0fa0 ("net: devmem: do not WARN conditionally after netdev_rx_queue_restart()")

from the net tree and commit:

  1d22d3060b9b ("net: drop rtnl_lock for queue_mgmt operations")

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/core/devmem.c
index 0e5a2c672efd,5c4d79a1bcd8..000000000000
--- a/net/core/devmem.c
+++ b/net/core/devmem.c
@@@ -118,11 -125,12 +126,14 @@@ void net_devmem_unbind_dmabuf(struct ne
  		WARN_ON(rxq->mp_params.mp_priv != binding);
  
  		rxq->mp_params.mp_priv = NULL;
+ 		rxq->mp_params.mp_ops = NULL;
  
+ 		netdev_lock(binding->dev);
  		rxq_idx = get_netdev_rx_queue_index(rxq);
 -		WARN_ON(netdev_rx_queue_restart(binding->dev, rxq_idx));
 +
 +		err = netdev_rx_queue_restart(binding->dev, rxq_idx);
 +		WARN_ON(err && err != -ENETDOWN);
+ 		netdev_unlock(binding->dev);
  	}
  
  	xa_erase(&net_devmem_dmabuf_bindings, binding->id);

Attachment: pgpmBLtnjkvrf.pgp
Description: OpenPGP digital signature