tree e7725e77cb0629c09fa6a47219a202776caa7038
parent 5ffa7b1da8008fdca2a048e0c795353f0f08d5d3
parent b8bd066f13f49321cc2837921c9de6fbe5e5e731
author Minming Qi <mqi@codeaurora.org> 1544770653 +0800
committer Minming Qi <mqi@codeaurora.org> 1545359892 +0800

Merge android-4.9.135 (03fcc2f) into msm-4.9

* refs/heads/tmp-03fcc2f:
  kernel/sched: Fix up 4.9.135 merge
  Revert "BACKPORT, FROMGIT: crypto: speck - add support for the Speck block cipher"
  Revert "FROMGIT: crypto: speck - export common helpers"
  Revert "BACKPORT, FROMGIT: crypto: arm/speck - add NEON-accelerated implementation of Speck-XTS"
  Revert "BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck128-XTS"
  Revert "BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck64-XTS"
  Revert "BACKPORT, FROMLIST: crypto: arm64/speck - add NEON-accelerated implementation of Speck-XTS"
  Revert "fscrypt: add Speck128/256 support"
  Linux 4.9.135
  HV: properly delay KVP packets when negotiation is in progress
  ext4: avoid running out of journal credits when appending to an inline file
  sched/cputime: Fix ksoftirqd cputime accounting regression
  sched/cputime: Increment kcpustat directly on irqtime account
  macintosh/rack-meter: Convert cputime64_t use to u64
  sched/cputime: Convert kcpustat to nsecs
  usb: gadget: serial: fix oops when data rx'd after close
  HID: quirks: fix support for Apple Magic Keyboards
  ARC: build: Don't set CROSS_COMPILE in arch's Makefile
  ARC: build: Get rid of toolchain check
  netfilter: check for seqadj ext existence before adding it in nf_nat_setup_info
  mm: Preserve _PAGE_DEVMAP across mprotect() calls
  mremap: properly flush TLB before releasing the page
  iommu/amd: Return devid as alias for ACPI HID devices
  powerpc/tm: Avoid possible userspace r1 corruption on reclaim
  powerpc/tm: Fix userspace r13 corruption
  net/mlx4: Use cpumask_available for eq->affinity_mask
  scsi: sd: don't crash the host on invalid commands
  drm: mali-dp: Call drm_crtc_vblank_reset on device init
  ravb: do not write 1 to reserved bits
  Input: atakbd - fix Atari CapsLock behaviour
  Input: atakbd - fix Atari keymap
  scsi: ibmvscsis: Ensure partition name is properly NUL terminated
  scsi: ibmvscsis: Fix a stringop-overflow warning
  clocksource/drivers/ti-32k: Add CLOCK_SOURCE_SUSPEND_NONSTOP flag for non-am43 SoCs
  batman-adv: fix hardif_neigh refcount on queue_work() failure
  batman-adv: fix backbone_gw refcount on queue_work() failure
  batman-adv: Prevent duplicated tvlv handler
  batman-adv: Prevent duplicated global TT entry
  batman-adv: Prevent duplicated softif_vlan entry
  batman-adv: Prevent duplicated nc_node entry
  batman-adv: Fix segfault when writing to sysfs elp_interval
  batman-adv: Fix segfault when writing to throughput_override
  media: af9035: prevent buffer overflow on write
  ANDROID: usb: gadget: f_mtp: Return error if count is negative

Conflicts:
	fs/crypto/fscrypt_private.h
	fs/crypto/keyinfo.c
	kernel/sched/cputime.c

Change-Id: I5565f2b8c93dfbde32f617eed14b9b574fc24912
Signed-off-by: Minming Qi <mqi@codeaurora.org>