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] [thread-next>] [day] [month] [year] [list]
Date:	Thu, 23 Jan 2014 13:50:10 +0100
From:	Jiri Olsa <jolsa@...hat.com>
To:	Namhyung Kim <namhyung@...nel.org>
Cc:	Arnaldo Carvalho de Melo <acme@...stprotocols.net>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Paul Mackerras <paulus@...ba.org>,
	Ingo Molnar <mingo@...nel.org>,
	Namhyung Kim <namhyung.kim@....com>,
	LKML <linux-kernel@...r.kernel.org>,
	Rodrigo Campos <rodrigo@...g.com.ar>,
	Andi Kleen <andi@...stfloor.org>, Arun Sharma <asharma@...com>,
	Frederic Weisbecker <fweisbec@...il.com>
Subject: Re: [PATCHSET 00/24] perf tools: Add support to accumulate hist
 periods (v6)

On Wed, Jan 22, 2014 at 11:44:33PM +0000, Namhyung Kim wrote:
> Hi Jiri,
> 
> On Wed, Jan 22, 2014 at 1:20 PM, Jiri Olsa <jolsa@...hat.com> wrote:
> > I have changes on top of this patchset and all looks great, I was
> > just going throught this again and wanted to send my ack, but it
> > no longer merges to the acme's perf/core.
> 
> Thanks, but wasn't it applied to the acme/perf/core?  Now I'm rebasing
> it onto the acme/perf/core and it applies without any conflicts.  Did
> you see one?

hum, I just merged our v6 on acme's perf/core and got conflicts..
not 100% sure the perf/core was clean though ;-)

> 
> >
> > Could you please send updated version, and I'll finish the
> > review.. I promise ;-)
> 
> Thanks in advance, I'll send out the v7 right soon. :)

checking.. thanks,
jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ