Re: [tip:perf/uprobes] uprobes, mm, x86: Add the ability to install and remove uprobes breakpoints
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
- Subject: Re: [tip:perf/uprobes] uprobes, mm, x86: Add the ability to install and remove uprobes breakpoints
- From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
- Date: Wed, 23 May 2012 10:37:35 +1000
- Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>, mingo@xxxxxxxxxx, a.p.zijlstra@xxxxxxxxx, peterz@xxxxxxxxxxxxx, anton@xxxxxxxxxx, rostedt@xxxxxxxxxxx, tglx@xxxxxxxxxxxxx, oleg@xxxxxxxxxx, linux-mm@xxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, hpa@xxxxxxxxx, jkenisto@xxxxxxxxxx, andi@xxxxxxxxxxxxxx, hch@xxxxxxxxxxxxx, ananth@xxxxxxxxxx, vda.linux@xxxxxxxxxxxxxx, masami.hiramatsu.pt@xxxxxxxxxxx, acme@xxxxxxxxxxxxx, srikar@xxxxxxxxxxxxxxxxxx, roland@xxxxxxxxxxxxx, mingo@xxxxxxx, linux-tip-commits@xxxxxxxxxxxxxxx
- In-reply-to: <20120521151323.f23bd5e9.akpm@linux-foundation.org>
Hi Andrew,
I have been thinking about this some more.
On Mon, 21 May 2012 15:13:23 -0700 Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Mon, 21 May 2012 15:00:28 -0700
> Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> > On Mon, May 21, 2012 at 2:37 PM, Andrew Morton
> > <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
> > >
> > > hm, we seem to have conflicting commits between mainline and linux-next.
> > > During the merge window. __Again. __Nobody knows why this happens.
> >
> > I didn't have my trivial cleanup branches in linux-next, I'm afraid.
>
> Well, it's a broader issue than that. I often see a large number of
> rejects when syncing mainline with linux-next during the merge window.
> Right now:
>
> Documentation/nfc/nfc-hci.txt:<<<<<<< HEAD
.
.
.
> net/nfc/hci/shdlc.c:<<<<<<< HEAD
> net/nfc/nci/core.c:<<<<<<< HEAD
What two SHA1s did you try to merge to get that. I can get some of it
but nothing like that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpBuQMLf5tiN.pgp
Description: PGP signature
[Index of Archives]
[Linux Stable Commits]
[Linux Stable Kernel]
[Linux Kernel]
[Linux USB Devel]
[Linux Video &Media]
[Linux Audio Users]
[Yosemite News]
[Linux SCSI]