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: Thu, 25 Feb 2010 14:31:12 -0800 [thread overview]
Message-ID: <20100225223111.GO28173@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1002241320120.2701@utopia.booyaka.com>
* Paul Walmsley <paul@pwsan.com> [100224 12:18]:
> On Wed, 24 Feb 2010, Paul Walmsley wrote:
>
> > On Wed, 24 Feb 2010, Tony Lindgren wrote:
> >
> > > * 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.
> >
> > Looks like 4751227df948582e82f19df30efa662ab71fa980 is the problem.
>
> Cool, it turned out to be not too bad to rebase. for_2.6.34_b branch is
> updated. I'll retest here and resend a pull request after the tests are
> complete.
OK that's merged now. I think we're pretty much done for this
merge window. I'll take a look at few more board-*.c patches
though.
Tony
prev parent reply other threads:[~2010-02-25 22:31 UTC|newest]
Thread overview: 5+ 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 19:02 ` Tony Lindgren
2010-02-24 19:07 ` Paul Walmsley
2010-02-24 20:21 ` Paul Walmsley
2010-02-25 22:31 ` Tony Lindgren [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=20100225223111.GO28173@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.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).