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:   Thu, 16 Sep 2021 16:27:40 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= 
        <u.kleine-koenig@pengutronix.de>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: Improvement suggestion for creation of next [Was: linux-next:
 manual merge of the dmaengine tree with the driver-core tree]
Message-ID: <20210916162740.3327df56@canb.auug.org.au>
In-Reply-To: <20210728071014.dkdvqmiw2lma6ooa@pengutronix.de>
References: <20210723155354.082a62d8@canb.auug.org.au>
        <20210728071014.dkdvqmiw2lma6ooa@pengutronix.de>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Haa0oEpn914_9eS/W_KnBeE";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Haa0oEpn914_9eS/W_KnBeE
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Hi Uwe,

[Sorry this took so long]

On Wed, 28 Jul 2021 09:10:14 +0200 Uwe Kleine-K=C3=B6nig <u.kleine-koenig@p=
engutronix.de> wrote:
>
> 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:
>=20
> 	uwe@taurus:~/gsrc/linux$ git name-rev d9e5481fca74
> 	d9e5481fca74 tags/next-20210722~22^2~2
>=20
> so it was merged in tags/next-20210722~22, looking at that I see:
>=20
> 	uwe@taurus:~/gsrc/linux$ git show tags/next-20210722~22
> 	commit 65da974af6a0d913cde0cf59f517322bceac24a7
> 	...
> 	    Merge remote-tracking branch 'dmaengine/next'
>=20
> and then I have to lookup what dmaengine/next means in next-20210722:
>=20
> 	uwe@taurus:~/gsrc/linux$ git show next-20210722 | grep dmaen
> 	...
> 	+dmaengine	git	git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaen=
gine.git#next
> 	...
>=20
> You could save me the last step if you used
>=20
> 	git pull dmaengine next
>=20
> instead of
>=20
> 	git merge dmaengine/next
>=20
> because then the commit message of tags/next-20210722~22 would be:
>=20
> 	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vko=
ul/dmaengine.git
>=20
> which is much more useful than
>=20
> 	Merge remote-tracking branch 'dmaengine/next'
>=20
> . Otherwise the result should be the same (apart from fetching the
> changes a tad later maybe).

Thanks for the feed back.

I prefer to fetch all the trees (and run my checking scripts across
them independently of the merge/build cycle.  However, I have improved
the merge commit messages (I think).  Please check out today's
linux-next.  I have decided to remove the SHA1 from the message, as you
can see that from what is merged anyway.

Let me know if this is better for you.

--=20
Cheers,
Stephen Rothwell

--Sig_/Haa0oEpn914_9eS/W_KnBeE
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmFC49wACgkQAVBC80lX
0GxkzQf/dU7Qxk8D4z+zo10wKh5U4X9bxOWYRqTQQqavLKxDkGhAvfnIV1uzUwnx
FvBjEmX+29b422pfB6LkQ8U5V9UhMHjIslfio5GO+Nta85nT1JQ7c8zdnxYYcBZq
gE/eNABfNNf5hVILNY/YAwh3Ly7aoY6Kh77A6kbFtGobyxVD9pv/3rQxvcJSgP4Z
H9hf6AZoIyq9jaAg7lp91zdXlVK578AQvvy0BQ8L4aRPbi+kxCclAhl7DL5ULt2M
3RPpSj91HGitrE3G1SsyvQ587JV8Y5ALd04ysXmqlocHX01Ruey5NiB1+N2UaDSu
7wvWfBR1EonpS3LtTikiugKurfshjQ==
=c4n7
-----END PGP SIGNATURE-----

--Sig_/Haa0oEpn914_9eS/W_KnBeE--