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:   Wed, 5 Dec 2018 12:07:06 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Leon Romanovsky <leon@kernel.org>,
        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>
Subject: linux-next: manual merge of the mlx5-next tree with the rdma tree
Message-ID: <20181205120706.294b9422@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/T8tK4Q5bNyrZX7VJB2eHTL3"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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

Hi Leon,

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

  drivers/infiniband/hw/mlx5/main.c
  drivers/infiniband/hw/mlx5/mlx5_ib.h

between commit:

  36e235c88299 ("RDMA/mlx5: Use the uapi disablement APIs instead of code")

from the rdma tree and commit:

  81773ce5f07f ("RDMA/mlx5: Use stages for callback to setup and release DE=
VX")

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

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/infiniband/hw/mlx5/main.c
index f9078688da5b,96515a8c9d2c..000000000000
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@@ -6231,6 -6336,12 +6321,9 @@@ static const struct mlx5_ib_profile pf_
  	STAGE_CREATE(MLX5_IB_STAGE_PRE_IB_REG_UMR,
  		     NULL,
  		     mlx5_ib_stage_pre_ib_reg_umr_cleanup),
 -	STAGE_CREATE(MLX5_IB_STAGE_SPECS,
 -		     mlx5_ib_stage_populate_specs,
 -		     NULL),
+ 	STAGE_CREATE(MLX5_IB_STAGE_WHITELIST_UID,
+ 		     mlx5_ib_stage_devx_init,
+ 		     mlx5_ib_stage_devx_cleanup),
  	STAGE_CREATE(MLX5_IB_STAGE_IB_REG,
  		     mlx5_ib_stage_ib_reg_init,
  		     mlx5_ib_stage_ib_reg_cleanup),
diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h
index a2b35a1a5031,861b68f2e330..000000000000
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@@ -781,6 -784,8 +784,7 @@@ enum mlx5_ib_stages=20
  	MLX5_IB_STAGE_UAR,
  	MLX5_IB_STAGE_BFREG,
  	MLX5_IB_STAGE_PRE_IB_REG_UMR,
 -	MLX5_IB_STAGE_SPECS,
+ 	MLX5_IB_STAGE_WHITELIST_UID,
  	MLX5_IB_STAGE_IB_REG,
  	MLX5_IB_STAGE_POST_IB_REG_UMR,
  	MLX5_IB_STAGE_DELAY_DROP,
@@@ -890,7 -896,9 +895,8 @@@ struct mlx5_ib_pf_eq=20
 =20
  struct mlx5_ib_dev {
  	struct ib_device		ib_dev;
 -	const struct uverbs_object_tree_def *driver_trees[7];
  	struct mlx5_core_dev		*mdev;
+ 	struct notifier_block		mdev_events;
  	struct mlx5_roce		roce[MLX5_MAX_PORTS];
  	int				num_ports;
  	/* serialize update of capability mask

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlwHJLoACgkQAVBC80lX
0GyS4Qf+O+tk+o6rVrqlB6yV/4P1AbZRGbwVYUk1ANyBxpjdootHfRqBDtlJtnmV
OteIebarKNgK1bLiKjHzUU8EYWb6vOES5ofpb/CFMd/qTXnzILrz2WajqxET4pNr
1IuaQdU6Q6WNMzCyPrxvtux0KuBGIbCRYeH6jBocOa1pECCZfsbFTKAlxYXUYTKY
gKXhzURcFwj6ubg7E8OM/ophi1Hcxyh2IERqXs47/MJtR0BlbOdl5eysGwqmlRYD
XHwPd0D9yjKX6ZfHXEfbAam3nZhVvHZPC66Xlf8bGZAdr0HBWY8XGxLBsc1/QT6C
LrPsLBra2V6Bhqgf/bVtLSCVl+wKvA==
=exhH
-----END PGP SIGNATURE-----

--Sig_/T8tK4Q5bNyrZX7VJB2eHTL3--