On Thu, 2010-08-19 at 17:51 +0100, Ian Campbell wrote: > The diff of source_amd64_xen before and after adding the pvhvm patches > is then tiny (see below) and results from merging v2.6.32.19 myself > instead of just rebasing the pvops patch to e.g. > e73f4955a821f850f5b88c32d12a81714523a95f. I don't really want to mixup > the rebase and the addition of pvhvm into one commit so should I > instead do the rebase first and then do pvhvm?
Rebasing to e73f4955a821f850f5b88c32d12a81714523a95f simplifies the patch regeneration to just: $ git checkout -b debian-base v2.6.32.19 $ git checkout -b debian-pvops e73f4955a821f850f5b88c32d12a81714523a95f $ git revert -m 1 bcf16b6b4f34fb40a7aaf637947c7d3bce0be671 $ git diff debian-base..debian-pvops And adds a sinlge (trivial looking) new changeset (d541da "pvops: make pte_flags() go via pvops"). Therefore I have committed this and a subsequent update to add the pvhvm driver. Ian. -- Ian Campbell I selected E5 ... but I didn't hear "Sam the Sham and the Pharoahs"!
signature.asc
Description: This is a digitally signed message part