linux/arch/arm
Tao Huang f6909c028f Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common
https://source.android.com/security/bulletin/2021-12-01
CVE-2021-33909
CVE-2021-38204
CVE-2021-0961

* tag 'ASB-2021-12-05_12-5.10': (3010 commits)
  ANDROID: workqueue: export symbol of the function wq_worker_comm()
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: vendor_hooks: Add hooks for binder proc transaction
  ANDROID: GKI: Add symbols abi for USB IP kernel modules.
  ANDROID: GKI: Fix file mode on mtk abi file
  UPSTREAM: erofs: fix deadlock when shrink erofs slab
  ANDROID: init_task: Init android vendor and oem data
  UPSTREAM: sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain()
  ANDROID: Update symbol list for mtk
  UPSTREAM: erofs: fix unsafe pagevec reuse of hooked pclusters
  UPSTREAM: erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()
  UPSTREAM: usb: dwc3: gadget: Fix null pointer exception
  ANDROID: fips140: support "evaluation testing" builds via build.sh
  FROMGIT: sched/scs: Reset task stack state in bringup_cpu()
  ANDROID: dma-buf: heaps: fix dma-buf heap pool pages stat
  ANDROID: ABI: Add several spi_mem related symbols
  UPSTREAM: spi: spi-mem: add spi_mem_dtr_supports_op()
  ANDROID: gki_defconfig: enable CONFIG_SPI_MEM
  ANDROID: ABI: Add several iio related symbols
  ANDROID: ABI: Update symbol list for IMX
  ...

Change-Id: I09cddc92fa34553b944e62cc5cbbba94a84e5437

Conflicts:
	arch/arm/boot/dts/rk322x.dtsi
	arch/arm64/boot/dts/rockchip/rk3399.dtsi
	drivers/dma-buf/heaps/system_heap.c
	drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/gpu/drm/rockchip/rockchip_lvds.c
	drivers/gpu/drm/rockchip/rockchip_vop_reg.c
	drivers/mtd/nand/spi/core.c
	drivers/pci/controller/pcie-rockchip-host.c
	drivers/soc/rockchip/Kconfig
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/core.h
2021-12-14 17:09:02 +08:00
..
boot Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common 2021-12-14 17:09:02 +08:00
common Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-03-17 18:07:51 +08:00
configs arm64: configs: rockchip: not to use CONFIG_MALI_BIFROST_FOR_LINUX 2021-09-14 09:29:47 +08:00
crypto Merge 5.10.37 into android12-5.10 2021-05-15 09:28:55 +02:00
include Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common 2021-12-14 17:09:02 +08:00
kernel Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common 2021-12-14 17:09:02 +08:00
lib rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-actions
mach-alpine
mach-artpec
mach-asm9260
mach-aspeed
mach-at91 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-axxia
mach-bcm
mach-berlin
mach-clps711x
mach-cns3xxx rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-davinci rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-digicolor
mach-dove
mach-ebsa110
mach-efm32
mach-ep93xx
mach-exynos ARM: exynos: add missing of_node_put for loop iteration 2021-07-20 16:05:54 +02:00
mach-footbridge ARM: footbridge: fix PCI interrupt mapping 2021-04-21 13:00:58 +02:00
mach-gemini
mach-highbank dma-mapping: split <linux/dma-mapping.h> 2020-10-06 07:07:03 +02:00
mach-hisi ARM: hisi: add support for SD5203 SoC 2020-09-30 09:56:03 +08:00
mach-imx ARM: imx: fix missing 3rd argument in macro imx_mmdc_perf_init 2021-08-12 13:22:02 +02:00
mach-integrator rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-iop32x rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-ixp4xx clocksource/drivers/ixp4xx: Select TIMER_OF when needed 2021-03-04 11:37:57 +01:00
mach-keystone ARM: keystone: fix integer overflow warning 2021-04-21 13:00:52 +02:00
mach-lpc18xx
mach-lpc32xx
mach-mediatek
mach-meson
mach-milbeaut
mach-mmp rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-moxart
mach-mstar ARM: mstar: Select MStar intc 2020-10-03 12:47:56 -07:00
mach-mv78xx0
mach-mvebu mvebu fixes for 5.9 (part 1) 2020-10-26 10:11:55 +01:00
mach-mxs
mach-nomadik
mach-npcm rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-nspire
mach-omap1 ARM: OMAP1: ams-delta: remove unused function ams_delta_camera_power 2021-09-08 08:49:00 +02:00
mach-omap2 ARM: omap2+: hwmod: fix potential NULL pointer access 2021-08-12 13:22:17 +02:00
mach-orion5x
mach-oxnas
mach-picoxcell
mach-prima2
mach-pxa rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-qcom
mach-rda
mach-realtek
mach-realview
mach-rockchip Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-03-17 18:07:51 +08:00
mach-rpc rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-s3c ARM: s3c: fix fiq for clang IAS 2021-03-04 11:37:28 +01:00
mach-s5pv210
mach-sa1100
mach-shmobile rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-socfpga rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-spear
mach-sti
mach-stm32 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-sunxi rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-tango rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-tegra rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-u300
mach-uniphier
mach-ux500
mach-versatile
mach-vexpress rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mach-vt8500
mach-zx
mach-zynq rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mm ARM: 9012/1: move device tree mapping out of linear region 2021-05-19 10:13:18 +02:00
net bpf: Introduce BPF nospec instruction for mitigating Spectre v4 2021-08-04 12:46:44 +02:00
nwfpe
oprofile
plat-omap PM: AVS: smartreflex Move driver to soc specific drivers 2020-10-16 18:28:43 +02:00
plat-orion rk: revert to v4.19 2021-03-17 18:05:39 +08:00
plat-pxa rk: revert to v4.19 2021-03-17 18:05:39 +08:00
plat-versatile
probes This is the 5.10.52 stable release 2021-07-20 16:36:53 +02:00
tools rk: revert to v4.19 2021-03-17 18:05:39 +08:00
vdso rk: revert to v4.19 2021-03-17 18:05:39 +08:00
vfp rk: revert to v4.19 2021-03-17 18:05:39 +08:00
xen rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Kbuild
Kconfig FROMLIST: arm: Mark the recheduling IPI as raw interrupt 2021-06-23 18:12:27 +00:00
Kconfig-nommu
Kconfig.assembler
Kconfig.debug rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Makefile ARM: rockchip: no build mach-rockchip when CONFIG_ARM_PSCI 2021-03-24 19:28:29 +08:00