Merge 4.1-rc4 into staging-next

We want the fixes in here for testing and merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2026-11-13 07:31:07 +00:00 · 2015-05-18 13:52:44 -07:00 · 2015-05-18 13:52:44 -07:00 · 936a0cd52a
commit 936a0cd52a
parent 36bf51acc8 e26081808e
549 changed files with 6108 additions and 4876 deletions
--- a/tools/lib/api/Makefile
+++ b/tools/lib/api/Makefile
--- a/tools/lib/lockdep/Makefile
+++ b/tools/lib/lockdep/Makefile
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
--- a/tools/perf/bench/futex-requeue.c
+++ b/tools/perf/bench/futex-requeue.c
--- a/tools/perf/bench/numa.c
+++ b/tools/perf/bench/numa.c
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
--- a/tools/testing/selftests/x86/Makefile
+++ b/tools/testing/selftests/x86/Makefile
--- a/tools/testing/selftests/x86/check_cc.sh
+++ b/tools/testing/selftests/x86/check_cc.sh
--- a/tools/testing/selftests/x86/run_x86_tests.sh
+++ b/tools/testing/selftests/x86/run_x86_tests.sh
--- a/tools/testing/selftests/x86/trivial_32bit_program.c
+++ b/tools/testing/selftests/x86/trivial_32bit_program.c
--- a/tools/testing/selftests/x86/trivial_64bit_program.c
+++ b/tools/testing/selftests/x86/trivial_64bit_program.c
--- a/tools/thermal/tmon/Makefile
+++ b/tools/thermal/tmon/Makefile
--- a/tools/vm/Makefile
+++ b/tools/vm/Makefile