Re: linux-next: manual merge of the tip tree with Linus' tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the tip tree with Linus' tree
Date	2015-07-06 23:40 +0200
Message-ID	<pJmhj-5dm-7@gated-at.bofh.it> (permalink)
References	<pJ28V-10i-15@gated-at.bofh.it> <pJ9k7-5ke-37@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

Re: linux-next: manual merge of the tip tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-07-06 23:40 +0200

csiph-web