Remaining omap pull requests
Tony Lindgren
tony at atomide.com
Mon Jul 11 07:47:37 EDT 2011
Hi Arnd,
Below is a summary of the pending omap pull requests as there are still
few branches pending.
Can you please take a look and see what you can take of these for v3.1
merge window?
There's still quite a bit more code shrinkage, and the new code for 4460
and PRCM related changes are badly needed.
Here's what's still pending:
1. Branches to pull into omap/cleanup
I will reply to this mail with a pull request for cleanup-part-3
that contains Russell's timer cleanup patch and Paul's PRCM cleanup
series.
2. Branches to pull into omap/fixes
I will reply to this mail with a pull request for fixes-part-2 that
contains Paul's PRCM fixes, and one McBSP fix also from Paul.
This branch depends on cleanup-part-3 in #1 above for the PRCM fixes.
3. Branches to pull into omap/board
This one needs one merge commit to clear the merge conflict that
I posted on Sunday at:
http://marc.info/?l=linux-omap&m=131032743717583&w=2
4. New code for minimal omap4460 support
This I've posted here:
http://marc.info/?l=linux-omap&m=131032754417673&w=2
It has some a trivial merge conflict with the cleanup-part-3 in
#1 above that you should be able to handle.
5. New code for ASoC and MFD changes
Because of the TWL cleanup, it was agreed that the TWL related
MFD/ASoC changes should be merged by us also. I will reply to
this mail with a pull request for this email.
Note that this could also be merged by the ASoC or MFD people
if they pull in your omap/cleanup-part-2.
6. New code for PRCM changes
This you might as well pull from Paul directly as posted here:
http://marc.info/?l=linux-omap&m=131030152129307&w=2
It depends on the PRCM fixes in #2 above. I've already pulled
this into linux-omap master branch for testing.
The following order should be kept for these branches:
omap/cleanup
omap/fixes
omap/board
And after that these can be merged in whatever order:
new code for minimal 4460 support
new code for ASoC/MFD
new code for PRCM changes
Then there are two new boards remaining, but they both are waiting
on the machine_id patch.
Regards,
Tony
More information about the linux-arm-kernel
mailing list