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 X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24D49C433DF for ; Tue, 2 Jun 2020 20:46:10 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AEC7820674 for ; Tue, 2 Jun 2020 20:46:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="dpjTeOUg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AEC7820674 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 385CA8E0006; Tue, 2 Jun 2020 16:46:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3366C8000B; Tue, 2 Jun 2020 16:46:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 225348E0007; Tue, 2 Jun 2020 16:46:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0058.hostedemail.com [216.40.44.58]) by kanga.kvack.org (Postfix) with ESMTP id 0AA7D8E0006 for ; Tue, 2 Jun 2020 16:46:09 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id C8692181AC9CC for ; Tue, 2 Jun 2020 20:46:08 +0000 (UTC) X-FDA: 76885454016.26.wrist58_6fd18dcb43e21 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id A073E1808F288 for ; Tue, 2 Jun 2020 20:46:08 +0000 (UTC) X-HE-Tag: wrist58_6fd18dcb43e21 X-Filterd-Recvd-Size: 3495 Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Tue, 2 Jun 2020 20:46:08 +0000 (UTC) Received: by mail-lj1-f180.google.com with SMTP id 9so12819040ljc.8 for ; Tue, 02 Jun 2020 13:46:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=eQH1mSRXRbdNjxBSHAITahezvnSxl7fCy/CGI6WYyaM=; b=dpjTeOUg+/6kW/p8CyGKRNp0ewNt+VVegQwZitialPWyNLlfP1YHeiwhxn7uz5hKw7 Yo6xAj5Qa5yQvfW1Ul9S0Y0yvl/aFjlJltsJzQRsJo9bTjVEZXNkD6PCG03WcRa8wHNs KdIKn4z4j4awbjWqrODlELTrGXV2VAhfJ1G9k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=eQH1mSRXRbdNjxBSHAITahezvnSxl7fCy/CGI6WYyaM=; b=TVzMkWGqpSOipDZAwJzDuDuSKFzlD8q7gJck4s/7Tsz0mkLc0DXoHVbbBmMVrjwLpG UsBC+GhEeAjpFcomjHBcvHayLCP1w56kxjQmVGf7f3HCV+Sl9aWt/SyKtSVwmXWtkzC4 NzGkoleGlkLhiQj7fTrT8PcXEa7lobWuZm8RzosCpEXsaoWCUVN7cyzHuYl4wBd3/1ZI SbhlSjeSnBqrsZmu44hbLBunhmBp+8qtxeGql3kSIE7AhTQkQLyyJvoGJ/ssH8LXhfT/ 5cDzbbpyz3JiaRKESQ0iSsuIzRnFKDcpPRiwmRoCwg7igFKn7TJSFZVymYHjcqDGpFM9 LCgw== X-Gm-Message-State: AOAM53185fiSl2Vvevfzad/YpksDM8K6JYSVL1pWYOc99zBuWVX/KkO4 QfCboUlvp9CfYdT9XBDVUCuAEzl596k= X-Google-Smtp-Source: ABdhPJwDmJXuBfAmw0fg+t+JyOfXbLtDb5Yc/5cfgcCQkR/5wzVawZSxBWw1cg6SuetI0qcq9tOgiw== X-Received: by 2002:a2e:94d6:: with SMTP id r22mr455635ljh.2.1591130766220; Tue, 02 Jun 2020 13:46:06 -0700 (PDT) Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com. [209.85.208.181]) by smtp.gmail.com with ESMTPSA id s20sm35784lfb.48.2020.06.02.13.46.05 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Jun 2020 13:46:05 -0700 (PDT) Received: by mail-lj1-f181.google.com with SMTP id c11so14319741ljn.2 for ; Tue, 02 Jun 2020 13:46:05 -0700 (PDT) X-Received: by 2002:a05:651c:2c6:: with SMTP id f6mr399502ljo.371.1591130764982; Tue, 02 Jun 2020 13:46:04 -0700 (PDT) MIME-Version: 1.0 References: <20200601214457.919c35648e96a2b46b573fe1@linux-foundation.org> <20200602130815.e42816a455f2861cc8521abd@linux-foundation.org> In-Reply-To: <20200602130815.e42816a455f2861cc8521abd@linux-foundation.org> From: Linus Torvalds Date: Tue, 2 Jun 2020 13:45:49 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: incoming To: Andrew Morton Cc: mm-commits@vger.kernel.org, Linux-MM Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: A073E1808F288 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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 Tue, Jun 2, 2020 at 1:08 PM Andrew Morton wrote: > > The local_lock merge made rather a mess of all of this. I'm > cooking up a full resend of the same material. Hmm. I have no issues with conflicts, and already took your previous series. I've pushed it out now - does my tree match what you expect? Linus