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:   Tue, 28 Jul 2020 18:45:20 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Kees Cook <keescook@chromium.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>,
        Leon Romanovsky <leonro@mellanox.com>
Subject: linux-next: manual merge of the kspp tree with the rdma tree
Message-ID: <20200728184520.5634a0a0@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/brtQ5yF3b/XQBvAo+YFBl8W";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/brtQ5yF3b/XQBvAo+YFBl8W
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/infiniband/core/uverbs_cmd.c

between commit:

  29f3fe1d6854 ("RDMA/uverbs: Remove redundant assignments")

from the rdma tree and commit:

  3f649ab728cd ("treewide: Remove uninitialized_var() usage")

from the kspp tree.

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.

--=20
Cheers,
Stephen Rothwell

--Sig_/brtQ5yF3b/XQBvAo+YFBl8W
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8f5aAACgkQAVBC80lX
0GwU9Af/ZI2vygS110uanKKD+OYtIVBpnRmUxRXm1o43YGdRR/XDK+vEVo1x9hW8
IDUbA7FCPmhBvKUjPSrDesUHVTN13Sk+pA9Uf5njdJsPl5aX9V8Xq/oWu+IEVB3g
hzo94LR4po2I8JP1CAXAXjm7ArC6Ny2rkYlI0GHVnL3wheT8Ljs9WIc02v89ZEVt
EHsuvz+MCWzfzmp3jXkrlaGYh2bZy+vFD6NsKtyNppSLTvtH9osxvy6i3SwTxmEi
ldTEYIXKIFjvsbCKquSsETL5bFZgXqOrMztJYUnmv/dHjOV4kHN8CXy8FFRA5OiX
IxVJj+UJbdR5AC3zzYMm4mKOsPuqsg==
=4G68
-----END PGP SIGNATURE-----

--Sig_/brtQ5yF3b/XQBvAo+YFBl8W--