Ok, with the help of a colleague with some more expertise on git than I have, we finally figured out which branch you mean with tip/perf/core. Sorry for the confusion! The conflict was trivial to solve, I will send the rebased patches separately.
Joseph On 09.07.2014 13:49, Jiri Olsa wrote: > On Wed, Jul 09, 2014 at 01:43:18PM +0200, Joseph Schuchart wrote: >> Jirka, >> >> I tried to apply the patches to the latest version of the perf/core branch >> before sending. Can you please send me some more information about the >> conflict? > > is your HEAD 8b5b584 ? > > [jolsa@krava perf]$ git show --oneline tip/perf/core > 8b5b584 Merge tag 'perf-core-for-mingo' of > git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core > > jirka > -- Dipl. Inf. Joseph Schuchart Computer Scientist Technische Universität Dresden Center for Information Services and High Performance Computing (ZIH) 01062 Dresden, Germany Phone: +49 351 463-36494 Fax: +49 351 463-3773 E-Mail: joseph.schuch...@tu-dresden.de
smime.p7s
Description: S/MIME Cryptographic Signature
