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 3D401C25B75 for ; Sun, 19 May 2024 15:33:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 32B546B007B; Sun, 19 May 2024 11:33:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2B47A6B0083; Sun, 19 May 2024 11:33:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 155F86B0085; Sun, 19 May 2024 11:33:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E81FE6B007B for ; Sun, 19 May 2024 11:33:07 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 3BBC5A0A53 for ; Sun, 19 May 2024 15:33:07 +0000 (UTC) X-FDA: 82135538814.21.5764D05 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by imf02.hostedemail.com (Postfix) with ESMTP id 4603E8000B for ; Sun, 19 May 2024 15:33:03 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=google header.b=Rp1TMlor; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf02.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.167.46 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716132784; 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=MDJiaiU5rkttwfgCtw/KvgAida8xU4nH18aWOxHr77A=; b=lspD0iQsRLrZ4RFLH5U4UErsvVd1BBi5wRHgdb1Lf2C/hyHW/rBsA7sxOybZ9HmTV/vBFT zL3ydq1XiwJ3eSLcT1rX6YTJceVDPoZtQ1fguYUJL2K8r6CYH9/EpVOPLgJL6Z7WmfEsfc nBiYAxGzliZQOJE2j+i13bgbfEtGvCw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716132784; a=rsa-sha256; cv=none; b=6Mo7PH1r9NyeuZsJEaFSWytw3IzghFHDiN1uHji93QXrti6GxnMg6EM4q/QOaLaPoV7yc1 WLSlTzBxxaCLSqKweH3jjo8vtU4HFsQuTsL1kVovxR2yh3Tes1MIMVTngZD0Vw2FxrJBdW 95lRaFDi0TU+r5m43hp8h/4jn5uYvok= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=google header.b=Rp1TMlor; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf02.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.167.46 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-51ffff16400so5700860e87.2 for ; Sun, 19 May 2024 08:33:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1716132782; x=1716737582; darn=kvack.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=MDJiaiU5rkttwfgCtw/KvgAida8xU4nH18aWOxHr77A=; b=Rp1TMlorpvu6YISLb2olAbMa6RYr0IT4bK6pacwOLXHXfeTBXG/QXjZkekdF7T3RyF w72Rj1S6D9nwRx2ytf2FLt6dT6dncXSTSqN3bvWu9GCqvcFmh0wR9Y8WO1paQV1psemF 3Vq0SB1RStZe+QXMONXNoPaMtGquMdkpTKFyQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716132782; x=1716737582; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MDJiaiU5rkttwfgCtw/KvgAida8xU4nH18aWOxHr77A=; b=bxsarpzRsMejFBfS0GOUMC2YJHTPjplG85b7bxcj33jRbBQ8PQHXDWGSbGH6zrhLB9 36kd2RRf1hiQ708CWuHZFl7cXGEbaioRIM+lRBRXLfiOMwTwUTxMBKb/agToVmxsaF1c +xwGxyNZMdyrPYXHgr/GsGhxTzBdx7URScjU5kFhsVwEe3RKtWxyh9brrONmZTBuiNU8 9VilB5uQfT5ghf/1tt3/YPaEqsI71OOWbd10RDEPZVJ0NXJcUsD4BM9CHtF84iD0YR81 pcPKCHZHPa9gpmW//QlMyJF2QDEx6tjiJzs+mk0oXugFL+6jH5oMBQhpLGdr4fn53m3F +FZA== X-Gm-Message-State: AOJu0Yz3QBoHNGLhD4yXTrST6sLQ4o2UujtbeMW6HukHwDUa5N0vQRpS lZcAB289GFcSMYK7lNxxihw7hZE1Kn3Ew0DpbOFhQcze2cAgUddBjCBwHV0s1l4HkwktnpnXZDB zv225oQ== X-Google-Smtp-Source: AGHT+IGHM74HMj7MSeWsGw+eubK7C2N/u6tlfr+stF35A6aay301DH+/BDqb+2S5rgqDbzU1goXeuA== X-Received: by 2002:a19:9107:0:b0:523:892c:9e0 with SMTP id 2adb3069b0e04-523892c0b0fmr10487636e87.41.1716132781951; Sun, 19 May 2024 08:33:01 -0700 (PDT) Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com. [209.85.167.41]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f38d86besm3905310e87.190.2024.05.19.08.33.00 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 19 May 2024 08:33:01 -0700 (PDT) Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-52388d9ca98so4089405e87.0 for ; Sun, 19 May 2024 08:33:00 -0700 (PDT) X-Received: by 2002:a05:6512:444:b0:51f:3e0c:ace3 with SMTP id 2adb3069b0e04-5220fd7c6bdmr22793661e87.16.1716132780601; Sun, 19 May 2024 08:33:00 -0700 (PDT) MIME-Version: 1.0 References: <20240517192239.9285edd85f8ef893bb508a61@linux-foundation.org> In-Reply-To: <20240517192239.9285edd85f8ef893bb508a61@linux-foundation.org> From: Linus Torvalds Date: Sun, 19 May 2024 08:32:44 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] MM updates for 6.10-rc1 To: Andrew Morton Cc: linux-mm@kvack.org, mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: q4dazbahzjko8oruwyfp8nci5czmf8td X-Rspamd-Queue-Id: 4603E8000B X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1716132783-506650 X-HE-Meta: U2FsdGVkX18zO20ce/SCrK7hcPKGKoRgi0EKJcG/P2YPx78eABQqZVkA8SDC0v1kpW3y13tXbV8+5x36DLhrXYOBxSNMBjUbF3m0RUu4PUT+f/J7ybCjN7J7BBEepmkyx/oP0PE16zhtxUClp4Rpw7KHNeGtACGAGZzLZmB8moTRvKv6GfWCjvHzIDaaQRPfMmAEgSl/tp9dwJCJ/pJAyuvfacprgt0btVJrzAbmDDx5r9lkphuocN1HBnriEBXxsh6CCgiWrC22cnQwp6jG/+zBDL9Ofe5QTek2PMA63ZK75n8Uv/wgMXBUAjTwlhXCfgL6Kko90KI4xq6MTpjAVBO+wqV2WG1wUPu7vweLj8QJdpBcz+nk/tM4ywb9PJ0Shaz4ac21pt5CBM/IKaTL6cuUScFsck9cPL8tKylzBv0pFLT2LlmYtw+fea1j1FkVq2ffQYwwy/bW39tomNOF6ww2Y4qLjebzUn93PkxTOPYDqZ58q5rStV5jY7eN/BwKQg+9QLvGg0SKqdLW3Zy02jO1J1WqHwRRKAsHOnReocaDRPnCVvAe9Dd5vm81IvEwPLMNeZ4zOyTRVmpdm/BgVL5dZ7yAJ18KWSx+GBc53B2vLRiG4B0DZcbr30mAc82PbzXHV57bS1jlIEfIpl8WP07+fbOsMeKATEbpOoyUJWcYEJ/BHEu9OVXLxhUHL1Peh0T955gMBEmiL6N+4M8sCDWkcXmo8b7fCiEMqUwXJkQwS4XM21ACeiORcUPwshajvIMEfMUellRmlNzKaC+4WM4OVxTCYIbHsPI5uGApoe9B1XeMYOrRNxRdopjCAIrmqFOGTc0Uzf0gvpcvJBBInFXl8o/WAPt6j53NX6UsBAxAPwwpjaNIz2OmFcXMlCci1Yo/uE3j3GJhjW7OFy6G1YSuGVPrHtmQjnFysNackJHbwyc1W1TCTAB3ZhgAphHfTPIgSy65JRLZav2zxxH gjx4ETa0 muL54fcSWNS4qGBrUIMSlQIPIDK1YZYjX39qbpr19lsRnna5lx7L49MUQFMZkr0reacQsvcfAnPxbuCDjrT78bktGha2GUMb9n0oD7ywSD2wSjayj18LBrNr9f4N1NxerXBYumklqTxQavHeyJoBgoY8Xh0YIn1cTbgCcUoTRRoFH+ZVwUpnaFYuITIfSFrVwI/qtoboxtVygliB+azNlsSZVLQkN0XcWxtE0ZoVP8RpEEDI/gbrFP8CAbilN8EfEFetUUdYaVN3gVUfJnb9AzURGzVpsoOtmx6t3vUQKL8nqUpxRd8xgzkXl+WW4jxeNxSEJRXDSAcprDSXWlciJPUX6HDyKFtK2hTNfgfHCXye/ZSWhoEcUVV3zYru33nFuDL+tJdnxdrPtfmcho5cMD3UAdYDUyMUz8GehC+t94fiEixvw9un1EYJKQwrN6lEjGinRYsFHVDAnJG7NSAdetIOSRfW/C3246rvG5Nhg5FETQjWGmJJzS3oUd1UDmlAO0mCz2NNRocJOp6rzEcZUh1Aj6wchi6s4/uw37edtaV1M4JTIyRQ5KVaF8AkrSiuQ6W79Ewwk2HTCAUQ= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, 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 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. 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") and those one-liners are all the explanation there are for the merges, and NONE OF THOSE MERGES ARE VALID IN THE FIRST PLACE! They shouldn't have been merges! You literally have no new code on the other side. You should have just fast-forwarded to the new state, since your side didn't contain anything relevant any more. So the merges are doubly wrong. They have no explanation, but part of the reason that they have no explanation is probably exactly the fact that there *IS* no explanation for them. There is one fundamental rule of merges: if you can't explain why you'd need to merge, DON'T DO IT. There are lots of smaller rules too. See Documentation/maintainer/rebasing-and-merging.rst for at least some of them. Linus Linus