Merge remote-tracking branch 'tip/perf/urgent' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 24 Jul 2018 17:34:32 +0000 (14:34 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 24 Jul 2018 17:34:32 +0000 (14:34 -0300)
commit1d59d16e9b4d5be80c9786a8b129c0f2af0e9522
treee23166c9bfa6a656d9093f3f4a2402a75f0a63d9
parent788faab70d5a882693286b8d5022779559c79904
parent4799f6856fdd38c8078a190eca3288029287cf66
Merge remote-tracking branch 'tip/perf/urgent' into perf/core

To pick up fixes.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
kernel/events/core.c
kernel/trace/trace_kprobe.c