linux-kernel - Re: [tip:perf/uprobes] uprobes, mm, x86: Add the ability to install and remove uprobes breakpoints

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 23 May 2012 10:37:35 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	Linus Torvalds <torvalds@...ux-foundation.org>, mingo@...hat.com,
	a.p.zijlstra@...llo.nl, peterz@...radead.org, anton@...hat.com,
	rostedt@...dmis.org, tglx@...utronix.de, oleg@...hat.com,
	linux-mm@...ck.org, linux-kernel@...r.kernel.org, hpa@...or.com,
	jkenisto@...ibm.com, andi@...stfloor.org, hch@...radead.org,
	ananth@...ibm.com, vda.linux@...glemail.com,
	masami.hiramatsu.pt@...achi.com, acme@...radead.org,
	srikar@...ux.vnet.ibm.com, roland@...k.frob.com, mingo@...e.hu,
	linux-tip-commits@...r.kernel.org
Subject: Re: [tip:perf/uprobes] uprobes, mm, x86: Add the ability to install
 and remove uprobes breakpoints

Hi Andrew,

I have been thinking about this some more.

On Mon, 21 May 2012 15:13:23 -0700 Andrew Morton <akpm@...ux-foundation.org> wrote:
>
> On Mon, 21 May 2012 15:00:28 -0700
> Linus Torvalds <torvalds@...ux-foundation.org> wrote:
> 
> > On Mon, May 21, 2012 at 2:37 PM, Andrew Morton
> > <akpm@...ux-foundation.org> 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@...b.auug.org.au

Content of type "application/pgp-signature" skipped