From: David Jander <david.jander@protonic•nl>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "Samuel Ortiz" <sameo@linux•intel.com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Andres Salomon" <dilinger@queued•net>,
"David Jander" <david@protonic•nl>,
"Sascha Hauer" <s.hauer@pengutronix•de>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>
Subject: Re: linux-next: manual merge of the mfd tree with the i.MX tree
Date: Tue, 1 Mar 2011 09:35:28 +0100 [thread overview]
Message-ID: <20110301093528.00184f93@archvile> (raw)
In-Reply-To: <20110301145436.b1ae1923.sfr@canb.auug.org.au>
Hi Stephen,
On Tue, 1 Mar 2011 14:54:36 +1100
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Today's linux-next merge of the mfd tree got a conflict in
> arch/arm/mach-imx/mach-mx27_3ds.c arch/arm/mach-imx/mach-pcm038.c
> arch/arm/mach-mx3/mach-mx31_3ds.c arch/arm/mach-mx3/mach-mx31moboard.c
> between commit 5836372e8a0ba5cc633f61bc0484ee20c86f4b36 ("ARM: imx+mx3:
> convert to mc13xxx MFD") from the i.MX tree and commit
> e84e545d47d26644275a79fe5ebc1797bcb80910 ("mfd: mfd_cell is now
> implicitly available to mc13xxx drivers") from the mfd tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
Your fix seems correct, although I fear I am too dumb to understand why commit
e84e545d47d26644275a79fe5ebc1797bcb80910 introduces this extra struct
nesting.... AFAICS gcc will end up doing the same as without the extra nest.
Btw, include/linux/mfd/mc13783.h should end up disappearing after you're done
merging... I hope so.
Best regards,
--
David Jander
Protonic Holland.
next prev parent reply other threads:[~2011-03-01 9:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-01 3:54 linux-next: manual merge of the mfd tree with the i.MX tree Stephen Rothwell
2011-03-01 8:35 ` David Jander [this message]
2011-03-01 19:39 ` Andres Salomon
2011-03-02 6:43 ` david
2011-03-02 7:31 ` Stephen Rothwell
2011-03-02 17:56 ` david
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=20110301093528.00184f93@archvile \
--to=david.jander@protonic$(echo .)nl \
--cc=david@protonic$(echo .)nl \
--cc=dilinger@queued$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=s.hauer@pengutronix$(echo .)de \
--cc=sameo@linux$(echo .)intel.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
/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