On 06/07/2015 02:08, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/sched/core.c
>
> between commit:
>
> 2ecd9d29abb1 ("sched, preempt_notifier: separate notifier
> registration from static_key inc/dec")
>
> from Linus' tree and commit:
>
> 6efde1d3716b ("sched/preempt, kvm: Fix KVM preempt_notifier
> usage")
>
> from the tip tree.
>
> I fixed it up (maybe - see below) and can carry the fix as
> necessary (no action is required).
The commit from the tip tree is obsolete.
Paolo
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
