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 0B4FFC433F5 for ; Fri, 27 May 2022 18:45:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 800B98D0003; Fri, 27 May 2022 14:45:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B33F8D0001; Fri, 27 May 2022 14:45:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 679248D0003; Fri, 27 May 2022 14:45:08 -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 597818D0001 for ; Fri, 27 May 2022 14:45:08 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 1EDEB35B52 for ; Fri, 27 May 2022 18:45:08 +0000 (UTC) X-FDA: 79512400296.13.3B32F2A Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by imf04.hostedemail.com (Postfix) with ESMTP id 7DBC240046 for ; Fri, 27 May 2022 18:44:50 +0000 (UTC) Received: by mail-ej1-f43.google.com with SMTP id n10so10384499ejk.5 for ; Fri, 27 May 2022 11:45:07 -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=52zOsCc6qEBLSd0EvVPsjC9FUkx7ysoIDr7i7kJhu7I=; b=eViVbPMW3o5xWiLGbwthVcpGNrkna0bmofKE98fV4grdZ6eH74UtthI/lzXo3RPIjz RwnfnWgzerkx2YzKRb/M9ndnInTc35IAUyAVqW91mVF2CtO8uqf6h5cuCiAiSN2JPaGP jC2VXu6WQjuai5tXQAtG6xajiwkx+dnQ+3/T0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=52zOsCc6qEBLSd0EvVPsjC9FUkx7ysoIDr7i7kJhu7I=; b=p3/0IqW0BC4a2WhtTkrFvQAPNkwXYFLnPkkTn2CM9UxUIK3ppDhwUpANaBHGPbfs65 WC/Agj08cfC1Nx+T9tpGOBfsemKnYXKGBQdcQqdn+yBsyUlrkjYH0O021+S2dxZE8dSu pYFWe1pfIzTeDUqDxYljP/DNRL3EKl8stJAVFg9KTZa7cdJUJhrSFjKfdNcZ6XxfCogW IK8jQ84nz8TRfl8RzQujdqnv6G36iZc6pFagSBMu0GFQPC92EDGSDuJhbzwtj3tUFnoG 0uZJAiE4Xyah8vDsbYhNCTwuGIZG9F0fOlHaoTMEAn42FwzAFc1FYuamlXTaE+g+tnZA 0z9A== X-Gm-Message-State: AOAM532Ctq7PSh8/6ng0JI2FISYmh8UpyTiUl1NHh6BRshi4ea2fyY0u iDJ5Sm7Fh1Qpu4WX4mcBV225mTQFP6j+ZkcG X-Google-Smtp-Source: ABdhPJx7z19Xy+L4Uh9rPPW20ArVHbe5QcAUqsrBQTT0inxk2N3G7cISUoOAPbHLSXq3c4JjRBGwuA== X-Received: by 2002:a17:907:7b9e:b0:6fe:d8df:d1e7 with SMTP id ne30-20020a1709077b9e00b006fed8dfd1e7mr25034692ejc.225.1653677105941; Fri, 27 May 2022 11:45:05 -0700 (PDT) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com. [209.85.128.52]) by smtp.gmail.com with ESMTPSA id j20-20020a1709062a1400b006f3ef214dcdsm1676977eje.51.2022.05.27.11.45.04 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 May 2022 11:45:05 -0700 (PDT) Received: by mail-wm1-f52.google.com with SMTP id f23-20020a7bcc17000000b003972dda143eso5023788wmh.3 for ; Fri, 27 May 2022 11:45:04 -0700 (PDT) X-Received: by 2002:a05:600c:4f0e:b0:397:6b94:7469 with SMTP id l14-20020a05600c4f0e00b003976b947469mr8216306wmq.145.1653677104449; Fri, 27 May 2022 11:45:04 -0700 (PDT) MIME-Version: 1.0 References: <20220527103014.517818624f9f6d4f0ba0b523@linux-foundation.org> In-Reply-To: <20220527103014.517818624f9f6d4f0ba0b523@linux-foundation.org> From: Linus Torvalds Date: Fri, 27 May 2022 11:44:47 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] additional MM updates for 5.19-rc1 To: Andrew Morton Cc: Linux-MM , Linux Kernel Mailing List , mm-commits@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 7DBC240046 X-Stat-Signature: qo7xypzjh9nq9b7sc333iys3n16buocr X-Rspam-User: Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b=eViVbPMW; spf=pass (imf04.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.218.43 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org; dmarc=none X-HE-Tag: 1653677090-672201 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, May 27, 2022 at 10:30 AM Andrew Morton wrote: > > There's a merge conflict in init/Kconfig. We resolved that by removing > the VM_EVENT_COUNTERS..MMAP_ALLOW_UNINITIALIZED entries. > > And another in lib/Kconfig.debug. Similarly resolved by removing the > DEBUG_SLAB..SLUB_STATS entries. Both of those also needed fixups for the new mm/Kconfig.debug thing to enable the proper STACKDEPOT things. Linus