From: Ben Dooks <ben-i2c-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
To: Kevin Hilman <khilman-l0cyMroinI0@public.gmane.org>
Cc: Ben Dooks <ben-i2c-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Andy Green <andy.green-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
Subject: Re: [PATCH v4 00/18] I2C: OMAP: I2C fixes, removal of cpu_is... from driver
Date: Fri, 8 Jul 2011 00:01:22 +0100 [thread overview]
Message-ID: <20110707230122.GM15795@trinity.fluff.org> (raw)
In-Reply-To: <1309892457.3077.8.camel@vence>
On Tue, Jul 05, 2011 at 12:00:56PM -0700, Kevin Hilman wrote:
> Hi Ben,
>
> On Mon, 2011-06-27 at 15:15 -0700, Kevin Hilman wrote:
> > On Mon, 2011-06-27 at 15:12 -0700, Kevin Hilman wrote:
> >
> > > Ping. I don't see this in linux-next yet.
> > >
> > > Are you planning to queue this for v3.1?
> > >
> >
> > Oops, pushed send too soon on this...
> >
> > As this series touches various data files in arch/arm/mach-omap2/* and
> > we have a handful of other changes to that data for this merge window, I
> > think it would be better for conflict avoidance if this series is merged
> > via Tony's linux-omap tree.
> >
> > With your Ack, we'll merge it via OMAP.
>
> I see that the same day I sent this, you merged it into your next-i2c
> branch. Guess I was too late with my request.
>
> As I mentioned above, we will have several conflicts with the
> arch/arm/mach-omap2 changes in this series, so we would prefer to merge
> them via the OMAP tree if at all possible so we can properly handle the
> conflicts.
>
> Do you mind dropping it from your next-i2c so we can merge it via
> linux-omap (with your Ack.)
Yes, and if you could indicate all the other omap i2c patches and I'll
add my ack to yours.
Acked-by: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
> Thanks,
>
> Kevin
>
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Ben Dooks, ben-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, http://www.fluff.org/ben/
Large Hadron Colada: A large Pina Colada that makes the universe disappear.
next prev parent reply other threads:[~2011-07-07 23:01 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-02 0:19 [PATCH v4 00/18] I2C: OMAP: I2C fixes, removal of cpu_is... from driver Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 02/18] I2C: OMAP2+: Name registers in I2C IP V2 only accordingly Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 04/18] I2C: OMAP2+: Tag all OMAP2+ hwmod defintions with I2C IP revision Kevin Hilman
[not found] ` <1306973984-15165-1-git-send-email-khilman-l0cyMroinI0@public.gmane.org>
2011-06-02 0:19 ` [PATCH v4 01/18] I2C: OMAP2+: Set hwmod flags to only allow 16-bit accesses to i2c Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 03/18] I2C: OMAP2+: Introduce I2C IP versioning constants Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 05/18] I2C: OMAP: add rev to omap i2c platform data Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 06/18] I2C: OMAP1: set IP revision in " Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 07/18] I2C: OMAP2+: Pass hwmod rev knowledge via platform_data when i2c bus added Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 08/18] I2C: OMAP2+: use platform_data ip revision to select register map Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 12/18] I2C: OMAP1/OMAP2+: add flags field to omap i2c platform data Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 13/18] I2C: OMAP2+: Pass flags up to omap i2c platform_data as well Kevin Hilman
2011-06-07 13:41 ` [PATCH v4 00/18] I2C: OMAP: I2C fixes, removal of cpu_is... from driver Ben Dooks
2011-06-15 21:36 ` Ben Dooks
[not found] ` <20110615213637.GH15795-SMNkleLxa3Z6Wcw2j4pizdi2O/JbrIOy@public.gmane.org>
2011-06-15 23:27 ` Nicolas Pitre
2011-06-15 23:33 ` Kevin Hilman
2011-06-27 22:12 ` Kevin Hilman
2011-06-27 22:15 ` Kevin Hilman
2011-07-05 19:00 ` Kevin Hilman
2011-07-07 23:01 ` Ben Dooks [this message]
2011-07-08 15:14 ` Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 09/18] I2C: OMAP2+: Solve array bounds overflow error on i2c idle Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 10/18] I2C: OMAP2+: address confused probed version naming Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 11/18] I2C: OMAP2+: increase omap_i2c_dev_attr flags from u8 to u32 Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 14/18] I2C: OMAP1/OMAP2+: create omap I2C functionality flags for each cpu_... test Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 15/18] I2C: OMAP2+: add correct functionality flags to all omap2plus i2c dev_attr Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 16/18] I2C: OMAP1: set i2c unit feature implementation flags in platform data Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 17/18] I2C: OMAP2+: Convert omap I2C driver to use feature implementation flags from " Kevin Hilman
2011-06-02 0:19 ` [PATCH v4 18/18] I2C: OMAP1/OMAP2+: prepend I2C IP version to probed version shown in dev_info Kevin Hilman
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=20110707230122.GM15795@trinity.fluff.org \
--to=ben-i2c-elnmno+kys3ytjvyw6ydsg@public.gmane.org \
--cc=andy.green-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org \
--cc=khilman-l0cyMroinI0@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/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).