diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-10 09:38:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-10 09:38:01 +0100 |
| commit | adeab5bfb81840dc4be7ae20324bbf03b2b53eb2 (patch) | |
| tree | 2b56c0fad02af5c99e0a741cefc49dad5ba7384c /tools/perf | |
| parent | usb: gadget: u_audio: Clear uac pointer when freed. (diff) | |
| parent | Linux 6.9-rc7 (diff) | |
| download | wireguard-linux-adeab5bfb81840dc4be7ae20324bbf03b2b53eb2.tar.xz wireguard-linux-adeab5bfb81840dc4be7ae20324bbf03b2b53eb2.zip | |
Merge 6.9-rc7 into usb-next
We want the USB fixes in here as well, and resolve a merge conflict in
drivers/usb/dwc3/core.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '')
| -rw-r--r-- | tools/perf/arch/riscv/util/header.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/arch/riscv/util/header.c b/tools/perf/arch/riscv/util/header.c index 4a41856938a8..1b29030021ee 100644 --- a/tools/perf/arch/riscv/util/header.c +++ b/tools/perf/arch/riscv/util/header.c @@ -41,7 +41,7 @@ static char *_get_cpuid(void) char *mimpid = NULL; char *cpuid = NULL; int read; - unsigned long line_sz; + size_t line_sz; FILE *cpuinfo; cpuinfo = fopen(CPUINFO, "r"); |