[PATCH 0/23] [Karmic] Dove: Latest batch of bug fixes and feature enhancements from Marvell.

Tim Gardner tim.gardner at canonical.com
Fri Aug 28 14:12:36 UTC 2009

Brad Figg wrote:
> Tim Gardner wrote:
>> Brad Figg wrote:
>>> Please pull from:
>>>     git://kernel.ubuntu.com/bradf/ubuntu-karmic mvl-dove
>>> Everything after:
>>>     32f9231fa28fc908cda8aa2085343be5108787a5 UBUNTU: [Config] Dove configuration, Wireless LAN, Graphics, AUFS
>>> Brad Figg (2):
>>>   UBUNTU: [Config] Dove configuration, DOVEFB_DISPLAY_MODE=y
>>>   UBUNTU: SAUCE: Correct undefined dove_pm_register which prevented Z0
>>>     flavour from building.
>> I would do this a bit differently. We want to maintain Marvell's branch
>> as delivered by them until 2.6.31 is released, i.e., we want our Ubuntu
>> goodness rebased on top of their branch.
>> So, some contortions are required. This method only works as long as you
>> have not made any commits _outside_ of debian or debian.mvl-dove,
>> otherwise they'll get lost.
>> ) Make sure your working tree is pristine
>> git checkout -f mvl-dove
>> git clean -f -d
>> ) Save off a copy of debian and debian.mvl-dove
>> mkdir ../debian.sav
>> rsync -a debian debian.mvl-dove ../debian.sav
>> ) Find a common merge point and rebase against Dove's branch
>> git reset HEAD v2.6.31-rc7
>> git remote add dove git://kernel.ubuntu.com/marvell/dove-kernel
>> git fetch dove
>> git rebase refs/remotes/dove/marvell-dove-2.6.31-rc7
>> ) At this point our branch should be identical to Marvell's. The next
>> step is to rebase Karmic master on top:
>> git rebase origin/master
>> ) In order to turn this into the Dove build we restore the stashed
>> copies of debian and debian.mvl-dove
>> rsync -a ../debian.sav/ .
>> git add --all
>> git commit -s -e -F debian/commit-templates/config-updates
>> ) The last step is to revert 2 Marvell commits that hose up the build:
>> dove: fix build error when builing modules This patch builds the hal
>> sub-dirs only when builing the kernel
>> fixes to the Makefile system to enable out-of-tree compilation
>> git revert -e 9d84859da6981d9dfc43a67f0ea9dd82204d95d1
>> git revert -e 9a06a61a1cf522ac8e2b894bfb554cb818a95b08
>> You'll also likely have to futz around with changelog versions and the
>> ABI stuff.
>> Easy, right?
>> rtg
> Actually, I'm glad you spelled it out for me. I was pretty interested
> in what you had been doing to the tree when you pulled out of their
> tree and now I know.
> Thanks for the detailed explanation.
> Brad

In order to totally make your morning, I've just pushed master rebased
against 2.6.31-rc8 :) I'll upload in a bit after doing some smoke testing.

If you don't want to deal with the -rc8 rebase, you can always reset
HEAD on the repo or branch against which you are rebasing. For example,
lets assume that your local master branch is up to date. You can just
reset HEAD back to the last tag in which you are interested

git checkout -f master
git reset --hard Ubuntu-2.6.31-8.28
git checkout -f mvl-dove
git rebase master

blah, blah, blah

Tim Gardner tim.gardner at canonical.com

More information about the kernel-team mailing list