diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-09-09 08:40:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-09-09 08:40:22 +0200 |
| commit | f299cd11f7539482e87b2d2d527968a26b33f0ec (patch) | |
| tree | abc4443b5666f567f3b83bf2a0cefe87a8930101 /tools/perf/util/python.c | |
| parent | xhci: support setting interrupt moderation IMOD for secondary interrupters (diff) | |
| parent | Linux 6.11-rc7 (diff) | |
| download | linux-f299cd11f7539482e87b2d2d527968a26b33f0ec.tar.gz linux-f299cd11f7539482e87b2d2d527968a26b33f0ec.zip | |
Merge 6.11-rc7 into usb-next
We need the USB fixes in here as well, and this also resolves the merge
conflict in:
drivers/usb/typec/ucsi/ucsi.c
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/util/python.c')
| -rw-r--r-- | tools/perf/util/python.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 3be882b2e845..31a223eaf8e6 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -20,6 +20,7 @@ #include "util/env.h" #include "util/kvm-stat.h" #include "util/kwork.h" +#include "util/sample.h" #include "util/lock-contention.h" #include <internal/lib.h> #include "../builtin.h" |