Commit cb7d32c2 authored by Will McVicker's avatar Will McVicker
Browse files

Merge aosp/android14-6.1 to aosp/android14-6.1-lts



* aosp/android14-6.1:
  BACKPORT: genirq/cpuhotplug, x86/vector: Prevent vector leak during CPU offline
  UPSTREAM: genirq/cpuhotplug: Retry with cpu_online_mask when migration fails
  UPSTREAM: genirq/cpuhotplug: Skip suspended interrupts when restoring affinity
  UPSTREAM: scsi: ufs: core: Perform read back after writing UTP_TASK_REQ_LIST_BASE_H
  UPSTREAM: mm/userfaultfd: UFFDIO_MOVE implementation should use ptep_get()
  UPSTREAM: f2fs: fix NULL pointer dereference in f2fs_submit_page_write()
  UPSTREAM: f2fs: zone: fix to wait completion of last bio in zone correctly
  UPSTREAM: iommu: Don't reserve 0-length IOVA region
  UPSTREAM: iommu: Fix printk arg in of_iommu_get_resv_regions()
  UPSTREAM: iommu: Map reserved memory as cacheable if device is coherent
  BACKPORT: io_uring/fdinfo: remove need for sqpoll lock for thread/pid retrieval
  UPSTREAM: wifi: cfg80211: fix assoc response warning on failed links
  UPSTREAM: usb: typec: tcpm: Add additional checks for contaminant
  UPSTREAM: mm: remove duplicated vma->vm_flags check when expanding stack
  ANDROID: Update the ABI symbol list
  ANDROID: add vendor hook for mapping_shrinkable
  FROMLIST: sd: Retry START STOP UNIT commands
  FROMLIST: scsi: core: Retry passthrough commands if SCMD_RETRY_PASSTHROUGH is set
  ANDROID: GKI: Update symbol list for mtk
  ANDROID: Update the ABI symbol list
  ANDROID: GKI: add symbol list for telechips
  UPSTREAM: ufs: core: bypass quick recovery if need force reset
  ANDROID: Update the ABI symbol list
  UPSTREAM: ring-buffer: Fix a race between readers and resize checks
  UPSTREAM: lib/build_OID_registry: avoid non-destructive substitution for Perl < 5.13.2 compat
  UPSTREAM: lib/build_OID_registry: don't mention the full path of the script in output
  ANDROID: GKI: Add symbol list for exynosauto
  UPSTREAM: erofs: fix race in z_erofs_get_gbuf()
  ANDROID: fuse: Skip canonical path logic if ENOSYS
  ANDROID: fsnotify: Do not notify lower fs of open when ENOSYS
  ANDROID: mm: madvise: Avoid counting swap entry references for migration entries
  UPSTREAM: scsi: ufs: core: Changing the status to check inflight
  ANDROID: Update the ABI symbol list
  ANDROID: power: add vendor hook to handle hibernate failures
  ANDROID: GKI: remove export of tracing control functions
  ANDROID: fix kernelci build-break for !CONFIG_ANDROID_VENDOR_OEM_DATA
  ANDROID: GKI: update symbol list file for xiaomi
  ANDROID: vendor_hooks: vendor hooks for optimizing the blocking problem caused by rwsem lock contention of reverse mapping during memory recycling.
  UPSTREAM: of: reserved_mem: Use proper binary prefix
  BACKPORT: gpio: of: support gpio-ranges for multiple gpiochip devices
  UPSTREAM: dt-bindings: gpio: brcmstb: add gpio-ranges
  ANDROID: Incremental fs: Retry page faults on non-fatal errors
  ANDROID: GKI: Update symbol list for BCMSTB
  ANDROID: GKI: Update rockchip symbols for dw_hdmi_qp.
  UPSTREAM: net: usb: ax88179_178a: improve reset check
  UPSTREAM: net: usb: ax88179_178a: fix link status when link is set to down/up
  UPSTREAM: usb: gadget: configfs: Prevent OOB read/write in usb_string_copy()
  UPSTREAM: usb: typec: tcpm: fix use-after-free case in tcpm_register_source_caps
  UPSTREAM: usb: typec: tcpm: unregister existing source caps before re-registration
  ANDROID: GKI: Update symbol list for mtk

Change-Id: I1b7876def61c1f0a09ec7599aeb64fd2de911619
Signed-off-by: default avatarWill McVicker <willmcvicker@google.com>
parents 6f4a686a edca080b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment