All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Zijlstra <peterz@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	David Miller <davem@davemloft.net>,
	Networking <netdev@vger.kernel.org>,
	Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Yonghong Song <yhs@fb.com>
Subject: Re: linux-next: manual merge of the tip tree with the net-next tree
Date: Wed, 1 Nov 2017 09:55:24 +0100	[thread overview]
Message-ID: <20171101085524.4dcxgaq7kawn37pq@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20171101082742.dteg337holmodzn2@gmail.com>

On Wed, Nov 01, 2017 at 09:27:43AM +0100, Ingo Molnar wrote:
> 
> * Peter Zijlstra <peterz@infradead.org> wrote:
> 
> > On Wed, Nov 01, 2017 at 06:15:54PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Today's linux-next merge of the tip tree got a conflict in:
> > > 
> > >   kernel/trace/bpf_trace.c
> > > 
> > > between commits:
> > > 
> > >   97562633bcba ("bpf: perf event change needed for subsequent bpf helpers")
> > > and more changes ...
> > > 
> > > from the net-next tree and commit:
> > > 
> > >   7d9285e82db5 ("perf/bpf: Extend the perf_event_read_local() interface, a.k.a. "bpf: perf event change needed for subsequent bpf helpers"")
> > > 
> > > from the tip tree.
> > 
> > So those should be the exact same patch; except for Changelog and
> > subject. Code wise there shouldn't be a conflict.
> 
> So the problem is that then we have:
> 
>   0d3d73aac2ff ("perf/core: Rewrite event timekeeping")
> 
> which changes the code. This is a known conflict generation pattern: Git isn't 
> smart enough to sort out that (probably because it would make merges too 
> expensive) - and it's a bad flow in any case.

Hmm, I thought having that same base patch in both trees would allow it
to resolve that conflict. A well..

  reply	other threads:[~2017-11-01  8:55 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-01  7:15 linux-next: manual merge of the tip tree with the net-next tree Stephen Rothwell
2017-11-01  8:18 ` Peter Zijlstra
2017-11-01  8:27   ` Ingo Molnar
2017-11-01  8:55     ` Peter Zijlstra [this message]
2017-11-01  9:04       ` Ingo Molnar
2017-11-01 10:57       ` Stephen Rothwell
2017-11-01 16:27       ` Alexei Starovoitov
2017-11-05  2:12         ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2022-03-15  2:13 Stephen Rothwell
2022-01-10  1:12 Stephen Rothwell
2019-10-18  2:31 Stephen Rothwell
2019-10-18  5:00 ` Alexei Starovoitov
2019-02-15  2:20 Stephen Rothwell
2017-11-01  7:10 Stephen Rothwell
2017-10-30 20:55 Mark Brown
2017-11-13  6:00 ` Stephen Rothwell
2017-08-31  3:47 Stephen Rothwell
2017-09-05  0:05 ` Stephen Rothwell
2017-02-20  1:22 Stephen Rothwell
2017-02-20  9:02 ` Daniel Borkmann
2016-12-12  2:30 Stephen Rothwell
2016-12-01  3:46 Stephen Rothwell
2016-11-17  3:04 Stephen Rothwell
2015-04-07  7:11 Stephen Rothwell
2015-04-07  7:11 ` Stephen Rothwell
2015-04-07  7:32 ` Daniel Borkmann
2015-04-07 16:10 ` Alexei Starovoitov
2015-04-07  7:04 Stephen Rothwell
2015-04-07  7:04 ` Stephen Rothwell
2015-04-07 16:11 ` Alexei Starovoitov
2015-04-07  7:00 Stephen Rothwell
2015-04-07  7:00 ` Stephen Rothwell
2015-04-07  7:30 ` Daniel Borkmann
2014-07-25  4:38 Stephen Rothwell
2014-07-25  4:38 ` Stephen Rothwell
2014-05-05  4:29 Stephen Rothwell
2014-05-05  4:29 ` Stephen Rothwell
2014-01-13  3:18 Stephen Rothwell
2014-01-13  3:18 ` Stephen Rothwell
2014-01-13  3:20 ` Stephen Rothwell
2014-01-13  3:20   ` Stephen Rothwell
2014-01-14  3:02   ` Stephen Rothwell
2014-01-14  3:02     ` Stephen Rothwell
2014-01-14  4:51     ` H. Peter Anvin
2014-01-14  5:19       ` Stephen Rothwell
2014-01-14  5:19       ` David Miller
2014-01-14  5:44         ` Stephen Rothwell
2014-01-14  5:48           ` David Miller
2014-01-14  6:10             ` Stephen Rothwell
2013-11-08  4:58 Stephen Rothwell
2013-11-08  4:58 ` Stephen Rothwell
2013-04-11  4:03 Stephen Rothwell
2013-04-11  4:03 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171101085524.4dcxgaq7kawn37pq@hirez.programming.kicks-ass.net \
    --to=peterz@infradead.org \
    --cc=davem@davemloft.net \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    --cc=yhs@fb.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.