From: Tony Lindgren <tony@atomide.com>
To: linux-omap@vger.kernel.org
Subject: Git tree updated, clocks and PM code reset to mainline
Date: Thu, 2 Apr 2009 17:13:33 -0700 [thread overview]
Message-ID: <20090403001333.GR32530@atomide.com> (raw)
Hi all,
So after playing with merging the current mainline code into linux-omap,
I ended up resetting all the clock and PM code to be the same as in
the mainline kernel. This allows Paul and Kevin do their branches
directly against the mainline, and we'll have those patches ready to
go to mainline for the next merge window.
This means that the PM and some clock features will be broken until
we can merge in Paul's clock branch and Kevin's pm branch.
Please everybody take a look at the big commit that resets the code,
it's commit eba05254cb561dc27d5664503f91f7c21954e648. I've made sure
things build for all omap configs, and booted several boards. But I
may have accidentally left out something critical too..
Anyways, anything that we need to merge back should be posted to this
list as patches against the mainline tree. From now on, let's try
to make all the patches against the mainline tree in a way where
there are no cross-patch dependencies.
For the other stuff that I've reset to mainline, please grep for
"REMOVE OMAP LEGACY CODE" in git log of the commits.
I've also branched omap-2.6.29 to have something stable until we have
things working properly again.
Cheers,
Tony
next reply other threads:[~2009-04-03 0:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-03 0:13 Tony Lindgren [this message]
2009-04-03 6:15 ` Git tree updated, clocks and PM code reset to mainline Jarkko Nikula
2009-04-03 15:13 ` Tony Lindgren
2009-04-04 5:27 ` Kalle Valo
2009-04-04 22:33 ` Paul Walmsley
2009-04-06 6:29 ` Jarkko Nikula
2009-04-06 10:49 ` Paul Walmsley
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=20090403001333.GR32530@atomide.com \
--to=tony@atomide.com \
--cc=linux-omap@vger.kernel.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