Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 5 Aug 2020 14:07:28 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Doug Ledford <dledford@redhat.com>,
        Jason Gunthorpe <jgg@mellanox.com>
Cc:     Kees Cook <keescook@chromium.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Leon Romanovsky <leonro@mellanox.com>
Subject: Re: linux-next: manual merge of the kspp tree with the rdma tree
Message-ID: <20200805140728.61834c32@canb.auug.org.au>
In-Reply-To: <20200728184520.5634a0a0@canb.auug.org.au>
References: <20200728184520.5634a0a0@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.fTp2_Vi3uPU2TbLo57SuUD";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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

Hi all,

On Tue, 28 Jul 2020 18:45:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Today's linux-next merge of the kspp tree got a conflict in:
>=20
>   drivers/infiniband/core/uverbs_cmd.c
>=20
> between commit:
>=20
>   29f3fe1d6854 ("RDMA/uverbs: Remove redundant assignments")
>=20
> from the rdma tree and commit:
>=20
>   3f649ab728cd ("treewide: Remove uninitialized_var() usage")
>=20
> from the kspp tree.
>=20
> I fixed it up (the former basically did what the latter did, so I used
> the former version) 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.

This is now a conflict between the rdma tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8qMIAACgkQAVBC80lX
0Gykngf+MHQ7qLRwHh87wEnXjwznwd8nvBtgo9EF7flXvVxAVxYTyTXau0UhM9ua
rYtPHy/XPDoAgFdRHeJG3bSWmle1SWok0h9rxGFnbalfLP3+Ui0fm6l1TTb45hFq
9uEljXfq0PSrOt1G+fK9BxQ/yYevDVZteMiBRptIzuah2DMIn31iS+IYBKcaZv4/
DzojM6WUgkszFwhGP9O18vrJuRZCo7pWVXIQNoR0Ht/3/QtVy0TdWl0Jk3zvDzzD
sDeyLyQXD67DFL8KHvgRxdmR55/JOiOWn1xTC8fj3jtaGFzn2c+9HsFh3JG9jAQA
BjYiDOMeGLxKa7U1Z4X9clXcdAfwtg==
=UTdf
-----END PGP SIGNATURE-----

--Sig_/.fTp2_Vi3uPU2TbLo57SuUD--