github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 07:03:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
defb18abcd
linux/drivers/bluetooth
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
..
ath3k.c Bluetooth: ath3k: use usb_control_msg_send() and usb_control_msg_recv() 2020-09-25 16:33:59 +02:00
bcm203x.c
bfusb.c
bluecard_cs.c
bpa10x.c
bt3c_cs.c
btbcm.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
btbcm.h
btintel.c Bluetooth: btintel: Functions to send firmware header / payload 2020-09-14 20:30:36 +02:00
btintel.h Bluetooth: btintel: Replace zero-length array with flexible-array member 2020-10-30 16:57:41 -05:00
btmrvl_debugfs.c
btmrvl_drv.h
btmrvl_main.c
btmrvl_sdio.c Bluetooth: btmrvl: eliminate duplicates introducing btmrvl_reg_89xx 2020-08-02 19:59:43 +02:00
btmrvl_sdio.h
btmtksdio.c Bluetooth: btmtksdio: Add the missed release_firmware() in mtk_setup_firmware() 2020-12-30 11:53:39 +01:00
btmtkuart.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
btqca.c Bluetooth: btqca: Don't modify firmware contents in-place 2021-07-14 16:55:34 +02:00
btqca.h
btqcomsmd.c Bluetooth: btqcomsmd: Fix a resource leak in error handling paths in the probe function 2021-03-04 11:37:20 +01:00
btrsi.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
btrtl.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
btrtl.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
btsdio.c
btusb.c Bluetooth: btusb: check conditions before enabling USB ALT 3 for WBS 2021-09-03 10:09:28 +02:00
dtl1_cs.c
h4_recv.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hci_ag6xx.c
hci_ath.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hci_bcm.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hci_bcsp.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hci_h4.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hci_h5.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hci_intel.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hci_ldisc.c Bluetooth: hci_ldisc: fix race between open, close and send data 2021-05-12 17:10:00 +08:00
hci_ll.c
hci_mrvl.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hci_nokia.c
hci_qca.c Bluetooth: hci_qca: fix potential GPF 2021-07-14 16:55:34 +02:00
hci_serdev.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hci_uart.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hci_vhci.c
Kconfig
Makefile
rtk_btusb.c
rtk_btusb.h