From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Lee Jones <lee.jones@linaro•org>,
Guenter Roeck <linux@roeck-us•net>,
Guodong Xu <guodong.xu@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Andreas Werner <andreas.werner@men•de>
Subject: linux-next: manual merge of the mfd tree with the hwmon-staging tree
Date: Thu, 25 Sep 2014 14:08:31 +1000 [thread overview]
Message-ID: <20140925140831.4c283b73@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1020 bytes --]
Hi Lee,
Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/Makefile between commit dfbdcd7cefca ("mfd: menf21bmc:
Introduce MEN 14F021P00 BMC MFD Core driver") from the hwmon-staging
tree and commit bc69ade0238e ("mfd: Add HI6421 PMIC Core driver") from
the mfd 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 drivers/mfd/Makefile
index d58068aa8aa9,f1b2e2c9264e..000000000000
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@@ -169,7 -171,7 +171,8 @@@ obj-$(CONFIG_MFD_AS3711) += as3711.
obj-$(CONFIG_MFD_AS3722) += as3722.o
obj-$(CONFIG_MFD_STW481X) += stw481x.o
obj-$(CONFIG_MFD_IPAQ_MICRO) += ipaq-micro.o
+obj-$(CONFIG_MFD_MENF21BMC) += menf21bmc.o
+ obj-$(CONFIG_MFD_HI6421_PMIC) += hi6421-pmic-core.o
intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o
obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2014-09-25 4:08 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=20140925140831.4c283b73@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andreas.werner@men$(echo .)de \
--cc=guodong.xu@linaro$(echo .)org \
--cc=lee.jones@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@roeck-us$(echo .)net \
/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