linux-next: manual merge of the tegra tree with the arm-soc tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
	Thierry Reding <treding@nvidia.com>,
	Arnd Bergmann <arnd@arndb.de>,
	ARM <linux-arm-kernel@lists.infradead.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Krzysztof Kozlowski <krzk@kernel.org>,
	Vidya Sagar <vidyas@nvidia.com>
Subject: linux-next: manual merge of the tegra tree with the arm-soc tree
Date: Tue, 25 Jun 2019 10:12:42 +1000	[thread overview]
Message-ID: <20190625101242.2eb0e418@canb.auug.org.au> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 1166 bytes --]

Hi all,

Today's linux-next merge of the tegra tree got a conflict in:

  arch/arm64/configs/defconfig

between commit:

  39bab7bfb7d9 ("arm64: configs: Remove useless UEVENT_HELPER_PATH")

from the arm-soc tree and commit:

  01d6fb565b4a ("arm64: defconfig: Add Tegra194 PCIe driver")

from the tegra 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/configs/defconfig
index 3fb84219817a,6a9dc67bbfac..000000000000

--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -192,6 -191,8 +192,7 @@@ CONFIG_PCIE_QCOM=
  CONFIG_PCIE_ARMADA_8K=y
  CONFIG_PCIE_KIRIN=y
  CONFIG_PCIE_HISI_STB=y
+ CONFIG_PCIE_TEGRA194=m
 -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_HISILICON_LPC=y

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
