You've already forked linux-rockchip
mirror of
https://github.com/armbian/linux-rockchip.git
synced 2026-01-06 11:08:10 -08:00
bc69b758ef
* 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