Merge 6.9-rc5 into tty-next

Browse source

We want the tty fixes in here as well, and it resolves a merge conflict
in:
	drivers/tty/serial/serial_core.c
as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Greg Kroah-Hartman 2024-04-23 13:24:45 +02:00

parent f70f95b485 ed30a4a51b

commit 660a708098

626 changed files with 9554 additions and 4477 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

15

include/uapi/linux/vhost.h

View file