Tao Huang 1efae67039 Merge tag 'android14-6.1-2023-11_r1' of https://android.googlesource.com/kernel/common ...

* commit 'android14-6.1-2023-11_r1': (3456 commits)
  ANDROID: fs/passthrough: Fix compatibility with R/O file system
  FROMLIST: usb: typec: tcpm: Fix sink caps op current check
  UPSTREAM: scsi: ufs: core: Add advanced RPMB support where UFSHCI 4.0 does not support EHS length in UTRD
  ANDROID: ABI: Update symbol list for MediatTek
  ANDROID: vendor_hooks: Add hook for mmc queue
  Revert "proc: allow pid_revalidate() during LOOKUP_RCU"
  UPSTREAM: scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW major version > 5
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: vendor_hook: Add hook to tune readaround size
  ANDROID: add for tuning readahead size
  ANDROID: vendor_hooks: Add hooks to avoid key threads stalled in memory allocations
  ANDROID: GKI: Update oplus symbol list
  ANDROID: vendor_hooks: add hooks for adjust kvmalloc_node alloc_flags
  UPSTREAM: netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
  ANDROID: ABI: Update symbol list for imx
  ANDROID: abi_gki_aarch64_qcom: Add __netif_rx
  ANDROID: ABI: Update sony symbol list and stg
  ANDROID: mmc: Add vendor hooks for sdcard failure diagnostics
  ANDROID: Update symbol list for mtk
  UPSTREAM: scsi: ufs: mcq: Fix the search/wrap around logic
  ...

Change-Id: I068babc9a4a733e7cff2e6be0620be36fbbee5a8

Conflicts:
	arch/arm64/boot/dts/rockchip/rk3568.dtsi
	arch/arm64/boot/dts/rockchip/rk356x.dtsi
	drivers/dma/pl330.c
	drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/mmc/core/card.h
	drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
	drivers/nvme/host/nvme.h
	drivers/pci/controller/pcie-rockchip.c
	drivers/power/supply/rk817_charger.c
	drivers/tty/serial/8250/8250_port.c
	drivers/usb/gadget/function/f_uvc.c
	drivers/usb/host/xhci.h
	drivers/usb/typec/tcpm/tcpm.c

2023-12-01 19:43:55 +08:00

169 KiB

Raw Blame History

View Raw