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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66644C433F5 for ; Sat, 6 Nov 2021 22:48:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B2750610FD for ; Sat, 6 Nov 2021 22:48:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B2750610FD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 0A85B6B006C; Sat, 6 Nov 2021 18:48:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 058ED6B00FB; Sat, 6 Nov 2021 18:48:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E89376B00FC; Sat, 6 Nov 2021 18:48:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0092.hostedemail.com [216.40.44.92]) by kanga.kvack.org (Postfix) with ESMTP id D6B986B006C for ; Sat, 6 Nov 2021 18:48:49 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 8B2A618132D08 for ; Sat, 6 Nov 2021 22:48:49 +0000 (UTC) X-FDA: 78779996778.14.61C5F66 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 9EF2B60019A8 for ; Sat, 6 Nov 2021 22:48:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=IqU1R3ik7BOcpROB1BbZqusi4ymhENZ5I6p76smXUHY=; b=SnrLECYEnTV1bbGo5b8isr5LMv uxutafHBDzlekq5TbDvaQbLw/QGmyvgRBVTAy22tEJ1AXMEcyg7Ew9rgcvvtkRtckMkANKm+Jdt8z Newi+UHuuES42RerDAV3GgdtB+9JOuqQbGreH530K0nbN/K/aKjmogu6nZJVZ0BTgRfjN8302b12W KyUwYvBNzVXMlFGpOPPbGud7uyxojN9s0JbWmxBSLPtgvelMGasVLg3YpLJUn2RtneiEZZ/rFSSJD Nr7KbPGptM+AnaKCoeL4MA4EQxtjPmzDzGV/qSEfjEI5z9HXSX3HCT1PoJHnOTvGBo1yWvuycEl5Y MEoIpOyg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mjURK-007UCr-7G; Sat, 06 Nov 2021 22:45:57 +0000 Date: Sat, 6 Nov 2021 22:45:34 +0000 From: Matthew Wilcox To: Linus Torvalds Cc: Andrew Morton , Andreas Dilger , Jonathan Corbet , Dave Chinner , "Darrick J. Wong" , Johannes Weiner , Linux-MM , Mel Gorman , Michal Hocko , mm-commits@vger.kernel.org, Neil Brown , Rik van Riel , Theodore Ts'o , Vlastimil Babka Subject: Re: [patch 149/262] mm/vmscan: throttle reclaim until some writeback completes if congested Message-ID: References: <20211105133408.cccbb98b71a77d5e8430aba1@linux-foundation.org> <20211105204225.iIh99P9cn%akpm@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 9EF2B60019A8 X-Stat-Signature: nuax59wj13ctf7i483piisgpr1ow9jdx Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=SnrLECYE; spf=none (imf14.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-HE-Tag: 1636238929-294237 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 Sat, Nov 06, 2021 at 02:12:02PM -0700, Linus Torvalds wrote: > On Sat, Nov 6, 2021 at 1:49 PM Linus Torvalds > wrote: > > > > This workflow can result in more conflicts for me than what Andrew > > used to do ("send against current linus tip"), but it means that when > > conflicts happen, they get all the merge resolution help that git > > gives you, and hopefully what gets tested (over the months that it can > > be in -mm) is closer to what gets sent to me. > > .. and resolving the conflicts (none of which looked bad), I think > that part of the resolution ends up doing very similar things to your > fixup patch. Reviewed what you did in the merge commit, looks good to me. And I've learned I need to run git log --cc instead of -p in order to see all changes to a file.