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 D7B4BC00140 for ; Sat, 6 Aug 2022 00:05:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 65BCC6B0071; Fri, 5 Aug 2022 20:05:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6323F6B0072; Fri, 5 Aug 2022 20:05:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4FB016B0073; Fri, 5 Aug 2022 20:05:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 3FED66B0071 for ; Fri, 5 Aug 2022 20:05:54 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 1C6878057A for ; Sat, 6 Aug 2022 00:05:54 +0000 (UTC) X-FDA: 79767224628.18.A2DC8BB Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf26.hostedemail.com (Postfix) with ESMTP id A2D0A140145 for ; Sat, 6 Aug 2022 00:05:53 +0000 (UTC) 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 ams.source.kernel.org (Postfix) with ESMTPS id 54AF5B8298C; Sat, 6 Aug 2022 00:05:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1F54C433D6; Sat, 6 Aug 2022 00:05:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1659744351; bh=mwUbPBYbpjlx0Ck1uwp4vA3CrzrvGUmVGR8nHBrzkRA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=al4PJ1GM200DeBhIH0jRzLDmeyQO+D7WT08RSs/AI49NrU1CzLwvElTmC15UIR1tv +UWwssdlqHfxVQnGiH5k61jRRQPtkeyalZsNXo8ZQFqNOJsychR5+kM+9jME5Hqo1Z EDk/2CCsEy113ycYtnMfv7r7JtN8YmtXNNK9KsQQ= Date: Fri, 5 Aug 2022 17:05:50 -0700 From: Andrew Morton To: Linus Torvalds Cc: mm-commits@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] MM updates for 5.20-rc1 Message-Id: <20220805170550.7b8d738155ad7083d680cf9a@linux-foundation.org> In-Reply-To: References: <20220803133541.18b82ec9344ed0e8b975fe5b@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 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659744353; a=rsa-sha256; cv=none; b=X6MApcAabyhy+xG7G48sLHrR9U+y8Ubfmvo8tVJezqNH41tVX093INA9DHT8PuBtwiGHWT o0UneAQ3DU3VS+5CS8gE4FeipDHjPuSUsX//QtaZ8PI8Snp7a9MQqWOeh+z3RADs6eaSev 7VeKfGteBsUENc2I8QFHGNJjgdUqwvM= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=al4PJ1GM; dmarc=none; spf=pass (imf26.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659744353; 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=PPLTNQ4zepoWUOmSIYOI+ygN6EthVVFqFf1bm9bGKTA=; b=Feb6Ro/dTGIqmjvvrL0+GSGYXcnBiy3Ek1q84iVBwxB++ZoNbmIbrqR4fPO9IQitdrjgSv oXU06xSsse/EqQLwsGEaZpc5aufLbrOWSWuIzs7vQ1tRnynTRAU3MiprkSZd0Mca9MQnN/ sxYKQ9SbNr50bV9/Lq/RV+PBNA7mjUo= X-Stat-Signature: z776834i3z97gtgzrkw9f158ysegfk8c X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: A2D0A140145 Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=al4PJ1GM; dmarc=none; spf=pass (imf26.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org X-Rspam-User: X-HE-Tag: 1659744353-777496 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 Fri, 5 Aug 2022 16:20:44 -0700 Linus Torvalds wrote: > 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. Huh. sorry, there was no XFS conflict with your tree when I did my test merge and I don't recall seeing emails from Darrick or Stephen on this one :( I guess that taking a peek at linux-next would be a good way to get at the tested resolution for these things? Emails which might prove useful later in this merge window are: EIF tree: https://lkml.kernel.org/r/20220726194643.47f6c020@canb.auug.org.au bitmap tree: https://lkml.kernel.org/r/20220726194151.71e511e7@canb.auug.org.au crypto: https://lkml.kernel.org/r/20220718195342.6817be63@canb.auug.org.au bitmap again: https://lkml.kernel.org/r/20220715211409.4fba48e8@canb.auug.org.au