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 3A275C00140 for ; Fri, 5 Aug 2022 23:21:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ADEDC8E0001; Fri, 5 Aug 2022 19:21:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A8D706B0072; Fri, 5 Aug 2022 19:21:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 97D048E0001; Fri, 5 Aug 2022 19:21:04 -0400 (EDT) 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 888436B0071 for ; Fri, 5 Aug 2022 19:21:04 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4A73F14065F for ; Fri, 5 Aug 2022 23:21:04 +0000 (UTC) X-FDA: 79767111648.20.CAF97B2 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by imf21.hostedemail.com (Postfix) with ESMTP id E47281C0152 for ; Fri, 5 Aug 2022 23:21:03 +0000 (UTC) Received: by mail-ed1-f46.google.com with SMTP id x21so5113386edd.3 for ; Fri, 05 Aug 2022 16:21:03 -0700 (PDT) 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; bh=iJnXDkhY3WibcgHqNJ/apiNs6qhmQXpZMLsKos5BMCQ=; b=eFUwGAvhoJ8EEYaGa/arj7adR8QlkncfXKcdX7iXgroj9yZ+Gm7dJ7Ts8/p6/xX1J5 x2r64ctbmyaFhx/lwup2rv3LDgDyHASHgKfhjxJiW6vrzdpSBUQpTRk11nT06VQg+LMi l9uKIxCdZxEdhmLdSRr30emGV+zBPUQDQ3YRY= 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; bh=iJnXDkhY3WibcgHqNJ/apiNs6qhmQXpZMLsKos5BMCQ=; b=cSuomPnGTV1A0iCZC9bQ8NkJSq+oM3zU+igY4sX1gtBKQ1+cbC1gkPvDozErKXMvR8 wBH4fHUjGdWOv+q6c9Ojdc+WNSSbhC94p25KFTmAMYR5GbBfSxRVD2V0P+DQYyrI74pW JwcRobba8GGpDuz14Ek4v0A5BJ2DU2ZwQvV1vhx7+ewiNeKc8U7uOwaO+h0NIxxIEgcs dV+/nfaN8A/K+sBODx+RO/RZEEL3kg7sGSPPCMIeoARXYYKrDAnByegDmTfn5hPd3EoW /2T3XvcVpnXtCJ8E4jEVrzCzRLTg7T8NWqAO67cehPfCUgMp/muYZTW8I4icwP/Z5KF/ GHFg== X-Gm-Message-State: ACgBeo0jOurYdE/u6skARRXAnWz42kLM1xhcS+NtOLUaxc1+JYnZV3wN MeSXA8xgLyzqZeRZ1stxxxc1p2XBtcidUPMb X-Google-Smtp-Source: AA6agR4XR+1bMJ3gx8PZvS0ZVcvGvH2PGAvhB3bLcFk72ayp3EBvEnhg+LUIa9Psmz6E4172UYzhdA== X-Received: by 2002:aa7:cad3:0:b0:43c:e615:13e2 with SMTP id l19-20020aa7cad3000000b0043ce61513e2mr8348229edt.289.1659741662314; Fri, 05 Aug 2022 16:21:02 -0700 (PDT) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com. [209.85.128.47]) by smtp.gmail.com with ESMTPSA id 10-20020a170906200a00b00721d8e5bf0bsm2066603ejo.6.2022.08.05.16.21.01 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Aug 2022 16:21:01 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id p8-20020a05600c05c800b003a50311d75cso4112343wmd.4 for ; Fri, 05 Aug 2022 16:21:01 -0700 (PDT) X-Received: by 2002:a1c:f603:0:b0:3a5:23ca:3e7c with SMTP id w3-20020a1cf603000000b003a523ca3e7cmr1634050wmc.38.1659741660817; Fri, 05 Aug 2022 16:21:00 -0700 (PDT) MIME-Version: 1.0 References: <20220803133541.18b82ec9344ed0e8b975fe5b@linux-foundation.org> In-Reply-To: <20220803133541.18b82ec9344ed0e8b975fe5b@linux-foundation.org> From: Linus Torvalds Date: Fri, 5 Aug 2022 16:20:44 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] MM updates for 5.20-rc1 To: Andrew Morton Cc: mm-commits@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659741664; 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=iJnXDkhY3WibcgHqNJ/apiNs6qhmQXpZMLsKos5BMCQ=; b=4IDgemZIZ7Fkvo/uouxv/HikeST79b48usAkyBCGBfVvjPrQDqcSmL1pvWtbXtM0ILNtpV VIye4vW3oTstrBsBX9RJtVaij2CQirERx0ahxFmMh1IvIClxREhz6WtaGjca+yQ8wCrQzN ZD3iGFhbdhniJMvhvfTC5zTh1BwAMIA= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b=eFUwGAvh; spf=pass (imf21.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.208.46 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659741664; a=rsa-sha256; cv=none; b=waa17O3ahyq+kJE8fV+WobIUlrJ5g35SnBRulCJss1oUhjhTTr9pxm/Xo+NyEcOywO+zRs 1INA+rZlG0VL93N+yYiY9yAM2j+KB8dhxvy2h0+VJS1dUqwNNxvPWBidzBrdS7cdp3UGEB 1lYs5ABlYkptYBBy/XICfT9g0Awv+Ow= Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b=eFUwGAvh; spf=pass (imf21.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.208.46 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org; dmarc=none X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: E47281C0152 X-Stat-Signature: yzgc16gzs9riuuf7i4f1peod5of8j569 X-Rspam-User: X-HE-Tag: 1659741663-875554 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 Wed, Aug 3, 2022 at 1:35 PM Andrew Morton wrote: > > There are 6-7 conflicts with your tree here. All very minor, mainly > related to the rename of Documentation/vm to Documentation/mm. What? No. Yeah, the doc conflicts were annoying enough, with the Chinese translations having incorrect pointers to the original sources both before and after the move in the MM tree. But that xfs conflict was positively nasty and definitely not minor. Had to look up Darrick Wong's "here's how to do it" message from the linux-next days. So I think I got it all right, but "very minor" it wasn't. Linus