linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Hilman <khilman-l0cyMroinI0@public.gmane.org>
To: Ben Dooks <ben-i2c-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>,
	linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-omap <linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	linux-arm-kernel
	<linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>
Subject: Re: [GIT PULL] I2C: OMAP: misc. fixes for v3.2
Date: Wed, 24 Aug 2011 16:15:28 -0700	[thread overview]
Message-ID: <87aaay765r.fsf@ti.com> (raw)
In-Reply-To: <20110824215706.GH19115-SMNkleLxa3Z6Wcw2j4pizdi2O/JbrIOy@public.gmane.org> (Ben Dooks's message of "Wed, 24 Aug 2011 22:57:06 +0100")

Ben Dooks <ben-i2c-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org> writes:

> On Tue, Aug 23, 2011 at 05:07:56PM -0700, Kevin Hilman wrote:
>> Hi Ben,
>> 
>> Initially, these fixes were planned to be queued for v3.1-rc, but since
>> the previous series from Andy didn't make it into v3.1, it should be
>> queued for v3.2.
>> 
>> This branch is based on the for_3.2/i2c-andy branch (previous pull request.)
>> 
>> Please pull into your tree for linux-next.
>> 
>> Thanks,
>> 
>> Kevin
>> 
>> The following changes since commit 48cc1edc8f6b65a9500c8f1d93db6038167da8f0:
>> 
>>   I2C: OMAP1/OMAP2+: prepend I2C IP version to probed version shown in dev_info (2011-08-23 10:51:45 -0700)
>> 
>> are available in the git repository at:
>>   git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git for_3.2/i2c-fixes
>> 
>> Kevin Hilman (1):
>>       Revert "i2c-omap: fix static suspend vs. runtime suspend"
>
> I've got this one, I assume it can be submitted without being based
> on the Andy Green series.

Well, the original version posted had a bug (thanks Felipe), so you need
to be sure you have the one from this branch.

Actually, this one (the revert commit) should also be submitted for
v3.1-rc, since this is a known bug/race in v3.1.

To that end, I reworked the branches slightly.  The patch above now
lives in my for_3.1/i2c-fixes branch (based on v3.1-rc3.)  This should
be submitted for v3.1-rc.

The other patch in this series is still in the v3.2/i2c-fixes branch
(based on Andy's branch, and merges for_3.1/i2c-fixes.)

The 2nd cleanup series (for_3.2/i2c-cleanup) was then simply rebased
onto for_3.2/i2c-fixes.

That should help clarify the dependences and also make it easy to get
the revert in for v3.1-rc as well.

Thanks,

Kevin

      parent reply	other threads:[~2011-08-24 23:15 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-24  0:07 [GIT PULL] I2C: OMAP: misc. fixes for v3.2 Kevin Hilman
     [not found] ` <20110824215706.GH19115@trinity.fluff.org>
     [not found]   ` <20110824215706.GH19115-SMNkleLxa3Z6Wcw2j4pizdi2O/JbrIOy@public.gmane.org>
2011-08-24 23:15     ` Kevin Hilman [this message]

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=87aaay765r.fsf@ti.com \
    --to=khilman-l0cymroini0@public.gmane.org \
    --cc=ben-i2c-elnMNo+KYs3YtjvyW6yDsg@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 \
    --cc=tony-4v6yS6AI5VpBDgjK7y7TUQ@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).