Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit deb64a7f authored by Kyle Yan's avatar Kyle Yan
Browse files

Merge remote-tracking branch '4.9/tmp-23b839a4' into msm-4.9



* 4.9/tmp-23b839a4:
  Linux 4.9.16
  IB/mlx5: Verify that Q counters are supported
  rc: raw decoder for keymap protocol is not loaded on register
  dm: flush queued bios when process blocks to avoid deadlock
  KVM: arm/arm64: Let vcpu thread modify its own active state
  KVM: s390: Fix guest migration for huge guests resulting in panic
  ext4: don't BUG when truncating encrypted inodes on the orphan list
  serial: samsung: Continue to work if DMA request fails
  USB: serial: io_ti: fix information leak in completion handler
  USB: serial: io_ti: fix NULL-deref in interrupt callback
  USB: iowarrior: fix NULL-deref in write
  USB: iowarrior: fix NULL-deref at probe
  USB: serial: omninet: fix reference leaks at open
  USB: serial: safe_serial: fix information leak in completion handler
  usb: host: xhci-plat: Fix timeout on removal of hot pluggable xhci controllers
  usb: host: xhci-dbg: HCIVERSION should be a binary number
  Revert "usb: gadget: uvc: Add missing call for additional setup data"
  usb: gadget: function: f_fs: pass companion descriptor along
  usb: ohci-at91: Do not drop unhandled USB suspend control requests
  usb: dwc3-omap: Fix missing break in dwc3_omap_set_mailbox()
  usb: dwc3: gadget: make Set Endpoint Configuration macros safe
  usb: gadget: dummy_hcd: clear usb_gadget region before registration
  PCI: Prevent VPD access for QLogic ISP2722
  powerpc/xics: Work around limitations of OPAL XICS priority handling
  powerpc: Emulation support for load/store instructions on LE
  i2c: add missing of_node_put in i2c_mux_del_adapters
  dw2102: don't do DMA on stack
  efi/arm: Fix boot crash with CONFIG_CPUMASK_OFFSTACK=y
  ucount: Remove the atomicity from ucount->count
  tracing: Add #undef to fix compile error
  cpmac: remove hopeless #warning
  bcm63xx_enet: avoid uninitialized variable warning
  MIPS: ralink: Remove unused rt*_wdt_reset functions
  MIPS: ralink: Remove unused timer functions
  MIPS: ralink: Cosmetic change to prom_init().
  mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy
  MIPS: Update lemote2f_defconfig for CPU_FREQ_STAT change
  MIPS: ip22: Fix ip28 build for modern gcc
  MIPS: Update ip27_defconfig for SCSI_DH change
  MIPS: ip27: Disable qlge driver in defconfig
  MIPS: VDSO: avoid duplicate CAC_BASE definition
  MIPS: Update defconfigs for NF_CT_PROTO_DCCP/UDPLITE change
  crypto: improve gcc optimization flags for serpent and wp512
  USB: serial: digi_acceleport: fix OOB-event processing
  USB: serial: digi_acceleport: fix OOB data sanity check
  ANDROID: sched: fix duplicate sched_group_energy const specifiers
  ANDROID: power: align wakeup_sources format
  ANDROID: dm: android-verity: allow disable dm-verity for Treble VTS

Conflicts:
	drivers/usb/gadget/function/f_fs.c
	drivers/usb/host/xhci-plat.c

Change-Id: Ie97f041c7512b888ecdedcf79981aed53a4da7dc
Signed-off-by: default avatarKyle Yan <kyan@codeaurora.org>
parents 345c814e 23b839a4
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment