git.maquefel.me Git - linux.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Tue, 23 Apr 2024 11:24:45 +0000 (13:24 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Tue, 23 Apr 2024 11:24:45 +0000 (13:24 +0200)
commit	660a708098569a66a47d0abdad998e29e1259de6
tree	513d7f3cda11cb65f91a6f55b72308accf079c8d	tree \| snapshot
parent	f70f95b485d78838ad28dbec804b986d11ad7bb0	commit \| diff
parent	ed30a4a51bb196781c8058073ea720133a65596f	commit \| diff

Merge 6.9-rc5 into tty-next

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>

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

Documentation/admin-guide/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/8250/8250_dw.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/mxs-auart.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/pmac_zilog.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/serial_base.h	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/serial_core.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/serial_port.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/stm32-usart.c	diff1 \|	diff2 \|	blob \| history