github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-12 00:23:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
aba99662aa
linux/include/dt-bindings
History
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
..
arm dt-bindings: arm: Adds CoreSight CTI hardware definitions 2020-03-21 11:32:19 +01:00
bus dt-bindings: bus: ti-sysc: Add support for PRUSS SYSC type 2020-03-04 07:52:50 -08:00
clk dt: Add additional option bindings for IDT VersaClock 2020-06-22 19:04:58 -07:00
clock Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common 2021-12-14 17:09:02 +08:00
display drm/rockchip: vop2: Support set cursor win from dts 2021-07-09 17:20:54 +08:00
dma dt: bindings: dma: xilinx: dpdma: DT bindings for Xilinx DPDMA 2020-07-17 11:37:59 +05:30
dram
firmware/imx dt-bindings: firmware: imx: Add more system controls and PM clock types 2020-05-13 16:19:39 +08:00
gce dt-binding: gce: add gce header file for mt6779 2020-08-03 23:56:37 -05:00
gpio
i2c
iio Merge branch 'ib-5.8-jz47xx-ts' into HEAD 2020-07-22 14:36:31 +01:00
input Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-03-17 18:07:51 +08:00
interconnect dt-bindings: interconnect: Add EPSS L3 DT binding on SM8250 2020-09-08 16:29:01 +03:00
interrupt-controller dt-bindings: interrupt-controller: Add Aspeed SCU interrupt controller 2020-01-20 19:10:03 +00:00
leds leds: add RGB color option, as that is different from multicolor. 2020-08-03 13:26:15 +02:00
mailbox dt-bindings: mailbox: Add devicetree binding for Qcom IPCC 2020-05-30 18:10:27 -05:00
media media: partial revert of "[media] tvp5150: add HW input connectors support" 2020-03-12 16:35:59 +01:00
memory dt-bindings: memory: add macro definition about LPDDR4 and LPDDR4X 2021-10-26 10:45:45 +08:00
mfd
mips
mux dt-bindings: ti-serdes-mux: Add defines for J7200 SoC 2020-09-30 07:34:02 -05:00
net
phy phy: phy-rockchip-snps-pcie3: Add pcie3_phymode setting 2021-11-16 16:23:36 +08:00
pinctrl dt-bindings: pinctrl: Remove unused rockchip files 2021-08-11 16:32:38 +08:00
pmu
power dt-bindings: add power-domain header for RK3588 SoCs 2021-08-23 19:17:37 +08:00
pwm
regulator regulator: mt6360: Add support for MT6360 regulator 2020-08-26 13:41:10 +01:00
reset Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-03-17 18:07:51 +08:00
reset-controller dt-bindings: mediatek: mt2712: Add #reset-cells 2020-01-27 15:55:48 +01:00
soc dt-bindings: soc: rockchip: add dram frequency level support 2021-07-27 18:48:07 +08:00
sound ASoC: dt-bindings: lpass: Fix and common up lpass dai ids 2021-02-03 23:28:46 +01:00
spmi
suspend arm64: dts: rockchip: rk3568: adjust suspend mode define 2021-02-25 16:26:01 +08:00
thermal thermal: exynos: Rename Samsung and Exynos to lowercase 2020-01-27 10:24:32 +01:00
usb FROMGIT: dt-bindings: connector: Replace BIT macro with generic bit ops 2021-06-07 06:15:29 +00:00
sensor-dev.h