| Message ID | 20231221173124.78c7df98@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-7892-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp220858dyi;
Wed, 20 Dec 2023 22:31:50 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IH6iDrYme8uP1d2/HOE+B0mY86qVJ4a6Y2zQo+7J9jowV4Nx0hxn0FkqQKyY49qj+iM5zOe
X-Received: by 2002:a05:6870:8091:b0:204:1304:7df7 with SMTP id
q17-20020a056870809100b0020413047df7mr942649oab.67.1703140310104;
Wed, 20 Dec 2023 22:31:50 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1703140310; cv=none;
d=google.com; s=arc-20160816;
b=rMPJyyE7SZ7Tl1i9a/4xtfcjDl4MmOQv2350syFCZMuYh79TfD5nfkhVPsT9R29aG3
jiPQIIEasjLQ/y3E2UsuqF+YV7qDOMDMQ33P6ArLTyZbBHCPBDUJWGPFe/+FEhBEJJaA
0RzGeIEsyIKyCz5pskpC2PKa97sbOZTnGUOc5P+7mJlyZ0D6/ANnjI7k/RKW0ti8Pofl
ZHomq30BspCpnhQjFiWUNsamdLKR/lKC9XhGESU0HsfyUmWWz9A4uQ2G0UjFwenhpDhy
3FmwWdRIjjQSLsRpegbmuSlDTTQN6iVOnmLcanR8jjE4VQ+fUuBBaY5RhHCUZJtVmxy+
QYkQ==
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=Rapc3Tfs1cCcH1qpsutR1bzBhPHIjD7KmbnugD5r/pU=;
fh=nL6MC+EJO41AKsaTGlExaJZuR/XUYf3qKCwABij+8ug=;
b=oDmwHMbyVL/aOJYxvpmNxcJR37PbLPsa5i/wsocXVbyknlCOGBjYGviBun16q+LohC
ArynrqqhNOEpOPIfRSNeMWSoNdoqgmjO3SuN+W6uzs0BxyUNSj2ZgM463N/I1smtKrqb
ggPcc5TzAMahT+OXZBCYDd34mOd5mprikoPdbIVQ3+fC8pHC5A6I8VrBqRe6QTU1y3OJ
366dZ8bBy5u4EZUHqX0GfLhbBSe8MuXpafO+7l8PzuNwrwHZDlkHdZNoL9ojYTqJW8Ny
qwJaXaEgMDSFtg5QvqLWne3koswYjmvoZoEV7JOKkgYE5cvVnBlHwEa3hPJGaZ/PCYBu
pNJQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=rmN34+ri;
spf=pass (google.com: domain of
linux-kernel+bounces-7892-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.199.223 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-7892-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223])
by mx.google.com with ESMTPS id
c8-20020a05622a024800b00425892ebeaasi1458947qtx.270.2023.12.20.22.31.49
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 20 Dec 2023 22:31:50 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-7892-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=rmN34+ri;
spf=pass (google.com: domain of
linux-kernel+bounces-7892-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.199.223 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-7892-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id DE5271C22C80
for <ouuuleilei@gmail.com>; Thu, 21 Dec 2023 06:31:49 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id F2DC7D26D;
Thu, 21 Dec 2023 06:31:35 +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="rmN34+ri"
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 DFE8DB671;
Thu, 21 Dec 2023 06:31:28 +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=1703140286;
bh=Rapc3Tfs1cCcH1qpsutR1bzBhPHIjD7KmbnugD5r/pU=;
h=Date:From:To:Cc:Subject:From;
b=rmN34+ribrVMv54rD0pStGFHf0C5PFSAfyKB3RfAWjSm5nDyV8ZEsRulydmyH6vOp
SrSXnzTnm1sYKChTmUlygLrcBlfuxYI5gLOvrBVJgZmpE8VTi9pZYMjMdQIhedpAMo
guul52ljTLhAq5gBSYc8sWSf2o2MAtbGBCnrhlhBVdBYWwtPFWqjHpg22xWeqF8SeV
uhf33A52OoJQ35U5RlefPMmt+tA7t2BPWDldCWzv1e3hQ0nYXJdczqxIVxdeSG2EPy
y22GKxBpC7rdbSjoSoK0UIKNjMA/U6gWWPyzW9RijTC4f/c1uzNvGxWVrLSppx+TiP
z1dWFCoq1bMBQ==
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 4SwgYp2g4rz4xNH;
Thu, 21 Dec 2023 17:31:26 +1100 (AEDT)
Date: Thu, 21 Dec 2023 17:31:24 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vlastimil Babka <vbabka@suse.cz>, Andrew Morton
<akpm@linux-foundation.org>
Cc: Andrey Konovalov <andreyknvl@gmail.com>, Andrey Konovalov
<andreyknvl@google.com>, Linux Kernel Mailing List
<linux-kernel@vger.kernel.org>, Linux Next Mailing List
<linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the slab tree with the mm-stable, mm
trees
Message-ID: <20231221173124.78c7df98@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ynlm/+rE6q+wooN_qc6k/hu";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1785872054025916438
X-GMAIL-MSGID: 1785872054025916438
|
| Series |
linux-next: manual merge of the slab tree with the mm-stable, mm trees
|
|
Commit Message
Stephen Rothwell
Dec. 21, 2023, 6:31 a.m. UTC
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")
f91ba46acc15 ("kasan: memset free track in qlink_free")
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 782e045da911,138c57b836f2..000000000000 --- a/mm/kasan/quarantine.c