Messages in this thread | | | Date | Thu, 5 Aug 2010 13:49:15 +0200 | From | Andrea Arcangeli <> | Subject | Re: Transparent Hugepage Support #29 |
| |
On Thu, Aug 05, 2010 at 07:27:24AM -0400, Ed Tomlinson wrote: > On a tree with: > > commit 9d9cec888c3c4a2d5b5f01c3f3984fc4bc602681 > Merge: dd6c927 9edd35f > Author: Ed <edt@aei.ca> > Date: Wed Aug 4 15:18:53 2010 -0400 > > Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin into vfs-scaling > > merged on top of > > commit 9fe6206f400646a2322096b56c59891d530e8d51 > Author: Linus Torvalds <torvalds@linux-foundation.org> > Date: Sun Aug 1 15:11:14 2010 -0700 > > Linux 2.6.35
Well I didn't realize you also merged 2.6.35 on top of it. This is no standard tree, so I suggest you to checkout -f origin/master of Nick's tree until he updates to 2.6.35 himself (then I can port to it).
| |