From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Krzysztof Kozlowski <k.kozlowski@samsung•com>,
Simon Horman <horms@verge•net.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Javier Martinez Canillas <javier@osg•samsung.com>,
Geert Uytterhoeven <geert+renesas@glider•be>
Subject: linux-next: manual merge of the samsung-krzk tree with the renesas tree
Date: Tue, 15 Dec 2015 10:10:41 +1100 [thread overview]
Message-ID: <20151215101041.3a71eabb@canb.auug.org.au> (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
reply other threads:[~2015-12-14 23:10 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=20151215101041.3a71eabb@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=geert+renesas@glider$(echo .)be \
--cc=horms@verge$(echo .)net.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 \
/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