Merge tag 'v4.9.210' into khadas-vims-4.9.y

This is the 4.9.210 stable release

Signed-off-by: Nick Xie <nick@khadas.com>
 Conflicts:
	drivers/usb/serial/usb_wwan.c

diff --cc Makefile
Simple merge

diff --cc drivers/hid/uhid.c
Simple merge

diff --cc drivers/input/input.c
Simple merge

diff --cc drivers/tty/serial/serial_core.c
Simple merge

diff --cc drivers/usb/serial/option.c
Simple merge

diff --cc drivers/usb/serial/usb_wwan.c
index a918f300557bc2c5857923434b60f98721075e02,93c696e2131f8d7bca1bddf04755abd96955dff1..4569a8a66c412f8c3cb467d0eb0bcc6f78c7777d
--- 1/drivers/usb/serial/usb_wwan.c
--- 2/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@@ -505,18 -506,9 +506,21 @@@ static struct urb *usb_wwan_setup_urb(s
                          usb_sndbulkpipe(serial->dev, endpoint) | dir,
                          buf, len, callback, ctx);
  
 +      if (dir == USB_DIR_OUT) {
 +              struct usb_device_descriptor *desc = &serial->dev->descriptor;
 +              if (desc->idVendor == cpu_to_le16(0x05C6) && desc->idProduct == cpu_to_le16(0x9090))
 +                      urb->transfer_flags |= URB_ZERO_PACKET;
 +              if (desc->idVendor == cpu_to_le16(0x05C6) && desc->idProduct == cpu_to_le16(0x9003))
 +                      urb->transfer_flags |= URB_ZERO_PACKET;
 +              if (desc->idVendor == cpu_to_le16(0x05C6) && desc->idProduct == cpu_to_le16(0x9215))
 +                      urb->transfer_flags |= URB_ZERO_PACKET;
 +              if (desc->idVendor == cpu_to_le16(0x2C7C))
 +                      urb->transfer_flags |= URB_ZERO_PACKET;
 +      }
 +
+       if (intfdata->use_zlp && dir == USB_DIR_OUT)
+               urb->transfer_flags |= URB_ZERO_PACKET;
+ 
        return urb;
  }
  

diff --cc fs/char_dev.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge