Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 23 Aug 2019 12:22:27 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Doug Ledford <dledford@redhat.com>,
        Jason Gunthorpe <jgg@mellanox.com>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Moni Shoua <monis@mellanox.com>,
        Parav Pandit <parav@mellanox.com>,
        Leon Romanovsky <leonro@mellanox.com>
Subject: linux-next: manual merge of the rdma tree with the rdma-fixes tree
Message-ID: <20190823122227.4c2b9790@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/mKDxMMYXrXXjP_s54QUOcKE";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/mKDxMMYXrXXjP_s54QUOcKE
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/infiniband/hw/mlx5/mlx5_ib.h

between commit:

  0e6613b41edd ("IB/mlx5: Consolidate use_umr checks into single function")

from the rdma-fixes tree and commit:

  3e1f000ff746 ("IB/mlx5: Support per device q counters in switchdev mode")

from the rdma 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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h
index 9ae587b74b12,cb41a7e6255a..000000000000
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@@ -1475,18 -1475,5 +1475,19 @@@ int bfregn_to_uar_index(struct mlx5_ib_
  			bool dyn_bfreg);
 =20
  int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter=
);
+ u16 mlx5_ib_get_counters_id(struct mlx5_ib_dev *dev, u8 port_num);
 +
 +static inline bool mlx5_ib_can_use_umr(struct mlx5_ib_dev *dev,
 +				       bool do_modify_atomic)
 +{
 +	if (MLX5_CAP_GEN(dev->mdev, umr_modify_entity_size_disabled))
 +		return false;
 +
 +	if (do_modify_atomic &&
 +	    MLX5_CAP_GEN(dev->mdev, atomic) &&
 +	    MLX5_CAP_GEN(dev->mdev, umr_modify_atomic_disabled))
 +		return false;
 +
 +	return true;
 +}
  #endif /* MLX5_IB_H */

--Sig_/mKDxMMYXrXXjP_s54QUOcKE
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl1fTeMACgkQAVBC80lX
0GyXDgf9FrwdVx6aO+wP4xotZb2GuGRLQQmv7QUKSls1w6kHrCSLXGnkg4belRqx
H1sbyvYwoIi7hGY8dVErjBmYAQoIBlYHE9xiwPA3LFhifxTpJS63aqc71AHj6hrY
PoXQRXof1/bvGiSBxP3E4VMk/7CY0XJL/62Ng7YeONa45qlZHqmFhfcC59Kp+HIA
4D6RamzkEyC8UGzhpeSujmK8d2dMFvrA9UFZvtAWMMGzE4MUqVLIATcR99keCf+q
Q86y3wicMd3onStdX8VY6HjRSCuXhbaKt8dmCVSu93lsEIVwfadhKsqQdeNYOl3q
TDSV/GSrPvzKIRR25kk393nf+Locbg==
=nIW5
-----END PGP SIGNATURE-----

--Sig_/mKDxMMYXrXXjP_s54QUOcKE--