Re: conflicted merge for sched-devel?

From: Peter Zijlstra
Date: Tue Apr 29 2008 - 08:06:28 EST

Next message: Ingo Molnar: "Re: [patch 0/2] Immediate Values - jump patching update"
Previous message: Patrick McHardy: "Re: [PATCH 11/12] netfilter: assign PDE->data before gluing PDE into/proc tree"
In reply to: Peter Teoh: "conflicted merge for sched-devel?"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Tue, 2008-04-29 at 19:47 +0800, Peter Teoh wrote:
> This morning (about 11 hours ago) I did a git pull in sched-devel
> today and got a problem:

sched-devel is constantly rebased, don't pull.

--
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/

Next message: Ingo Molnar: "Re: [patch 0/2] Immediate Values - jump patching update"
Previous message: Patrick McHardy: "Re: [PATCH 11/12] netfilter: assign PDE->data before gluing PDE into/proc tree"
In reply to: Peter Teoh: "conflicted merge for sched-devel?"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]