linux/block
Tao Huang bc69b758ef Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common
* android12-5.10: (176331 commits)
  ANDROID: GKI: Enable bounds sanitizer
  ANDROID: Allow HAS_LTO_CLANG with KASAN_HW_TAGS
  ANDROID: abi_gki_aarch64_qcom: Add cpufreq related symbols
  ANDROID: cpufreq: Add a restricted vendor hook for freq transition
  ANDROID: scsi: ufs: add hooks to track ufs commands
  ANDROID: Fix compilation error when CPU_FREQ is disabled
  BACKPORT: kasan, arm64: allow using KUnit tests with HW_TAGS mode
  Revert "FROMGIT: kasan, arm64: allow using KUnit tests with HW_TAGS mode"
  Revert "BACKPORT: kasan: remove redundant config option"
  UPSTREAM: arm/kasan: fix the array size of kasan_early_shadow_pte[]
  FROMGIT: KVM: arm64: Workaround firmware wrongly advertising GICv2-on-v3 compatibility
  FROMGIT: KVM: arm64: Rename __vgic_v3_get_ich_vtr_el2() to __vgic_v3_get_gic_config()
  FROMGIT: KVM: arm64: Don't access PMSELR_EL0/PMUSERENR_EL0 when no PMU is available
  FROMGIT: KVM: arm64: Turn kvm_arm_support_pmu_v3() into a static key
  FROMGIT: KVM: arm64: Fix nVHE hyp panic host context restore
  FROMGIT: KVM: arm64: Avoid corrupting vCPU context register in guest exit
  FROMLIST: arm64: cpufeatures: Fix handling of CONFIG_CMDLINE for idreg overrides
  ANDROID: sched: Add vendor hook for uclamp_eff_value
  ANDROID: abi_gki_aarch64_qcom: Add CFS scheduler symbols
  ANDROID: GKI: Add mempool APIs to the symbol list
  ...

Change-Id: I4ed13984b97bc531d1dae61920457f31b84190e9

Conflicts:
	Documentation/devicetree/bindings/nvmem/rockchip-otp.txt
	arch/arm64/boot/dts/rockchip/px30.dtsi
	arch/arm64/boot/dts/rockchip/rk3308.dtsi
	arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
	drivers/clk/rockchip/Kconfig
	drivers/clk/rockchip/clk-rk3308.c
	drivers/gpu/drm/rockchip/rk3066_hdmi.c
	drivers/gpu/drm/rockchip/rockchip_rgb.c
	drivers/media/i2c/imx219.c
	drivers/nvmem/rockchip-otp.c
	drivers/power/supply/cw2015_battery.c
	sound/soc/codecs/cx2072x.c
	sound/soc/codecs/cx2072x.h
	sound/soc/codecs/rk3328_codec.c
2021-03-17 18:07:51 +08:00
..
partitions Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-03-17 18:07:51 +08:00
badblocks.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
bfq-cgroup.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bfq-iosched.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bfq-iosched.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bfq-wf2q.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bio-integrity.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bio.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-cgroup-rwstat.c
blk-cgroup-rwstat.h
blk-cgroup.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-core.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-crypto-fallback.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-crypto-internal.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-crypto.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-exec.c
blk-flush.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-integrity.c block: remove the unused blk_integrity_merge_bio export 2020-10-06 07:29:53 -06:00
blk-ioc.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-iocost.c blk-iocost: fix NULL iocg deref from racing against initialization 2021-01-12 20:18:23 +01:00
blk-iolatency.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-lib.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-map.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-merge.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-mq-cpumap.c blk-mq: remove the calling of local_memory_node() 2020-10-20 07:08:17 -06:00
blk-mq-debugfs-zoned.c
blk-mq-debugfs.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-mq-debugfs.h
blk-mq-pci.c
blk-mq-rdma.c
blk-mq-sched.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-mq-sched.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-mq-sysfs.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-mq-tag.c block-mq: fix comments in blk_mq_queue_tag_busy_iter 2020-09-29 08:11:00 -06:00
blk-mq-tag.h blk-mq: Relocate hctx_may_queue() 2020-09-03 15:20:47 -06:00
blk-mq-virtio.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-mq.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-mq.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-pm.c scsi: block: Fix a race in the runtime power management code 2021-01-06 14:56:50 +01:00
blk-pm.h scsi: block: Do not accept any requests while suspended 2021-01-12 20:18:17 +01:00
blk-rq-qos.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-rq-qos.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-settings.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-stat.c blk-stat: make q->stats->lock irqsafe 2020-09-01 16:48:46 -06:00
blk-stat.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-sysfs.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-throttle.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-timeout.c block: blk-timeout: delete duplicated word 2020-07-31 16:29:47 -06:00
blk-wbt.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
blk-wbt.h
blk-zoned.c block: don't do revalidate zones on invalid devices 2020-08-03 09:24:04 -06:00
blk.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bounce.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bsg-lib.c block: drop double zeroing 2020-09-23 09:18:13 -06:00
bsg.c FROMLIST: block: bsg: resume platform device before accessing 2021-01-28 20:23:35 +00:00
cmdline-parser.c
elevator.c block: fix comment and add lockdep assert 2020-10-09 12:34:06 -06:00
genhd.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ioctl.c block: add a bdev_is_partition helper 2020-09-25 08:18:57 -06:00
ioprio.c Revert "block: grant IOPRIO_CLASS_RT to CAP_SYS_NICE" 2020-10-24 17:30:14 +02:00
Kconfig rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Kconfig.iosched
keyslot-manager.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
kyber-iosched.c blk-mq: Use pointers for blk_mq_tags bitmap tags 2020-09-03 15:20:47 -06:00
Makefile rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mq-deadline.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
opal_proto.h
scsi_ioctl.c Revert "Revert "iov_iter: transparently handle compat iovecs in import_iovec"" 2020-11-02 09:27:36 +01:00
sed-opal.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
t10-pi.c