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, 28 Jul 2021 09:10:14 +0200
From:   Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Improvement suggestion for creation of next [Was: linux-next: manual
 merge of the dmaengine tree with the driver-core tree]
Message-ID: <20210728071014.dkdvqmiw2lma6ooa@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="uj5lprban3ske425"
Content-Disposition: inline
In-Reply-To: <20210723155354.082a62d8@canb.auug.org.au>
Precedence: bulk


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

Hello Stephen,

On Fri, Jul 23, 2021 at 03:53:54PM +1000, Stephen Rothwell wrote:
> 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.

I intended to take a look at the resolution that Vinod pushed in his
tree. To find his tree and the right branch my approach in such a
situation is usually:

	uwe@taurus:~/gsrc/linux$ git name-rev d9e5481fca74
	d9e5481fca74 tags/next-20210722~22^2~2

so it was merged in tags/next-20210722~22, looking at that I see:

	uwe@taurus:~/gsrc/linux$ git show tags/next-20210722~22
	commit 65da974af6a0d913cde0cf59f517322bceac24a7
	...
	    Merge remote-tracking branch 'dmaengine/next'

and then I have to lookup what dmaengine/next means in next-20210722:

	uwe@taurus:~/gsrc/linux$ git show next-20210722 | grep dmaen
	...
	+dmaengine	git	git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengi=
ne.git#next
	...

You could save me the last step if you used

	git pull dmaengine next

instead of

	git merge dmaengine/next

because then the commit message of tags/next-20210722~22 would be:

	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul=
/dmaengine.git

which is much more useful than

	Merge remote-tracking branch 'dmaengine/next'

=2E Otherwise the result should be the same (apart from fetching the
changes a tad later maybe).

Thanks for considering
Uwe

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

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

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

iQEzBAABCgAdFiEEfnIqFpAYrP8+dKQLwfwUeK3K7AkFAmEBAtIACgkQwfwUeK3K
7AmiNQf6Avmc6SwBu6uW8mwFiL0mV/1hyiJPr4l5hYfl9FUFLgvhRb8xLec6f/5v
l3/ntN7qtDfaldSs9Z9VgyFLILwE1loLwYkRPw6j6cLpwGBZPPABRgB4Tfln3o1M
EPlhfo8ZCjHOzUgAh2kpvTrtspIkRfKIPZ1AlykGYDXU8eT5xk0T1FvWfmeAD8nD
s/IYcAFfxEI3iQXVLHe33+CTPjOVBQ0kiwZ6bhmSR59w90sF63TDY9I/4ipuVgU7
kL16LqmBF4THn2G1Y4BXp9bv1oDdxPEKxpgcVDckJMUkZd3/zqtQhT3k8/2eTKzO
QqKPDzyd5XXpgLMxGd8RYWm2isg2NQ==
=6czK
-----END PGP SIGNATURE-----

--uj5lprban3ske425--