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 08812C25B75 for ; Sun, 19 May 2024 18:36:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 53F0E6B0083; Sun, 19 May 2024 14:36:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C88A6B0088; Sun, 19 May 2024 14:36:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 368A86B0089; Sun, 19 May 2024 14:36:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 156B96B0083 for ; Sun, 19 May 2024 14:36:48 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 83645160AAE for ; Sun, 19 May 2024 18:36:47 +0000 (UTC) X-FDA: 82136001654.17.DFD503C Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf18.hostedemail.com (Postfix) with ESMTP id 173DC1C0006 for ; Sun, 19 May 2024 18:36:44 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=CpFm2ZzT; spf=pass (imf18.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.73.55 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=1716143805; 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=Ef7XIllQveMAPHSBXI6IuLEY50oSp7PeJYfOlQkhN34=; b=lXbAgGAsRgpKJrBk6gvhlN9j22SeAffSd5/B2k0ttfq6FmPUIqcEfQJmhmiSFa0XXYuENf SlTBTfYUN5d83EJwd2Oas2WbeQbBBU9tLbKjh2TOj4qV6jWnzPmJ3JhFU50Cw47cpbiX4Y hhew71k4jNamqTmZAr/kyQbyqLR7kKc= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=CpFm2ZzT; spf=pass (imf18.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716143805; a=rsa-sha256; cv=none; b=jdQVi49KRbXUCbGiQomI9+g5Mig7AvbPQZVwfTiBkR4z9CPdUYtShxie12pJsDQEkieHG0 4KGG1sus8jcQsGsuSXZ5IbweKL1cygdrLbwLCpOeCARHExjChd3+i/MLsHmjwSTXdGIlXT hO0ESQEcMWLoJbYqz83bWXIJSD7Nzmw= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 18A97CE08CD; Sun, 19 May 2024 18:36:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29884C32781; Sun, 19 May 2024 18:36:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1716143800; bh=UUhwXxqUPl7s1YkfVggMn/rNgFKLSx/iqaAxFo+gv7w=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=CpFm2ZzTjT7bt9pUpITHxMxR/vtK7evZs57rWz3tBtSlm/XOEFX3G9m1K6CGPK+kv 1FoUOPWtfpQWYJY+33Zak7EMr76YRoJl/9/PXFfU+OvzXBuqc0uGOpScWZVZDwvIP/ d94OEdp8flElEddq31aS8tKpn+K3F8NFhhSU2orc= Date: Sun, 19 May 2024 11:36:39 -0700 From: Andrew Morton To: Linus Torvalds Cc: linux-mm@kvack.org, mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] MM updates for 6.10-rc1 Message-Id: <20240519113639.db3fe5f80d25be4e7666751e@linux-foundation.org> In-Reply-To: References: <20240517192239.9285edd85f8ef893bb508a61@linux-foundation.org> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 173DC1C0006 X-Stat-Signature: w7cpfooxjombsn1tabfpyu3d3rtrapp3 X-HE-Tag: 1716143804-642883 X-HE-Meta: U2FsdGVkX1/MLmtyf38260bUWQ5WFpZNgk2xi2OmnYNQ7T6iYZThBnAkIo5a/W4OI+dK0mYQqbnJbyyqRgurgINsKzqsEDdkoTFA4OMlochpvpmkl6jblfrY37xeZsHXuVFBFR6NxmPCMejFi0+spF7ZePv15fzqSl46bAwkfbIck4MV302yaK5dF34ZEGSe2YDZRoV0yXuEy4Mu/DTNeUGH0bNNqln4J4rcLFVbCs59qBvQBaH2/fFHKnaJTaF6XdVQU9hL1q3sqyalXMH4Av9xzFwZUibFg0u4KrRbCY+4X9urqUSu9rC5g7kcjmO5JtcgWvN7/1PZRoqFGwKTgkMDU28VzO08fWmmD9e/79QyqSnDtnjPJgyW2t+YBrnGVZNd1fcE/E10Xmg6DRKxGjarSKVRLSEN4S14obizQ/AT5QKcEWnr3VvfTHepS+QFbLS992qibO9nk0P1/eINGhjHSYSXI4EtGenAk5ptJ3DRGrTrYSaJa0FGZrN6xF4hKIefJ5pBdZiMNKKv55aHBNLu7u0n01/suUyuk19/DyurJJYWkRuvZ169C38ho5ZA+hXwYOcM0+WYjya8Gi4qU75ctRvLyXTzn9cS+UVO26x2uM3i6E/oW6eNKTp94lIKamaagLOeUK1VogPeWaUOxLLeTgso8N3KG3fuhc8o/EtxGpXkSUDxdbXsKwbO1q39+BLMcMhWo6sFNC2xlX99MKxgc1xeEP11isX289P2gXI26FTghx78aLk3W9IHDZm5XhAMvEZw2KrgA8v9fnRqO3e46fMKDg8Hh5BM83sxXmfXAFLszY31xN7u4XqxfaOilfwTeSZHE6ayRHNUxUZoq5HolUg8PyYqPvYq8/449NavMJAiEsw/nUATp41dj5D+U4CZEsv9z0X1Y5P2LXj9atjvbHSSN8SXiBUDphERO1a+bRzoekOCOISLogfYT6lZk0hSmjdo/3YHclUKQbR /bRfXlPA CfKFLXrIYMbKvA1rh8XEnsifJsx4nPYWq64MEsX4ZfH0FXUeLmYjKmx5hrNItAX7e/XiBBnlrflqTDLkc8gEV7V16An5F4aQo+HqM9sgOPw/TfRvxzXtOVTBzIel3fVXzZ0btKU1tS6rRMjZ2Ae2y8i05twezSmmcmAFX7/bRIDW4l07DIH4b8H8DYUN8/f/UVIlEL7zXUwLCKj55nt0g73EQWjSy7gE0x+5niL4k6SUNBReo4yk40P2i2WPDziQa+ui8/GRCy0iGSlHyccIs+eCckbKWYjlTW/EWmUdLGgCvJo0xshXh3yU1iloBaMDE/H9wCyxLHSUYsENjFX4XLAQxg6W/cDsOtMRXwWSSpLCUcrobj0Mvildauwhnc6UO2WV+fJLmh9jFeFP4EsnoMWR56Uw+bHTeq7pwkKfuUmKZrdm1/M1cUcn3sxpoyZkfRYrqPM7XfuGNjSvY5+6ZbbW8HA== 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: List-Subscribe: List-Unsubscribe: On Sun, 19 May 2024 08:32:44 -0700 Linus Torvalds wrote: > On Fri, 17 May 2024 at 19:22, Andrew Morton wrote: > > > > include/linux/slab.h > > https://lkml.kernel.org/r/20240429114302.7af809e8@canb.auug.org.au > > This is not only a merge conflict, your tree is actively buggy. > > You have introduced changes like this: > > -static inline __alloc_size(1, 2) void *kvcalloc(size_t n, size_t > size, gfp_t flags) > -{ > - return kvmalloc_array(n, size, flags | __GFP_ZERO); > -} > +#define kvcalloc(_n, _size, _flags) kvmalloc_array(_n, _size, > _flags|__GFP_ZERO) > > and that's just completely wrong. Note the "_flags|__GFP_ZERO": yes, > the bitwise or is fairly low down in the operator precedence rules, > and it probably work sin practice because most cases will just pass in > a simple expression for the flags, but it's still *horribly* wrong. > > I'm going to take this pull and fix up the cases I find, but I'm not > happy with this kind of trivial C preprocessor misuse. Thanks, I've asked Suren and Kent to check it all over. > I also note that you have *SEVEN* pointless merges that have no > explanation for them. I'm happy that you use git, but that means that > you also need to either > > (a) not do merges at all and treat it as a patch queue > > (b) do merges _properly_ and not throw them around like some madman > > And doing them properly means not only writing good commit messages, > but actually having good reasons for them. As it is, we have > > 5d1bc760583f ("merge mm-hotfixes-stable into mm-nonmm-stable to pick > up needed changes") > 640958fde130 ("Merge branch 'master' into mm-stable") > 4e2e36129225 ("Merge branch 'master' into mm-stable") > 1dd4505cf4c8 ("Merge branch 'master' into mm-stable") > 71919308943d ("Merge branch 'master' into mm-stable") > b228ab57e51b ("Merge branch 'master' into mm-stable") > 5e2806112864 ("Merge branch 'master' into mm-stable") This is me advancing the master branch once per week until we hit -rc4. I don't understand why these merges were visible to this pull. I sent: : The following changes since commit 5d1bc760583f225032f91bd88853f4c26acaf4e0: : : merge mm-hotfixes-stable into mm-nonmm-stable to pick up needed changes (2024-04-25 20:54:12 -0700) : : are available in the Git repository at: : : git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-stable-2024-05-17-19-19 : : for you to fetch changes up to 76edc534cc289308130272a2ac28694fc9b72a03: : : memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order (2024-05-11 15:41:37 -0700) : This has worked OK before,