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 CE9A1C00145 for ; Mon, 12 Dec 2022 23:33:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2BFB88E0003; Mon, 12 Dec 2022 18:33:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 248478E0002; Mon, 12 Dec 2022 18:33:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0C34A8E0003; Mon, 12 Dec 2022 18:33:23 -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 EC8048E0002 for ; Mon, 12 Dec 2022 18:33:22 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C2137C0C6B for ; Mon, 12 Dec 2022 23:33:22 +0000 (UTC) X-FDA: 80235257844.18.CE872BC Received: from mail-vk1-f179.google.com (mail-vk1-f179.google.com [209.85.221.179]) by imf05.hostedemail.com (Postfix) with ESMTP id 0F0F010001A for ; Mon, 12 Dec 2022 23:33:20 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b=T89ajwxp; spf=pass (imf05.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.221.179 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670888001; 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=fga4qUrgOLw2yQYkt0IWHNCALPR+bSFXVXGNvrtam+g=; b=6shzSUGG4RL1Rg2nGUfhqALWOfk0e3DQb7UI0gJkmeYjR1LYzLHl8TXfFnff9OFM1wm7c9 svb2Z7MDjKDWhoLvvLozXsdVmhe10pGIZF94llPRFxt22D0iZzl7VQNOdQMzZ3Gaop8NHt jVorW/2pqw5MO4jr1hgB0yjmk3dAsOE= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b=T89ajwxp; spf=pass (imf05.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.221.179 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670888001; a=rsa-sha256; cv=none; b=w19su6kLaEllBjtHzn63M/wYg8YoNIWcXdY6huhTbiyQXBqDreTxVQFStvdo3LkEbMTTKB RuelfXz6gPlGtjDojLSfUgUaT/YJirrtlaSoksrH5vm04RYPpAv+yab/AI5Jq4oIzITp9B vItrvfNL98OirBRW19Iygo4AjFsFgAk= Received: by mail-vk1-f179.google.com with SMTP id l17so772825vkk.3 for ; Mon, 12 Dec 2022 15:33:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=fga4qUrgOLw2yQYkt0IWHNCALPR+bSFXVXGNvrtam+g=; b=T89ajwxpcbXcHjR4PtXDmD5i/UX6zN5Mci2FNmYP6Ijn1+KckGeEdjUWpRMxmZeOLI hD36lMGIXsQ3E93rqbcuvZYuI6IKua/cwG0SEix+oUGyQH7q+OzRmdqXKprP483jb0Na FTbS4RbkuQ/R9SYqhH2ac8MWZfGA8NiE5Lk0U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=fga4qUrgOLw2yQYkt0IWHNCALPR+bSFXVXGNvrtam+g=; b=UrK0lztPa4sgd4FQJtZkXohj7Z/XI0S9QQfqqlUR6quoAIiXzmMYRbyD5dIMXCAAPh sc58uP4rt/6ZqaO/hQzJzpzEv0/3Z4WXJRpM4rEk9vzUS8614eke0bDf7/bq8V9VWX8M 9rnf8+65FABhVd8s52POxNH4SfaZvlQfIZrLjce/C3yZMr6BI/mhVTZd5xPITOSSyzxV 1nqcVyex+bzGQ6brBoBzcdbbGePt7JhMOaehE7LPPY2LLiOqi1wjsXAzNqKQzLzuI8bD s1W3rzscV+7HLeyGnoqPWwmb+RT1n5Vj4rygZBfYuwyvaMcTEtylpIcsvdRvMIPXh1Za m2/A== X-Gm-Message-State: ANoB5pm9QsjrTNEUzz3xQZoj6Uzbmb/+BR5xnqyboC6lXGheZXji4w5P VRVWD/HHHpxvSTDlKAaf6qpInojF56zVgXex X-Google-Smtp-Source: AA0mqf5ECX0f2aINmUB/QRqMO1uOXC+uF7JIid3V2wZcOJ/usIoW/MdYxy826uUNN+0quCWSmGviYg== X-Received: by 2002:a1f:3003:0:b0:3b7:93e9:b24c with SMTP id w3-20020a1f3003000000b003b793e9b24cmr8993264vkw.5.1670887999859; Mon, 12 Dec 2022 15:33:19 -0800 (PST) Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com. [209.85.219.45]) by smtp.gmail.com with ESMTPSA id k12-20020a05620a414c00b006e42a8e9f9bsm6788739qko.121.2022.12.12.15.33.18 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Dec 2022 15:33:18 -0800 (PST) Received: by mail-qv1-f45.google.com with SMTP id s14so9277886qvo.11 for ; Mon, 12 Dec 2022 15:33:18 -0800 (PST) X-Received: by 2002:a0c:c790:0:b0:4c6:608c:6b2c with SMTP id k16-20020a0cc790000000b004c6608c6b2cmr68762628qvj.130.1670887997972; Mon, 12 Dec 2022 15:33:17 -0800 (PST) MIME-Version: 1.0 References: <20221212134425.b20b80955e5e8a4a36ce1b9a@linux-foundation.org> <20221212142754.5f699c4ff515fd9d42768fb2@linux-foundation.org> In-Reply-To: <20221212142754.5f699c4ff515fd9d42768fb2@linux-foundation.org> From: Linus Torvalds Date: Mon, 12 Dec 2022 15:33:02 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] non-MM commits for 6.2-rc1 To: Andrew Morton Cc: "Jason A. Donenfeld" , linux-mm@kvack.org, mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: hjcd38w43mss6jq3ncju4jsyamwu7ahu X-Rspam-User: X-Rspamd-Queue-Id: 0F0F010001A X-Rspamd-Server: rspam06 X-HE-Tag: 1670888000-456126 X-HE-Meta: U2FsdGVkX19kj3cO2cqmPlskNT6b1RcNRuxAatahUkgU07muTNMrgLt3cq9tDGp1iGxQeFarlkwwQelPMdLWiK3ML+WByW4M6WwZ83IgcC+RMwNn0izFIovil3mQLI9meQWaO8Z3F5XpPqqsgZQjhtKRjHl3fL0OLWLz37qKtVEcqbZfU6ys400gvA47Xku3wPmDmBNxqlMw4hXgz2oYo9kF1AKlQ5reWqfPeserdsebrWxIOC49/PtPXHn9ywzcc6dRpCwdOpGPiFoqzvj6XTVqf+DN9fEuyepmi3HHoJLfZ2MHl9rm1bMxqWZjMEuJwcwWX7+Qk/ti+TUsJsedwGbHFz1Iblf/5u89s7FShLUP5QfGhJMoIOR7ExWuRSDwuU+x9i9lHMf55cAGY0cjpw3cPaMJb1MrNXUVuuB1V3qlc+Ysc/QQfDYgJ6cxDmTT1JKbglZdixL6gbvcLdJsCdJJCv3gmGZyO1Ji558uSD579dV2H43b1cavHTzC/ojqfq2EzRvt8LWJWACxsYxpdcDbrxWVI2tIwlhWxOXsojHf4K4m8k/LoVhHENLV9m0ZFW5or700I9mvQdNT8iopUWMq2X/Wm6mDrOdtkTRNhiS1GEa6aCIqGe72vzOqXW78qgoByEucn2/8P+cdu5BiZzW2rBufxKR9RdbukFkBYm6Zl/fKupzdB0eOxqiWi6RtguFqFScji0jC5t9qfaBxKQ6DneNn4zqseraFp+8InmVhFmQG6+eKr0wflIyevTFWByTv29iEdf1zFAj80Vp2/Iw75pCR6ekd2K2PfB9G3K7c8+g/HAgN0jRQ7cVoUSNMAUBOLD603Tm3zRu5mjxMb1I3Da6btJcOnmNrkhf0rlsOCwUAYeQ1gzJ0eGXHmrCO21yjEvXIUwIDmPruRrHs0LS9AvrV3T4WYp0zmPn55Ezfvxu7+8y/3x3FNupccndB7O8SKw8Y/cSXIXeIPJP TRt5IGnl sl5ZuHaRIFpRu+4sAZxGzqADRZHKGCmcWRIkg+xrBd4dmutRfVpiNsL3QyR+7gU4/ptMOjDKj77JlGO0147j2M5t5sCk5/1XAepKCT3rS+gqY5QFgROE6YbpX1ABl2klqv3o1Ip3+Lu7t+LFfxEqw8UQJeXcmeg76cJ2Z+sliu0EG7uqchGhJ4qXW1NiOMTFIzpHZ7o3yuwoBmENMfUmVv916FHJByrwhViRMcNIS6FbT0loh9meO0M5bXqoOmqenJfkrdRQKpoLf7oHbHztys7uxv3xna/01h7fv 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 Mon, Dec 12, 2022 at 2:27 PM Andrew Morton wrote: > > Is there some way of telling git to complain about identical changes > when doing a trial merge? No, the merge functionality of git literally doesn't care about individual commits. (git does walk the commit chain as part of finding the common ancestor, but apart from that, very fundamentally merging in git is *not* about merging individual commits at any point. None of the darcs "patch algebra" nonsense). But as Vlastimil pointed out, git does have various log-based models for finding identical patches based on the patch ID. Those are intentionally not used for merging, but for the various "move patches around" models (cherry-picking and rebasing). Linus