All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Jon Hunter <jon-hunter@ti.com>,
	linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: OK to use commit 71856843 as base for further omap clean up?
Date: Wed, 3 Apr 2013 11:03:58 -0700	[thread overview]
Message-ID: <20130403180358.GW10155@atomide.com> (raw)
In-Reply-To: <20130403165353.GW30923@n2100.arm.linux.org.uk>

* Russell King - ARM Linux <linux@arm.linux.org.uk> [130403 09:58]:
> On Tue, Mar 26, 2013 at 11:22:00PM +0000, Russell King - ARM Linux wrote:
> > On Mon, Mar 25, 2013 at 02:31:26PM -0500, Jon Hunter wrote:
> > > Hi Russell,
> > > 
> > > On 03/19/2013 12:59 PM, Tony Lindgren wrote:
> > > > Hi Russell,
> > > > 
> > > > Can we use your commit 71856843 (ARM: OMAP: use consistent error checking)
> > > > as an immutable base for further omap dmtimer and gpmc work?
> > > 
> > > I saw that you updated your clean-up branch. Ok to use the below commit
> > > [1] as a base for some v3.10 updates?
> > 
> > It's still the same commit.  I'm not intending to remove this commit
> > from it, so yes, fine, go ahead.
> 
> *sigh*.  Actually, 4d485661d799e81f98097057d445f4803cef2af0 is buggered
> which is the commit below it.  I said yes too quickly.  Oh well, it'll
> just have to be broken for when it hits mainline now.

Yes we have few branches based on that. Note that the issue reported by
Lothar I just resolved in the omap-for-v3.10/timer branch along with
other conflicts when pulling in Jon's patches, so that might do the trick
assuming there are no other issues.

Regards,

Tony

WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: OK to use commit 71856843 as base for further omap clean up?
Date: Wed, 3 Apr 2013 11:03:58 -0700	[thread overview]
Message-ID: <20130403180358.GW10155@atomide.com> (raw)
In-Reply-To: <20130403165353.GW30923@n2100.arm.linux.org.uk>

* Russell King - ARM Linux <linux@arm.linux.org.uk> [130403 09:58]:
> On Tue, Mar 26, 2013 at 11:22:00PM +0000, Russell King - ARM Linux wrote:
> > On Mon, Mar 25, 2013 at 02:31:26PM -0500, Jon Hunter wrote:
> > > Hi Russell,
> > > 
> > > On 03/19/2013 12:59 PM, Tony Lindgren wrote:
> > > > Hi Russell,
> > > > 
> > > > Can we use your commit 71856843 (ARM: OMAP: use consistent error checking)
> > > > as an immutable base for further omap dmtimer and gpmc work?
> > > 
> > > I saw that you updated your clean-up branch. Ok to use the below commit
> > > [1] as a base for some v3.10 updates?
> > 
> > It's still the same commit.  I'm not intending to remove this commit
> > from it, so yes, fine, go ahead.
> 
> *sigh*.  Actually, 4d485661d799e81f98097057d445f4803cef2af0 is buggered
> which is the commit below it.  I said yes too quickly.  Oh well, it'll
> just have to be broken for when it hits mainline now.

Yes we have few branches based on that. Note that the issue reported by
Lothar I just resolved in the omap-for-v3.10/timer branch along with
other conflicts when pulling in Jon's patches, so that might do the trick
assuming there are no other issues.

Regards,

Tony

  reply	other threads:[~2013-04-03 18:04 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-19 17:59 OK to use commit 71856843 as base for further omap clean up? Tony Lindgren
2013-03-19 17:59 ` Tony Lindgren
2013-03-25 19:31 ` Jon Hunter
2013-03-25 19:31   ` Jon Hunter
2013-03-26 23:22   ` Russell King - ARM Linux
2013-03-26 23:22     ` Russell King - ARM Linux
2013-04-03 16:53     ` Russell King - ARM Linux
2013-04-03 16:53       ` Russell King - ARM Linux
2013-04-03 18:03       ` Tony Lindgren [this message]
2013-04-03 18:03         ` Tony Lindgren

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=20130403180358.GW10155@atomide.com \
    --to=tony@atomide.com \
    --cc=jon-hunter@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    /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.