tree 865c8299c2d77eebb548e536cea8544221aa20ca
parent 58eb1df212c254a10c15a696e0cc8b6ada984084
parent 47c0adf05004bbc0ece4b9e13dad9b521683f57f
author Kyle Yan <kyan@codeaurora.org> 1489610301 -0700
committer Kyle Yan <kyan@codeaurora.org> 1489610301 -0700

Merge remote-tracking branch '4.9/tmp-47c0adf' into 4.9

* 4.9/tmp-47c0adf:
  Linux 4.9.15
  drivers: hv: Turn off write permission on the hypercall page
  fat: fix using uninitialized fields of fat_inode/fsinfo_inode
  mm: do not call mem_cgroup_free() from within mem_cgroup_alloc()
  thp: fix another corner case of munlock() vs. THPs
  x86/tlb: Fix tlb flushing when lguest clears PGE
  x86, mm: fix gup_pte_range() vs DAX mappings
  libceph: use BUG() instead of BUG_ON(1)
  drm/i915: Fix not finding the VBT when it overlaps with OPREGION_ASLE_EXT
  drm/i915: Avoid spurious WARNs about the wrong pipe in the PPS code
  drm: Cancel drm_fb_helper_resume_work on unload
  drm: Cancel drm_fb_helper_dirty_work on unload
  drm/i915/gvt: Disable access to stolen memory as a guest
  drm/atomic: fix an error code in mode_fixup()
  drm/imx: imx-tve: Do not set the regulator voltage
  dmaengine: imx-sdma - correct the dma transfer residue calculation
  drm/vmwgfx: Work around drm removal of control nodes
  drm/ttm: Make sure BOs being swapped out are cacheable
  drm/edid: Add EDID_QUIRK_FORCE_8BPC quirk for Rotel RSX-1058
  drm/ast: Fix AST2400 POST failure without BMC FW or VBIOS
  drm/ast: Call open_key before enable_mmio in POST code
  drm/ast: Fix test for VGA enabled
  drm/amdgpu: add more cases to DCE11 possible crtc mask setup
  mac80211: use driver-indicated transmitter STA only for data frames
  mac80211: don't handle filtered frames within a BA session
  mac80211: don't reorder frames with SN smaller than SSN
  mac80211: flush delayed work when entering suspend
  nfit, libnvdimm: fix interleave set cookie calculation
  xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD
  pwm: pca9685: Fix period change with same duty cycle
  nlm: Ensure callback code also checks that the files match
  drivers/pci/hotplug: Fix initial state for empty slot
  drivers/pci/hotplug: Handle presence detection change properly
  target: Fix NULL dereference during LUN lookup + active I/O shutdown
  pci/hotplug/pnv-php: Disable surprise hotplug capability on conflicts
  pci/hotplug/pnv-php: Remove WARN_ON() in pnv_php_put_slot()
  ceph: remove req from unsafe list when unregistering it
  ktest: Fix child exit code processing
  memory/atmel-ebi: Fix ns <-> cycles conversions
  orangefs: Use RCU for destroy_inode
  fs: Better permission checking for submounts
  IB/srp: Fix race conditions related to task management
  IB/srp: Avoid that duplicate responses trigger a kernel bug
  IB/SRP: Avoid using IB_MR_TYPE_SG_GAPS
  IB/mlx5: Fix out-of-bound access
  IB/IPoIB: Add destination address when re-queue packet
  IB/ipoib: Fix deadlock between rmmod and set_mode
  mnt: Tuck mounts under others instead of creating shadow/side mounts.
  brcmfmac: fix incorrect event channel deduction
  cxl: fix nested locking hang during EEH hotplug
  cxl: Prevent read/write to AFU config space while AFU not configured
  net: mvpp2: fix DMA address calculation in mvpp2_txq_inc_put()
  s390: use correct input data address for setup_randomness
  s390: make setup_randomness work
  s390: TASK_SIZE for kernel threads
  s390/chsc: Add exception handler for CHSC instruction
  s390/kdump: Use "LINUX" ELF note name instead of "CORE"
  s390/dcssblk: fix device size calculation in dcssblk_direct_access()
  s390/qdio: clear DSCI prior to scanning multiple input queues
  Bluetooth: Add another AR3012 04ca:3018 device
  KVM: VMX: use correct vmcs_read/write for guest segment selector/base
  KVM: s390: Disable dirty log retrieval for UCONTROL guests
  serial: 8250_pci: Add MKS Tenta SCOM-0800 and SCOM-0801 cards
  tty: n_hdlc: get rid of racy n_hdlc.tbuf
  uid_sys_stats: change to use rt_mutex
  ANDROID: uid_sys_stats: account for fsync syscalls
  ANDROID: sched: add a counter to track fsync
  ANDROID: uid_sys_stats: fix negative write bytes.
  ANDROID: uid_sys_stats: allow writing same state
  ANDROID: uid_sys_stats: rename uid_cputime.c to uid_sys_stats.c
  ANDROID: uid_cputime: add per-uid IO usage accounting
  ANDROID: sched/walt: Fix missing locking in WALT port
  UPSTREAM: arm64: Allow hw watchpoint of length 3,5,6 and 7
  UPSTREAM: arm64: hw_breakpoint: Handle inexact watchpoint addresses
  UPSTREAM: arm64: Allow hw watchpoint at varied offset from base address
  UPSTREAM: hw_breakpoint: Allow watchpoint of length 3,5,6 and 7
  ANDROID: usb: gadget: f_accessory: Fix for UsbAccessory clean unbind.
  ANDROID: nf: IDLETIMER: Use fullsock when querying uid
  ANDROID: Replace spaces by '_' for some android filesystem tracepoints.

Conflicts:
	kernel/sched/core.c
	kernel/sched/fair.c

Change-Id: I31ee14ac15765dbb5fe53800d2c39224131287b0
Signed-off-by: Kyle Yan <kyan@codeaurora.org>