All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Linus Walleij <linus.walleij@linaro.org>,
	Lee Jones <lee.jones@linaro.org>
Subject: linux-next: manual merge of the mfd tree with Linus' tree
Date: Wed, 23 May 2012 13:01:54 +1000	[thread overview]
Message-ID: <20120523130154.e5c745258e22a992dcc21723@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1429 bytes --]

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/Makefile between commits dece3709b71a ("mfd/db5500-prcmu:
delete DB5500 PRCMU support") and 72fb92200d6c ("mfd/ab5500: delete
AB5500 support") from Linus' tree and commit d28f1db8187d ("mfd: Remove
confusing ab8500-i2c file and merge into ab8500-core") from the mfd tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/mfd/Makefile
index 43672b8,afe96b2..0000000
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@@ -87,12 -91,14 +91,11 @@@ obj-$(CONFIG_PCF50633_GPIO)	+= pcf50633
  obj-$(CONFIG_ABX500_CORE)	+= abx500-core.o
  obj-$(CONFIG_AB3100_CORE)	+= ab3100-core.o
  obj-$(CONFIG_AB3100_OTP)	+= ab3100-otp.o
  obj-$(CONFIG_AB8500_DEBUG)	+= ab8500-debugfs.o
  obj-$(CONFIG_AB8500_GPADC)	+= ab8500-gpadc.o
  obj-$(CONFIG_MFD_DB8500_PRCMU)	+= db8500-prcmu.o
- # ab8500-i2c need to come after db8500-prcmu (which provides the channel)
- obj-$(CONFIG_AB8500_I2C_CORE)	+= ab8500-i2c.o
+ # ab8500-core need to come after db8500-prcmu (which provides the channel)
+ obj-$(CONFIG_AB8500_CORE)	+= ab8500-core.o ab8500-sysctrl.o
 -obj-$(CONFIG_MFD_DB5500_PRCMU)	+= db5500-prcmu.o
  obj-$(CONFIG_MFD_TIMBERDALE)    += timberdale.o
  obj-$(CONFIG_PMIC_ADP5520)	+= adp5520.o
  obj-$(CONFIG_LPC_SCH)		+= lpc_sch.o

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-05-23  3:02 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-23  3:01 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-03-05 22:49 linux-next: manual merge of the mfd tree with Linus' tree Stephen Rothwell
2019-06-11  4:31 Stephen Rothwell
2019-05-09  2:44 Stephen Rothwell
2019-02-08  2:37 Stephen Rothwell
2019-02-08  8:33 ` Jarkko Nikula
2018-08-17  0:39 Stephen Rothwell
2018-08-21  8:08 ` Geert Uytterhoeven
2018-08-21  8:30   ` Stephen Rothwell
2018-08-28 13:34     ` Geert Uytterhoeven
2018-08-28 21:45       ` Stephen Rothwell
2018-03-08  1:33 Stephen Rothwell
2018-03-08  8:12 ` Lee Jones
2014-11-13  1:47 Stephen Rothwell
2012-11-28  3:20 Stephen Rothwell
2012-10-03  4:12 Stephen Rothwell
2012-09-18  3:19 Stephen Rothwell
2012-09-18  7:31 ` Dong Aisheng
2012-09-12  2:49 Stephen Rothwell
2012-07-25  1:18 Stephen Rothwell
2012-07-25  6:40 ` Laxman Dewangan
2012-05-22  4:14 Stephen Rothwell
2012-05-22  4:10 Stephen Rothwell
2012-03-23  3:32 Stephen Rothwell
2012-03-23  9:41 ` Samuel Ortiz
2012-03-24 17:31   ` Grant Likely
2012-03-26  8:25     ` Samuel Ortiz
2012-03-28 22:47       ` Grant Likely
2012-01-12  1:06 Stephen Rothwell
2011-09-09  4:22 Stephen Rothwell
2011-03-21  1:26 Stephen Rothwell
2011-03-21  8:21 ` Linus Walleij
2011-03-22 11:16   ` Samuel Ortiz
2011-03-23 17:57     ` Linus Walleij
2011-03-22 11:08 ` Samuel Ortiz
2010-09-13  1:54 Stephen Rothwell
2010-09-13 13:59 ` Samuel Ortiz
2010-08-12  4:41 Stephen Rothwell
2010-08-12  9:51 ` Samuel Ortiz

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=20120523130154.e5c745258e22a992dcc21723@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=lee.jones@linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sameo@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.