* commit '5ff74e8e': (494 commits)
  Slider: Add cfg80211 & mac80211 as vendor modules.
  soc: google: hardlockup-debug: Print Mem-Info when WDT
  kleaf: update dt-bindings to be generic
  kleaf: update the readme commands
  Revert "usb: typec: tcpci_max77759: stub for tcpm_is_debouncing()"
  Revert "slider_gki: enable CONFIG_VH_SCHED"
  Revert "Revert "scsi: ufs: ufs-exynos: update hba suspend vops""
  Revert "drivers: thermal: update milliwatts references"
  Revert "scsi: ufs: ufs-exynos: update hba suspend vops"
  Revert "scsi: ufs: update to new wrapped key api"
  Revert "usb: dwc3: remove duplicated definitions"
  Revert "cpufreq: acme: flag updates to cpufreq_policy"
  Revert "iommu/samsung: drop IOVA cookie management"
  Revert "cpufreq: acme: fix thermal API for 5.17-rc2"
  Revert "Revert "tty: serial: exynos_tty: remove duplicated definitions""
  Revert "soc/google/cpif: replace PDE_DATA as pde_data"
  Revert "ANDROID: Fixup spi_driver remove functions"
  Revert "media: mfc/smfc: Fix depends on VIDEO_V4L2"
  Revert "dma-buf-map: Rename to iosys-map"
  Revert "usb: dwc3: remove duplicate DWC3_GFLADJ_REFCLK_FLADJ_MASK"
  Revert "google/debug: update path to debug_kinfo.h"
  Revert "serial: exynos: update exynos_serial_console_putchar"
  Revert "iommu/samsung:remove aux-domain interfaces usage"
  Revert "dts/google: tpu: disable ssmt"
  Revert "Revert "dma-buf: Fix build for shrinker controlled page pool""
  Revert "Revert "Revert "ANDROID: dma-buf: heaps: Add a shrinker controlled page pool"""
  Revert "Revert "dma-buf: Fix build for deferred-free-helper.h""
  Revert "Revert "Revert "ANDROID: dma-buf: heaps: Add deferred-free-helper library code"""
  Revert "ANDROID: dma-buf: heaps: fix dma-buf heap pool pages stat"
  kleaf: Add kleaf tests for kernel_images
  kleaf: Move SLIDER_DTBOS to a global variable.
  kleaf: Move SLIDER_DTBOS to a global variable.
  kleaf: build abi for slider
  vendor_hook: sched: Add control for reduce_prefer_idle
  usb: dwc3: cancel gadget retry during device reboot
  arm64/dts: devfreq: add boot_info
  google/debug: ehld: handle hrtimers correctly in CPUHP and CPUPM
  Revert "google/debug: ehld: stop and restart hrtimer at CPU PM"
  google/debug: ehld: fix exynos_ehld_stop_cpu()
  devfreq: add sysfs node "cancel_boot_freq"
  aoc/alsa: dts: change the name for immersive playback
  aoc/alsa: dt-bindings: change the name for immersive playback
  arm64/dts: Add board_id and board_rev to aoc
  pcie: exynos: Skip PHY isloation on hot reset test
  Revert "vendor_hook: sched: Implement vendor group util"
  Revert "vendor_hook: sched: Check if cfs_rq->curr is a task"
  gvotable: export run_election API with force_callback parameter
  usb: have gvotable callback return an error code
  gvotable: have callback return an error code
  arm64/dts: enable battery pairing feature
  vendor_hook: sched: Add trace for compute_energy
  vh: sched: rt: prefer to overutilized CPU from unfit CPU
  soc/google/cpif: Keep DIT downstream netdev until removeDownstream
  vendor_hook: sched: revert back to use most_spare_cap_cpu
  media: mfc: move the mfc_alloc_codec_buffers()
  usb: dwc3: move the operation for burst mode setting
  arm64/dts: set bhi algo_ver and threshold
  vendor_hook: sched: Change the uclamp max of low prio tasks
  usb: phy: limit the string length in phy attribute
  google/debug: eat: use polling api for channel operations
  google/debug: eat: fix mbox ipc race condition
  media: mfc: fix KASAN use-after-free case
  misc: logbuffer: Fix a deadlock
  arm64/dts: gs101: Update default target_load for ALT DVFS
  ANDROID: trusty: add a toggle for running trusty work in higher priority
  Revert "trusty: add a toggle for using high prio WQ"
  pogo_transport: Configure USB_MUX_POGO_SEL
  Revert "vendor_hook: sched: Refine vendor group uclamp update"
  vendor_hook: sched: Refine RT util check
  usb: dwc3: disable INCR undefined length burst mode
  kleaf: build abi for slider
  tcpci_max77759: Reset the OVP if Vbus times out
  build.config.gs101: enable kunit kernel arg
  kleaf: Add log=info to slider.
  kleaf: Add log=info to slider.
  kleaf: Explicitly set build_initramfs.
  kleaf: Explicitly set build_initramfs.
  Add dw3000-core-tests.ko to the blocklist
  kleaf: re-enable the vendor_dlkm blocklist
  kleaf: add missing pixel_em.ko
  kleaf: Add slider_unstripped_modules_archive.
  kleaf: Move definitions to slider.bzl.
  kleaf: Add slider_unstripped_modules_archive.
  kleaf: Move definitions to slider.bzl.
  iommu/samsung: add missing unmap_pages op
  kleaf: update build command in README.md
  kleaf: Fix KCONFIG_EXT_MODULES_PREFIX for kleaf --config=local builds.
  Rename merge-from-mainline.sh
  build.config.gs101: drop the boot ramdisk
  PRE_DEFCONFIG_CMDS does not write to source tree.
  PRE_DEFCONFIG_CMDS does not write to source tree.
  merge-from-mainline: update the script to
  soc: google: bcm_dbg: check copy_to_user return value
  drivers: thermal: update milliwatts references
  google/debug: ehld: stop and restart hrtimer at CPU PM
  usb: dwc3: wait for pm suspend for USB host
  usb: dwc3: remove conditional operator
  usb: dwc3: release the lock if device is suspended
  usb: dwc3: wait for pm suspend when cable is plug-in
  vendor_hook: sched: Support RT task util
  ...

Change-Id: I6f1ffd50ee4379247eef9319d1ff27dfe6599260
Signed-off-by: Will McVicker <[email protected]>