Messages in this thread | | | Date | Tue, 7 Jul 2015 07:34:56 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the tip tree with Linus' tree |
| |
Hi Paolo,
On Mon, 6 Jul 2015 09:49:09 +0200 Paolo Bonzini <pbonzini@redhat.com> wrote: > > On 06/07/2015 02:08, Stephen Rothwell wrote: > > > > 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.
And has now been removed from the tip tree, so we won't see that conflict today.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |