[request pull] intrepid-ports - Rebased to 2.6.25.16 and patched for PS3

Dan Munckton lists at munckfish.net
Mon Sep 22 15:23:59 UTC 2008


On Mon, 2008-09-22 at 08:07 -0600, Tim Gardner wrote:
> I sure get a lot of conflicts on the pull. Did you rebase correctly
> first ?

Umm. I'm not sure what "correctly" is. These are the steps I followed to
rebase (on my blog from notes gleaned on this list):

http://munckfish.net/blog/archive/2008/08/30/ubuntu-ps3-kernel-upstream-syncing/

If that's the not the correct procedure please let me know and I'll get
it sorted.

Cheers

Dan







More information about the kernel-team mailing list