lkml.org 
[lkml]   [2019]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the tegra tree with the arm-soc tree
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2019-06-25 02:15    [W:0.041 / U:7.460 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site