All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Paul Walmsley <paul@pwsan.com>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] Second set of OMAP clock/hwmod patches for 2.6.34
Date: Wed, 24 Feb 2010 11:02:12 -0800	[thread overview]
Message-ID: <20100224190211.GS28173@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1002241116000.2701@utopia.booyaka.com>

* Paul Walmsley <paul@pwsan.com> [100224 10:15]:
> 
> Hi Tony,
> 
> The following changes since commit 0482e3c6f704d25b6a4e3c940caeeacece4e6d74:
>   Tony Lindgren (1):
>         Merge branch 'omap-fixes-for-linus' into omap-for-linus
> 
> are available in the git repository at:
> 
>   git://git.pwsan.com/linux-2.6 for_2.6.34_b

Hmm this does not seem to merge without conflicts to omap-for-linus,
maybe take a look if you can merge/rebase it?

I'd assume rebasing or merging your branch with
80c20d543d142ee54ec85259b77aaf0b83c32db5 will do the trick.

Regards,

Tony

WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Second set of OMAP clock/hwmod patches for 2.6.34
Date: Wed, 24 Feb 2010 11:02:12 -0800	[thread overview]
Message-ID: <20100224190211.GS28173@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1002241116000.2701@utopia.booyaka.com>

* Paul Walmsley <paul@pwsan.com> [100224 10:15]:
> 
> Hi Tony,
> 
> The following changes since commit 0482e3c6f704d25b6a4e3c940caeeacece4e6d74:
>   Tony Lindgren (1):
>         Merge branch 'omap-fixes-for-linus' into omap-for-linus
> 
> are available in the git repository at:
> 
>   git://git.pwsan.com/linux-2.6 for_2.6.34_b

Hmm this does not seem to merge without conflicts to omap-for-linus,
maybe take a look if you can merge/rebase it?

I'd assume rebasing or merging your branch with
80c20d543d142ee54ec85259b77aaf0b83c32db5 will do the trick.

Regards,

Tony

  reply	other threads:[~2010-02-24 19:01 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-24 18:18 [GIT PULL] Second set of OMAP clock/hwmod patches for 2.6.34 Paul Walmsley
2010-02-24 18:18 ` Paul Walmsley
2010-02-24 19:02 ` Tony Lindgren [this message]
2010-02-24 19:02   ` Tony Lindgren
2010-02-24 19:07   ` Paul Walmsley
2010-02-24 19:07     ` Paul Walmsley
2010-02-24 20:21     ` Paul Walmsley
2010-02-24 20:21       ` Paul Walmsley
2010-02-25 22:31       ` Tony Lindgren
2010-02-25 22:31         ` 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=20100224190211.GS28173@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=paul@pwsan.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 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.