Re: [GIT pull] timekeeping updates for 2.6.36
From: Linus Torvalds
Date: Fri Aug 06 2010 - 16:25:49 EST
On Thu, Aug 5, 2010 at 3:19 PM, Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote:
> Please pull the latest timers-timekeeping-for-linus git tree from:
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-timekeeping-for-linus
> It contains two cherry-picks from the powerpc tree which have changes
> in the same area of code. John Stultz selected them with the powerpc
> folks to avoid complex fixups in next.
Well, it just resulted in another merge conflict, but I resolved it
the same way you had resolved your cherry-picks. However, I wanted to
let people know, so that the powerpc guys can re-verify that whole
vsyscall timer change.
So Paul, Ben, please check out that I didn't screw something up in there.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/