tree 9f088ca6c83136f1b9c4f281eeff4b7d5bc86246
parent cabdf6bcfa244e614306a2f1ed0a38d7ecdc369d
parent e2171b62ec47b0e55737a477288693bb83e816c8
author Tengfei Fan <tengfeif@codeaurora.org> 1560392395 +0800
committer Tengfei Fan <tengfeif@codeaurora.org> 1560405223 +0800

Merge android-4.9.175 (e2171b6) into msm-4.9

* refs/heads/tmp-e2171b6:
  Linux 4.9.175
  timer/debug: Change /proc/timer_stats from 0644 to 0600
  ASoC: Intel: avoid Oops if DMA setup fails
  UAS: fix alignment of scatter/gather segments
  Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
  Bluetooth: hidp: fix buffer overflow
  scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routines
  usb-storage: Set virt_boundary_mask to avoid SG overflows
  USB: serial: f81232: fix interrupt worker not stop
  usb: dwc3: Fix default lpm_nyet_threshold value
  genirq: Prevent use-after-free and work list corruption
  ARM: 8680/1: boot/compressed: fix inappropriate Thumb2 mnemonic for __nop
  mm: add 'try_get_page()' helper function
  iommu/amd: Set exclusion range correctly
  virtio-blk: limit number of hw queues by nr_cpu_ids
  drm/mediatek: fix possible object reference leak
  scsi: csiostor: fix missing data copy in csio_scsi_err_handler()
  linux/kernel.h: Use parentheses around argument in u64_to_user_ptr()
  perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS
  drm/mediatek: Fix an error code in mtk_hdmi_dt_parse_pdata()
  ASoC: tlv320aic32x4: Fix Common Pins
  IB/hfi1: Eliminate opcode tests on mr deref
  ASoC: cs4270: Set auto-increment bit for register writes
  ASoC: nau8810: fix the issue of widget with prefixed name
  ASoC:soc-pcm:fix a codec fixup issue in TDM case
  staging: greybus: power_supply: fix prop-descriptor request size
  ubsan: Fix nasty -Wbuiltin-declaration-mismatch GCC-9 warnings
  scsi: libsas: fix a race condition when smp task timeout
  ANDROID: block/cfq-iosched: make group_idle per io cgroup tunable
  ANDROID: cuttlefish_defconfig: Enable CONFIG_CPUSETS and CONFIG_CGROUP_SCHEDTUNE
  ANDROID: Communicates LMK events to userland where they can be logged
  ext4: don't bother checking for encryption key in ->mmap()
  fscrypt: remove filesystem specific build config option
  f2fs: use IS_ENCRYPTED() to check encryption status
  ext4: use IS_ENCRYPTED() to check encryption status
  fscrypt: return -EXDEV for incompatible rename or link into encrypted dir
  fscrypt: remove CRYPTO_CTR dependency
  fscrypt: add Adiantum support / removed speck
  ext4: switch to fscrypt_prepare_setattr()
  ext4: switch to fscrypt_prepare_rename()
  ext4: switch to fscrypt_prepare_link()
  ext4: switch to fscrypt_file_open()
  ext4, dax: set ext4_dax_aops for dax files

Conflicts:
	drivers/staging/android/lowmemorykiller.c
	fs/crypto/fscrypt_private.h
	fs/ext4/inode.c
	include/linux/fscrypt_notsupp.h
	kernel/irq/manage.c
	kernel/time/timer_stats.c

Change-Id: Icb948feb15f26630d658312502997f4f9bdad3d2
Signed-off-by: Tengfei Fan <tengfeif@codeaurora.org>