| Message ID | YNRJ7D7kVwaLWXe5@hovoldconsulting.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8e9910c5ad97aa9479ab19e6535065522d6a0f08 |
| Headers | show |
| Series | [GIT,PULL] USB-serial updates for 5.14-rc1 | expand |
On Thu, Jun 24, 2021 at 11:01:32AM +0200, Johan Hovold wrote: > Hi Greg, > > Here are the USB serial updates for 5.14-rc1. > > Note that you'll get a merge conflict in cp210x between > > 6f7ec77cc8b6 ("USB: serial: cp210x: fix alternate function for CP2102N QFN20") > > which is already in your tree and > > 8051334e901f ("USB: serial: cp210x: add support for GPIOs on CP2108") > > This was also reported by Stephen here > > https://lore.kernel.org/r/20210617150224.19213166@canb.auug.org.au > > and the resolution should be straight forward. > > Let me know if you prefer I pull in Linus's rc:s like you do to resolve any > issues like this in the future. Not a problem, now pulled and pushed out, thanks. greg k-h
Hi Greg, Here are the USB serial updates for 5.14-rc1. Note that you'll get a merge conflict in cp210x between 6f7ec77cc8b6 ("USB: serial: cp210x: fix alternate function for CP2102N QFN20") which is already in your tree and 8051334e901f ("USB: serial: cp210x: add support for GPIOs on CP2108") This was also reported by Stephen here https://lore.kernel.org/r/20210617150224.19213166@canb.auug.org.au and the resolution should be straight forward. Let me know if you prefer I pull in Linus's rc:s like you do to resolve any issues like this in the future. Johan The following changes since commit d07f6ca923ea0927a1024dfccafc5b53b61cfecc: Linux 5.13-rc2 (2021-05-16 15:27:44 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git tags/usb-serial-5.14-rc1 for you to fetch changes up to 8051334e901f2f7ab9fa30a15b74cdc8e58dfde2: USB: serial: cp210x: add support for GPIOs on CP2108 (2021-06-16 17:40:01 +0200) ---------------------------------------------------------------- USB-serial updates for 5.14-rc1 Here are the USB-serial updates for 5.14-rc1, including: - gpio support for CP2108 - chars_in_buffer and write_room return-value updates - chars_in_buffer and write_room clean ups Included are also various clean ups. All have been in linux-next with no reported issues. ---------------------------------------------------------------- Jiri Slaby (2): USB: serial: make usb_serial_driver::write_room return uint USB: serial: make usb_serial_driver::chars_in_buffer return uint Johan Hovold (6): USB: serial: digi_acceleport: reduce chars_in_buffer over-reporting USB: serial: digi_acceleport: add chars_in_buffer locking USB: serial: io_edgeport: drop buffer-callback sanity checks USB: serial: mos7720: drop buffer-callback sanity checks USB: serial: mos7840: drop buffer-callback return-value comments USB: serial: drop irq-flags initialisations Pho Tran (1): USB: serial: cp210x: add support for GPIOs on CP2108 drivers/usb/serial/cp210x.c | 189 ++++++++++++++++++++++++++++++---- drivers/usb/serial/cyberjack.c | 4 +- drivers/usb/serial/cypress_m8.c | 16 +-- drivers/usb/serial/digi_acceleport.c | 46 ++++----- drivers/usb/serial/garmin_gps.c | 2 +- drivers/usb/serial/generic.c | 12 +-- drivers/usb/serial/io_edgeport.c | 39 ++----- drivers/usb/serial/io_ti.c | 12 +-- drivers/usb/serial/ir-usb.c | 6 +- drivers/usb/serial/keyspan.c | 4 +- drivers/usb/serial/kobil_sct.c | 4 +- drivers/usb/serial/metro-usb.c | 12 +-- drivers/usb/serial/mos7720.c | 29 ++---- drivers/usb/serial/mos7840.c | 17 ++- drivers/usb/serial/opticon.c | 6 +- drivers/usb/serial/oti6858.c | 12 +-- drivers/usb/serial/quatech2.c | 6 +- drivers/usb/serial/sierra.c | 8 +- drivers/usb/serial/ti_usb_3410_5052.c | 16 +-- drivers/usb/serial/usb-wwan.h | 4 +- drivers/usb/serial/usb_wwan.c | 12 +-- include/linux/usb/serial.h | 8 +- 22 files changed, 286 insertions(+), 178 deletions(-)