From patchwork Tue Jan 2 04:13:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 184217 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4262690dyb; Mon, 1 Jan 2024 20:14:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IHqfT++FVBkYSgCD5vlaXBLdnU4UfwMOij3lanMOTqWNS64y2xOFltFI1fgQ30z++YQ2GoH X-Received: by 2002:a2e:88ce:0:b0:2cc:5fac:a503 with SMTP id a14-20020a2e88ce000000b002cc5faca503mr7805423ljk.61.1704168871843; Mon, 01 Jan 2024 20:14:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704168871; cv=none; d=google.com; s=arc-20160816; b=l71F6RAkFqfhhNu4RXghV00hzKrCfX4JDtl2oF567TBm3CjyrOT5xShUjCSY/NeaOR KL7YzYC/va3HN1iLkpqaHzbHG4dSG4X1W0ia4Sak5ljiwUYgtAoGrgdzE+EYA1yIEHfk cujEvuMniiU6ZjpVRgAYNHFhjsAXDFlZUJwk7ESd/QFO95RrfujGJJ9eTLB6VHusXUN5 vw0LAJfyin9yAuig0wNNbofadbyscbr2X0B4a5B5WMlFG/gSwh2GrW3sFKT9kH+xjdFL B1d2QlOa9jzkHn7k5as8fZfzswF5eDFavkTGIl3nGDFJB5JroGWUVM75y7CbBG6dzZpx 1Mtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=nzjB48cCE5VSIzRwROBH6itfJxdakHetauGeOCGlZUQ=; fh=nL6MC+EJO41AKsaTGlExaJZuR/XUYf3qKCwABij+8ug=; b=B+CWkT3WmITTj3s6YQqnMcXVf/WxioXIKrYbAf3EFI+KZdWOTlIoh+VF7kmNT3s3dg YbcR7JZ7VvnMzsrk4rIugXjDm9BfgRd5ySydNUcKmthCmzEA5EFusyVmMg58HuHVNJmv pYccwxNqN3QLQgCa2VIKkwpf1B5ZPhODOUY9l9J2B0ZnR1F3znlRE4Ag7LEPCGovolhH 6znJ20IY6zYrEVTcn47MqBdAFVK/ImIUPzeeUMY2/hyFQgk+leKE41KOJgRPzdH/43m/ X2gyxhMx6FLRte1NTjM62lHdZZzegxoNFviygnduqDmLYgLj9auj/Yxd/MzaKaWazM3S LH7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=F+hD3Sct; spf=pass (google.com: domain of linux-kernel+bounces-14014-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14014-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id w24-20020a50d798000000b00554e134aafesi7038409edi.209.2024.01.01.20.14.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 20:14:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-14014-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=F+hD3Sct; spf=pass (google.com: domain of linux-kernel+bounces-14014-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14014-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 72E331F219CF for ; Tue, 2 Jan 2024 04:14:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B0DA815D0; Tue, 2 Jan 2024 04:13:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="F+hD3Sct" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE7E0ECB; Tue, 2 Jan 2024 04:13:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1704168813; bh=nzjB48cCE5VSIzRwROBH6itfJxdakHetauGeOCGlZUQ=; h=Date:From:To:Cc:Subject:From; b=F+hD3SctfdecCH+JptjFhCzUgVmxxW375fljX4auBlQk5z5uqJMa/dlCg5j1SktBe N1VUvhdeO1C+DM4flBZyXe2IP0oDQWVSUgTTaV2d794tNsIlBO7nOg48pnTYX7B5RI cbdxYcv/TyhssTXnmqIYuuGp0Y+DL8Ov8utgqwae37NlhPJrjH2UhZ/w8vHyX9SKFW SgdFMgv+ajOy5mxkPpAD0xCgkolyDJiNBA7lKO7RC7k8PIVij0KIzdXORmOCtscOlm HO6SVgflewncTorvwM13S2ax+YTy3IxRLfbU5Cnypx8mJMkx2k8uXqams8Q2cNfJiz nOnWBL8l35bdA== 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 4T3zx94417z4wcM; Tue, 2 Jan 2024 15:13:33 +1100 (AEDT) Date: Tue, 2 Jan 2024 15:13:32 +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-stable, mm trees Message-ID: <20240102151332.48a87d86@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786950578710481853 X-GMAIL-MSGID: 1786950578710481853 Hi all, Today's linux-next merge of the slab tree got a conflict in: mm/kasan/quarantine.c between commits: 773688a6cb24 ("kasan: use stack_depot_put for Generic mode") 435736586ddc ("kasan: stop leaking stack trace handles") from the mm-stable, mm trees and commit: 72786c0a3dc5 ("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 8afa77bc5d3b,138c57b836f2..000000000000 --- a/mm/kasan/quarantine.c