Merge tag 'android14-6.1-2023-06_r1' of https://android.googlesource.com/kernel/common

android14-6.1 June 2023 release 1

Artifacts:
  https://ci.android.com/builds/submitted/10351523/kernel_aarch64/latest

* tag 'android14-6.1-2023-06_r1': (596 commits)
  ANDROID: GKI: Include kheaders in gki_system_dlkm_modules
  ANDROID: 6/16/2023 KMI update
  ANDROID: sched: Add parameter to android_rvh_schedule.
  ANDROID: GKI: provide more padding for struct usb_phy
  ANDROID: GKI enable CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
  FROMGIT: arm64: set __exception_irq_entry with __irq_entry as a default
  ANDROID: GKI: update symbol list file for xiaomi
  ANDROID: Remove all but top-level OWNERS
  ANDROID: Enable GKI Dr. No Enforcement
  ANDROID: 6/16/2023 KMI update
  ANDROID: virt: gunyah: Sync with latest platform ops
  FROMGIT: usb: gadget: udc: core: Prevent soft_connect_store() race
  FROMGIT: usb: gadget: udc: core: Offload usb_udc_vbus_handler processing
  UPSTREAM: Bluetooth: fix debugfs registration
  UPSTREAM: Bluetooth: hci_sync: add lock to protect HCI_UNREGISTER
  UPSTREAM: net/ipv6: fix bool/int mismatch for skip_notify_on_dev_down
  UPSTREAM: neighbour: fix unaligned access to pneigh_entry
  UPSTREAM: tcp: deny tcp_disconnect() when threads are waiting
  ANDROID: sound: usb: Add vendor's hooking interface
  ANDROID: GKI: USB: XHCI: add Android ABI padding to struct xhci_driver_overrides
  ...

Conflicts:
	arch/arm/boot/dts/rk3288.dtsi
	drivers/dma-buf/dma-buf.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
	drivers/mmc/core/mmc.c
	drivers/pwm/pwm-rockchip.c
	drivers/usb/gadget/udc/core.c
	fs/erofs/data.c
	include/linux/dma-buf.h
	kernel/sched/cpufreq_schedutil.c

According to commit 5dd0547a3e ("UPSTREAM: mm: replace vma->vm_flags direct modifications with modifier calls").
Fixes:
	drivers/gpu/arm/bifrost/mali_kbase_mem_linux.c
	drivers/gpu/arm/mali400/mali/linux/mali_memory.c
	drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c
	drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
	drivers/misc/rockchip/pcie-rkep.c
	drivers/pci/controller/dwc/pcie-dw-ep-rockchip.c
	drivers/rknpu/rknpu_gem.c
	drivers/spi/spi-rockchip.c

Backport commit 44ee9eef21 ("ANDROID: usb: xhci-plat: Fix double-free in xhci_plat_remove").
Fixes:
	drivers/usb/host/xhci-plat.c

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I90f59fb8f35d2a0bd2102a2b1a4119115a614f9d
This commit is contained in:
Tao Huang
2023-07-20 20:32:09 +08:00
761 changed files with 60017 additions and 78770 deletions

View File

@@ -4966,6 +4966,7 @@ void wq_worker_comm(char *buf, size_t size, struct task_struct *task)
mutex_unlock(&wq_pool_attach_mutex);
}
EXPORT_SYMBOL_GPL(wq_worker_comm);
#ifdef CONFIG_SMP