OSDN Git Service

Merge android-4.4.96 (aed4c54) into msm-4.4
authorBlagovest Kolenichev <bkolenichev@codeaurora.org>
Tue, 12 Dec 2017 11:32:55 +0000 (03:32 -0800)
committerBlagovest Kolenichev <bkolenichev@codeaurora.org>
Tue, 12 Dec 2017 22:25:27 +0000 (14:25 -0800)
commit3bda2b55b41dacecc8fdf44d9066e54b3a0b827a
tree01ca34176aaf0401099dcc89ed8297c072c9ff3e
parentaaf4841e27b932dec6fae2703fae284627f335fb
parentaed4c54ad104104ac693e8a0d6b6b3f7e409bc81
Merge android-4.4.96 (aed4c54) into msm-4.4

* refs/heads/tmp-aed4c54
  Linux 4.4.96
  Revert "drm: bridge: add DT bindings for TI ths8135"
  ecryptfs: fix dereference of NULL user_key_payload
  x86/microcode/intel: Disable late loading on model 79
  regulator: fan53555: fix I2C device ids
  can: kvaser_usb: Ignore CMD_FLUSH_QUEUE_REPLY messages
  can: kvaser_usb: Correct return value in printout
  can: sun4i: fix loopback mode
  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: uapi: spidev: add missing ioctl header
  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
  sched: EAS: upmigrate misfit current task
  sched: avoid pushing tasks to an offline CPU
  sched: Extend active balance to accept 'push_task' argument
  Revert "sched/core: Warn if ENERGY_AWARE is enabled but data is missing"
  Revert "sched/core: fix have_sched_energy_data build warning"
  FROMLIST: kbuild: clang: fix build failures with sparse check
  Revert "Revert "UPSTREAM: efi/libstub/arm64: Set -fpie when building the EFI stub""
  BACKPORT: efi/libstub: Unify command line param parsing

Conflicts:
drivers/usb/host/xhci-hub.c
kernel/sched/core.c
kernel/sched/fair.c

Change-Id: Ie36ce5de516f02b2d553043009d9afee64e7ff24
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
13 files changed:
Makefile
drivers/firmware/efi/libstub/Makefile
drivers/firmware/efi/libstub/arm64-stub.c
drivers/regulator/fan53555.c
drivers/scsi/sg.c
drivers/usb/host/xhci-hub.c
fs/ecryptfs/ecryptfs_kernel.h
fs/ecryptfs/keystore.c
fs/fuse/dir.c
kernel/sched/core.c
kernel/sched/fair.c
kernel/sched/sched.h
kernel/workqueue.c