Hi Greg, As Stephen reported the other day, there's a trivial conflict with a change in the TTY tree that made one of the set_termios parameters const: https://lore.kernel.org/lkml/20220921151109.174cad24@xxxxxxxxxxxxxxxx/ Johan The following changes since commit 7e18e42e4b280c85b76967a9106a13ca61c16179: Linux 6.0-rc4 (2022-09-04 13:10:01 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git tags/usb-serial-6.1-rc1 for you to fetch changes up to 6b2fe3df7c0ca3cf9ee9cea4470462fa708baf87: USB: serial: ftdi_sio: clean up driver prefix (2022-09-20 09:45:50 +0200) ---------------------------------------------------------------- USB-serial updates for 6.1-rc1 Here are the USB-serial updates for 6.1-rc1, including: - a fix for a very long-standing FTDI SIO regression - a long-overdue cleanup of the FTDI type handling - support for new FTDI HP and HA devices Included are also various clean ups. All have been in linux-next with no reported issues. ---------------------------------------------------------------- Amireddy mallikarjuna reddy (1): USB: serial: ftdi_sio: add support for HP and HA devices Jiasheng Jiang (1): USB: serial: ftdi_sio: convert to use dev_groups Johan Hovold (15): USB: serial: ftdi_sio: fix 300 bps rate for SIO USB: serial: ftdi_sio: clean up chip type enum USB: serial: ftdi_sio: drop redundant chip type comments USB: serial: ftdi_sio: rename chip types USB: serial: ftdi_sio: include FT2232D in type string USB: serial: ftdi_sio: rename channel index USB: serial: ftdi_sio: tighten device-type detection USB: serial: ftdi_sio: clean up modem-status handling USB: serial: ftdi_sio: clean up attribute handling USB: serial: ftdi_sio: clean up baudrate request USB: serial: ftdi_sio: assume hi-speed type USB: serial: ftdi_sio: simplify divisor handling USB: serial: ftdi_sio: clean up attribute visibility logic USB: serial: ftdi_sio: move driver structure USB: serial: ftdi_sio: clean up driver prefix Liang He (1): USB: serial: console: move mutex_unlock() before usb_serial_put() drivers/usb/serial/console.c | 2 +- drivers/usb/serial/ftdi_sio.c | 485 ++++++++++++++++++-------------------- drivers/usb/serial/ftdi_sio.h | 22 +- drivers/usb/serial/ftdi_sio_ids.h | 7 + 4 files changed, 245 insertions(+), 271 deletions(-)
