diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-16 10:18:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-16 10:18:49 +0200 |
| commit | fe2017ba24f318e5feef487b7552e40a3de2d50a (patch) | |
| tree | 59f3695ecd07645910210156fc8255da99aba6f7 /tools/perf/scripts/python/bin | |
| parent | tty/sysrq: replace smp_processor_id() with get_cpu() (diff) | |
| parent | Linux 6.6-rc6 (diff) | |
| download | linux-fe2017ba24f318e5feef487b7552e40a3de2d50a.tar.gz linux-fe2017ba24f318e5feef487b7552e40a3de2d50a.zip | |
Merge 6.6-rc6 into tty-next
We need the tty/serial fixes in here as well for testing, and this
resolves merge conflicts in:
drivers/tty/serial/serial_core.c
as reported in linux-next
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/scripts/python/bin')
0 files changed, 0 insertions, 0 deletions