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: Tue, 22 May 2012 11:10:07 +1000
- Cc: Andrew Morton <akpm@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: <CA+55aFw5ccuvvtyf6iuuw-Finr79ZkPxgCxL5jNvdnX5oMYkgg@mail.gmail.com>
Hi Linus,
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.
> Usually my pending cleanups are just small patches that I carry along
> without even committing them, this time around I had slightly more
> than that.
You could set up a branch that is merged into linux-next if you want
to ... it may lower the suprise factor.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpjgBlytuORH.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]