linux-next: manual merge of the samsung-krzk tree with the renesas tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the samsung-krzk tree with the renesas tree
Date	2015-12-15 00:20 +0100
Message-ID	<qFKzn-4lD-19@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Krzysztof,

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

  arch/arm/configs/multi_v7_defconfig

between commit:

  954ceafd50cf ("ARM: multi_v7_defconfig: Enable missing Renesas ARM support based on DTSes")

from the renesas tree and commit:

  23a526f0478c ("ARM: multi_v7_defconfig: Build ChromeOS EC drivers as modules")

from the samsung-krzk 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/arm/configs/multi_v7_defconfig
index a4f8f5d37d82,e191a083d3ed..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -412,10 -400,9 +415,10 @@@ CONFIG_MFD_AS3722=
  CONFIG_MFD_ATMEL_FLEXCOM=y
  CONFIG_MFD_BCM590XX=y
  CONFIG_MFD_AXP20X=y
- CONFIG_MFD_CROS_EC=y
+ CONFIG_MFD_CROS_EC=m
  CONFIG_MFD_CROS_EC_I2C=m
- CONFIG_MFD_CROS_EC_SPI=y
+ CONFIG_MFD_CROS_EC_SPI=m
 +CONFIG_MFD_DA9063=m
  CONFIG_MFD_MAX14577=y
  CONFIG_MFD_MAX77686=y
  CONFIG_MFD_MAX77693=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 | Find similar | Unroll thread

Thread

linux-next: manual merge of the samsung-krzk tree with the renesas  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-15 00:20 +0100

csiph-web