From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754433AbbA1VOs (ORCPT ); Wed, 28 Jan 2015 16:14:48 -0500 Received: from mail.kernel.org ([198.145.29.136]:57900 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752320AbbA1UwN (ORCPT ); Wed, 28 Jan 2015 15:52:13 -0500 Date: Wed, 28 Jan 2015 11:55:36 -0300 From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: =?iso-8859-1?Q?Fr=E9d=E9ric?= Weisbecker , linux-kernel@vger.kernel.org, Adrian Hunter , Borislav Petkov , Cody P Schafer , David Ahern , Don Zickus , Haren Myneni , Jiri Olsa , Joe Mario , Kan Liang , linuxppc-dev@lists.ozlabs.org, Masami Hiramatsu , Michael Ellerman , Mike Galbraith , Namhyung Kim , Paul Mackerras , Peter Zijlstra , Ramkumar Ramachandra , Rasmus Villemoes , Richard Fowles , Rickard Strandqvist , Stephane Eranian , Steven Rostedt , Sukadev Bhattiprolu Subject: Re: [GIT PULL 00/26] perf/core improvements and fixes Message-ID: <20150128145536.GJ7220@kernel.org> References: <1422294449-12735-1-git-send-email-acme@kernel.org> <20150128145015.GB6559@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150128145015.GB6559@gmail.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Wed, Jan 28, 2015 at 03:50:15PM +0100, Ingo Molnar escreveu: > Pulled, thanks a lot Arnaldo! Thanks! > Note that there was some minimal interaction with Frederic's > pending perf/hw_breakpoint work, in tools/perf/Documentation/perf-record.txt. > > I resolved the conflict and merged perf/hw_breakpoint into > perf/core as well, to avoid future complications. (Once I've > pushed it all out you guys might want to double check what I did > there though, just to make sure.) As soon as 'git remote update tip' gets this stuff, I'll check it! - Arnaldo