projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f70f95b
ed30a4a
)
Merge 6.9-rc5 into tty-next
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)
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>
1
2
Documentation/admin-guide/kernel-parameters.txt
patch
|
diff1
|
diff2
|
blob
|
history
drivers/tty/serial/8250/8250_dw.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/tty/serial/mxs-auart.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/tty/serial/pmac_zilog.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/tty/serial/serial_base.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/tty/serial/serial_core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/tty/serial/serial_port.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/tty/serial/stm32-usart.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/admin-guide/kernel-parameters.txt
Simple merge
diff --cc
drivers/tty/serial/8250/8250_dw.c
Simple merge
diff --cc
drivers/tty/serial/mxs-auart.c
Simple merge
diff --cc
drivers/tty/serial/pmac_zilog.c
Simple merge
diff --cc
drivers/tty/serial/serial_base.h
Simple merge
diff --cc
drivers/tty/serial/serial_core.c
Simple merge
diff --cc
drivers/tty/serial/serial_port.c
Simple merge
diff --cc
drivers/tty/serial/stm32-usart.c
Simple merge