Merge tag 'perf-urgent-for-mingo-20160324' of... (80594769) · Commits · e / devices / android_kernel_oneplus_sm8150

Merge tag 'perf-urgent-for-mingo-20160324' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent Pull perf/urgent fixes from Arnaldo Carvalho de Melo: - Fix detached tarball building due to missing 'perf bench memcpy' headers (Arnaldo Carvalho de Melo) - Fix tarpkg build test error output redirection (Arnaldo Carvalho de Melo) Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by:

Ingo Molnar <mingo@kernel.org>

tools/perf/MANIFEST

+1 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ arch//include/uapi/asm/unistd.h
		arch/*/include/uapi/asm/perf_regs.h
		arch//lib/memcpy.S
		arch//lib/memset.S
		arch//include/asm/features.h
		include/linux/poison.h
		include/linux/hw_breakpoint.h
		include/uapi/linux/perf_event.h

tools/perf/tests/perf-targz-src-pkg

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ TMP_DEST=$(mktemp -d)
		tar xf ${TARBALL} -C $TMP_DEST
		rm -f ${TARBALL}
		cd - > /dev/null
		make -C $TMP_DEST/perf*/tools/perf > /dev/null 2>&1
		make -C $TMP_DEST/perf*/tools/perf > /dev/null
		RC=$?
		rm -rf ${TMP_DEST}
		exit $RC