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:   Fri, 23 Jul 2021 11:16:41 +0200
From:   Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Vinod Koul <vkoul@kernel.org>, Greg KH <greg@kroah.com>,
        Dave Jiang <dave.jiang@intel.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the dmaengine tree with the
 driver-core tree
Message-ID: <20210723091641.zse42sotjt2pqiif@pengutronix.de>
References: <20210723155354.082a62d8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="fr5d5cyat2qyc4gs"
Content-Disposition: inline
In-Reply-To: <20210723155354.082a62d8@canb.auug.org.au>
Precedence: bulk


--fr5d5cyat2qyc4gs
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hello,

On Fri, Jul 23, 2021 at 03:53:54PM +1000, Stephen Rothwell wrote:
> Hi all,
>=20
> Today's linux-next merge of the dmaengine tree got a conflict in:
>=20
>   drivers/dma/idxd/sysfs.c
>=20
> between commit:
>=20
>   fc7a6209d571 ("bus: Make remove callback return void")
>=20
> from the driver-core tree and commit:
>=20
>   d9e5481fca74 ("dmaengine: dsa: move dsa_bus_type out of idxd driver to =
standalone")
>=20
> from the dmaengine tree.

Greg provided a tag for this case at

	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/=
bus_remove_return_void-5.15

=2E Vinod might want to rebase on top of this or merge it into his tree
with Stephen's conflict resolution.

Best regards
Uwe

--=20
Pengutronix e.K.                           | Uwe Kleine-K=F6nig            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

--fr5d5cyat2qyc4gs
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEfnIqFpAYrP8+dKQLwfwUeK3K7AkFAmD6iPcACgkQwfwUeK3K
7Am9PAf8DT64/bN05JlJzWdHDafV5UAYyevkebDweEgpAByiBeWNPjO1rMX68kK9
8C4y7FM3HAZquL7yIrbXDULKcU2i/XwIs1UgkbT269v1b0Mb+wbyk6tYYIKita3M
8rLC6khp1lzyuJT5vNeTYh3jMRC+IHQXNXmD4E+JY1JarAXB9A93xn7wLVUlNTYX
/dGop5FL68mUEv3TKxdLOw8lwcrMyfY+l0VsahkIDfUFEz/QAbZXTN4EofUWxfyY
hDHu/Z/bjnW2d0XT/l6QBFShZT5RzLMba9Bad3soFTIsITGj1ba6ux9ZPH30B+F/
o0ksFs48CsLpTtniaoIwlihKT/T9/Q==
=6Rbt
-----END PGP SIGNATURE-----

--fr5d5cyat2qyc4gs--