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

Commit Message

Stephen Rothwell Oct. 19, 2021, 11:34 p.m. UTC

Hi all,

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

  include/linux/mlx5/fs.h

between commit:

  b8dfed636fc6 ("net/mlx5: Add priorities for counters in RDMA namespaces")

from the rdma tree and commit:

  425a563acb1d ("net/mlx5: Introduce port selection namespace")

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.

Patch

diff --cc include/linux/mlx5/fs.h
index f2c3da2006d9,7a43fec63a35..000000000000
--- a/include/linux/mlx5/fs.h