| Message ID | 20231024151138.74b045ce@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1706191vqx;
Mon, 23 Oct 2023 21:12:16 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IFKAyl7FC1m6oWRGJC9zKP2kjhuLsBCSro/kmopaiydR+C5rHgpHppk+Iu5BTFW9O4tnoGA
X-Received: by 2002:a17:902:fb87:b0:1c3:845d:a4 with SMTP id
lg7-20020a170902fb8700b001c3845d00a4mr7760923plb.51.1698120735713;
Mon, 23 Oct 2023 21:12:15 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1698120735; cv=none;
d=google.com; s=arc-20160816;
b=jqLw3LUyjrBchxqPpHT4lo5gbK/R08UfnlV6WDK85gPCRWUfWDcgFs3EFq4yk32M6X
E2PC1C032cqaqR53i8qytVeTllkEcduVdYS3lQSwH80LN/JGVze5CEZlr7hknXPevY/9
16UETxa3Zy4QX4w2Yne/kLs6o4BKELo7ISUn66l+exCsfIgqrAwZJibKxVPQDxQb06hN
/VFuua+qB3n0xPzi8kS6BroP611N7sCTRuWVqODIdOVoLw/r9kfVYCA+1sAzXN4otybm
UBIHOoXQCZ5kIi/I3fzlcTzknlsvui6ekmSOjeVCouJ9ROknqxGcgYJHjZXbNXtpdFWg
oW4g==
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=Ou9+eoT1DfUcoGZAKsecRDOEYriRBnaZ7ZxjIG/Npuo=;
fh=8ivrOtP2qCy1z0uVyIzXyxCFJYCL8fbPzwVR+AFrMM8=;
b=Cc476b9eAWnSalhQK0OqDl4GP6Gav4S2u6iYG1gOccCR7hNnZGw+UZ79eoH30/VFac
Q92bbjyZd5ZkwaCPtaSAR7hQZQgUD3alcjCPZoXuF2bToxILh/K3k0DWaZCN+z+SpuvN
4G8AbePqOc2reAzo/JtOvu0M3ommfEwR0pltOP2t+0sTdu+ODX/v1vst8XUJAtFzp17c
LAAqoa5r1gAHZpHb7FyfTg+qWUX1HuKRWfav80deBd5m71+M3lRbWGZRRY/Z+A9tyLdd
EOXzZ9Uc8F8wIWDKdM+3lHalB/G2Irvhbx+TtnyCS1cgd2n4737xCAIQ/7SSkBSjo3AD
JNHA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=c2t8Cg8c;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1])
by mx.google.com with ESMTPS id
b2-20020a170902650200b001bf741231f7si7637702plk.570.2023.10.23.21.12.15
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 23 Oct 2023 21:12:15 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:1 as permitted sender)
client-ip=2620:137:e000::3:1;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=c2t8Cg8c;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:1 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 morse.vger.email (Postfix) with ESMTP id C5E67807C863;
Mon, 23 Oct 2023 21:12:13 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S232086AbjJXELt (ORCPT <rfc822;aposhian.dev@gmail.com>
+ 27 others); Tue, 24 Oct 2023 00:11:49 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44816 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S232082AbjJXELp (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 24 Oct 2023 00:11:45 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C994B10E;
Mon, 23 Oct 2023 21:11:42 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1698120701;
bh=Ou9+eoT1DfUcoGZAKsecRDOEYriRBnaZ7ZxjIG/Npuo=;
h=Date:From:To:Cc:Subject:From;
b=c2t8Cg8cTALBbYqgNYbdoRl11YblEIICLP9m86x80kK2deliUwR7hKJNdEYtXvndK
AqK6nL3fShdu9Krwa5Zo46ETrdy9BadWa0R0JoYGM4LSsZKi6X7qdHiXvESkOVeytc
31vfYBbBZBgZXaRG361Jp+IgdeY0odWwjL0PHXqhBnem4cT7XtX2KVLtS1+n5fwgu0
cCJg+wOA5FdnnXR00VRq/eA7yw5XHX8tTmIKic3GZWbaq6HkhMJ4K7wBC9gVDzRChD
lnbW2qpvlDMcfzAog3kokGbaL2tXlzzUDqPhP75j56WWNsAGqZPhUYoT+MfsbmFJ67
SteRo6jQ0EtiA==
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 4SDzCJ1Q0cz4wd2;
Tue, 24 Oct 2023 15:11:39 +1100 (AEDT)
Date: Tue, 24 Oct 2023 15:11:38 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dipen Patel <dipenp@nvidia.com>,
Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Arnd Bergmann <arnd@arndb.de>,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
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 hte tree with the gpio-brgl tree
Message-ID: <20231024151138.74b045ce@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/lojYEUpnjkKC_U36m+RmUz/";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.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 (morse.vger.email [0.0.0.0]);
Mon, 23 Oct 2023 21:12:13 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1780608648541427660
X-GMAIL-MSGID: 1780608648541427660
|
| Series |
linux-next: manual merge of the hte tree with the gpio-brgl tree
|
|
Commit Message
Stephen Rothwell
Oct. 24, 2023, 4:11 a.m. UTC
Hi all,
Today's linux-next merge of the hte tree got a conflict in:
drivers/hte/Kconfig
between commit:
9bc633117d6a ("hte: tegra194: add GPIOLIB dependency")
from the gpio-brgl tree and commit:
63137bee5a7a ("hte: allow building modules with COMPILE_TEST enabled")
from the hte 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.
Comments
Hi all, On Tue, 24 Oct 2023 15:11:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the hte tree got a conflict in: > > drivers/hte/Kconfig > > between commit: > > 9bc633117d6a ("hte: tegra194: add GPIOLIB dependency") > > from the gpio-brgl tree and commit: > > 63137bee5a7a ("hte: allow building modules with COMPILE_TEST enabled") > > from the hte tree. > > diff --cc drivers/hte/Kconfig > index 8e0fd818a73e,083e67492bf2..000000000000 > --- a/drivers/hte/Kconfig > +++ b/drivers/hte/Kconfig > @@@ -16,8 -16,7 +16,8 @@@ if HT > > config HTE_TEGRA194 > tristate "NVIDIA Tegra194 HTE Support" > - depends on ARCH_TEGRA_194_SOC > + depends on (ARCH_TEGRA_194_SOC || COMPILE_TEST) > + depends on GPIOLIB > help > Enable this option for integrated hardware timestamping engine also > known as generic timestamping engine (GTE) support on NVIDIA Tegra194 This is now a conflict between the hte tree and Linus' tree.
diff --cc drivers/hte/Kconfig index 8e0fd818a73e,083e67492bf2..000000000000 --- a/drivers/hte/Kconfig