Hi Phillip, On Mon, 05 Jan 2009 12:29:00 +0000 Phillip Lougher <phillip@xxxxxxxxxxxxxxxxxxx> wrote: > > Can you try pulling the master branch of: > > git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git I fetched this to have a look and it is based on next-20090105. You cannot base any git tree that is to be included into linux-next on linux-next itself. You should base it on Linus' latest tree (except for very special cases where your code actually depends on something that is only in thelinux-next tree). Once it is set up like that, you don't need to keep rebasing it and only need to merge Linus' tree into it if there are more than trivial conflicts (which there shouldn't be given it touches very little outside fs/squashfs). I also expected it to be a series of commits to match (more or less) what you have been posting for review. I fetched your squashfs-linus.git instead and that looks exactly like what I need. I also just noticed Andrew's comment about aiming for a 2.6.29 merge (I should read my mail better), so I will add your squashfs-linus.git tree to linux-next tomorrow. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpWDidKL05tu.pgp
Description: PGP signature
