]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 4fb92bd 22a40d1)
Merge 6.10-rc6 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Jul 2024 12:16:48 +0000 (14:16 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Jul 2024 12:16:48 +0000 (14:16 +0200)
commit33827dc4ad8982c987ad4066d643693403ce7fd0
tree93337503859f8f990fde2132394c809ce7d09850tree
parent4fb92bdb8e84e618f8c289dc56a923b914a72caccommit | diff
parent22a40d14b572deb80c0648557f4bd502d7e83826commit | diff
Merge 6.10-rc6 into tty-next

This resolves the merge issues in the 8250 code due to some reverts in
6.10-rc6 in the console changes.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_core.c diff1 | diff2 | blob | history
drivers/tty/serial/8250/8250_platform.c diff1 | | blob | history
drivers/tty/serial/imx.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.