From patchwork Mon Nov 27 01:29:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 169936 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp2785751vqx; Sun, 26 Nov 2023 17:29:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IGjmqhL5/UEmoiKYC3TXqzL9u0UP1wcnzd/tl497iB4+U60ZND19ZbQCkhv4Qfz71gecD10 X-Received: by 2002:a17:90b:1d09:b0:280:c98f:2090 with SMTP id on9-20020a17090b1d0900b00280c98f2090mr13022402pjb.32.1701048565147; Sun, 26 Nov 2023 17:29:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701048565; cv=none; d=google.com; s=arc-20160816; b=HUaIvhv1fNK4qJoET7MCugRhIYUS8ltF9MgUN0SBiTKDAPf5nSpHvhcuwDXCT/SC/Y oa6zBQZZXsph758NQvfDuhLWn2oK3S0Rq7b3vo4LlAe+hPNoFoC0XbKE5uI06FZaCQ9E XrmiFpy3HRZWPY1CDHysDfW7GYFunxz6+n9zq85CB34+I86KzWGcbH9vdpD5gU7lSJsC MmyuDKopX6rhLsLvMb0cdUP9+NjAFv3ANTB94sZl5rOGZ8rd7FLK5SrFb4Dn5MP1m2GW +WTm7O5i3vwWSWkr6+GuYO86L/oWoi/Z4dcshsaD9i4lZjCCLLWZ+tC7sgtc9dDIFL09 MGjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=c8WraKH7izMTzidMiHYbs+LFOZrlhXTUuBrEz0967Ec=; fh=nL6MC+EJO41AKsaTGlExaJZuR/XUYf3qKCwABij+8ug=; b=Y+hRfpCgmJGkocBJF6cO0II1lHPFY2yITVX1nu/iqICDjno8MZMIWGwYNoCQ67xfJl T9p68/qdK7ufWrU5vgcGi5MA/luyHmG0DUiU8D3Ywc3do0KYpHrGUOnxqVagjVO4zlNi /kRbVV2y9KISvOtJlOErVNVH3gShuq12Z5MEtOS047n8JMm1FnO2QOIyzg55gwjOAt0m Sq8vcdEAXvU5qdWf5Dym76EB7h4xfEM4gBGu3LOJT4lerKlEdNH+T5i9na5JK4Eu4CdY 5jUpD3vBwJsKcClTMvehSP5gI9K/DeZFFenP3RxHcSFYS+6f8pyfob4I/re11tfPI56h /N5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=gJSY2rLP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id fu22-20020a17090ad19600b00285a1ff69b3si4574049pjb.75.2023.11.26.17.29.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Nov 2023 17:29:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=gJSY2rLP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id A7D16807F648; Sun, 26 Nov 2023 17:29:22 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231272AbjK0B3B (ORCPT + 99 others); Sun, 26 Nov 2023 20:29:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229472AbjK0B3A (ORCPT ); Sun, 26 Nov 2023 20:29:00 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0438E3; Sun, 26 Nov 2023 17:29:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701048544; bh=c8WraKH7izMTzidMiHYbs+LFOZrlhXTUuBrEz0967Ec=; h=Date:From:To:Cc:Subject:From; b=gJSY2rLP/nKY6yZzr6xV5MaHq6oFnYlDzsoHwxbFZzDpoo2sZGhn56OfiClTv69SQ GgsJFOOj3vhZ+tD27+T6HXCFnmqVFwpY2lXcIntW8w9NDXhQsQ2XpT/+VBatQ4Rkap pdD7t7l/Or8xl7FM6gS8v+ro7tC3QZtr0tF/YlVzMBuqudSdSQmBtMOKgQxBq0XAAJ 6pERLj6f8GwMr+TXiW73Fjucn7/h/IslYYNG8362Pr3GdJT5ZQv/yoiCAARaqfGCFn XxRcXrQTewG9hLz8AAbVDT/br6kEa80lfXSHJEmf+VyVSemDT8kjJni0Ns9nwA4p8Q Fs9XzOWqunMmQ== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Sdnzz5rnHz4wc1; Mon, 27 Nov 2023 12:29:03 +1100 (AEDT) Date: Mon, 27 Nov 2023 12:29:02 +1100 From: Stephen Rothwell To: Vlastimil Babka , Andrew Morton Cc: Andrey Konovalov , Andrey Konovalov , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the slab tree with the mm tree Message-ID: <20231127122902.566de6d1@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sun, 26 Nov 2023 17:29:22 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783678700335011152 X-GMAIL-MSGID: 1783678700335011152 Hi all, Today's linux-next merge of the slab tree got a conflict in: mm/kasan/quarantine.c between commit: f644ee35cf5b ("kasan: use stack_depot_put for Generic mode") from the mm tree and commit: 40a038d5fc11 ("KASAN: remove code paths guarded by CONFIG_SLAB") from the slab tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc mm/kasan/quarantine.c index 265ca2bbe2dd,138c57b836f2..000000000000 --- a/mm/kasan/quarantine.c