From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A127C00145 for ; Tue, 13 Dec 2022 02:58:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5CFE58E0003; Mon, 12 Dec 2022 21:58:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5806F8E0002; Mon, 12 Dec 2022 21:58:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 448018E0003; Mon, 12 Dec 2022 21:58:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 34D338E0002 for ; Mon, 12 Dec 2022 21:58:21 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id F3F421A040C for ; Tue, 13 Dec 2022 02:58:20 +0000 (UTC) X-FDA: 80235774360.06.7DFCA1B Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by imf25.hostedemail.com (Postfix) with ESMTP id 6F2A2A0008 for ; Tue, 13 Dec 2022 02:58:17 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=canb.auug.org.au header.s=201702 header.b="uKN/mflF"; spf=pass (imf25.hostedemail.com: domain of sfr@canb.auug.org.au designates 150.107.74.76 as permitted sender) smtp.mailfrom=sfr@canb.auug.org.au; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670900298; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0dc9lgZjVANauji2m70gBAeV2LINYSzAa3eEsrS3Gs8=; b=FfBS1YbpHCw5c5ckPqWK1ir2U0uzf5JymAHqK8QSdeh9v+iZ9rJyHnxuVYAJRdNweOJ6Pg 8VjUOnew/3sgWDBp3uarqkLdwUH/km8NiP1WHsHpUXkv2+ceMorSKFE9dfF9oHEA++5VZa OIWaLUvygPUR7iBpcmBfLKjKpkN6+hg= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=canb.auug.org.au header.s=201702 header.b="uKN/mflF"; spf=pass (imf25.hostedemail.com: domain of sfr@canb.auug.org.au designates 150.107.74.76 as permitted sender) smtp.mailfrom=sfr@canb.auug.org.au; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670900298; a=rsa-sha256; cv=none; b=2ghnlE579u4Yk0nYSV2LEfch6/jvWmdTdHa5r7+ChPxX1QHGXlkqNBiePVRawkoTn2UcQX AtPp31tvSv9xXOFfOOCwzJxR1QgvGqWWxs3gG3GByQOikqxJbxipz7JvUI1WH/Mt3TmvWR 4FKKYjU3BFHEacNIkW9+T1kcbMA7SVg= Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NWNTw2Hdlz4xN4; Tue, 13 Dec 2022 13:58:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1670900293; bh=0dc9lgZjVANauji2m70gBAeV2LINYSzAa3eEsrS3Gs8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=uKN/mflFOkoC+pzOQcTxJdDlh8T6HJjDg1xC93hF8UcpGEuHSxmiBjXb0g2dDkS5p 5F9YdMZf+4+aFiZZN2nwemZVTxZJjJNvv6lTWmeXoJFJbq/NjjdGh8dpfJ+3zRHmAH Bn/lC+CNBrwakh69Hh2l25iW6+zAvw0StV/UIytCRMJr0SvYGhNj8H/OXgNoJWNO25 oVoOBHbyOLLNfFHUDVK4L7sQlyWXjTF1FCquB9QhHqES/FvtRpIWOUdZGNOZuAoe/+ OYhhwELvpUbQ8BOKqfrhjanOlu8MDI519h2sBYGERFY2AjMfKL50SHgooDX1hw7Y09 UrFYxumW501Og== Date: Tue, 13 Dec 2022 13:58:11 +1100 From: Stephen Rothwell To: Andrew Morton Cc: Vlastimil Babka , "Jason A. Donenfeld" , Linus Torvalds , linux-mm@kvack.org, mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] non-MM commits for 6.2-rc1 Message-ID: <20221213135811.3f0b07b2@canb.auug.org.au> In-Reply-To: <20221212183554.e0a2536e860172282b189ca4@linux-foundation.org> References: <20221212134425.b20b80955e5e8a4a36ce1b9a@linux-foundation.org> <20221212142754.5f699c4ff515fd9d42768fb2@linux-foundation.org> <20221212183554.e0a2536e860172282b189ca4@linux-foundation.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/ZdDhwBg7FNFHWcu.l8kupo_"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Stat-Signature: s6ywd78iocruzuudm7fdrng63jrdg3ee X-Rspam-User: X-Rspamd-Queue-Id: 6F2A2A0008 X-Rspamd-Server: rspam06 X-HE-Tag: 1670900297-125209 X-HE-Meta: U2FsdGVkX1+XpmS4Od9l3FPM7mDlg/LmUnL8Ayeaj3ZfMHl6vHxBNmX7DFwOdkaYEkfqN96jfnSRWuMM1s0ArlVh3gSiYVi1eChWK43JpN+wfsadt8f58k4lxnNrulZdfC15qA1gYF5+JMTZtDV6hBXYM+29unDEpo6Xe3DfUYo/WWlAPZT1LFDC+y7eyHBrgi+tPRteFKHN4+KDnuqqFRfDQoWRYaayiyHd/T5lcW9ERVbzc135Oj2rLUu9k2fL1r5YN5X6BPplSvcqoN0t5/Yb2heKZ/CbYVnZSboSZGLTt435OvC3K+ZQrjg2xJF5suY1ZG1/ZkfKuOrTQUAMqNS0Xjd4dwspHBoLueTaesFDYHA74rkZ3fe7IlUlPwO3lsdiwIVisqzkpIjpn0D63B/y5uICxgs6RFDHUyWOanApqzlvqW9NJnkebRmsAvZt2w59E/yuzsEZ7EGqpAHNZgjSeZN4SpLZF53nV2pWonHMr1m40CjrfCSMeGl6v/NxoiV2N6Q0pV7BcA8qo5Cg12GEa5AdzcNgfx9Fg+GdaV4piffgspsDZO2QmPTuUsWCpX22Qx6/V4hGvtQQQKqereRLvf2NOvOlKeo3MBBaXPAe3dFqGllq3/kJ7S7KFCX46Z7kLQpALKoxpXOeny32ZBJ71SkAvGaX8a3QiccbDM/OroBF3Noo74/OYteeUoT6DJPciPKWQ9m83AClooun9jIO2jFKT20bKu4E1vVwK8mfTfeKCPggPy2r0Gi1Z1PIqXdVG0tad29htqhKhhpb+GfhNc4weEDkXVAhQdDto2dOm0LaAa507bd5ESxegoxihUEjv/BwXCmjnrZrz9GY1TAwRalvWdrlxZx9rbC0rPItK4S22olnXvuCuu+lBnLa4C0GEGyUt3Tw5uXzFxXibSEnI/KYzD8yh/Mv1rHzZc9gkb+EgbMSocEOVMhYTWrCg8JI8PG68Ciw7B6mirn dVg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: --Sig_/ZdDhwBg7FNFHWcu.l8kupo_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Andrew, On Mon, 12 Dec 2022 18:35:54 -0800 Andrew Morton wrote: > > On Tue, 13 Dec 2022 00:16:07 +0100 Vlastimil Babka wrote: >=20 > > On 12/12/22 23:27, Andrew Morton wrote: =20 > > > On Mon, 12 Dec 2022 15:16:43 -0700 "Jason A. Donenfeld" wrote: > > > =20 > > >> On Mon, Dec 12, 2022 at 01:44:25PM -0800, Andrew Morton wrote: =20 > > >> > wifi: rt2x00: use explicitly signed or unsigned types =20 > > >>=20 > > >> Why is this part of your PULL? This was a netdev/wireless tree fix w= hich > > >> was in 6.1-rc5. Kalle wrote that he took it on 21 Oct 2022 in: > > >> https://lore.kernel.org/all/166633563389.6242.13987912613257140089.k= valo@kernel.org/ > > >> =20 > > >=20 > > > Huh. I guess git quietly accepts the identical commit, so Stephen > > > never told me and my test-merge-with-Linus-latest also came up clean.= =20 > > > Which leaves it to me to manually handle these things, and that's > > > unreliable. > > >=20 > > > Is there some way of telling git to complain about identical changes > > > when doing a trial merge? =20 > > =20 > > Probably not exactly that, but there seems to be a way with "git cherry= ". Dunno > > how reliable in practice, seems to be based on patch-id so probably can= fail > > easily if the commit or context changes slightly? =20 >=20 > Well here's a hacky thing - just look for duplicated patch titles after > stripping away the hashes. >=20 >=20 > $ git log --oneline --no-merges v6.0..HEAD | sed -e "s/[^ ]* //" | sort >= /tmp/1 =20 > $ uniq < /tmp/1 > /tmp/2 > $ diff -u /tmp/1 /tmp/2 | grep "^-.*" >=20 > The above turns up 67 duplicates in Linus's tree and 382 in linux-next. > Maybe this is wrong - I'm just tossing it out there in the hope that > someone will do the work for me :) I already do this when I produce my stats after the merge window - I produce three lines like these (from last time): Commits with the same SHA1: 10436 Commits with the same patch_id: 342 Commits with the same subject line: 20 The above is pretty easy, but takes a while (looking at 11000+ commits) because I am just conparing Linus' tree to one of my trees (so 2 branches in my tree). During out development phase, these commits could be spread over 350+ branches in my tree :-( I will have a play and see what I can come up with. The plan would be to figure these out when I fetch trees and only report them to people who care (just you, Andrew, initially) as there are trees out there for which duplicating patches between the development branches and -fixes branches (and Linus' tree) is part of the process :-( --=20 Cheers, Stephen Rothwell --Sig_/ZdDhwBg7FNFHWcu.l8kupo_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmOX6kMACgkQAVBC80lX 0GwwzQf/epFGs2COgU6byJ1MNtBGxAku6cVVwjJG7M1+s2Ftfq1moVxyEFiEBf2o ZsGFiSMOe7GH/zfbFY/RmpIeZtTh1MBhcWkY9V++qX7pv+c3EUfvVnPHQJXZqPJ7 1nlzLWde1FuYiPl+s9l+9RXjF412nG/pADsi71KqSE88yxc7OeHAopajYeOXYV9j uMriMp2KblJy3po9JyUotyYUSKFaWEMnmfN6ZB+8XMxhkZevbkjkJmsT/ojK78so IZmJX97KVVizoK5acJJTwR5BKWzEEvnyKD+ErWp+LSO+QiMj1iSUfYWUC7D+CMBf t9E2bpmO8cZyMAglK9+PNyeqyPX7KA== =9yiP -----END PGP SIGNATURE----- --Sig_/ZdDhwBg7FNFHWcu.l8kupo_--