Em Wed, Sep 16, 2015 at 09:25:44AM +0200, Ingo Molnar escreveu: > > * Arnaldo Carvalho de Melo <a...@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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
