| Message ID | 20221110145501.5fc3ded0@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp711841wru;
Wed, 9 Nov 2022 20:01:18 -0800 (PST)
X-Google-Smtp-Source:
AMsMyM5pAkt6c6+qsThhQFQemZISPnFFUfOSnbJmI6y9i54WU+IVgU1eS7oZlu4y5MsnBd9tTtLN
X-Received: by 2002:a17:907:c1e:b0:7ae:31a0:571e with SMTP id
ga30-20020a1709070c1e00b007ae31a0571emr26510224ejc.690.1668052877952;
Wed, 09 Nov 2022 20:01:17 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1668052877; cv=none;
d=google.com; s=arc-20160816;
b=N/gxqphwHIUPxA2vwa1CNxvT5SS7U7u7CLRfip1wHwBCrsMi0qm8Ht5CI+Wo8lZbLL
alPiEQ27VZ6J2zbSqm/DtZ7zzq3PeBRSFjC7Rm+H4cEp7BP9Hr21Sy3NaUO3gqR6e2hl
J+5LsPKWdqXc1qMQDh4XJbn/x2L6veN9Cj+A7UbfayZal6TBwo23ARSJuI1lZ6XeeRbf
NWs5LCFTmH/WvqWF3jQj5fK/D4P+x+c8+Cbilt78z8Ty5IN3b+1cFshxVJzFq2ovONfS
ERaeBXiylLS69qaW4W+IdhInMnKPsxMUlge3b8jjdSsAXX3g12uk6wZqlnNf049S5apb
f9Fg==
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=b7e2IkOP0F0WeZOg5dfnibVWxTSp5I9yLTgZhjI6fDc=;
b=PXepdYFyzW0BmW6laMa/pnwXVAceYNAAX/OUNOSc87VWn7XluSV7RBuM6CzXIOq88c
j1mzCZRPUNQg1x1KBsSq8rd2y4QrUCokiFagtdaqHKop0AX9GWfu5fy9ozaJCiBqOzy8
oBqiwi+JaBgM1KpT0FvnFdhCHOcT/JMedh5dHbhPX4GkwAJKt30Cxw5WbWOnFxLQY6aH
YHwDIbh5Ksx4oWSHxMfqIgMYa3IGLeQ7GbCFL6bPvtG20OQsvafAO6ercC39vQw/c1HO
ucFCaxCEAvh0dmOmasPQUBKUgpdy+VKWGdc14WUuny2ODblq+UTylKLtkdlEH1m6PVEO
rLDA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=EyfXceks;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
p13-20020a05640210cd00b00460c36e09b6si14638758edu.431.2022.11.09.20.00.41;
Wed, 09 Nov 2022 20:01:17 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=EyfXceks;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S232147AbiKJDzJ (ORCPT <rfc822;dexuan.linux@gmail.com>
+ 99 others); Wed, 9 Nov 2022 22:55:09 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54012 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229516AbiKJDzH (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 9 Nov 2022 22:55:07 -0500
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD08A21E0A;
Wed, 9 Nov 2022 19:55:05 -0800 (PST)
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 (P-256) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4N77Jl3gF6z4xYD;
Thu, 10 Nov 2022 14:55:03 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1668052504;
bh=b7e2IkOP0F0WeZOg5dfnibVWxTSp5I9yLTgZhjI6fDc=;
h=Date:From:To:Cc:Subject:From;
b=EyfXceksohI12E8SNw8W2GCpj55Pcj2qQl90Rc/uxPpp1q0CLlmlpXnTauzaN7slg
obDseUMGJx6RP2QP4oJk1av3TwdtfahDye3by3YpqUTvDwVtHhiEw3GiKahBru5j4v
S8W+8XUjOzfOgwcO/SU/W2ul4oe1noLyrqJ1MycvL4PcVDLliKLmIwFU80IrE1vh2Y
JVwgCbr8NbNF5GOKg7L1sH21QcnG2UszLeu2yt9+DGppORCMYCIncltuZ7mWowico2
r7MyXIkdl4z/UnipelKmwTI064KsIul2tCj2Xo4fXNmC0K1+91HvlKsizD0WEjst0B
MUDH0pLN3FGvQ==
Date: Thu, 10 Nov 2022 14:55:01 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bartosz Golaszewski <brgl@bgdev.pl>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
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 gpio-brgl tree with the arm64 tree
Message-ID: <20221110145501.5fc3ded0@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/N/HVRkWgm7aDdarSZSTKM_5";
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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1749080214703644177?=
X-GMAIL-MSGID: =?utf-8?q?1749080214703644177?=
|
| Series |
linux-next: manual merge of the gpio-brgl tree with the arm64 tree
|
|
Commit Message
Stephen Rothwell
Nov. 10, 2022, 3:55 a.m. UTC
Hi all,
Today's linux-next merge of the gpio-brgl tree got a conflict in:
arch/arm64/Kconfig
between commit:
3b619e22c460 ("arm64: implement dynamic shadow call stack for Clang")
from the arm64 tree and commit:
f5a681d23888 ("arm64: Remove CONFIG_ARCH_NR_GPIO")
from the gpio-brgl 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/arm64/Kconfig index ed9c184ccc6b,a0c36763d954..000000000000 --- a/arch/arm64/Kconfig