| Message ID | 20230803092245.4c0fc299@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp808489vqx;
Wed, 2 Aug 2023 17:10:23 -0700 (PDT)
X-Google-Smtp-Source:
APBJJlFcCCpJsDyJzzCvmYFCXkUWm62JINmjhprPJveGk6srfNYXiIFw5HG6suntcrxnlB6W7+9B
X-Received: by 2002:a05:6a20:158a:b0:13d:7aa3:aa6c with SMTP id
h10-20020a056a20158a00b0013d7aa3aa6cmr13412091pzj.0.1691021422504;
Wed, 02 Aug 2023 17:10:22 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1691021422; cv=none;
d=google.com; s=arc-20160816;
b=dHbI+HRM7/A/u1qNJuBL6iiEJNexUf8kGNQmFP68KBypSj7a8uVTuErhFfTfJoNNol
vM2yTJIu/66SW3BXwKnmgzfzfrvHrYKbC9vQehR9rU1Eh8jHQLR7Dtz0wG2DvC9cZ2Cq
ggF37nAGYwNPF4UkyhCLlGNgekn1mHf6YaDcMI+YvubRTpZ05GyW33dUVof+HxUS8mv9
BgaMhokiGXRmfFTg0Y0qEv/bc0zMnKq/FImu6fLeEjNtVHZF0pIi9ohREp2T0714ahB9
2V7FlzByrO+x5O+B8t8xsZYFPMz+PKSkTzwYefBAb/PUsDTCbTc+D2N45u1/K4SgVq+8
QxNw==
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=s+wJuNHRcXYhlpADMo06g8Fz7nrpZ9yYMbSWWaXuWCE=;
fh=XZhLhUvhj8plArYqROvesfG/6RC5PlE1Snt/89ENe9A=;
b=sG/CrJBTEfgrLlN8VSeF8GaF2Dd7qPqjyurKEViPp6mD+OTm/FLGQfO4MBBrwhRmLv
EyRk9yysO/gOuM7mP/qsl2vOgSTwOYQ3McBC+Vg6keymZW1q6ztsCxQoKHVPwj/WFxEc
XJKrFNqtdNM2rDxecWeDzcbGBt6v/QA/bWXOQsptIIxhT0Ok7jtXDqNFJPh1M6aaq74r
+TrFGon5wr4UmAs9QOwLvdaxUK852oMHPjYpnuPHM/3rzwABegwuC+2IP6+JUu4UILlY
Rk/pO37Jlg3I8Pay8NKipy1NsxQnqaGlBiggwSo6sHD4npgL536QQpo7aEArrauoKCGA
DEeg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=UrTM6UqB;
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;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
207-20020a6300d8000000b00563d6a2aab9si11486771pga.588.2023.08.02.17.10.09;
Wed, 02 Aug 2023 17:10:22 -0700 (PDT)
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=UrTM6UqB;
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;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230058AbjHBXXJ (ORCPT <rfc822;cambridge8321@gmail.com>
+ 99 others); Wed, 2 Aug 2023 19:23:09 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34208 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S232080AbjHBXWy (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 2 Aug 2023 19:22:54 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E24B1D9;
Wed, 2 Aug 2023 16:22:49 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1691018568;
bh=s+wJuNHRcXYhlpADMo06g8Fz7nrpZ9yYMbSWWaXuWCE=;
h=Date:From:To:Cc:Subject:From;
b=UrTM6UqB+P6V1xZ1F8md9RIfXE9XHfMDu6QPbvIDFa5COXX3gn5poDUGQjbXmBM6n
7nsRyZwr+uXys7tPJ31OhLfc/CV5eywFmZOk28zFkGGv0TFG3jMgWVklPIXusW00Kl
NiAU/SQQ6aDhCrQD2hVtECB6oBFSX1Cco7Za6eMXqB5uo8p4s4k1JBsLEPm7DRnfD2
8h0TcN2bUHfpsWMxxn2WW5het+QE08R7QGTK/kveRnr/Zq9e04OYutWamhkQHn7uKo
/HCe/QPyjwcN3FX2dezfkM/JRg8Z3V8CeFqrhJWPXdVvx7rtipBFUm233SO2LTrGmP
4FoyGN3RohRVA==
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 4RGSgr1CK1z4wZJ;
Thu, 3 Aug 2023 09:22:47 +1000 (AEST)
Date: Thu, 3 Aug 2023 09:22:45 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Nishanth Menon <nm@ti.com>, Tero Kristo <kristo@kernel.org>,
Santosh Shilimkar <ssantosh@kernel.org>,
Shawn Guo <shawnguo@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Peng Fan <peng.fan@nxp.com>, Udit Kumar <u-kumar1@ti.com>
Subject: linux-next: manual merge of the ti tree with the imx-mxs tree
Message-ID: <20230803092245.4c0fc299@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Tu2vuV8DJFVY+E_42AY.OxX";
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,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS,
T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: INBOX
X-GMAIL-THRID: 1773164478751011597
X-GMAIL-MSGID: 1773164478751011597
|
| Series |
linux-next: manual merge of the ti tree with the imx-mxs tree
|
|
Commit Message
Stephen Rothwell
Aug. 2, 2023, 11:22 p.m. UTC
Hi all,
Today's linux-next merge of the ti tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
b940e6846cf7 ("arm64: defconfig: select IMX_REMOTEPROC and RPMSG_VIRTIO")
from the imx-mxs tree and commit:
8127ab5fbaee ("arm64: defconfig: Enable various configs for TI K3 platforms")
from the ti 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
On 09:22-20230803, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the ti tree got a conflict in: > > arch/arm64/configs/defconfig > > between commit: > > b940e6846cf7 ("arm64: defconfig: select IMX_REMOTEPROC and RPMSG_VIRTIO") > > from the imx-mxs tree and commit: > > 8127ab5fbaee ("arm64: defconfig: Enable various configs for TI K3 platforms") > > from the ti 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. Thank you, Stephen. I had suspected something of the sort would happen as I picked the patch up, I will let Arnd know as well on this incoming as part of PR. > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/arm64/configs/defconfig > index 03fce1752521,700d5571f12b..000000000000 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@@ -938,8 -929,8 +943,9 @@@ CONFIG_SND_SOC_GTM601= > CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m > CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m > CONFIG_SND_SOC_PCM3168A_I2C=m > +CONFIG_SND_SOC_RK817=m > CONFIG_SND_SOC_RT5640=m > + CONFIG_SND_SOC_J721E_EVM=m > CONFIG_SND_SOC_RT5659=m > CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m > CONFIG_SND_SOC_SIMPLE_MUX=m > @@@ -1255,7 -1246,8 +1265,9 @@@ CONFIG_ARM_SMMU_V3= > CONFIG_MTK_IOMMU=y > CONFIG_QCOM_IOMMU=y > CONFIG_REMOTEPROC=y > +CONFIG_IMX_REMOTEPROC=y > + CONFIG_TI_K3_R5_REMOTEPROC=m > + CONFIG_TI_K3_DSP_REMOTEPROC=m > CONFIG_MTK_SCP=m > CONFIG_QCOM_Q6V5_ADSP=m > CONFIG_QCOM_Q6V5_MSS=m
diff --cc arch/arm64/configs/defconfig index 03fce1752521,700d5571f12b..000000000000 --- a/arch/arm64/configs/defconfig