Re: [tip:perf/uprobes] uprobes, mm, x86: Add the ability to installand remove uprobes breakpoints

[Stephen Rothwell]

Hi Andrew,

On Mon, 21 May 2012 19:27:00 -0700 Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Tue, 22 May 2012 11:16:18 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 
> > I have been meaning to talk to you about basing the majority of your
> > patch series on Linus' tree.  This would give it mush greater stability
> > and would make the merge resolution my problem (and Linus', of course).
> 
> Confused.  None of those conflicts have anything to do with the -mm
> patches: the only trees involved there are mainline and
> trees-in-next-other-than-mm.

Right, its a separate issue.  Though I do end up coping with conflicts in
the -mm tree as I have to rebase it everyday.

> > There will be bits that may need to be based on other work in linux-next,
> > but I suspect that it is not very much.
> 
> Well, there are a number of reasons why I base off linux-next.  To see
> whether others have merged patches which I have merged (and, sometimes,
> missed later fixes to them).  Explicit fixes against -next material. 
> To get visibility into upcoming merge problems.  And so that I and
> others test -next too.

I guess I see a separation between what you are working on and what you
are publishing.  You used to publish a reasonable amount of subseries for
others and most of this I suspect could just be based on Linus' tree.
Anyway, not a big problem except when I get days like yesterday (when I
saw some of the conflicts you are noting).

> Basing -mm on next is never a problem (for me).  What is a problem is
> the mess which happens when people merge things into mainline which are
> (I assume) either slightly different from what they merged in -next or
> which never were in -next at all.

Indeed.  Some of what you have seen this time is just last minute updates
of other trees and bug fixes in Linus' tree.  We had about 2000 (net)
commits added to linux-next in the past week (800+ over the weekend).
Some of this has now migrated to Linus' tree already.

> That's guessing - it's a long time since I sat down and worked out exactly
> what is causing this.

Which is not a trivial problem.  I will run my stats script and see what
pops out.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature