tree 1dc85ce162e487b16ffc8e11165fab4f255783ef
parent 73072d747cf1e53df9f115333f36945e2b0d7be4
parent 7ee58bfe251a6bd962150ccada7028cdbeb4e9de
author Martin Faltesek <mfaltesek@google.com> 1636739055 -0600
committer Martin Faltesek <mfaltesek@google.com> 1636739056 -0600

CHROMIUM: Merge 'v4.4.292' into chromeos-4.4

Merge of v4.4.292 into chromeos-4.4

Changes applied on top of 'v4.4.292' prior to merge:
    7ee58bfe251a CHROMIUM: Revert "printk/console: Allow to disable console output by using console="" or console=null"

Changelog:
----------------------------------------------------------------
Andreas Kemnade (1):
      net: hso: register netdev later to avoid a race condition

Cheah Kok Cheong (1):
      staging: comedi: drivers: replace le16_to_cpu() with usb_endpoint_maxp()

Dongliang Mu (1):
      usb: hso: fix error handling code of hso_create_net_device

Geert Uytterhoeven (1):
      usb: gadget: Mark USB_FSL_QE broken on 64-bit

Greg Kroah-Hartman (1):
      Linux 4.4.292

Gustavo A. R. Silva (1):
      IB/qib: Use struct_size() helper

James Buren (1):
      usb-storage: Add compatibility quirk flags for iODD 2531/2541

Jan Kara (1):
      isofs: Fix out of bound access for corrupted isofs image

Johan Hovold (8):
      comedi: dt9812: fix DMA buffers on stack
      comedi: ni_usb6501: fix NULL-deref in command paths
      comedi: vmk80xx: fix transfer-buffer overflows
      comedi: vmk80xx: fix bulk-buffer overflow
      comedi: vmk80xx: fix bulk and interrupt message timeouts
      staging: r8712u: fix control-message timeout
      staging: rtl8192u: fix control-message timeouts
      rsi: fix control-message timeout

Martin Faltesek (2):
      CHROMIUM: Revert "printk/console: Allow to disable console output by using console="" or console=null"
      Merge remote-tracking branch 'cros/stable-merge/linux/v4.4.292' into merge/chromeos-4.4-v4.4.292

Mike Marciniszyn (1):
      IB/qib: Protect from buffer overflow in struct qib_user_sdma_pkt fields

Ming Lei (1):
      scsi: core: Put LLD module refcnt after SCSI device is released

Petr Mladek (1):
      printk/console: Allow to disable console output by using console="" or console=null

Wang Kefeng (1):
      ARM: 9120/1: Revert "amba: make use of -1 IRQs warn"

 Makefile                                    |   2 +-
 drivers/amba/bus.c                          |   3 -
 drivers/infiniband/hw/qib/qib_user_sdma.c   |  35 +++++---
 drivers/net/usb/hso.c                       |  45 +++++++----
 drivers/net/wireless/rsi/rsi_91x_usb.c      |   2 +-
 drivers/scsi/scsi.c                         |   4 +-
 drivers/scsi/scsi_sysfs.c                   |   9 +++
 drivers/staging/comedi/drivers/dt9812.c     | 119 ++++++++++++++++++++--------
 drivers/staging/comedi/drivers/ni_usb6501.c |  14 +++-
 drivers/staging/comedi/drivers/vmk80xx.c    |  34 ++++----
 drivers/staging/rtl8192u/r8192U_core.c      |  18 ++---
 drivers/staging/rtl8712/usb_ops_linux.c     |   2 +-
 drivers/usb/gadget/udc/Kconfig              |   1 +
 drivers/usb/storage/unusual_devs.h          |  10 +++
 fs/isofs/inode.c                            |   2 +
 15 files changed, 209 insertions(+), 91 deletions(-)

BUG=b:206085400
TEST=Build and test on various affected systems

Change-Id: Id55b4b9e61e9b3104798935a2bfa806ea371b5f0
Disallow-Recycled-Builds: test-failures
Signed-off-by: Martin Faltesek <mfaltesek@google.com>