Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1271737

linux-next: manual merge of the tegra tree with the renesas tree

Show all headers | View raw

Hi all,

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

  arch/arm64/configs/defconfig

between commit:

  727e8d0126e3 ("arm64: defconfig: renesas: Enable Renesas r8a7795 SoC")

from the renesas tree and commit:

  0a31289369f8 ("arm64: defconfig: Enable serial-tegra driver")

from the tegra tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm64/configs/defconfig
index a260e3a46f01,3852c51330e2..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -118,9 -116,7 +118,10 @@@ CONFIG_SERIAL_SAMSUNG=
  CONFIG_SERIAL_SAMSUNG_UARTS_4=y
  CONFIG_SERIAL_SAMSUNG_UARTS=4
  CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 +CONFIG_SERIAL_SH_SCI=y
 +CONFIG_SERIAL_SH_SCI_NR_UARTS=11
 +CONFIG_SERIAL_SH_SCI_CONSOLE=y
+ CONFIG_SERIAL_TEGRA=y
  CONFIG_SERIAL_MSM=y
  CONFIG_SERIAL_MSM_CONSOLE=y
  CONFIG_SERIAL_OF_PLATFORM=y
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the tegra tree with the renesas tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-18 00:20 +0100
  Re: linux-next: manual merge of the tegra tree with the renesas tree Thierry Reding <treding@nvidia.com> - 2015-11-18 15:30 +0100
    Re: linux-next: manual merge of the tegra tree with the renesas tree Simon Horman <horms@verge.net.au> - 2015-11-18 17:10 +0100

csiph-web