github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-11 16:13:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
aba99662aa
linux/drivers/staging
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
..
android Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common 2021-12-14 17:09:02 +08:00
axis-fifo rk: revert to v4.19 2021-03-17 18:05:39 +08:00
board
clocking-wizard clk: staging: correct reference to config IOMEM to config HAS_IOMEM 2021-09-15 09:50:41 +02:00
comedi staging: comedi: tests: ni_routes_test: Fix compilation error 2021-05-14 09:50:15 +02:00
emxx_udc staging: emxx_udc: fix loop in _nbu2ss_nuke() 2021-06-03 09:00:49 +02:00
fbtft staging: fbtft: Don't spam logs when probe is deferred 2021-07-14 16:56:32 +02:00
fieldbus
fsl-dpaa2 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
fwserial staging: fwserial: fix TIOCGSERIAL implementation 2021-05-14 09:50:15 +02:00
gasket rk: revert to v4.19 2021-03-17 18:05:39 +08:00
gdm724x staging: gdm724x: check for overflow in gdm_lte_netif_rx() 2021-07-14 16:56:45 +02:00
goldfish
greybus staging: greybus: uart: fix unprivileged TIOCCSERIAL 2021-05-14 09:50:15 +02:00
gs_fpgaboot
hikey9xx
iio staging: iio: cdc: ad7746: avoid overwrite of num_channels 2021-06-03 09:00:32 +02:00
imgtec rk: remove ioremap_nocache and devm_ioremap_nocache 2021-04-12 19:24:04 +08:00
kpc2000
ks7010 staging: ks7010: prevent buffer overflow in ks_wlan_set_scan() 2021-03-17 17:06:32 +01:00
media media: atomisp: fix the uninitialized use and rename "retvalue" 2021-09-15 09:50:34 +02:00
most rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mt7621-dma rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mt7621-dts staging: mt7621-dts: fix pci address for PCI memory range 2021-07-14 16:56:46 +02:00
mt7621-pci rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mt7621-pci-phy
mt7621-pinctrl pinctrl: ralink: rt2880: avoid to error in calls is pin is already enabled 2021-06-23 14:42:49 +02:00
netlogic
nvec
octeon rk: revert to v4.19 2021-03-17 18:05:39 +08:00
octeon-usb
olpc_dcon rk: revert to v4.19 2021-03-17 18:05:39 +08:00
pi433 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
qlge
ralink-gdma
rtl8188eu staging: rtl8188eu: fix potential memory corruption in rtw_check_beacon_data() 2021-03-17 17:06:31 +01:00
rtl8192e staging: rtl8192e: Change state information from u16 to u8 2021-04-07 15:00:13 +02:00
rtl8192u staging: rtl8192u: Fix potential infinite loop 2021-05-14 09:50:15 +02:00
rtl8712 staging: rtl8712: error handling refactoring 2021-08-12 13:22:14 +02:00
rtl8723bs staging: rtl8723bs: Fix a resource leak in sd_int_dpc 2021-08-12 13:22:13 +02:00
rts5208
sm750fb rk: revert to v4.19 2021-03-17 18:05:39 +08:00
unisys
vc04_services staging: mmal-vchiq: Fix incorrect static vchiq_instance. 2021-07-14 16:56:39 +02:00
vme
vt6655 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
vt6656 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
wfx staging: wfx: fix possible panic with re-queued frames 2021-03-04 11:37:28 +01:00
wlan-ng rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Kconfig rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Makefile rk: revert to v4.19 2021-03-17 18:05:39 +08:00