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;
Message-ID: <16f0ac6227f948165b7062a72e1fa82f1dfe4697.camel@redhat.com>
Subject: Re: linux-next: manual merge of the net-next tree with the rdma tree
From:   Doug Ledford <dledford@redhat.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        Jason Gunthorpe <jgg@mellanox.com>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Shamir Rabinovitch <shamir.rabinovitch@oracle.com>,
        Jakub Kicinski <jakub.kicinski@netronome.com>
Date:   Wed, 27 Feb 2019 11:24:51 -0500
In-Reply-To: <20190227112522.2f32b5d7@canb.auug.org.au>
References: <20190227112522.2f32b5d7@canb.auug.org.au>
Organization: Red Hat, Inc.
Content-Type: multipart/signed; micalg="pgp-sha256";
        protocol="application/pgp-signature"; boundary="=-Ztt69rjC7eLb5Zkdd3kZ"
User-Agent: Evolution 3.30.5 (3.30.5-1.fc29) 
MIME-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--=-Ztt69rjC7eLb5Zkdd3kZ
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Wed, 2019-02-27 at 11:25 +1100, Stephen Rothwell wrote:
> Hi all,
>=20
> Today's linux-next merge of the net-next tree got a conflict in:
>=20
>   drivers/infiniband/hw/mlx4/Kconfig
>=20
> between commit:
>=20
>   6fa8f1afd337 ("IB/{core,uverbs}: Move ib_umem_xxx functions from ib_cor=
e to ib_uverbs")
>=20
> from the rdma tree and commit:
>=20
>   f4b6bcc7002f ("net: devlink: turn devlink into a built-in")
>=20
> from the net-next tree.
>=20
> 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

Thanks Stephen, we'll add it to the (largish this release) list of
conflicts to bring to Linus' attention.

--=20
Doug Ledford <dledford@redhat.com>
    GPG KeyID: B826A3330E572FDD
    Key fingerprint =3D AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD

--=-Ztt69rjC7eLb5Zkdd3kZ
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit

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

iQIzBAABCAAdFiEErmsb2hIrI7QmWxJ0uCajMw5XL90FAlx2udMACgkQuCajMw5X
L908zg//WyrOBrH4aY9dpVct3tcwhj1OqaBUCNOwdkFkqB4VShFRf0tajMZLjWM7
aJamWayMn4uR9C6IkwbWhxnc6BYClwXIF1HetZIYXWBlj8ehoQI3Do9yuaBDzJsV
RvQ1bWbiIbHGmBQJ00f+0ZYsk4Dkfcu/4QCjWGWX3QpCRbUKucUgdovEL7XJFZil
Ydg8tRPck/t/U58pxugdRuSSnjHx3Bq/dRflSueti8vWv6BsGm+xtyH8U/cKIsgn
FvMZ1xLz+vnG1K9m7o/eXTCRJ4xv4FRt08nqdlPTENQndgLvTPLUnAvgcTIUrbyQ
EQW0PvV3k0z/bqQnGPpWnW50+evj3IsnEpBIcKkUn8FXjKc1yBobYMUF72QO7MEF
Mp90zsDbp9PVb3Z+fRZfZ2hli/iwoDQ67vvSHrZQkRvEJm+liCod3ac3cmZVUaOQ
tAwIkpRq50bWSrwBeRf8NagbyeKTRJTz5tg37Sr7cr2w1JPmpAXGgN6UZp+0b/r5
foPvseoQNA7U7OjYLb8IEEicFz3RYjcj3sO/5tAmEpAbn9GxFUpFbWJgmQa77T5W
ZytHSytt7drPKY8GQUvW4uaiSNIRLy24Pkojdanpyr/LsSvpkoDUmTRbUXVEcQL7
odXeNcozRvns3/7hbXh0g2a1RsvZloAl4xunjPpQC9iI+4ry1Z4=
=XnDM
-----END PGP SIGNATURE-----

--=-Ztt69rjC7eLb5Zkdd3kZ--