From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Maxime Ripard <maxime.ripard@free-electrons•com>,
Krzysztof Kozlowski <k.kozlowski@samsung•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Chen-Yu Tsai <wens@csie•org>,
Javier Martinez Canillas <javier@osg•samsung.com>
Subject: linux-next: manual merge of the sunxi tree with the samsung-krzk tree
Date: Mon, 23 Nov 2015 10:09:17 +1100 [thread overview]
Message-ID: <20151123100917.36b71f1a@canb.auug.org.au> (raw)
Hi Maxime,
Today's linux-next merge of the sunxi tree got a conflict in:
arch/arm/configs/multi_v7_defconfig
between commit:
23a526f0478c ("ARM: multi_v7_defconfig: Build ChromeOS EC drivers as modules")
from the samsung-krzk tree and commit:
83e9e1f84074 ("ARM: multi_v7_defconfig: Enable RSB and AXP20X related drivers as modules")
from the sunxi 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 b96bb7c15a74,1a609b10a055..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -252,10 -252,8 +252,10 @@@ CONFIG_TOUCHSCREEN_STMPE=
CONFIG_TOUCHSCREEN_SUN4I=y
CONFIG_TOUCHSCREEN_WM97XX=m
CONFIG_INPUT_MISC=y
+CONFIG_INPUT_MAX77693_HAPTIC=m
+CONFIG_INPUT_MAX8997_HAPTIC=m
CONFIG_INPUT_MPU3050=y
- CONFIG_INPUT_AXP20X_PEK=y
+ CONFIG_INPUT_AXP20X_PEK=m
CONFIG_INPUT_ADXL34X=m
CONFIG_SERIO_AMBAKMI=y
CONFIG_SERIAL_8250=y
@@@ -367,8 -365,8 +367,9 @@@ CONFIG_BATTERY_MAX17040=
CONFIG_BATTERY_MAX17042=m
CONFIG_CHARGER_MAX14577=m
CONFIG_CHARGER_MAX77693=m
+CONFIG_CHARGER_MAX8997=m
CONFIG_CHARGER_TPS65090=y
+ CONFIG_AXP20X_POWER=m
CONFIG_POWER_RESET_AS3722=y
CONFIG_POWER_RESET_GPIO=y
CONFIG_POWER_RESET_GPIO_RESTART=y
@@@ -400,9 -398,11 +401,11 @@@ CONFIG_MFD_AS3722=
CONFIG_MFD_ATMEL_FLEXCOM=y
CONFIG_MFD_BCM590XX=y
CONFIG_MFD_AXP20X=y
+ CONFIG_MFD_AXP20X_I2C=m
+ CONFIG_MFD_AXP20X_RSB=m
-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_MAX14577=y
CONFIG_MFD_MAX77686=y
CONFIG_MFD_MAX77693=y
reply other threads:[~2015-11-22 23:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151123100917.36b71f1a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=javier@osg$(echo .)samsung.com \
--cc=k.kozlowski@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maxime.ripard@free-electrons$(echo .)com \
--cc=wens@csie$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox