| Message ID | 20231003120410.3c408680@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id
in14csp1785173vqb;
Mon, 2 Oct 2023 18:04:21 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IFaTFW0frRdoaTWpx9tp3zcdeh1AbltBJSszALZ4In0Zr2vyIS+zIFaJb7O/DC5riTb6rA9
X-Received: by 2002:a05:6a20:734c:b0:140:f6c4:aa71 with SMTP id
v12-20020a056a20734c00b00140f6c4aa71mr15282624pzc.8.1696295060844;
Mon, 02 Oct 2023 18:04:20 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1696295060; cv=none;
d=google.com; s=arc-20160816;
b=yCsMvxTJANdT2NoocSF8Mr+jwiakYlC1321BhcvqrwU0ayADYC0rfG7lJ9Si9xAfRp
hu6ZIymw806lIk29BePF4tPRV3hfu664QZOctAcoPrQ4uLHpQ1nVUeQG7cSlof3yOYcQ
V4qEis11HnYL9tFXe5I8I7wVOguCvsK7PDu5cZ/dQ6DmVb00QCZGQUv25aU+AR3jI5Zl
c1mvz64gXtBhXRMMYwW3Dhn66+cLbaFpeJpjsEVgkcNWV9dOqdFzarQwBCi3oSg3cKfF
cDRqlhpwZkxwvozUHuHxjSi9C0ki+HQWTRBYkz0kGn0VCyT46H2XPIFS3zVG0f8WTPvn
uNBQ==
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=xsf9tIw5a6T3R+Pom55EWLjfIAm3f6Ai/hp/EsxCLXE=;
fh=/n4ZSgEC1um0q7/GwADHPiUOGg+toAYnCEIU8g0iIrA=;
b=XaGjEdeqH6pNEl6Vevn9A8sEUDjd2wYUx520bJsBSEirdmN1C+m6+3b0/B8ZCp9MGO
ni2GFRMj6cxsM3WTrt12GKqQMUCbmo5X9b4OlF8iTW1Zyl24BLBbFdSTXgJRABLH+FwC
R8oRD7kdj4B2oxNLXdNIyS9/PteWAt6a7V+JfZzIIoEc4HDKPe6VTCwZ8TnQP5WdBXOb
POlby5ljkhpA2XkjkryhLHZQ0uBNBajMgEuamGDDbfndKpubtHFoRoW4qwvYYiTqX/mm
J8HXkZ6CHFcUtOgtKr7PH0j9lnI90/HUXoDhBDLCRGzAR6SSUv0c0C0zqOBo5vKVKcsK
1lcA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=j8twwBzm;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7])
by mx.google.com with ESMTPS id
h7-20020a056a00230700b0068beee4922csi290280pfh.23.2023.10.02.18.04.20
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 02 Oct 2023 18:04:20 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 as permitted sender)
client-ip=2620:137:e000::3:7;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=j8twwBzm;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id C90A68116E4A;
Mon, 2 Oct 2023 18:04:19 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229943AbjJCBET (ORCPT <rfc822;pusanteemu@gmail.com> + 18 others);
Mon, 2 Oct 2023 21:04:19 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43166 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229837AbjJCBET (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 2 Oct 2023 21:04:19 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFB99B4;
Mon, 2 Oct 2023 18:04:15 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1696295054;
bh=xsf9tIw5a6T3R+Pom55EWLjfIAm3f6Ai/hp/EsxCLXE=;
h=Date:From:To:Cc:Subject:From;
b=j8twwBzmjkuslN1x5RHY0DwyGNwM4fvJq3AYuF4KDlgktjhRwkkIBPRk9q+j6Pvi/
Cksp2YV93qdxDwRbOU3RIVakM6blpKd8i5szwyTYlN0Y0GbmynvnekoLmHVvPQ6ngT
waD/aoQXHRzx1oqV7vDzKNR6vpFGD6gOMl6vjPbXUfgY7MPdmQE+0dKd6e08nJaTDa
Kq7eFJDcfs7t6Q0NGEe85X7YOT+FRn9rUh34wMX41gXk3LgOrIuYJVreqD7qBtnKEL
om/wouqNP8Au1lRaY59ExcD2LZkPFIvgxM2Qckce7TM6tr+h1HWddxW0L/pKsvQ8Kd
W016rKXOW+K7g==
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 ECDHE (prime256v1) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4S002j1sdWz4xPf;
Tue, 3 Oct 2023 12:04:12 +1100 (AEDT)
Date: Tue, 3 Oct 2023 12:04:10 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Joerg Roedel <joro@8bytes.org>, Arnd Bergmann <arnd@arndb.de>
Cc: Ard Biesheuvel <ardb@kernel.org>, Joerg Roedel <jroedel@suse.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Niklas Schnelle <schnelle@linux.ibm.com>
Subject: linux-next: manual merge of the iommu tree with the asm-generic
tree
Message-ID: <20231003120410.3c408680@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/3jZx8B.5TOmVuygG6eAZsh_";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
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 (snail.vger.email [0.0.0.0]);
Mon, 02 Oct 2023 18:04:19 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1778694289518936801
X-GMAIL-MSGID: 1778694289518936801
|
| Series |
linux-next: manual merge of the iommu tree with the asm-generic tree
|
|
Commit Message
Stephen Rothwell
Oct. 3, 2023, 1:04 a.m. UTC
Hi all,
Today's linux-next merge of the iommu tree got a conflict in:
drivers/iommu/Kconfig
between commit:
cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
from the asm-generic tree and commit:
c76c067e488c ("s390/pci: Use dma-iommu layer")
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 drivers/iommu/Kconfig index 7f04491ca5f0,3199fd54b462..000000000000 --- a/drivers/iommu/Kconfig