Files
kernel_google_redbull/kernel/power
lucaswei 95ddbb8a09 Merge LA.UM.9.12.R1.10.00.00.597.042 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/filesystems/fsverity.rst
	Makefile
	arch/arm64/configs/vendor/kona_defconfig
	arch/arm64/configs/vendor/lito_defconfig
	block/blk-core.c
	build.config.common
	drivers/base/core.c
	drivers/base/power/main.c
	drivers/clk/clk.c
	drivers/clk/qcom/clk-alpha-pll.c
	drivers/dma-buf/dma-buf.c
	drivers/gpu/msm/kgsl_pool.c
	drivers/input/misc/qpnp-power-on.c
	drivers/iommu/dma-mapping-fast.c
	drivers/iommu/io-pgtable-fast.c
	drivers/iommu/io-pgtable-msm-secure.c
	drivers/iommu/io-pgtable.c
	drivers/of/property.c
	drivers/platform/msm/ipa/ipa_clients/ipa_gsb.c
	drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c
	drivers/platform/msm/ipa/ipa_v3/ipa_mpm.c
	drivers/power/supply/power_supply_sysfs.c
	drivers/power/supply/qcom/qg-core.h
	drivers/power/supply/qcom/qpnp-qg.c
	drivers/soc/qcom/scm.c
	drivers/staging/android/ion/ion_page_pool.c
	drivers/tty/serial/msm_geni_serial.c
	fs/crypto/Kconfig
	fs/crypto/bio.c
	fs/crypto/crypto.c
	fs/crypto/fname.c
	fs/crypto/fscrypt_private.h
	fs/crypto/hooks.c
	fs/crypto/keyinfo.c
	fs/crypto/policy.c
	fs/ext4/ext4.h
	fs/ext4/hash.c
	fs/ext4/inode.c
	fs/ext4/namei.c
	fs/ext4/page-io.c
	fs/ext4/readpage.c
	fs/ext4/super.c
	fs/ext4/verity.c
	fs/f2fs/Makefile
	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/namei.c
	fs/f2fs/segment.c
	fs/f2fs/super.c
	fs/f2fs/sysfs.c
	fs/f2fs/verity.c
	fs/inode.c
	fs/ubifs/dir.c
	fs/unicode/utf8-core.c
	fs/verity/enable.c
	fs/verity/fsverity_private.h
	fs/verity/hash_algs.c
	fs/verity/open.c
	fs/verity/verify.c
	include/linux/coresight.h
	include/linux/device.h
	include/linux/dma-buf.h
	include/linux/f2fs_fs.h
	include/linux/fscrypt.h
	include/linux/fsverity.h
	include/linux/fwnode.h
	include/linux/leds-qpnp-flash.h
	include/linux/perf_event.h
	include/linux/power_supply.h
	include/linux/unicode.h
	include/soc/qcom/scm.h
	include/uapi/linux/nl80211.h
	kernel/events/core.c
	kernel/sched/core.c
	kernel/sched/fair.c
	lib/Kconfig.debug
	lib/Makefile
	lib/test_meminit.c
	mm/slub.c
	mm/swapfile.c
	mm/vmalloc.c
	net/wireless/nl80211.c
	security/selinux/include/security.h

Bug: 153823050
Bug: 153825378
Signed-off-by: lucaswei <lucaswei@google.com>
Change-Id: Ia2bfb56f0d48504ba600b52bdde958a76d5bff72
2020-05-30 02:28:19 +08:00
..