| Message ID | 20231213124302.2a6281af@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp8120151vqy;
Tue, 12 Dec 2023 17:43:20 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IEd3iVeLlhMiAow9v9KeaumCDbS9/RXuvH2oEmAx2efROs3nRupkAX4BNd3SAEvJeSXkOu7
X-Received: by 2002:a05:6a21:192:b0:190:1cf7:f80 with SMTP id
le18-20020a056a21019200b001901cf70f80mr9462427pzb.93.1702431798188;
Tue, 12 Dec 2023 17:43:18 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1702431798; cv=none;
d=google.com; s=arc-20160816;
b=KikFtNmS/9UqaWLPgJqEhdM2k0vufJUeekzXw+0DgPbaXSnBSn0902/kvSOG1iUDUi
pP0aAhP6M4j3JkEfydaWDFBy54/ECR1AwUL03DtbHW2YUh6QejQ93NkQwadnYedPWK6F
MUD1RyO2QEzuW5rrHDJAumTcNfbI7wmIRG4o4UQxHTe83cmvgr7KroTZVmVnj8qwmj/o
+fMWIY0wUzYORTIYTgrjuxMxoNV0voDJTwjrj6/urGmr+X6czN5+D7p71OPFT8Y+lqGW
tC7CUo5Qcl5LYZf0+5lZ19dS2r9Mr0goPjfqOmxXWH9KEjT0IDz43Jbb/rEeIPgRlsEt
qksw==
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=kJaU2JTGNOSsbFtXofZUd1U0Nbf9C/FQpjhmSxjoQss=;
fh=2ILjXAbADXGRiayezPN4pic+RiT/tG3Ju2e4wHLYbjg=;
b=hYUd0vt+9n24Hv8zPFBIessVqmy91Wu5WEpqpOsWtPKvAoiui275l/6Omohv6YXQiv
iRDkameLMoVXu+x8+qI4F1Qd7QnIV56De7a3KH611qZnBeKIuECX6AajFBleGfVldR0d
BVnRLtUvSGhPX7AtT1t71hZ/mCDvf9IGvxo/PuiPqiEJqR5KPUJyzUhV6Xl/BlXJJTPK
ierrrEcnvkyHbhSoQprvrnXP2M+MnN5K572wIvZpCAf0irUbzSaES1VC+UqYFNUXe/n7
Pftq2vpnMnk7Sp6aWFw+NJ8tUbjnzYAFU4dGlpvQ/pQsCeaX6Cj7TYyCgpHP24n4uztu
OYBw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DxJM33ES;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38])
by mx.google.com with ESMTPS id
s15-20020a65690f000000b005bdfe7528c9si8574493pgq.726.2023.12.12.17.43.16
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 12 Dec 2023 17:43:18 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DxJM33ES;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id E1F0C80A9DFB;
Tue, 12 Dec 2023 17:43:12 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1378212AbjLMBnB (ORCPT <rfc822;dexuan.linux@gmail.com>
+ 99 others); Tue, 12 Dec 2023 20:43:01 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43708 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1378199AbjLMBnA (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 12 Dec 2023 20:43:00 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26DD1B7;
Tue, 12 Dec 2023 17:43:06 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1702431784;
bh=kJaU2JTGNOSsbFtXofZUd1U0Nbf9C/FQpjhmSxjoQss=;
h=Date:From:To:Cc:Subject:From;
b=DxJM33ESLL/bxPYx7rOpgAAWenCpSfGRD1HDyTZfmRNQWNaNWkzqfoIC9oX3pi22U
LMkU7ORwXNuKySICRXVCBrFek4KcKabFr2nu8haiEDXgnnt5X55+UqK4HFwmeJJ/8J
qaSPP95bQ8f349gvhHYu3VMfFvscQ3bspNfLJ90uGNYHHgY3/RNcOiPR3He0PPQCqI
DvgPaZQYrf7rpFVTMdiTry6OQ0Ei3p58ebV1430+QK3gB11apHcXXashANgZonKREx
gvyr4aywZqi4sli36D3j7YOIJNp20QvtYM++vMGnUoXp98Xgdl93cilo6DDE38YFxq
DCNy/c06yrYMA==
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 4SqdXl6PpPz4wdC;
Wed, 13 Dec 2023 12:43:03 +1100 (AEDT)
Date: Wed, 13 Dec 2023 12:43:02 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Joerg Roedel <joro@8bytes.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Heiko Carstens <hca@linux.ibm.com>,
Jason Gunthorpe <jgg@nvidia.com>,
Jason Gunthorpe <jgg@ziepe.ca>, Joerg Roedel <jroedel@suse.de>,
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 iommu tree with the mm-nonmm-stable
tree
Message-ID: <20231213124302.2a6281af@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/fBm6b//CFPRkuNN2Ov+FvBG";
protocol="application/pgp-signature"; micalg=pgp-sha256
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 fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]);
Tue, 12 Dec 2023 17:43:13 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1785129125182613200
X-GMAIL-MSGID: 1785129125182613200
|
| Series |
linux-next: manual merge of the iommu tree with the mm-nonmm-stable tree
|
|
Commit Message
Stephen Rothwell
Dec. 13, 2023, 1:43 a.m. UTC
Hi all,
Today's linux-next merge of the iommu tree got a conflict in:
arch/Kconfig
between commits:
0eb5085c3874 ("arch: remove ARCH_TASK_STRUCT_ON_STACK")
3888750e21cc ("arch: remove ARCH_TASK_STRUCT_ALLOCATOR")
from the mm-nonmm-stable tree and commit:
8f23f5dba6b4 ("iommu: Change kconfig around IOMMU_SVA")
from the iommu 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 arch/Kconfig index bfcc7c2dc039,3e49f862670e..000000000000 --- a/arch/Kconfig