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 2B35AC4332F for ; Tue, 13 Dec 2022 02:36:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F2088E0003; Mon, 12 Dec 2022 21:36:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6A2428E0002; Mon, 12 Dec 2022 21:36:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 590628E0003; Mon, 12 Dec 2022 21:36:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4BD1F8E0002 for ; Mon, 12 Dec 2022 21:36:00 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1240EC097A for ; Tue, 13 Dec 2022 02:36:00 +0000 (UTC) X-FDA: 80235718080.18.942C5C6 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf14.hostedemail.com (Postfix) with ESMTP id 8953110000F for ; Tue, 13 Dec 2022 02:35:57 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=fmeZFJX+; spf=pass (imf14.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670898958; a=rsa-sha256; cv=none; b=ZAy7BtUa9p+XMjiFIV+JLW1Y+H9cchog0BzIBsLzbOLeq03poRiOmWvJxElclvT2nd8EuC 7De+9syJ1z14GsFwIdnPfH2PF+HQfXDz+2Stm/vy3uxN5WPpTi2yRHGjReY92jbkJUI1Cm r5NP/VCqhXz8QxBitWzoawYzQvcHAu4= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=fmeZFJX+; spf=pass (imf14.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670898958; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=A5DP26hjoDUb12CfyDVPKYoypXxkCMcGAJN+fQ+YuCw=; b=VA0zfTf7sv1FoaK9RCqEm6dROPwGCRgwurxZFFKm5yCzmupvOQbtm1kl/+bU5DwN7HhN/s DixMnEW63iQxZHa6qTRygwByxRUgws73T2rfMdvxf6FVn+i8Yi7YGKBwRNkV0zkupCLdEO BygG+Sb6gyUVP/IXzPuBfd1IoA0+RZU= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 342BB6124C; Tue, 13 Dec 2022 02:35:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59AAFC433D2; Tue, 13 Dec 2022 02:35:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1670898955; bh=MJfbec56Cilr/DNLc0S8FXtEAXdlH2MTjKaFB6ucBmg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=fmeZFJX+3CpcHfz1KgOGfv35JsRvRB/tTPGDm/55Wi2EdwTHWKg2tn0jpg9cfGCOD si1B/TcaCkr1WqWsdHeFAHO0/fKk81LpvaKTXWwCDKIKkconhjgPhygP6QuVNyJcbN JaNQnc05SBej+lyWwKyXYiyKd8T8n1XSGA1u+UJI= Date: Mon, 12 Dec 2022 18:35:54 -0800 From: Andrew Morton To: Vlastimil Babka Cc: "Jason A. Donenfeld" , Linus Torvalds , linux-mm@kvack.org, mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org, Stephen Rothwell Subject: Re: [GIT PULL] non-MM commits for 6.2-rc1 Message-Id: <20221212183554.e0a2536e860172282b189ca4@linux-foundation.org> In-Reply-To: References: <20221212134425.b20b80955e5e8a4a36ce1b9a@linux-foundation.org> <20221212142754.5f699c4ff515fd9d42768fb2@linux-foundation.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: 8953110000F X-Rspamd-Server: rspam01 X-Stat-Signature: 17y3iwf653n1skdhhdg8kn14k4u9j5x7 X-HE-Tag: 1670898957-543113 X-HE-Meta: U2FsdGVkX192Jq979FCPThdqV5TYxl8UvO3jpwV12topQtGTjE54miaRYSpgzj3Nv0pV2aVhv3jOejU+8n2qcWXKFXnnOpMxkD3a7W/mG9ko7uoBJr27Qbe8ba+3Uj57dQDNCJMn3w8mxfMp9VIvR7ipvSqrtJ7NmYoIAuSICTRb1agGqLv6TPLVjigYIaT6OLXLMBWfPhc9b+VpwMhBMN1i0LTfyC3QjJvboAlNnspAT1rcZhJvWyIkD2QZ/rMBqt8KbMsSo5loQi7fj45rsGxmIVePfkFhSOkwKDj8Yx+NygyZK90eA2uuF8B+/sJy5eJ0sF3B5rmX/tvLH4APfvDTIoo+bk8R11hJ1veijBbuWYxE/jnaUFfCMCLV+33fJfYA8AdGqIvJi7ujnQ3UIpeFmANovGY5nPB9bPexEo4MagEBlGjCz32RntVhEqJoMKiPh3fXnoI+d7R8Y9eTKOMjIyIby5r1AVaDYkcKKr3WBzePnxlK7G+6WVdx1+sFgo+x8iWGG89mL/jy/77ZCBQmEyZeMKBSZTS8Fsq+BSzbvHp9gA8hNid40tHnEijwEkaI/M7y/6p5A5AOjRJkuDifvGC8QOhcGT2EfAvFUGJckF76ZSJPEEx0CAYCQeeSdQRwyWEpAjwrY6WcBLcrz6FcB51Xk7ciBmxyWb6YUQfWzH0tza6xHb4M3+TqCoNHzKyLCe3Auz4SvZO7pY1u8AmkEdOCyxtVg5Ngb6aX38zscP/dZufXnSUb5z6O9yd7T/FRJanCjHdTum6o4zwI95RlXjeYdAUAHoCXsg/Q3IN1UKI2Nme1H5+V6+Chd78WioutApR4QijTj6KveQ6WaqexHuxJJLSUk1qukN/hyzmGwGsB0G5VvhyZXLujtzq52TYHMsnv5D98+hAC82M4v++TF9afz67MCDECVsfCGYSDr8POO0L8Z0j1FOkvqwxKo8CYJ/Hlevy0JHgv3D8 0px4w+yf PZlELAm51xa24UhkYkjnHW/K3WEVKgHZDMj8x2BTHfGbWO39+B907d7Wts2JLL9nylHqPugHiGjTNJFQ= 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: On Tue, 13 Dec 2022 00:16:07 +0100 Vlastimil Babka wrote: > On 12/12/22 23:27, Andrew Morton wrote: > > On Mon, 12 Dec 2022 15:16:43 -0700 "Jason A. Donenfeld" wrote: > > > >> On Mon, Dec 12, 2022 at 01:44:25PM -0800, Andrew Morton wrote: > >> > wifi: rt2x00: use explicitly signed or unsigned types > >> > >> Why is this part of your PULL? This was a netdev/wireless tree fix which > >> was in 6.1-rc5. Kalle wrote that he took it on 21 Oct 2022 in: > >> https://lore.kernel.org/all/166633563389.6242.13987912613257140089.kvalo@kernel.org/ > >> > > > > 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. > > Which leaves it to me to manually handle these things, and that's > > unreliable. > > > > Is there some way of telling git to complain about identical changes > > when doing a trial merge? > > 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? Well here's a hacky thing - just look for duplicated patch titles after stripping away the hashes. $ git log --oneline --no-merges v6.0..HEAD | sed -e "s/[^ ]* //" | sort > /tmp/1 $ uniq < /tmp/1 > /tmp/2 $ diff -u /tmp/1 /tmp/2 | grep "^-.*" 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 :)