Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1226101

Re: [GIT PULL 0/8] perf/core improvements and fixes

Show all headers | View raw

Em Wed, Sep 16, 2015 at 09:25:44AM +0200, Ingo Molnar escreveu:
> 
> * Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> 
> > Hi Ingo,
> > 
> > 	Please consider pulling,
> > 
> > - Arnaldo
> > 
> > The following changes since commit 9059b284caecb628fac826c2c5cc8ee85708eec1:
> > 
> >   Merge tag 'perf-core-for-mingo-2' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (2015-09-15 08:50:59 +0200)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-core-for-mingo
> 
> So your perf/urgent bits now conflict with the latest perf/core, in 
> tools/perf/ui/browsers/hists.c. I have merged perf/urgent into perf/core - please 
> double check my resolution (d71b0ad8d309).

Looks fine, tested it even, thanks!

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[GIT PULL 0/8] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:30 +0200
  [PATCH 5/8] perf evsel: Propagate error info from tp_format Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:30 +0200
  [PATCH 1/8] perf probe: Free perf_probe_event in cleanup_perf_probe_events() Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:40 +0200
  [PATCH 4/8] perf tools: Propagate error info for the tracepoint parsing Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:40 +0200
  [PATCH 3/8] tools: Add err.h with ERR_PTR PTR_ERR interface Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:40 +0200
  [PATCH 2/8] perf probe: Export init/exit_probe_symbol_maps() Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-15 17:40 +0200
  Re: [GIT PULL 0/8] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2015-09-16 09:30 +0200
    Re: [GIT PULL 0/8] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-16 16:00 +0200

csiph-web