diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-30 11:51:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-30 11:51:36 -0700 |
| commit | e6d34ced01bc3aaad616b9446bbaa96cd04617c4 (patch) | |
| tree | 6cbfe85715047b09cc62fefda55dc0194e3f3ea1 /Documentation | |
| parent | 3d6b77a8d4b4603c243ab2ee0f04f74f122d576a (diff) | |
| parent | 748c5ea8b8796ae8ee80b8d3a3d940570b588d59 (diff) | |
| download | linux-stable-e6d34ced01bc3aaad616b9446bbaa96cd04617c4.tar.gz linux-stable-e6d34ced01bc3aaad616b9446bbaa96cd04617c4.tar.bz2 linux-stable-e6d34ced01bc3aaad616b9446bbaa96cd04617c4.zip | |
Merge tag 'tty-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial fixes from Greg KH:
"Here are some small TTY and serial driver fixes for 6.5-rc4 for some
reported problems. Included in here is:
- TIOCSTI fix for braille readers
- documentation fix for minor numbers
- MAINTAINERS update for new serial files in -rc1
- minor serial driver fixes for reported problems
All of these have been in linux-next with no reported problems"
* tag 'tty-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
serial: 8250_dw: Preserve original value of DLF register
tty: serial: sh-sci: Fix sleeping in atomic context
serial: sifive: Fix sifive_serial_console_setup() section
Documentation: devices.txt: reconcile serial/ucc_uart minor numers
MAINTAINERS: Update TTY layer for lists and recently added files
tty: n_gsm: fix UAF in gsm_cleanup_mux
TIOCSTI: always enable for CAP_SYS_ADMIN
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/admin-guide/devices.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt index 06c525e01ea5..b1b57f638b94 100644 --- a/Documentation/admin-guide/devices.txt +++ b/Documentation/admin-guide/devices.txt @@ -2691,7 +2691,7 @@ 45 = /dev/ttyMM1 Marvell MPSC - port 1 (obsolete unused) 46 = /dev/ttyCPM0 PPC CPM (SCC or SMC) - port 0 ... - 47 = /dev/ttyCPM5 PPC CPM (SCC or SMC) - port 5 + 49 = /dev/ttyCPM5 PPC CPM (SCC or SMC) - port 3 50 = /dev/ttyIOC0 Altix serial card ... 81 = /dev/ttyIOC31 Altix serial card |