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
..
bridge	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
i2c
ttm
amd_asic_type.h
drm_agpsupport.h
drm_atomic_helper.h
drm_atomic_state_helper.h
drm_atomic_uapi.h
drm_atomic.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_audio_component.h
drm_auth.h
drm_blend.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_bridge_connector.h
drm_bridge.h
drm_cache.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_client.h
drm_color_mgmt.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_connector.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_crtc_helper.h
drm_crtc.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_damage_helper.h
drm_debugfs_crc.h
drm_debugfs.h
drm_device.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_displayid.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_dp_dual_mode_helper.h
drm_dp_helper.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_dp_mst_helper.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_drv.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_dsc.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_edid.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_encoder_slave.h
drm_encoder.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_fb_cma_helper.h
drm_fb_helper.h
drm_file.h
drm_fixed.h
drm_flip_work.h
drm_format_helper.h
drm_fourcc.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_framebuffer.h
drm_gem_cma_helper.h
drm_gem_framebuffer_helper.h
drm_gem_shmem_helper.h
drm_gem_ttm_helper.h
drm_gem_vram_helper.h
drm_gem.h
drm_hashtab.h
drm_hdcp.h
drm_ioctl.h
drm_irq.h
drm_lease.h
drm_legacy.h
drm_managed.h
drm_mipi_dbi.h
drm_mipi_dsi.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_mm.h
drm_mode_config.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_mode_object.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_modes.h
drm_modeset_helper_vtables.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_modeset_helper.h
drm_modeset_lock.h
drm_of.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_panel.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_pciids.h
drm_plane_helper.h
drm_plane.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_prime.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_print.h	drm: drm_print.h: fix kernel-doc markups	2020-10-27 11:21:39 +01:00
drm_probe_helper.h
drm_property.h
drm_rect.h
drm_scdc_helper.h
drm_self_refresh_helper.h
drm_simple_kms_helper.h
drm_sync_helper.h
drm_syncobj.h
drm_sysfs.h
drm_util.h
drm_utils.h
drm_vblank_work.h
drm_vblank.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
drm_vma_manager.h
drm_writeback.h
gma_drm.h
gpu_scheduler.h
i915_component.h
i915_drm.h
i915_mei_hdcp_interface.h
i915_pciids.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
intel_lpe_audio.h
intel-gtt.h
spsc_queue.h
task_barrier.h