lucaswei 56acc710a6 Merge LA.UM.9.12.R2.10.00.00.685.011 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19 ...

Conflicts:
	Documentation/ABI/testing/sysfs-fs-f2fs
	Documentation/filesystems/f2fs.txt
	Documentation/filesystems/fscrypt.rst
	Documentation/sysctl/vm.txt
	Makefile
	arch/arm64/boot/Makefile
	arch/arm64/configs/vendor/kona_defconfig
	arch/arm64/configs/vendor/lito_defconfig
	arch/arm64/kernel/vdso.c
	arch/arm64/mm/init.c
	arch/arm64/mm/mmu.c
	arch/ia64/mm/init.c
	arch/powerpc/mm/mem.c
	arch/s390/mm/init.c
	arch/sh/mm/init.c
	arch/x86/mm/init_32.c
	arch/x86/mm/init_64.c
	block/bio.c
	block/blk-crypto-fallback.c
	block/blk-crypto-internal.h
	block/blk-crypto.c
	block/blk-merge.c
	block/keyslot-manager.c
	build.config.common
	drivers/base/core.c
	drivers/base/power/wakeup.c
	drivers/char/adsprpc.c
	drivers/char/diag/diagchar_core.c
	drivers/crypto/Makefile
	drivers/crypto/msm/qcedev.c
	drivers/crypto/msm/qcrypto.c
	drivers/dma-buf/dma-buf.c
	drivers/input/input.c
	drivers/input/keycombo.c
	drivers/input/misc/gpio_input.c
	drivers/input/misc/gpio_matrix.c
	drivers/input/touchscreen/st/fts.c
	drivers/md/Kconfig
	drivers/md/dm-default-key.c
	drivers/md/dm.c
	drivers/mmc/host/Makefile
	drivers/mmc/host/sdhci-msm-ice.h
	drivers/net/phy/phy_device.c
	drivers/of/property.c
	drivers/pci/controller/pci-msm.c
	drivers/platform/msm/gsi/Makefile
	drivers/platform/msm/ipa/ipa_rm_inactivity_timer.c
	drivers/platform/msm/ipa/ipa_v3/ipa.c
	drivers/platform/msm/ipa/ipa_v3/ipa_pm.c
	drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
	drivers/platform/msm/sps/spsi.h
	drivers/power/supply/qcom/qpnp-smb5.c
	drivers/power/supply/qcom/smb5-lib.h
	drivers/power/supply/qcom/step-chg-jeita.c
	drivers/scsi/ufs/Kconfig
	drivers/scsi/ufs/Makefile
	drivers/scsi/ufs/ufs-qcom-ice.c
	drivers/scsi/ufs/ufs-qcom.c
	drivers/scsi/ufs/ufs-qcom.h
	drivers/scsi/ufs/ufshcd-crypto.c
	drivers/scsi/ufs/ufshcd-crypto.h
	drivers/scsi/ufs/ufshcd.c
	drivers/scsi/ufs/ufshcd.h
	drivers/soc/qcom/Makefile
	drivers/soc/qcom/msm_bus/msm_bus_dbg.c
	drivers/soc/qcom/msm_bus/msm_bus_dbg_rpmh.c
	drivers/soc/qcom/msm_minidump.c
	drivers/soc/qcom/peripheral-loader.c
	drivers/soc/qcom/smp2p.c
	drivers/soc/qcom/smp2p_sleepstate.c
	drivers/soc/qcom/subsystem_restart.c
	drivers/spi/spi-geni-qcom.c
	drivers/thermal/tsens.h
	drivers/tty/serial/Kconfig
	drivers/tty/serial/msm_geni_serial.c
	drivers/usb/typec/tcpm/fusb302.c
	drivers/usb/typec/tcpm/tcpm.c
	fs/crypto/bio.c
	fs/crypto/crypto.c
	fs/crypto/fname.c
	fs/crypto/fscrypt_private.h
	fs/crypto/inline_crypt.c
	fs/crypto/keyring.c
	fs/crypto/keysetup.c
	fs/crypto/keysetup_v1.c
	fs/crypto/policy.c
	fs/eventpoll.c
	fs/ext4/inode.c
	fs/ext4/ioctl.c
	fs/ext4/page-io.c
	fs/ext4/super.c
	fs/f2fs/Kconfig
	fs/f2fs/compress.c
	fs/f2fs/data.c
	fs/f2fs/dir.c
	fs/f2fs/f2fs.h
	fs/f2fs/file.c
	fs/f2fs/gc.c
	fs/f2fs/hash.c
	fs/f2fs/inline.c
	fs/f2fs/inode.c
	fs/f2fs/namei.c
	fs/f2fs/super.c
	fs/f2fs/sysfs.c
	fs/ubifs/ioctl.c
	include/linux/bio-crypt-ctx.h
	include/linux/bio.h
	include/linux/blk-crypto.h
	include/linux/blk_types.h
	include/linux/fscrypt.h
	include/linux/gfp.h
	include/linux/keyslot-manager.h
	include/linux/memory_hotplug.h
	include/linux/usb/tcpm.h
	include/linux/usb/typec.h
	include/soc/qcom/socinfo.h
	include/trace/events/f2fs.h
	include/uapi/linux/fscrypt.h
	include/uapi/linux/sched/types.h
	kernel/memremap.c
	kernel/sched/core.c
	kernel/sched/cpufreq_schedutil.c
	kernel/sched/fair.c
	kernel/sched/psi.c
	kernel/sched/sched.h
	kernel/sysctl.c
	lib/Makefile
	lib/test_stackinit.c
	mm/filemap.c
	mm/hmm.c
	mm/memory_hotplug.c
	mm/page_alloc.c
	scripts/gen_autoksyms.sh

Bug: 157994070
Bug: 157858241
Bug: 157879992
Signed-off-by: lucaswei <lucaswei@google.com>
Change-Id: Ib43efc6464e484b85107587c2f770246b48ddee6

2020-06-15 15:36:42 +08:00

61 KiB

Raw Blame History

View Raw