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

Merge remote-tracking branch '4.9/tmp-4b2b8b99' into msm-4.9



* 4.9/tmp-4b2b8b99:
  Linux 4.9.60
  ecryptfs: fix dereference of NULL user_key_payload
  regulator: fan53555: fix I2C device ids
  ipsec: Fix aborted xfrm policy dump crash
  cfg80211: fix connect/disconnect edge cases
  can: kvaser_usb: Ignore CMD_FLUSH_QUEUE_REPLY messages
  can: kvaser_usb: Correct return value in printout
  can: sun4i: fix loopback mode
  drm/amd/powerplay: fix uninitialized variable
  scsi: sg: Re-fix off by one in sg_fill_request_table()
  scsi: zfcp: fix erp_action use-before-initialize in REC action trace
  assoc_array: Fix a buggy node-splitting case
  Input: gtco - fix potential out-of-bound access
  Input: elan_i2c - add ELAN0611 to the ACPI table
  xen/gntdev: avoid out of bounds access in case of partial gntdev_mmap()
  fuse: fix READDIRPLUS skipping an entry
  spi: bcm-qspi: Fix use after free in bcm_qspi_probe() in error path
  spi: uapi: spidev: add missing ioctl header
  KVM: PPC: Fix oops when checking KVM_CAP_PPC_HTM
  usb: xhci: Handle error condition in xhci_stop_device()
  ceph: unlock dangling spinlock in try_flush_caps()
  ALSA: hda - fix headset mic problem for Dell machines with alc236
  ALSA: hda/realtek - Add support for ALC236/ALC3204
  workqueue: replace pool->manager_arb mutex with a flag

Conflicts:
	drivers/usb/host/xhci-hub.c

Change-Id: I6de307270a5b951e4fb5c9ee62781a7b4f206b26
Signed-off-by: default avatarKyle Yan <kyan@codeaurora.org>
parents 4777f6d2 4b2b8b99
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment