From: Grant Likely <grant.likely@secretlab.ca>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
jonsmirl@gmail.com, galak@kernel.crashing.org
Cc: Jean Delvare <khali@linux-fr.org>,
linuxppc-dev@ozlabs.org, linux-next@vger.kernel.org,
Paul Mackerras <paulus@samba.org>,
Timur Tabi <timur@freescale.com>
Subject: Re: linux-next: manual merge of the powerpc tree
Date: Wed, 2 Jul 2008 23:47:39 -0600 [thread overview]
Message-ID: <20080703054739.GA643@secretlab.ca> (raw)
In-Reply-To: <20080703133905.7b6f058f.sfr@canb.auug.org.au>
On Thu, Jul 03, 2008 at 01:39:05PM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the powerpc tree got a conflict in
> arch/powerpc/sysdev/fsl_soc.c between commit
> 4eac6a8b17ce5ebe66eb94b6a0b43aa3a2bf7ea6 ("i2c-mpc: Convert to an
> of_platform driver") from the i2c tree and commits
It probably would have been better for this patch to go in via the
PowerPC tree. It only touches powerpc-specific i2c code, not any i2c
core code. There are quite a few MPCxxxx ports which use this driver,
I'd be happier to see it dropped from the i2c tree and merged in via
either Kumar or myself.
I'd also like to see some acks from people who have tested this patch
before it goes in. (I'm just as guilty here; I'll apply it and test it
to my tree tomorrow).
g.
next prev parent reply other threads:[~2008-07-03 5:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-03 3:39 linux-next: manual merge of the powerpc tree Stephen Rothwell
2008-07-03 5:47 ` Grant Likely [this message]
2008-07-03 12:22 ` Jon Smirl
2008-07-03 15:24 ` Grant Likely
2008-07-04 5:54 ` Grant Likely
2008-07-04 7:35 ` Jean Delvare
-- strict thread matches above, loose matches on Subject: below --
2008-10-14 1:02 Stephen Rothwell
2008-10-14 1:02 Stephen Rothwell
2008-07-14 5:44 Stephen Rothwell
2008-07-15 1:24 ` Steven Rostedt
2008-07-07 13:07 Stephen Rothwell
2008-07-07 21:13 ` Daniel Walker
2008-07-11 19:01 ` Bartlomiej Zolnierkiewicz
2008-07-12 3:41 ` Benjamin Herrenschmidt
2008-07-01 6:48 Stephen Rothwell
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=20080703054739.GA643@secretlab.ca \
--to=grant.likely@secretlab.ca \
--cc=galak@kernel.crashing.org \
--cc=jonsmirl@gmail.com \
--cc=khali@linux-fr.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
--cc=sfr@canb.auug.org.au \
--cc=timur@freescale.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).