PDS Kernel Configuration

Linux 6.2.y: Move cherry picks from ee6cc74e03 to cfs and cfs-additions patches
Fixes https://github.com/Frogging-Family/linux-tkg/issues/712
2023-03-05 09:49:37 -05:00 · 2023-03-05 02:04:05 +01:00 · 2023-03-03 13:20:55 +01:00 · 2023-03-03 13:17:10 +01:00 · 2023-02-23 13:13:29 +01:00 · 2023-02-23 13:01:29 +01:00
37 changed files with 12176 additions and 1434 deletions
--- a/.github/workflows/build-current-kernel-arch.yml
+++ b/.github/workflows/build-current-kernel-arch.yml
@@ -10,6 +10,8 @@ env:
  _processor_opt: "generic"
  PKGDEST: "/tmp/linux-tkg"
  _debugdisable: "true"
  _kernel_work_folder: "/tmp"
  _kernel_source_folder: "/tmp"
  # _modprobeddb: "true"
  # _modprobeddb_db_path: ${{ github.workspace }}/modprobed.db
--- a/25
+++ b/25
@@ -48,8 +48,6 @@ fi
 source "$_where"/BIG_UGLY_FROGMINER
 _srcpath="linux-src-git"
 if [ -n "$_custom_pkgbase" ]; then
  pkgbase="${_custom_pkgbase}"
 else
@@ -81,10 +79,12 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP
 prepare() {
  rm -rf $pkgdir # Nuke the entire pkg folder so it'll get regenerated clean on next build
-  ln -s "${_where}/customization.cfg" "${srcdir}" # workaround
+  _define_kernel_abs_paths
-  ln -s "${_where}/linux-src-git" "${srcdir}" # workaround, this doesn't respect tmpfs choice
+  if [ -e "${srcdir}/customization.cfg" ]; then
-
+    msg2 "Nuking remnant customization.cfg symlink" && rm -rf "${srcdir}/customization.cfg"
-  cd "${srcdir}/${_srcpath}"
+  fi
  ln -s "${_where}/customization.cfg" "${srcdir}"
  ln -s "${_kernel_work_folder_abs}" "${srcdir}"
  source "${_where}/current_env"
@@ -92,7 +92,7 @@ prepare() {
 }
 build() {
-  cd "${srcdir}/${_srcpath}"
+  cd "$_kernel_work_folder_abs"
  # Use custom compiler paths if defined
  if [ "$_compiler_name" = "-llvm" ] && [ -n "${CUSTOM_LLVM_PATH}" ]; then
@@ -143,7 +143,8 @@ hackbase() {
  fi
  replaces=(virtualbox-guest-modules-arch wireguard-arch)
-  cd "${srcdir}/${_srcpath}"
+  _define_kernel_abs_paths
  cd "$_kernel_work_folder_abs"
  # get kernel version
  local _kernver="$(<version)"
@@ -173,9 +174,9 @@ hackbase() {
  install -Dm644 "${srcdir}"/customization-full.cfg "${pkgdir}/usr/share/doc/${pkgbase}/customization.cfg"
  # workaround for missing header with winesync
-  if [ -e "${srcdir}/${_srcpath}/include/uapi/linux/winesync.h" ]; then
+  if [ -e "${_kernel_work_folder_abs}/include/uapi/linux/winesync.h" ]; then
    msg2 "Workaround missing winesync header"
-    install -Dm644 "${srcdir}/${_srcpath}"/include/uapi/linux/winesync.h "${pkgdir}/usr/include/linux/winesync.h"
+    install -Dm644 "${_kernel_work_folder_abs}"/include/uapi/linux/winesync.h "${pkgdir}/usr/include/linux/winesync.h"
  fi
  # load winesync module at boot
@@ -202,7 +203,9 @@ hackheaders() {
    ;;
  esac
-  cd "${srcdir}/${_srcpath}"
+  _define_kernel_abs_paths
  cd "$_kernel_work_folder_abs"
  local builddir="${pkgdir}/usr/lib/modules/$(<version)/build"
  msg2 "Installing build files..."
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ This repository provides scripts to automatically download, patch and compile th
 - **Non-pacman distros support can be considered experimental. You're invited to report issues you might encounter with it.**
 - **If your distro isn't using systemd, please set _configfile="running-kernel" in customization.cfg or you might end up with a non-bootable kernel**
 - Keep in mind building recent linux kernels with GCC will require ~20-25GB of disk space. Using llvm/clang, LTO, ccache and/or enabling more drivers in the defconfig will push that requirement higher, so make sure you have enough free space on the volume you're using to build.
 - In `intel_pstate` driver, frequency scaling aggressiveness has been changed with kernel 5.5 which results in stutters and poor performance in low/medium load scenarios (for higher power savings). As a workaround for our gaming needs, we are setting it to passive mode to make use of the `acpi_cpufreq` governor passthrough, keeping full support for turbo frequencies. It's combined with our aggressive ondemand governor by default for good performance on most CPUs while keeping frequency scaling for power savings. In a typical low/medium load scenario (Core i7 9700k, playing Mario Galaxy on Dolphin emulator) intel_pstate in performance mode gives a stuttery 45-50 fps experience, while passive mode + aggressive ondemand offers a locked 60 fps.
 - Nvidia's proprietary drivers might need to be patched if they don't support your chosen kernel OOTB: [Frogging-Family nvidia-all](https://github.com/Frogging-Family/nvidia-all) can do that automatically for you.
 - Note regarding kernels older than 5.9 on Arch Linux: since the switch to `zstd` compressed `initramfs` by default, you will face an `invalid magic at start of compress` error by default. You can workaround the issue by editing `/etc/mkinitcpio.conf` to uncomment the `COMPRESSION="lz4"` (for example, since that's the best option after zstd) line and regenerating `initramfs` for all kernels with `sudo mkinitpcio -P`
@@ -19,8 +20,10 @@ This repository provides scripts to automatically download, patch and compile th
 Alternative schedulers are available to you in linux-tkg:
 - Project C / PDS & BMQ by Alfred Chen: [blog](http://cchalpha.blogspot.com/ ), [code repository](https://gitlab.com/alfredchen/projectc)
 - MuQSS by Con Kolivas : [blog](http://ck-hack.blogspot.com/), [code repository](https://github.com/ckolivas/linux)
- CacULE by Hamad Marri: [code repository](https://github.com/hamadmarri/cacule-cpu-scheduler)
+- CacULE by Hamad Marri - CFS based : [code repository](https://github.com/hamadmarri/cacule-cpu-scheduler)
- Undead PDS: TkG's port of the pre-Project C "PDS-mq" scheduler by Alfred Chen. While PDS-mq got dropped with kernel 5.1 in favor of its BMQ evolution/rework, it wasn't on par with PDS-mq in gaming. "U" PDS still performs better in some cases than other schedulers, so it's been kept undead.
+- Task Type (TT) by Hamad Marri - CFS based : [code repository](https://github.com/hamadmarri/TT-CPU-Scheduler)
 - BORE (Burst-Oriented Response Enhancer) by Masahito Suzuki - CFS based : [code repository](https://github.com/firelzrd/bore-scheduler)
 - Undead PDS : TkG's port of the pre-Project C "PDS-mq" scheduler by Alfred Chen. While PDS-mq got dropped with kernel 5.1 in favor of its BMQ evolution/rework, it wasn't on par with PDS-mq in gaming. "U" PDS still performed better in some cases than other schedulers, so it's been kept undead for a while.
 These alternative schedulers can offer a better performance/latency ratio for gaming and desktop use. The availability of each scheduler depends on the chosen Kernel version: the script will display what's available on a per-version basis.
 #### Default tweaks
@@ -119,17 +122,6 @@ cd path/to/linux-tkg
 ```
 The script will use a slightly modified Arch config from the `linux-tkg-config` folder, it can be changed through the `_configfile` variable in `customization.cfg`.
 #### Void Linux
 ```shell
 git clone -b tkg https://github.com/Hyper-KVM/void-packages/
 cd void-packages
 ./xbps-src binary-bootstrap
 # Optional: edit customization.cfg located in srcpkgs/linux-tkg/files
 # Optional: add custom userpatches with the ".mypatch" extension to srcpkgs/linux-tkg/files/mypatches
 ./xbps-src pkg -j$(nproc) linux-tkg
 ```
 If you have to restart the build for any reason, run `./xbps-src clean linux-tkg` first.
 #### Generic install
 The interactive `install.sh` script can be used to perform a "Generic" install by choosing `Generic` when prompted. It git clones the kernel tree in the `linux-src-git` folder, patches the code and edits a `.config` file in it. The commands to do are the following:
 ```shell
--- a/customization.cfg
+++ b/customization.cfg
@@ -1,6 +1,6 @@
 # linux-TkG config file
-# Linux distribution you are using, options are "Arch", "Void", "Ubuntu", "Debian", "Fedora", "Suse", "Gentoo", "Generic".
+# Linux distribution you are using, options are "Arch", "Ubuntu", "Debian", "Fedora", "Suse", "Gentoo", "Generic".
 # It is automatically set to "Arch" when using PKGBUILD.
 # If left empty, the script will prompt
 _distro="Arch"
@@ -23,6 +23,20 @@ _NUKR="true"
 # Git mirror to use to get the kernel sources, possible values are "kernel.org", "googlesource.com", "github.com" and "torvalds"
 _git_mirror="kernel.org"
 # Root folder where to checkout the kernel sources (linux-src-git subdir) and build
 # Note: - Leave empty to use PKGBUILD's dir
 #       - Start with a '/' for an absolute path in which `linux-tkg/linux-src-git/` will be created
 #       - This setting can be used to set the work/build folder to a tmpfs folder
 #         - Requires >= 32GB ram when building a full kernel, should work with less ram with modprobed-db
 _kernel_work_folder=""
 # Permanent root folder where to keep the git clone (linux-kernel.git subdir) and fetch new blobs
 # Note: - Leave empty to use PKGBUILD's dir
 #       - Start with a '/' for an absolute path in which `linux-tkg/linux-kernel.git/` will be created
 #       - If your internet is faster than your storage, it may be wise to put this folder
 #         in a tmpfs location (although it will reclone after each restart / tmpfs folder cleanup)
 _kernel_source_folder=""
 # Custom compiler root dirs - Leave empty to use system compilers
 # Example: CUSTOM_GCC_PATH="/home/frog/PKGBUILDS/mostlyportable-gcc/gcc-mostlyportable-9.2.0"
 CUSTOM_GCC_PATH=""
@@ -54,17 +68,6 @@ _diffconfig="false"
 # Set to the file name where the generated config fragment should be written to. Only used if _diffconfig is active.
 _diffconfig_name=""
 # [install.sh specific] Use tmpfs as a work directory, recommended when RAM >= 32GB to reduce HDD/SSD usage. For more information, see https://wiki.archlinux.org/title/Tmpfs
 _use_tmpfs="false"
 # Always make a fresh clone of the source in tmpfs to speed up compilation times
 # ! This will take ~20GB of RAM by itself, so don't use on <32GB RAM systems !
 _source_in_tmpfs="false"
 # [install.sh specific] tmpfs folder path, only used when _use_tmpfs="true".
 #                       Creates a linux-tkg work folder within that pathmake sure to have nothing important in "$_tmpfs_path/linux-tkg"
 _tmpfs_path="/tmp"
 # [install.sh: Generic and Gentoo specific] Dracut options when generating initramfs
 _dracut_options="--lz4"
@@ -93,7 +96,7 @@ _STRIP="true"
 # LEAVE AN EMPTY VALUE TO BE PROMPTED ABOUT FOLLOWING OPTIONS AT BUILD TIME
-# CPU scheduler - Options are "upds" (TkG's Undead PDS), "pds", "bmq", "muqss", "cacule" or "cfs" (kernel's default)
+# CPU scheduler - Options are "upds" (TkG's Undead PDS), "pds", "bmq", "muqss", "cacule", "tt", "bore" or "cfs" (kernel's default)
 _cpusched="pds"
 # Compiler to use - Options are "gcc" or "llvm".
@@ -160,24 +163,6 @@ _acs_override="false"
 # This can be buggy and isn't recommended on a production machine, also enabling this option will not allow you to enable MGLRU.
 _bcachefs="false"
 # Set to "true" to add multi-generational LRU framework support on kernel 5.18+ - Improves memory pressure handling - https://lore.kernel.org/lkml/20220706220022.968789-1-yuzhao@google.com/
 # Older kernel versions might have a patch available in the community-patches repo
 # ! This option will be disabled when bcachefs is enabled for now !
 _mglru="true"
 # Set to "true" to enable support for fsync, an experimental replacement for esync found in Valve Proton 4.11+ - https://steamcommunity.com/games/221410/announcements/detail/2957094910196249305
 # Can be enabled alongside _futex_waitv on 5.13+ to use it as a fallback for older Proton builds
 _fsync="true"
 # Set to "true" to enable support for futex2, an experimental interface that can be used by proton-tkg and proton 5.13 experimental through Fsync - Can be enabled alongside fsync to use it as a fallback
 # https://gitlab.collabora.com/tonyk/linux/-/tree/futex2-dev
 _futex2="true"
 # Set to "true" to enable backported patches to add support for the futex_waitv() syscall, a new interface for fsync. It will appear in mainline at Linux 5.16 release and requires a wine/proton with builtin support for it. It's expected to be available in Valve Proton 6.3 stable soon - https://github.com/ValveSoftware/wine/pull/128
 # !! Disables futex2 interfaces support !!
 # https://github.com/andrealmeid/futex_waitv_patches
 _futex_waitv="false"
 # Set to "true" to enable support for winesync, an experimental replacement for esync - requires patched wine - https://repo.or.cz/linux/zf.git/shortlog/refs/heads/winesync4
 # ! Can't be used on multiple kernels installed side-by-side, which will require https://aur.archlinux.org/packages/winesync-dkms/ instead of this option !
 _winesync="false"
@@ -205,9 +190,6 @@ _compileroptlevel="2"
 # - "generic_v4" (depends on GCC11 - to share the package between machines with different CPU µarch supporting at least x86-64-v4
 _processor_opt="skylake"
 # MuQSS only - Make IRQ threading compulsory (FORCE_IRQ_THREADING) - Default is "false"
 _irq_threading="false"
 # CacULE only - Enable Response Driven Balancer, an experimental load balancer for CacULE
 _cacule_rdb="false"
@@ -224,10 +206,6 @@ _smt_nice="true"
 # Trust the CPU manufacturer to initialize Linux's CRNG (RANDOM_TRUST_CPU) - Kernel default is "false"
 _random_trust_cpu="true"
 # MuQSS only - CPU scheduler runqueue sharing - No sharing (RQ_NONE), SMT (hyperthread) siblings (RQ_SMT), Multicore siblings (RQ_MC), Symmetric Multi-Processing (RQ_SMP), NUMA (RQ_ALL)
 # Valid values are "none", "smt", "mc", "mc-llc"(for zen), "smp", "all" - Kernel default is "smt"
 _runqueue_sharing=""
 # Timer frequency - "100" "250" "300" "500" "750" "1000" ("2000" is available for cacule cpusched only) - More options available in kernel config prompt when left empty depending on selected cpusched with the default option pointed with a ">" (2000 for cacule, 100 for muqss and 1000 for other cpu schedulers)
 _timer_freq="500"
@@ -261,14 +239,41 @@ _custom_pkgbase=""
 # If left empty, it will use "-tkg-${_cpusched}${_compiler}" where "${_cpusched}" will be replaced by the user chosen scheduler, ${_compiler} will be replaced by "-llvm" if clang is used (nothing for GCC).
 _kernel_localversion=""
 # Set to "true" to add back missing symbol for AES-NI/AVX support on ZFS - This is a legacy option that can be ignored on 5.10+ kernels - https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch
 _zfsfix="true"
 # Set to your maximum number of CPUs (physical + logical cores) - Lower means less overhead - You can set it to "$(nproc)" to use the current host's CPU(s) core count, or leave empty to use default
 # If you set this to a lower value than you have cores, some cores will be disabled
 # Default Arch kernel value is 320
 _NR_CPUS_value=""
 #### LEGACY OPTIONS ####
 # Set to "true" to enable support for fsync, an experimental replacement for esync found in Valve Proton 4.11+ - https://steamcommunity.com/games/221410/announcements/detail/2957094910196249305
 # Can be enabled alongside _futex_waitv on 5.13+ to use it as a fallback for older Proton builds
 _fsync="true"
 # Set to "true" to enable backported patches to add support for the futex_waitv() syscall, a new interface for fsync. Upstream as of 5.16 and requires a wine/proton with builtin support for it - https://github.com/ValveSoftware/wine/pull/128
 # !! Disables futex2 interfaces support !!
 # https://github.com/andrealmeid/futex_waitv_patches
 _futex_waitv="true"
 # Set to "true" to enable support for futex2, an experimental interface that can be used by proton-tkg and proton 5.13 experimental through Fsync - Can be enabled alongside fsync to use it as a fallback
 # https://gitlab.collabora.com/tonyk/linux/-/tree/futex2-dev
 _futex2="true"
 # Set to "true" to add back missing symbol for AES-NI/AVX support on ZFS - This is a legacy option that can be ignored on 5.10+ kernels - https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch
 _zfsfix="true"
 # MuQSS only - CPU scheduler runqueue sharing - No sharing (RQ_NONE), SMT (hyperthread) siblings (RQ_SMT), Multicore siblings (RQ_MC), Symmetric Multi-Processing (RQ_SMP), NUMA (RQ_ALL)
 # Valid values are "none", "smt", "mc", "mc-llc"(for zen), "smp", "all" - Kernel default is "smt"
 _runqueue_sharing=""
 # MuQSS only - Make IRQ threading compulsory (FORCE_IRQ_THREADING) - Default is "false"
 _irq_threading="false"
 # Set to "true" to add multi-generational LRU framework support on kernel 5.18+ - Improves memory pressure handling - https://lore.kernel.org/lkml/20220706220022.968789-1-yuzhao@google.com/
 # Older kernel versions might have a patch available in the community-patches repo
 # Upstream as of 6.1
 # ! This option will be disabled when bcachefs is enabled !
 _mglru="true"
 #### USER PATCHES ####
--- a/install.sh
+++ b/install.sh
@@ -83,7 +83,7 @@ _install_dependencies() {
 if [ "$1" != "install" ] && [ "$1" != "config" ] && [ "$1" != "uninstall-help" ]; then
  msg2 "Argument not recognised, options are:
-        - config : interactive script that shallow clones the linux 5.x.y git tree into the folder linux-src-git, then applies extra patches and prepares the .config file
+        - config : interactive script that shallow clones the linux 5.x.y git tree into the folder \$_kernel_work_folder, then applies extra patches and prepares the .config file
                   by copying the one from the currently running linux system and updates it.
        - install : does the config step, proceeds to compile, then prompts to install
                    - 'DEB' distros: it creates .deb packages that will be installed then stored in the DEBS folder.
@@ -136,24 +136,9 @@ if [ "$1" = "install" ] || [ "$1" = "config" ]; then
    _distro=""
  fi
  # cd into the linux-src folder is important before calling _tkg_srcprep
  cd "$_where/linux-src-git"
  _tkg_srcprep
-  _build_dir="$_where"
+  _build_dir="$_kernel_work_folder_abs/.."
  if [ "$_use_tmpfs" = "true" ]; then
    if [ -d "$_tmpfs_path/linux-tkg" ]; then
      msg2 "Nuking linux-tkg tmpfs folder $_tmpfs_path/linux-tkg"
      rm -rf "$_tmpfs_path/linux-tkg"
    fi
    mkdir "$_tmpfs_path/linux-tkg"
    cp -r "$_where/linux-src-git" "$_tmpfs_path/linux-tkg/linux-src-git"
    # cd into the linux-src folder is important before calling _tkg_srcprep
    _build_dir="$_tmpfs_path/linux-tkg"
    cd "$_tmpfs_path/linux-tkg/linux-src-git"
  fi
  # Uppercase characters are not allowed in source package name for debian based distros
  if [[ "$_distro" =~ ^(Debian|Ubuntu)$ && "$_cpusched" = "MuQSS" ]]; then
@@ -221,6 +206,8 @@ if [ "$1" = "install" ]; then
    #_runtime=$( time ( schedtool -B -n 1 -e ionice -n 1 "$@" 2>&1 ) 3>&1 1>&2 2>&3 ) || _runtime=$( time ( "$@" 2>&1 ) 3>&1 1>&2 2>&3 ) - Bash 5.2 is broken https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1018727
  #}
  cd "$_kernel_work_folder_abs"
  if [[ "$_distro" =~ ^(Ubuntu|Debian)$ ]]; then
    msg2 "Building kernel DEB packages"
@@ -262,10 +249,7 @@ if [ "$1" = "install" ]; then
      _extra_ver_str="_${_kernel_flavor}"
    fi
-    _fedora_work_dir="${HOME}/.cache/linux-tkg-rpmbuild"
+    _fedora_work_dir="$_kernel_work_folder_abs/linux-tkg-rpmbuild"
    if [ "$_use_tmpfs" = "true" ]; then
      _fedora_work_dir="$_tmpfs_path/linux-tkg/linux-tkg-rpmbuild"
    fi
    msg2 "Building kernel RPM packages"
    RPMOPTS="--define '_topdir ${_fedora_work_dir}'" make ${llvm_opt} -j ${_thread_num} rpm-pkg EXTRAVERSION="${_extra_ver_str}"
@@ -432,7 +416,7 @@ if [ "$1" = "uninstall-help" ]; then
    msg2 "Note: linux-libc-dev packages are no longer created and installed, you can safely remove any remnants."
  elif [ "$_distro" = "Fedora" ]; then
    msg2 "List of installed custom tkg kernels: "
-    dnf list --installed kernel*
+    dnf list --installed | grep -i "tkg"
    msg2 "To uninstall a version, you should remove the kernel, kernel-headers and kernel-devel associated to it (if installed), with: "
    msg2 "      sudo dnf remove --noautoremove kernel-VERSION kernel-devel-VERSION kernel-headers-VERSION"
    msg2 "       where VERSION is displayed in the second column"
--- a/linux-tkg-config/6.2/config.x86_64
+++ b/linux-tkg-config/6.2/config.x86_64
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.2.0-rc1 Kernel Configuration
+# Linux/x86 6.2.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120200
+CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23900
+CONFIG_AS_VERSION=24000
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23900
+CONFIG_LD_VERSION=24000
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -182,10 +182,9 @@ CONFIG_RCU_NOCB_CPU=y
 # CONFIG_RCU_NOCB_CPU_DEFAULT_ALL is not set
 # CONFIG_RCU_NOCB_CPU_CB_BOOST is not set
 # CONFIG_TASKS_TRACE_RCU_READ_MB is not set
-# CONFIG_RCU_LAZY is not set
+CONFIG_RCU_LAZY=y
 # end of RCU Subsystem
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_IKHEADERS=m
@@ -206,6 +205,7 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
 CONFIG_GCC11_NO_ARRAY_BOUNDS=y
 CONFIG_GCC12_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_ARCH_SUPPORTS_INT128=y
@@ -241,6 +241,7 @@ CONFIG_UTS_NS=y
 CONFIG_TIME_NS=y
 CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
 CONFIG_USER_NS_UNPRIVILEGED=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
@@ -486,7 +487,7 @@ CONFIG_X86_INTEL_TSX_MODE_AUTO=y
 CONFIG_X86_SGX=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
-CONFIG_EFI_HANDOVER_PROTOCOL=y
+# CONFIG_EFI_HANDOVER_PROTOCOL is not set
 CONFIG_EFI_MIXED=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_RUNTIME_MAP=y
@@ -636,7 +637,7 @@ CONFIG_ACPI_ADXL=y
 CONFIG_ACPI_CONFIGFS=m
 CONFIG_ACPI_PFRUT=m
 CONFIG_ACPI_PCC=y
-# CONFIG_ACPI_FFH is not set
+CONFIG_ACPI_FFH=y
 CONFIG_PMIC_OPREGION=y
 CONFIG_BYTCRC_PMIC_OPREGION=y
 CONFIG_CHTCRC_PMIC_OPREGION=y
@@ -934,7 +935,7 @@ CONFIG_MODULE_SIG_HASH="sha512"
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS_XZ is not set
 CONFIG_MODULE_COMPRESS_ZSTD=y
-# CONFIG_MODULE_DECOMPRESS is not set
+CONFIG_MODULE_DECOMPRESS=y
 CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES_TREE_LOOKUP=y
@@ -1987,7 +1988,7 @@ CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_HCIUART_MRVL=y
 CONFIG_BT_HCIBCM203X=m
-# CONFIG_BT_HCIBCM4377 is not set
+CONFIG_BT_HCIBCM4377=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIDTL1=m
@@ -2325,7 +2326,7 @@ CONFIG_SYSFB=y
 CONFIG_FW_CS_DSP=m
 CONFIG_GOOGLE_FIRMWARE=y
 # CONFIG_GOOGLE_SMI is not set
-# CONFIG_GOOGLE_CBMEM is not set
+CONFIG_GOOGLE_CBMEM=m
 CONFIG_GOOGLE_COREBOOT_TABLE=m
 CONFIG_GOOGLE_MEMCONSOLE=m
 # CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
@@ -2537,7 +2538,7 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y
 CONFIG_ZRAM_DEF_COMP="lzo-rle"
 CONFIG_ZRAM_WRITEBACK=y
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
-# CONFIG_ZRAM_MULTI_COMP is not set
+CONFIG_ZRAM_MULTI_COMP=y
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
 CONFIG_BLK_DEV_DRBD=m
@@ -2546,6 +2547,9 @@ CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_BLKDEV_BACKEND=m
@@ -2594,6 +2598,8 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_SMPRO_ERRMON=m
 CONFIG_SMPRO_MISC=m
 CONFIG_HP_ILO=m
 CONFIG_APDS9802ALS=m
 CONFIG_ISL29003=m
@@ -3318,7 +3324,7 @@ CONFIG_ENC28J60=m
 # CONFIG_ENC28J60_WRITEVERIFY is not set
 CONFIG_ENCX24J600=m
 CONFIG_LAN743X=m
-# CONFIG_VCAP is not set
+CONFIG_VCAP=y
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 CONFIG_NET_VENDOR_MICROSOFT=y
@@ -3892,7 +3898,7 @@ CONFIG_MT7921_COMMON=m
 CONFIG_MT7921E=m
 CONFIG_MT7921S=m
 CONFIG_MT7921U=m
-# CONFIG_MT7996E is not set
+CONFIG_MT7996E=m
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 CONFIG_WILC1000=m
 CONFIG_WILC1000_SDIO=m
@@ -3956,27 +3962,29 @@ CONFIG_RTL8XXXU_UNTESTED=y
 CONFIG_RTW88=m
 CONFIG_RTW88_CORE=m
 CONFIG_RTW88_PCI=m
 CONFIG_RTW88_USB=m
 CONFIG_RTW88_8822B=m
 CONFIG_RTW88_8822C=m
 CONFIG_RTW88_8723D=m
 CONFIG_RTW88_8821C=m
 CONFIG_RTW88_8822BE=m
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
-# CONFIG_RTW88_8822CU is not set
+CONFIG_RTW88_8822CU=m
 CONFIG_RTW88_8723DE=m
-# CONFIG_RTW88_8723DU is not set
+CONFIG_RTW88_8723DU=m
 CONFIG_RTW88_8821CE=m
-# CONFIG_RTW88_8821CU is not set
+CONFIG_RTW88_8821CU=m
 CONFIG_RTW88_DEBUG=y
 CONFIG_RTW88_DEBUGFS=y
 CONFIG_RTW89=m
 CONFIG_RTW89_CORE=m
 CONFIG_RTW89_PCI=m
 CONFIG_RTW89_8852A=m
 CONFIG_RTW89_8852B=m
 CONFIG_RTW89_8852C=m
 CONFIG_RTW89_8852AE=m
-# CONFIG_RTW89_8852BE is not set
+CONFIG_RTW89_8852BE=m
 CONFIG_RTW89_8852CE=m
 CONFIG_RTW89_DEBUG=y
 CONFIG_RTW89_DEBUGMSG=y
@@ -4224,7 +4232,7 @@ CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
 CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
 CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
-# CONFIG_TOUCHSCREEN_CYTTSP5 is not set
+CONFIG_TOUCHSCREEN_CYTTSP5=m
 CONFIG_TOUCHSCREEN_DA9034=m
 CONFIG_TOUCHSCREEN_DA9052=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
@@ -4236,7 +4244,7 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_HIDEEP=m
 CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
-# CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set
+CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m
 CONFIG_TOUCHSCREEN_ILI210X=m
 CONFIG_TOUCHSCREEN_ILITEK=m
 CONFIG_TOUCHSCREEN_S6SY761=m
@@ -4311,7 +4319,7 @@ CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_TOUCHSCREEN_ZINITIX=m
-# CONFIG_TOUCHSCREEN_HIMAX_HX83112B is not set
+CONFIG_TOUCHSCREEN_HIMAX_HX83112B=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_88PM860X_ONKEY=m
 CONFIG_INPUT_88PM80X_ONKEY=m
@@ -4429,7 +4437,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-CONFIG_LEGACY_TIOCSTI=y
+# CONFIG_LEGACY_TIOCSTI is not set
 CONFIG_LDISC_AUTOLOAD=y
 #
@@ -4522,7 +4530,7 @@ CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_IPMB=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
-# CONFIG_SSIF_IPMI_BMC is not set
+CONFIG_SSIF_IPMI_BMC=m
 CONFIG_IPMB_DEVICE_INTERFACE=m
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -4718,7 +4726,7 @@ CONFIG_SPI_MICROCHIP_CORE=m
 CONFIG_SPI_MICROCHIP_CORE_QSPI=m
 # CONFIG_SPI_LANTIQ_SSC is not set
 CONFIG_SPI_OC_TINY=m
-# CONFIG_SPI_PCI1XXXX is not set
+CONFIG_SPI_PCI1XXXX=m
 CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=m
 # CONFIG_SPI_ROCKCHIP is not set
@@ -4935,7 +4943,7 @@ CONFIG_GPIO_VIPERBOARD=m
 # Virtual GPIO drivers
 #
 CONFIG_GPIO_AGGREGATOR=m
-# CONFIG_GPIO_LATCH is not set
+CONFIG_GPIO_LATCH=m
 CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_VIRTIO=m
 CONFIG_GPIO_SIM=m
@@ -5073,6 +5081,7 @@ CONFIG_HWMON_VID=m
 #
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_SMPRO=m
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
@@ -5192,8 +5201,9 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NZXT_KRAKEN2=m
 CONFIG_SENSORS_NZXT_SMART2=m
-# CONFIG_SENSORS_OCC_P8_I2C is not set
+CONFIG_SENSORS_OCC_P8_I2C=m
-# CONFIG_SENSORS_OXP is not set
+CONFIG_SENSORS_OCC=m
 CONFIG_SENSORS_OXP=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
@@ -5398,7 +5408,7 @@ CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_RETU_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
-# CONFIG_ADVANTECH_EC_WDT is not set
+CONFIG_ADVANTECH_EC_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_EBC_C384_WDT=m
@@ -5480,7 +5490,7 @@ CONFIG_BCMA_DRIVER_GPIO=y
 #
 CONFIG_MFD_CORE=y
 CONFIG_MFD_AS3711=y
-# CONFIG_MFD_SMPRO is not set
+CONFIG_MFD_SMPRO=m
 CONFIG_PMIC_ADP5520=y
 CONFIG_MFD_AAT2870_CORE=y
 CONFIG_MFD_BCM590XX=m
@@ -5661,7 +5671,7 @@ CONFIG_REGULATOR_MT6311=m
 CONFIG_REGULATOR_MT6323=m
 CONFIG_REGULATOR_MT6331=m
 CONFIG_REGULATOR_MT6332=m
-# CONFIG_REGULATOR_MT6357 is not set
+CONFIG_REGULATOR_MT6357=m
 CONFIG_REGULATOR_MT6358=m
 CONFIG_REGULATOR_MT6359=m
 CONFIG_REGULATOR_MT6360=m
@@ -5683,7 +5693,7 @@ CONFIG_REGULATOR_RT5120=m
 CONFIG_REGULATOR_RT5190A=m
 CONFIG_REGULATOR_RT5759=m
 CONFIG_REGULATOR_RT6160=m
-# CONFIG_REGULATOR_RT6190 is not set
+CONFIG_REGULATOR_RT6190=m
 CONFIG_REGULATOR_RT6245=m
 CONFIG_REGULATOR_RTQ2134=m
 CONFIG_REGULATOR_RTMV20=m
@@ -6177,7 +6187,8 @@ CONFIG_VIDEO_VIMC=m
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-# CONFIG_VIDEO_VISL is not set
+CONFIG_VIDEO_VISL=m
 # CONFIG_VISL_DEBUGFS is not set
 CONFIG_DVB_TEST_DRIVERS=y
 CONFIG_DVB_VIDTV=m
@@ -6252,7 +6263,7 @@ CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 CONFIG_VIDEO_OV02A10=m
 CONFIG_VIDEO_OV08D10=m
-# CONFIG_VIDEO_OV08X40 is not set
+CONFIG_VIDEO_OV08X40=m
 CONFIG_VIDEO_OV13858=m
 CONFIG_VIDEO_OV13B10=m
 CONFIG_VIDEO_OV2640=m
@@ -6260,7 +6271,7 @@ CONFIG_VIDEO_OV2659=m
 CONFIG_VIDEO_OV2680=m
 CONFIG_VIDEO_OV2685=m
 CONFIG_VIDEO_OV2740=m
-# CONFIG_VIDEO_OV4689 is not set
+CONFIG_VIDEO_OV4689=m
 CONFIG_VIDEO_OV5647=m
 CONFIG_VIDEO_OV5648=m
 CONFIG_VIDEO_OV5670=m
@@ -6570,7 +6581,6 @@ CONFIG_DRM=y
 CONFIG_DRM_MIPI_DBI=m
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
 CONFIG_DRM_USE_DYNAMIC_DEBUG=y
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
@@ -6848,7 +6858,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 # CONFIG_LOGO is not set
 # end of Graphics support
-# CONFIG_DRM_ACCEL is not set
+CONFIG_DRM_ACCEL=y
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -7160,11 +7170,11 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST=m
-# CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set
+CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825=m
-# CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set
+CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
@@ -7517,7 +7527,7 @@ CONFIG_SND_SOC_WM8903=m
 CONFIG_SND_SOC_WM8904=m
 CONFIG_SND_SOC_WM8940=m
 CONFIG_SND_SOC_WM8960=m
-# CONFIG_SND_SOC_WM8961 is not set
+CONFIG_SND_SOC_WM8961=m
 CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM8974=m
 CONFIG_SND_SOC_WM8978=m
@@ -8347,7 +8357,7 @@ CONFIG_INFINIBAND_HFI1=m
 # CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
 # CONFIG_SDMA_VERBOSITY is not set
 CONFIG_INFINIBAND_IRDMA=m
-# CONFIG_MANA_INFINIBAND is not set
+CONFIG_MANA_INFINIBAND=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
 CONFIG_INFINIBAND_MTHCA=m
@@ -8623,7 +8633,7 @@ CONFIG_NITRO_ENCLAVES=m
 CONFIG_ACRN_HSM=m
 CONFIG_EFI_SECRET=m
 CONFIG_SEV_GUEST=m
-# CONFIG_TDX_GUEST_DRIVER is not set
+CONFIG_TDX_GUEST_DRIVER=m
 CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI_LIB=m
@@ -8821,7 +8831,7 @@ CONFIG_CROS_EC_DEBUGFS=m
 CONFIG_CROS_EC_SENSORHUB=m
 CONFIG_CROS_EC_SYSFS=m
 CONFIG_CROS_EC_TYPEC=m
-# CONFIG_CROS_HPS_I2C is not set
+CONFIG_CROS_HPS_I2C=m
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CROS_USBPD_NOTIFY=m
 CONFIG_CHROMEOS_PRIVACY_SCREEN=m
@@ -8898,7 +8908,9 @@ CONFIG_AMILO_RFKILL=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_GPD_POCKET_FAN=m
-# CONFIG_X86_PLATFORM_DRIVERS_HP is not set
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
 CONFIG_HP_ACCEL=m
 CONFIG_HP_WMI=m
 CONFIG_WIRELESS_HOTKEY=m
 CONFIG_IBM_RTL=m
 CONFIG_IDEAPAD_LAPTOP=m
@@ -8913,7 +8925,7 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_THINKPAD_LMI=m
 CONFIG_INTEL_ATOMISP2_PDX86=y
 CONFIG_INTEL_ATOMISP2_LED=m
-# CONFIG_INTEL_IFS is not set
+CONFIG_INTEL_IFS=m
 CONFIG_INTEL_SAR_INT1092=m
 CONFIG_INTEL_SKL_INT3472=m
 CONFIG_INTEL_PMC_CORE=y
@@ -9039,7 +9051,7 @@ CONFIG_INTEL_IOMMU_SVM=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y
-# CONFIG_IOMMUFD is not set
+CONFIG_IOMMUFD=m
 CONFIG_IRQ_REMAP=y
 CONFIG_HYPERV_IOMMU=y
 CONFIG_VIRTIO_IOMMU=m
@@ -9216,8 +9228,9 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
 CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
-# CONFIG_IIO_KX022A_SPI is not set
+CONFIG_IIO_KX022A=m
-# CONFIG_IIO_KX022A_I2C is not set
+CONFIG_IIO_KX022A_SPI=m
 CONFIG_IIO_KX022A_I2C=m
 CONFIG_KXSD9=m
 CONFIG_KXSD9_SPI=m
 CONFIG_KXSD9_I2C=m
@@ -9244,7 +9257,7 @@ CONFIG_STK8BA50=m
 # Analog to digital converters
 #
 CONFIG_AD_SIGMA_DELTA=m
-# CONFIG_AD4130 is not set
+CONFIG_AD4130=m
 CONFIG_AD7091R5=m
 CONFIG_AD7124=m
 CONFIG_AD7192=m
@@ -9285,7 +9298,7 @@ CONFIG_MAX1027=m
 CONFIG_MAX11100=m
 CONFIG_MAX1118=m
 CONFIG_MAX11205=m
-# CONFIG_MAX11410 is not set
+CONFIG_MAX11410=m
 CONFIG_MAX1241=m
 CONFIG_MAX1363=m
 CONFIG_MAX9611=m
@@ -9293,7 +9306,7 @@ CONFIG_MCP320X=m
 CONFIG_MCP3422=m
 CONFIG_MCP3911=m
 CONFIG_MEDIATEK_MT6360_ADC=m
-# CONFIG_MEDIATEK_MT6370_ADC is not set
+CONFIG_MEDIATEK_MT6370_ADC=m
 CONFIG_MEN_Z188_ADC=m
 CONFIG_MP2629_ADC=m
 CONFIG_NAU7802=m
@@ -9326,7 +9339,7 @@ CONFIG_XILINX_XADC=m
 #
 # Analog to digital and digital to analog converters
 #
-# CONFIG_AD74115 is not set
+CONFIG_AD74115=m
 CONFIG_AD74413R=m
 # end of Analog to digital and digital to analog converters
@@ -9476,7 +9489,7 @@ CONFIG_AD9523=m
 #
 CONFIG_ADF4350=m
 CONFIG_ADF4371=m
-# CONFIG_ADF4377 is not set
+CONFIG_ADF4377=m
 CONFIG_ADMV1013=m
 CONFIG_ADMV1014=m
 CONFIG_ADMV4420=m
@@ -9785,7 +9798,7 @@ CONFIG_TMP007=m
 CONFIG_TMP117=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
-# CONFIG_MAX30208 is not set
+CONFIG_MAX30208=m
 CONFIG_MAX31856=m
 CONFIG_MAX31865=m
 # end of Temperature sensors
@@ -9939,7 +9952,8 @@ CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000=m
 CONFIG_FPGA_DFL_PCI=m
 CONFIG_FPGA_M10_BMC_SEC_UPDATE=m
 CONFIG_FPGA_MGR_MICROCHIP_SPI=m
-# CONFIG_FPGA_MGR_LATTICE_SYSCONFIG_SPI is not set
+CONFIG_FPGA_MGR_LATTICE_SYSCONFIG=m
 CONFIG_FPGA_MGR_LATTICE_SYSCONFIG_SPI=m
 CONFIG_TEE=m
 CONFIG_AMDTEE=m
 CONFIG_MULTIPLEXER=m
@@ -10184,10 +10198,10 @@ CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
 CONFIG_SQUASHFS_DECOMP_SINGLE=y
-# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
+CONFIG_SQUASHFS_DECOMP_MULTI=y
-CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT=y
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_MOUNT_DECOMP_THREADS=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
@@ -10866,6 +10880,7 @@ CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_BTREE=y
 CONFIG_INTERVAL_TREE=y
 CONFIG_INTERVAL_TREE_SPAN_ITER=y
 CONFIG_XARRAY_MULTI=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -283,9 +283,9 @@ _set_cpu_scheduler() {
    _avail_cpu_scheds=("cfs" "pds" "bmq" "tt" "bore")
  elif [ "$_kver" = "601" ]; then
    _avail_cpu_scheds=("cfs" "pds" "bmq" "tt" "bore")
    _projectc_unoff=1
  elif [ "$_kver" = "602" ]; then
-    _avail_cpu_scheds=("cfs" "tt" "bore")
+    _avail_cpu_scheds=("cfs" "pds" "bmq" "tt" "bore")
    _projectc_unoff=1
  else
    _avail_cpu_scheds=("cfs")
  fi
@@ -382,8 +382,31 @@ _set_compiler(){
  echo -e "_compiler_name='$_compiler_name'\nllvm_opt='$llvm_opt'" >> "$_where"/BIG_UGLY_FROGMINER
 }
 _define_kernel_abs_paths() {
-_linux_git_branch_checkout() {
+  source "$_where"/BIG_UGLY_FROGMINER
  if [ -z "$_kernel_work_folder_abs" ]; then
    _kernel_work_folder_abs="$_where/$_kernel_work_folder/linux-src-git"
    if [[ "$_kernel_work_folder" == /* ]]; then
      _kernel_work_folder_abs="$_kernel_work_folder/linux-tkg/linux-src-git"
    fi
    echo -e "_kernel_work_folder_abs=\"$_kernel_work_folder_abs\"" >> "$_where"/BIG_UGLY_FROGMINER
  fi
  if [ -z "$_kernel_source_folder_abs" ]; then
    _kernel_source_folder_abs="$_where/$_kernel_source_folder/linux-kernel.git"
    if [[ "$_kernel_source_folder" == /* ]]; then
      _kernel_source_folder_abs="$_kernel_source_folder/linux-tkg/linux-kernel.git"
    fi
    echo -e "_kernel_source_folder_abs=\"$_kernel_source_folder_abs\"" >> "$_where"/BIG_UGLY_FROGMINER
  fi
 }
 _setup_kernel_work_folder() {
  _define_kernel_abs_paths
  if [ -z "$_kernel_git_tag" ]; then
    warning "internal error: kernel version should be chosen before cloning kernel sources"
@@ -392,85 +415,44 @@ _linux_git_branch_checkout() {
  cd "$_where"
-  if ! [ -d linux-src-git ] || ( [ "$_source_in_tmpfs" = "true" ] && ! [ -d /tmp/linux-src-git ] ); then
+  if ! [ -d "$_kernel_source_folder_abs" ]; then
    msg2 "First initialization of the linux source code git folder"
-    if [ "$_source_in_tmpfs" = "true" ]; then
+    mkdir -p "$_kernel_source_folder_abs"
-      rm -rf "${_where}/linux-src-git"
+    cd "$_kernel_source_folder_abs"
-      mkdir "/tmp/linux-src-git"
+    git init --bare
      ln -s "/tmp/linux-src-git" "${_where}"
    else
      mkdir linux-src-git
    fi
    cd linux-src-git
    git init
    for remote in "${!_kernel_git_remotes[@]}"; do
      git remote add "$remote" "${_kernel_git_remotes[$remote]}"
    done
  else
    if [ "$_source_in_tmpfs" = "true" ]; then
      rm -rf "${_where}/linux-src-git"
      ln -s "/tmp/linux-src-git" "${_where}"
  fi
-    cd linux-src-git
+  cd "$_kernel_source_folder_abs"
    # Remove "origin" remote if present
    if git remote -v | grep -w "origin" ; then
      git remote rm origin
    fi
  # Add remotes if needed
  for remote in "${!_kernel_git_remotes[@]}"; do
    if ! git remote -v | grep -w "$remote" ; then
      git remote add "$remote" "${_kernel_git_remotes[$remote]}"
    fi
  done
-    msg2 "Current branch: $(git branch | grep "\*")"
+  msg2 "Fetching tag: $_kernel_git_tag from mirror $_git_mirror"
    msg2 "Reseting files to their original state"
    git reset --hard HEAD
    git clean -f -d -x
  fi
  if [[ "$_sub" = rc* ]]; then
    msg2 "Switching to master branch for RC Kernel"
    if ! git branch --list | grep "master-${_git_mirror}" ; then
      msg2 "master branch doesn't locally exist, shallow cloning..."
      git remote set-branches --add kernel.org master
      git remote set-branches --add googlesource.com master
      git remote set-branches --add torvalds master
      git fetch --depth=1 $_git_mirror master
  git fetch --depth 1 $_git_mirror tag "$_kernel_git_tag"
-      git checkout -b master-${_git_mirror} ${_git_mirror}/master
+
-    else
+  msg2 "Checking out tag: $_kernel_git_tag"
-      msg2 "master branch exists locally, updating..."
+  msg2 "   in the work folder: $_kernel_work_folder_abs"
-      git checkout master-${_git_mirror}
+
-      git fetch --depth 1 $_git_mirror tag "$_kernel_git_tag"
+  # The space ' ' in grep -w "$_kernel_work_folder_abs " is important
-      git reset --hard ${_git_mirror}/master
+  # to not match an existing folder with a longer name with the same prefix name
-    fi
+  if [ -d "$_kernel_work_folder_abs" ] && \
-    msg2 "Checking out latest RC tag: $_kernel_git_tag"
+     ( git worktree list | grep -w "$_kernel_work_folder_abs " ) && \
     ( cd "$_kernel_work_folder_abs" && git status > /dev/null 2>&1 ); then
    # Worktree folder exists and is a valid worktree
    cd "$_kernel_work_folder_abs"
    git reset --hard
    git clean -ffdx
    git checkout "$_kernel_git_tag"
  else
-    msg2 "Switching to linux-${_basekernel}.y"
+    # In all other cases, just force create the work tree
-    if ! git branch --list | grep -w "linux-${_basekernel}-${_git_mirror}" ; then
+    rm -rf "$_kernel_work_folder_abs"
-      msg2 "${_basekernel}.y branch doesn't locally exist, shallow cloning..."
+    git worktree add -f "$_kernel_work_folder_abs" "$_kernel_git_tag"
      git remote set-branches --add kernel.org linux-${_basekernel}.y
      git remote set-branches --add googlesource.com linux-${_basekernel}.y
      git remote set-branches --add torvalds linux-${_basekernel}.y
      git fetch --depth=1 $_git_mirror linux-${_basekernel}.y
      git fetch --depth=1 $_git_mirror tag "$_kernel_git_tag"
      git checkout -b linux-${_basekernel}-${_git_mirror} ${_git_mirror}/linux-${_basekernel}.y
    else
      msg2 "${_basekernel}.y branch exists locally, updating..."
      git checkout linux-${_basekernel}-${_git_mirror}
      git fetch --depth 1 $_git_mirror tag "$_kernel_git_tag"
      git reset --hard ${_git_mirror}/linux-${_basekernel}.y
    fi
    msg2 "Checking out latest release: $_kernel_git_tag"
    git checkout "$_kernel_git_tag"
  fi
 }
@@ -488,6 +470,23 @@ _tkg_initscript() {
    exit 1
  fi
  typeset -Ag _deprecated_config_var_set
  # Check if user is defining deprecated config vars
  _deprecated_config_var_set=(
    ["_use_tmpfs"]=`[ -n "$_use_tmpfs" ]; echo $?`
    ["_source_in_tmpfs"]=`[ -n "$_source_in_tmpfs" ]; echo $?`
    ["_tmpfs_path"]=`[ -n "$_tmpfs_path" ]; echo $?`
  )
  for _deprectated_config_var in "${!_deprecated_config_var_set[@]}"; do
    if [ "${_deprecated_config_var_set[$_deprectated_config_var]}" == "0" ]; then
      warning "The deprecated config var $_deprectated_config_var has been set"
      warning "Please check the latest customization.cfg file to see what replaces it"
      exit 1
    fi
  done
  # Default to Arch
  if [ -z "$_distro" ] || [ "$_ispkgbuild" = "true" ]; then
    msg2 "Defaulting to Archlinux target\n"
@@ -495,11 +494,7 @@ _tkg_initscript() {
  fi
  # create build dir early
  if [ "$_distro" = "Void" ]; then
    _path="${XBPS_BUILDDIR}/${wrksrc}"
  else
  _path="${_where}"
  fi
  # Clean the logs folder
  [ -e "${_where}/logs" ] && rm -rf "${_where}/logs"
@@ -511,13 +506,8 @@ _tkg_initscript() {
  # Select CPU scheduler
  _set_cpu_scheduler
  if [ "$_distro" != "Void" ]; then
  cp "$_where"/linux-tkg-patches/${_basekernel}/* "$_where" # copy patches inside the PKGBUILD's dir to preserve makepkg sourcing and md5sum checking
  cp "$_where"/linux-tkg-config/${_basekernel}/* "$_where" # copy config files and hooks inside the PKGBUILD's dir to preserve makepkg sourcing and md5sum checking
  else
    cp "$_where"/linux-tkg-patches/${_basekernel}/* "$_path"
    cp "$_where"/linux-tkg-config/${_basekernel}/* "$_path"
  fi
  # Set compiler
  _set_compiler
@@ -526,7 +516,7 @@ _tkg_initscript() {
    echo -e "_custom_pkgbase=\"$_custom_pkgbase\"" >> "$_where"/BIG_UGLY_FROGMINER
  fi
-  _linux_git_branch_checkout
+  _setup_kernel_work_folder
 }
 user_patcher() {
@@ -593,12 +583,16 @@ _tkg_patcher() {
    patch -Np1 -i "$tkgpatch" >> "$_where"/logs/prepare.log.txt || error "An error was encountered applying patches. It was logged to the prepare.log.txt file."
    echo -e "\n" >> "$_where"/logs/prepare.log.txt
  else
-    msg2 "Skipping patch %s...\n         (unavailable for this kernel version)" "${tkgpatch##*/}" #"
+    msg2 "Skipping patch ${tkgpatch##*/}...\n         (unavailable for this kernel version)"
  fi
 }
 _tkg_srcprep() {
  _define_kernel_abs_paths
  cd "$_kernel_work_folder_abs"
  msg2 "Setting version..."
  scripts/setlocalversion --save-scmversion
@@ -607,13 +601,6 @@ _tkg_srcprep() {
    echo -e "Version tail set to \"-$pkgrel-tkg-${_cpusched}${_compiler_name}\"\n" > "$_where"/logs/prepare.log.txt
    echo "" > localversion.20-pkgname
  fi
  if [ "${_distro}" = "Void" ]; then
 	  pkgver="${version}"
  fi
  if [ "${_distro}" = "Arch" ] || [ "${_distro}" = "Void" ]; then
    tkgpatch="$srcdir/patch-${pkgver}"
    _msg="Patching from $_basekernel to $pkgver" && _tkg_patcher
  fi
  # Hardened Patches
  if [ "${_configfile}" = "config_hardened.x86_64" ] && [ "${_cpusched}" = "cfs" ]; then
@@ -629,9 +616,6 @@ _tkg_srcprep() {
  # graysky's cpu opts - https://github.com/graysky2/kernel_compiler_patch
  _patch_location="$srcdir"
  if [ "${_distro}" = "Void" ]; then
    _patch_location="${wrksrc}"
  fi
  if [ "$_kver" = "504" ]; then
    _patch_name="more-uarches-for-kernel-4.19-5.4"
@@ -697,10 +681,8 @@ _tkg_srcprep() {
    _msg="Applying glitched base non-rt additions patch" && _tkg_patcher
  fi
  if [[ "$_distro" =~ ^(Fedora|Suse)$ ]]; then
  tkgpatch="$srcdir/0013-fedora-rpm.patch"
  _msg="RPM: fixing spec generator" && _tkg_patcher
  fi
  if [ -z $_misc_adds ]; then
    plain "Enable misc additions ? They may contain temporary fixes pending upstream, or some other changes that can break on non-Arch distros."
@@ -740,6 +722,8 @@ _tkg_srcprep() {
    rev=1
  elif [ "$_kver" = "518" ]; then
    rev=2
  elif [ "$_kver" = "601" ]; then
    rev=1
  else
    rev=0
  fi
@@ -801,16 +785,6 @@ _tkg_srcprep() {
    tkgpatch="$srcdir/0009-glitched-bmq.patch" && _tkg_patcher
  elif [ "${_cpusched}" = "cacule" ]; then
    _msg="Applying cacule patch"
    if [ "${_distro}" = "Void" ]; then
      if [[ $_kver -lt 515 ]]; then
        wget -P "$wrksrc" "https://raw.githubusercontent.com/hamadmarri/cacule-cpu-scheduler/master/patches/CacULE/v${_basekernel}/cacule-${_basekernel}.patch"
      elif [[ $_kver = 515 ]]; then
        wget -P "$wrksrc" "https://raw.githubusercontent.com/CachyOS/cacule-cpu-scheduler/master/patches/CacULE/v${_basekernel}/cacule-${_basekernel}.patch"
      else
        wget -P "$wrksrc" "https://raw.githubusercontent.com/CachyOS/cacule-cpu-scheduler/master/patches/CacULE/v${_basekernel}/0001-cacULE-${_basekernel}.patch"
      fi
      tkgpatch="$wrksrc/cacule-${_basekernel}.patch" && _tkg_patcher
    else
    if [[ $_kver -lt 515 ]]; then
      wget -P "$srcdir" "https://raw.githubusercontent.com/hamadmarri/cacule-cpu-scheduler/master/patches/CacULE/v${_basekernel}/cacule-${_basekernel}.patch"
    elif [[ $_kver = 515 ]]; then
@@ -820,42 +794,29 @@ _tkg_srcprep() {
    fi
    tkgpatch="$srcdir/cacule-${_basekernel}.patch" && _tkg_patcher
    tkgpatch="$srcdir/0001-cacULE-${_basekernel}.patch" && _tkg_patcher
    fi
  elif [ "${_cpusched}" = "tt" ]; then
    _msg="Applying TT patch"
    if [ "${_distro}" = "Void" ]; then
      curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-tt.patch" > "$wrksrc"/tt.patch
      tkgpatch="$wrksrc/tt.patch" && _tkg_patcher
    else
    curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-tt.patch" > "$srcdir"/tt.patch
    tkgpatch="$srcdir/tt.patch" && _tkg_patcher
    fi
    if [ "$_tt_high_hz" = "true" ] && [ $_kver = 515 ]; then
      _msg="Applying TT High HZ patch"
      if [ "${_distro}" = "Void" ]; then
        curl "https://raw.githubusercontent.com/hamadmarri/TT-CPU-Scheduler/master/patches/${_basekernel}/high-hz.patch" > "$wrksrc"/tt_high_hz.patch
        tkgpatch="$wrksrc/tt_high_hz.patch" && _tkg_patcher
      else
      curl "https://raw.githubusercontent.com/hamadmarri/TT-CPU-Scheduler/master/patches/${_basekernel}/high-hz.patch" > "$srcdir"/tt_high_hz.patch
      tkgpatch="$srcdir/tt_high_hz.patch" && _tkg_patcher
    fi
    fi
  elif [ "${_cpusched}" = "bore" ]; then
    _msg="Applying BORE patch"
    if [ "${_distro}" = "Void" ]; then
      curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-bore.patch" > "$wrksrc"/0001-bore.patch
      tkgpatch="$wrksrc/0001-bore.patch" && _tkg_patcher
    else
    curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-bore.patch" > "$srcdir"/0001-bore.patch
    tkgpatch="$srcdir/0001-bore.patch" && _tkg_patcher
    fi
  elif [ "${_cpusched}" = "cfs" ]; then
    _msg="Applying Glitched CFS patch"
    tkgpatch="$srcdir/0003-glitched-cfs.patch" && _tkg_patcher
    _msg="Applying Glitched CFS additions patch"
    tkgpatch="$srcdir/0003-glitched-cfs-additions.patch" && _tkg_patcher
  fi
  if [ "${_cpusched}" = "cfs" ] || [ "${_cpusched}" = "cacule" ] || [ "${_cpusched}" = "tt" ] || [ "${_cpusched}" = "bore" ]; then
    _msg="Applying Glitched CFS patch"
    tkgpatch="$srcdir/0003-glitched-cfs.patch" && _tkg_patcher
  fi
  fi
  if [ -z "${_configfile}" ]; then
@@ -905,6 +866,11 @@ _tkg_srcprep() {
  _disable "CPU_FREQ_DEFAULT_GOV_ONDEMAND" "CPU_FREQ_DEFAULT_GOV_CONSERVATIVE" "CPU_FREQ_DEFAULT_GOV_PERFORMANCE" "CPU_FREQ_DEFAULT_GOV_PERFORMANCE_NODEF"
  _module "BLK_DEV_LOOP"
  # buggy project C/PSI interaction workaround
  if [ "${_cpusched}" = "pds" ] || [ "${_cpusched}" = "bmq" ]; then
    _enable "PSI_DEFAULT_DISABLED"
  fi
  if [ -n "$_custom_commandline" ]; then
    _enable "CMDLINE_BOOL"
    _disable "CMDLINE_OVERRIDE"
@@ -916,8 +882,7 @@ _tkg_srcprep() {
  # ccache fix
  if [ "$_noccache" != "true" ]; then
-    if { [ "$_distro" = "Arch" ] && pacman -Qq ccache &> /dev/null; } || { [ "$_distro" = "Ubuntu" ] && dpkg -l ccache > /dev/null; }\
+    if { [ "$_distro" = "Arch" ] && pacman -Qq ccache &> /dev/null; } || { [ "$_distro" = "Ubuntu" ] && dpkg -l ccache > /dev/null; }; then
 	    || { [ "$_distro" = "Void" ] && xbps-query -s ccache > /dev/null; } ; then
      _disable "GCC_PLUGINS"
    fi
  fi
@@ -1613,17 +1578,21 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
  fi
  # NR_CPUS
  if [ "$_basever" != "601" ]; then
    if [ -n "$_NR_CPUS_value" ]; then
      scripts/config --set-val "NR_CPUS" "$_NR_CPUS_value"
      _enable "FORCE_NR_CPUS"
    fi
  else
    warning "NR_CPUS is bugged on 6.1.y, so your setting was ignored"
  fi
  fi
  # Community patches
  if [ -n "$_community_patches" ]; then
    if [ ! -d "$_where/../community-patches" ]; then
-      cd "$_where/.." && git clone https://github.com/Frogging-Family/community-patches.git && cd "${srcdir}/${_srcpath}"
+      cd "$_where/.." && git clone https://github.com/Frogging-Family/community-patches.git && cd "${_kernel_work_folder_abs}"
    fi
    _community_patches=($_community_patches)
    mkdir -p "$_where"/linux"$_basever"-tkg-userpatches
@@ -1649,7 +1618,7 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
    rm -f "$_where"/linux"$_basever"-tkg-userpatches/$_p
  done
-  if [ "$_distro" = "Arch" ] || [ "$_distro" = "Void" ]; then
+  if [ "$_distro" = "Arch" ]; then
    # don't run depmod on 'make install'. We'll do this ourselves in packaging
    sed -i '2iexit 0' scripts/depmod.sh
@@ -1718,17 +1687,12 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
    fi
  fi
  # set _menuconfig early for Void
  if [ "$_distro" = "Void" ]; then
    _menuconfig="Void"
  fi
  # rewrite configuration
  msg2 "Setting config"
  make ${_config_updating} ${llvm_opt} |& tee -a "$_where"/logs/prepare.log.txt
  # menuconfig / nconfig
-  if [ -z "$_menunconfig" ] && [ "$_distro" != "Void" ]; then
+  if [ -z "$_menunconfig" ]; then
    plain ""
    plain "*Optional* For advanced users - Do you want to use make menuconfig or nconfig"
    plain "to configure the kernel before building it?"
@@ -1770,16 +1734,11 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
      fi
      if [ -z "$_diffconfig_name" ]; then
        echo 'No file name given, not generating config fragment.'
      else (
        if [ "$_distro" = "Arch" ] || [ "$_ispkgbuild" = "true" ]; then
          prev_pwd="${PWD:-$(pwd)}/linux-src-git"
          cd "$_where" || exit
      else
-          prev_pwd="${PWD:-$(pwd)}"
+        pushd "$_kernel_work_folder_abs"
-          cd "$_where" || exit
+        scripts/diffconfig -m .config.orig .config > "$_where/$_diffconfig_name"
        popd
      fi
        "${prev_pwd}/scripts/diffconfig" -m "${prev_pwd}/.config.orig" "${prev_pwd}/.config" > "$_diffconfig_name"
      ) fi
    fi
    rm .config.orig
  fi
@@ -1809,12 +1768,6 @@ exit_cleanup() {
  # Remove winesync rules file
  rm -f "$_where"/winesync.rules
  # Remove RPM temporary files left
  rm -rf ${HOME}/.cache/linux-tkg-rpmbuild
  if [ "$_distro" != "Arch" ] && [ "$_use_tmpfs" = "true" ]; then
    rm -rf "$_tmpfs_path/linux-tkg"
  fi
  # Community patches removal in case of failure
  for _p in ${_community_patches[@]}; do
    rm -f "$_where"/linux"$_basever"-tkg-userpatches/"$_p"
@@ -1902,7 +1855,5 @@ exit_cleanup() {
    sed -i 's/\x1b(B//g' "$_where"/logs/shell-output.log.txt
  fi
 }
-# Void has its own clean function, this breaks it so ignore it
+
-if [ "$_distro" != "Void" ]; then
+trap exit_cleanup EXIT
  trap exit_cleanup EXIT
 fi
--- a/linux-tkg-patches/5.10/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.10/0013-fedora-rpm.patch
@@ -1,28 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 # and fix akmod-nvidia
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/5.11/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.11/0013-fedora-rpm.patch
@@ -1,28 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 # and fix akmod-nvidia
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/5.12/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.12/0013-fedora-rpm.patch
@@ -1,28 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 # and fix akmod-nvidia
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/5.13/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.13/0013-fedora-rpm.patch
@@ -1,28 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 # and fix akmod-nvidia
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/5.14/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.14/0013-fedora-rpm.patch
@@ -1,28 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 # and fix akmod-nvidia
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/5.15/0007-v5.15-fsync.patch
+++ b/linux-tkg-patches/5.15/0007-v5.15-fsync.patch
@@ -68,7 +68,7 @@ Signed-off-by: André Almeida <andrealmeid@collabora.com>
 Adjusted for v5.9: Removed `put_futex_key` calls.
 ---
 include/uapi/linux/futex.h |  20 +++
- kernel/futex.c             | 348 +++++++++++++++++++++++++++++++++++++
+ kernel/futex/core.c             | 348 +++++++++++++++++++++++++++++++++++++
 2 files changed, 368 insertions(+)
 diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h
@@ -114,10 +114,10 @@ index a89eb0accd5e2e..580001e89c6cae 100644
 +};
 +
 #endif /* _UAPI_LINUX_FUTEX_H */
-diff --git a/kernel/futex.c b/kernel/futex.c
+diff --git a/kernel/futex/core.c b/kernel/futex/core.c
 index 408cad5e89680f..c30930a955cece 100644
--- a/kernel/futex.c
+--- a/kernel/futex/core.c
-+++ b/kernel/futex.c
+++ b/kernel/futex/core.c
@@ -197,6 +197,8 @@ struct futex_pi_state {
  * @bitset:		bitset for the optional bitmasked wakeup
  * @requeue_state:	State field for futex_requeue_pi()
@@ -536,7 +536,7 @@ Subject: [PATCH] futex: Add Proton compatibility code
 ---
 include/uapi/linux/futex.h | 2 +-
- kernel/futex.c             | 3 ++-
+ kernel/futex/core.c             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h
@@ -552,10 +552,10 @@ index 580001e89c6cae..a3e760886b8e7e 100644
 #define FUTEX_PRIVATE_FLAG	128
 #define FUTEX_CLOCK_REALTIME	256
-diff --git a/kernel/futex.c b/kernel/futex.c
+diff --git a/kernel/futex/core.c b/kernel/futex/core.c
 index c30930a955cece..aa33e66df5c9df 100644
--- a/kernel/futex.c
+--- a/kernel/futex/core.c
-+++ b/kernel/futex.c
+++ b/kernel/futex/core.c
@@ -4002,7 +4002,7 @@ futex_init_timeout(u32 cmd, u32 op, struct timespec64 *ts, ktime_t *t)
 		return -EINVAL;
--- a/linux-tkg-patches/5.15/0007-v5.15-fsync1_via_futex_waitv.patch
+++ b/linux-tkg-patches/5.15/0007-v5.15-fsync1_via_futex_waitv.patch
@@ -14,7 +14,7 @@ of Proton to still use fsync in new kernel releases.
 Signed-off-by: André Almeida <andrealmeid@collabora.com>
 ---
 include/uapi/linux/futex.h | 12 ++++++
- kernel/futex.c             | 75 +++++++++++++++++++++++++++++++++++++-
+ kernel/futex/core.c        | 75 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 86 insertions(+), 1 deletion(-)
 diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h
@@ -47,10 +47,10 @@ index 2a06b99f9803..417c5d89b745 100644
 /*
  * Support for robust futexes: the kernel cleans up held futexes at
-diff --git a/kernel/futex.c b/kernel/futex.c
+diff --git a/kernel/futex/core.c b/kernel/futex/core.c
 index 4a9e7ce3714a..c3f2e65afab8 100644
--- a/kernel/futex.c
+--- a/kernel/futex/core.c
-+++ b/kernel/futex.c
+++ b/kernel/futex/core.c
@@ -4012,6 +4012,7 @@ static __always_inline bool futex_cmd_has_timeout(u32 cmd)
 	case FUTEX_LOCK_PI2:
 	case FUTEX_WAIT_BITSET:
--- a/linux-tkg-patches/5.15/0007-v5.15-futex_waitv.patch
+++ b/linux-tkg-patches/5.15/0007-v5.15-futex_waitv.patch
@@ -43,7 +43,7 @@ Link: https://lore.kernel.org/r/20210923171111.300673-17-andrealmeid@collabora.c
 include/linux/syscalls.h          |   6 +
 include/uapi/asm-generic/unistd.h |   5 +-
 include/uapi/linux/futex.h        |  26 +++
- kernel/futex.c                    | 334 ++++++++++++++++++++++++++++++
+ kernel/futex/core.c               | 334 ++++++++++++++++++++++++++++++
 kernel/sys_ni.c                   |   1 +
 5 files changed, 371 insertions(+), 1 deletion(-)
@@ -125,10 +125,10 @@ index a89eb0accd5e..1666f5e4b837 100644
 /*
  * Support for robust futexes: the kernel cleans up held futexes at
  * thread exit time.
-diff --git a/kernel/futex.c b/kernel/futex.c
+diff --git a/kernel/futex/core.c b/kernel/futex/core.c
 index 408cad5e8968..d7dc0bd9379c 100644
--- a/kernel/futex.c
+--- a/kernel/futex/core.c
-+++ b/kernel/futex.c
+++ b/kernel/futex/core.c
@@ -285,6 +285,18 @@ static const struct futex_q futex_q_init = {
 	.requeue_state	= ATOMIC_INIT(Q_REQUEUE_PI_NONE),
 };
--- a/linux-tkg-patches/5.15/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.15/0013-fedora-rpm.patch
@@ -1,28 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 # and fix akmod-nvidia
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/5.16/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.16/0013-fedora-rpm.patch
@@ -1,28 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 # and fix akmod-nvidia
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/5.17/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.17/0013-fedora-rpm.patch
@@ -1,28 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 # and fix akmod-nvidia
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/5.18/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.18/0013-fedora-rpm.patch
@@ -1,27 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/5.19/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.19/0013-fedora-rpm.patch
@@ -1,27 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/5.4/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.4/0013-fedora-rpm.patch
@@ -1,28 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 # and fix akmod-nvidia
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/5.7/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.7/0013-fedora-rpm.patch
@@ -1,28 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 # and fix akmod-nvidia
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/5.8/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.8/0013-fedora-rpm.patch
@@ -1,28 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 # and fix akmod-nvidia
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/5.9/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/5.9/0013-fedora-rpm.patch
@@ -1,28 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 # and fix akmod-nvidia
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/6.0/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/6.0/0013-fedora-rpm.patch
@@ -1,27 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/6.1/0008-6.1-bcachefs.patch
+++ b/linux-tkg-patches/6.1/0008-6.1-bcachefs.patch
@@ -90612,7 +90612,7 @@ index 5cfc95a52bc3..be075882450a 100644
 }
 static DEFINE_STATIC_KEY_FALSE(trace_no_verify);
-@@ -6792,12 +6788,12 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
+@@ -6793,7 +6789,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
 	trace_access_lock(iter->cpu_file);
 	while (trace_find_next_entry_inc(iter) != NULL) {
 		enum print_line_t ret;
@@ -90621,7 +90621,19 @@ index 5cfc95a52bc3..be075882450a 100644
 		ret = print_trace_line(iter);
 		if (ret == TRACE_TYPE_PARTIAL_LINE) {
- 			/* don't print partial lines */
+@@ -6803,7 +6799,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
 			 * In this case, we need to consume it, otherwise, loop will peek
 			 * this event next time, resulting in an infinite loop.
 			 */
 -			if (save_len == 0) {
 +			if (save_pos == 0) {
 				iter->seq.full = 0;
 				trace_seq_puts(&iter->seq, "[LINE TOO BIG]\n");
 				trace_consume(iter);
@@ -6811,7 +6807,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
 			}
 			/* In other cases, don't print partial lines */
 -			iter->seq.seq.len = save_len;
 +			iter->seq.seq.pos = save_pos;
 			break;
--- a/linux-tkg-patches/6.1/0009-prjc_v6.1-r1.patch
+++ b/linux-tkg-patches/6.1/0009-prjc_v6.1-r1.patch
--- a/linux-tkg-patches/6.1/0012-misc-additions.patch
+++ b/linux-tkg-patches/6.1/0012-misc-additions.patch
@@ -63,350 +63,3 @@ index 2c7171e0b0010..85de313ddec29 100644
 	select CPU_FREQ_GOV_CONSERVATIVE
 	select CPU_FREQ_GOV_PERFORMANCE
 	help
 From 0c079d3f88df5f8286cd5c91b54bdac7c819be85 Mon Sep 17 00:00:00 2001
 From: Matthew Auld <matthew.auld@intel.com>
 Date: Tue, 6 Dec 2022 16:11:41 +0000
 Subject: [PATCH] drm/i915: improve the catch-all evict to handle lock
 contention
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 The catch-all evict can fail due to object lock contention, since it
 only goes as far as trylocking the object, due to us already holding the
 vm->mutex. Doing a full object lock here can deadlock, since the
 vm->mutex is always our inner lock. Add another execbuf pass which drops
 the vm->mutex and then tries to grab the object will the full lock,
 before then retrying the eviction. This should be good enough for now to
 fix the immediate regression with userspace seeing -ENOSPC from execbuf
 due to contended object locks during GTT eviction.
 Testcase: igt@gem_ppgtt@shrink-vs-evict-*
 Fixes: 7e00897be8bf ("drm/i915: Add object locking to i915_gem_evict_for_node and i915_gem_evict_something, v2.")
 References: https://gitlab.freedesktop.org/drm/intel/-/issues/7627
 References: https://gitlab.freedesktop.org/drm/intel/-/issues/7570
 References: https://bugzilla.mozilla.org/show_bug.cgi?id=1779558
 Signed-off-by: Matthew Auld <matthew.auld@intel.com>
 Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
 Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
 Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
 Cc: Andrzej Hajda <andrzej.hajda@intel.com>
 Cc: Mani Milani <mani@chromium.org>
 Cc: <stable@vger.kernel.org> # v5.18+
 Revision 1 of https://patchwork.freedesktop.org/series/111686/
 ---
 .../gpu/drm/i915/gem/i915_gem_execbuffer.c    | 25 +++++++++++--
 drivers/gpu/drm/i915/gem/i915_gem_mman.c      |  2 +-
 drivers/gpu/drm/i915/i915_gem_evict.c         | 37 ++++++++++++++-----
 drivers/gpu/drm/i915/i915_gem_evict.h         |  4 +-
 drivers/gpu/drm/i915/i915_vma.c               |  2 +-
 .../gpu/drm/i915/selftests/i915_gem_evict.c   |  4 +-
 6 files changed, 56 insertions(+), 18 deletions(-)
 diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
 index 845023c14eb36f..094e92ed28db4f 100644
 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
 +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -741,25 +741,44 @@ static int eb_reserve(struct i915_execbuffer *eb)
 	 *
 	 * Defragmenting is skipped if all objects are pinned at a fixed location.
 	 */
 -	for (pass = 0; pass <= 2; pass++) {
 +	for (pass = 0; pass <= 3; pass++) {
 		int pin_flags = PIN_USER | PIN_VALIDATE;
 		if (pass == 0)
 			pin_flags |= PIN_NONBLOCK;
 		if (pass >= 1)
 -			unpinned = eb_unbind(eb, pass == 2);
 +			unpinned = eb_unbind(eb, pass >= 2);
 		if (pass == 2) {
 			err = mutex_lock_interruptible(&eb->context->vm->mutex);
 			if (!err) {
 -				err = i915_gem_evict_vm(eb->context->vm, &eb->ww);
 +				err = i915_gem_evict_vm(eb->context->vm, &eb->ww, NULL);
 				mutex_unlock(&eb->context->vm->mutex);
 			}
 			if (err)
 				return err;
 		}
 +		if (pass == 3) {
 +retry:
 +			err = mutex_lock_interruptible(&eb->context->vm->mutex);
 +			if (!err) {
 +				struct drm_i915_gem_object *busy_bo = NULL;
 +
 +				err = i915_gem_evict_vm(eb->context->vm, &eb->ww, &busy_bo);
 +				mutex_unlock(&eb->context->vm->mutex);
 +				if (err && busy_bo) {
 +					err = i915_gem_object_lock(busy_bo, &eb->ww);
 +					i915_gem_object_put(busy_bo);
 +					if (!err)
 +						goto retry;
 +				}
 +			}
 +			if (err)
 +				return err;
 +		}
 +
 		list_for_each_entry(ev, &eb->unbound, bind_link) {
 			err = eb_reserve_vma(eb, ev, pin_flags);
 			if (err)
 diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
 index 73d9eda1d6b7a6..c83d98e1dc5da0 100644
 --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
 +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -369,7 +369,7 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf)
 		if (vma == ERR_PTR(-ENOSPC)) {
 			ret = mutex_lock_interruptible(&ggtt->vm.mutex);
 			if (!ret) {
 -				ret = i915_gem_evict_vm(&ggtt->vm, &ww);
 +				ret = i915_gem_evict_vm(&ggtt->vm, &ww, NULL);
 				mutex_unlock(&ggtt->vm.mutex);
 			}
 			if (ret)
 diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c
 index f025ee4fa52618..a4b4d9b7d26c7a 100644
 --- a/drivers/gpu/drm/i915/i915_gem_evict.c
 +++ b/drivers/gpu/drm/i915/i915_gem_evict.c
@@ -416,6 +416,11 @@ int i915_gem_evict_for_node(struct i915_address_space *vm,
  * @vm: Address space to cleanse
  * @ww: An optional struct i915_gem_ww_ctx. If not NULL, i915_gem_evict_vm
  * will be able to evict vma's locked by the ww as well.
 + * @busy_bo: Optional pointer to struct drm_i915_gem_object. If not NULL, then
 + * in the event i915_gem_evict_vm() is unable to trylock an object for eviction,
 + * then @busy_bo will point to it. -EBUSY is also returned. The caller must drop
 + * the vm->mutex, before trying again to acquire the contended lock. The caller
 + * also owns a reference to the object.
  *
  * This function evicts all vmas from a vm.
  *
@@ -425,7 +430,8 @@ int i915_gem_evict_for_node(struct i915_address_space *vm,
  * To clarify: This is for freeing up virtual address space, not for freeing
  * memory in e.g. the shrinker.
  */
 -int i915_gem_evict_vm(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww)
 +int i915_gem_evict_vm(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww,
 +		      struct drm_i915_gem_object **busy_bo)
 {
 	int ret = 0;
@@ -457,15 +463,22 @@ int i915_gem_evict_vm(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww)
 			 * the resv is shared among multiple objects, we still
 			 * need the object ref.
 			 */
 -			if (dying_vma(vma) ||
 +			if (!i915_gem_object_get_rcu(vma->obj) ||
 			    (ww && (dma_resv_locking_ctx(vma->obj->base.resv) == &ww->ctx))) {
 				__i915_vma_pin(vma);
 				list_add(&vma->evict_link, &locked_eviction_list);
 				continue;
 			}
 -			if (!i915_gem_object_trylock(vma->obj, ww))
 +			if (!i915_gem_object_trylock(vma->obj, ww)) {
 +				if (busy_bo) {
 +					*busy_bo = vma->obj; /* holds ref */
 +					ret = -EBUSY;
 +					break;
 +				}
 +				i915_gem_object_put(vma->obj);
 				continue;
 +			}
 			__i915_vma_pin(vma);
 			list_add(&vma->evict_link, &eviction_list);
@@ -473,25 +486,29 @@ int i915_gem_evict_vm(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww)
 		if (list_empty(&eviction_list) && list_empty(&locked_eviction_list))
 			break;
 -		ret = 0;
 		/* Unbind locked objects first, before unlocking the eviction_list */
 		list_for_each_entry_safe(vma, vn, &locked_eviction_list, evict_link) {
 			__i915_vma_unpin(vma);
 -			if (ret == 0)
 +			if (ret == 0) {
 				ret = __i915_vma_unbind(vma);
 -			if (ret != -EINTR) /* "Get me out of here!" */
 -				ret = 0;
 +				if (ret != -EINTR) /* "Get me out of here!" */
 +					ret = 0;
 +			}
 +			if (!dying_vma(vma))
 +				i915_gem_object_put(vma->obj);
 		}
 		list_for_each_entry_safe(vma, vn, &eviction_list, evict_link) {
 			__i915_vma_unpin(vma);
 -			if (ret == 0)
 +			if (ret == 0) {
 				ret = __i915_vma_unbind(vma);
 -			if (ret != -EINTR) /* "Get me out of here!" */
 -				ret = 0;
 +				if (ret != -EINTR) /* "Get me out of here!" */
 +					ret = 0;
 +			}
 			i915_gem_object_unlock(vma->obj);
 +			i915_gem_object_put(vma->obj);
 		}
 	} while (ret == 0);
 diff --git a/drivers/gpu/drm/i915/i915_gem_evict.h b/drivers/gpu/drm/i915/i915_gem_evict.h
 index e593c530f9bd7a..bf0ee0e4fe6088 100644
 --- a/drivers/gpu/drm/i915/i915_gem_evict.h
 +++ b/drivers/gpu/drm/i915/i915_gem_evict.h
@@ -11,6 +11,7 @@
 struct drm_mm_node;
 struct i915_address_space;
 struct i915_gem_ww_ctx;
 +struct drm_i915_gem_object;
 int __must_check i915_gem_evict_something(struct i915_address_space *vm,
 					  struct i915_gem_ww_ctx *ww,
@@ -23,6 +24,7 @@ int __must_check i915_gem_evict_for_node(struct i915_address_space *vm,
 					 struct drm_mm_node *node,
 					 unsigned int flags);
 int i915_gem_evict_vm(struct i915_address_space *vm,
 -		      struct i915_gem_ww_ctx *ww);
 +		      struct i915_gem_ww_ctx *ww,
 +		      struct drm_i915_gem_object **busy_bo);
 #endif /* __I915_GEM_EVICT_H__ */
 diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
 index f17c09ead7d778..4d06875de14a14 100644
 --- a/drivers/gpu/drm/i915/i915_vma.c
 +++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -1569,7 +1569,7 @@ static int __i915_ggtt_pin(struct i915_vma *vma, struct i915_gem_ww_ctx *ww,
 			 * locked objects when called from execbuf when pinning
 			 * is removed. This would probably regress badly.
 			 */
 -			i915_gem_evict_vm(vm, NULL);
 +			i915_gem_evict_vm(vm, NULL, NULL);
 			mutex_unlock(&vm->mutex);
 		}
 	} while (1);
 diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c
 index 8c6517d29b8e0c..37068542aafe7f 100644
 --- a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c
 +++ b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c
@@ -344,7 +344,7 @@ static int igt_evict_vm(void *arg)
 	/* Everything is pinned, nothing should happen */
 	mutex_lock(&ggtt->vm.mutex);
 -	err = i915_gem_evict_vm(&ggtt->vm, NULL);
 +	err = i915_gem_evict_vm(&ggtt->vm, NULL, NULL);
 	mutex_unlock(&ggtt->vm.mutex);
 	if (err) {
 		pr_err("i915_gem_evict_vm on a full GGTT returned err=%d]\n",
@@ -356,7 +356,7 @@ static int igt_evict_vm(void *arg)
 	for_i915_gem_ww(&ww, err, false) {
 		mutex_lock(&ggtt->vm.mutex);
 -		err = i915_gem_evict_vm(&ggtt->vm, &ww);
 +		err = i915_gem_evict_vm(&ggtt->vm, &ww, NULL);
 		mutex_unlock(&ggtt->vm.mutex);
 	}
 From 189603b802a2bb276b82a0a4f66528ad29156f46 Mon Sep 17 00:00:00 2001
 From: Alexey Izbyshev <izbyshev@ispras.ru>
 Date: Sat, 12 Nov 2022 00:54:39 +0300
 Subject: [PATCH] futex: Resend potentially swallowed owner death notification
 Commit ca16d5bee598 ("futex: Prevent robust futex exit race") addressed
 two cases when tasks waiting on a robust non-PI futex remained blocked
 despite the futex not being owned anymore:
 * if the owner died after writing zero to the futex word, but before
  waking up a waiter
 * if a task waiting on the futex was woken up, but died before updating
  the futex word (effectively swallowing the notification without acting
  on it)
 In the second case, the task could be woken up either by the previous
 owner (after the futex word was reset to zero) or by the kernel (after
 the OWNER_DIED bit was set and the TID part of the futex word was reset
 to zero) if the previous owner died without the resetting the futex.
 Because the referenced commit wakes up a potential waiter only if the
 whole futex word is zero, the latter subcase remains unaddressed.
 Fix this by looking only at the TID part of the futex when deciding
 whether a wake up is needed.
 Fixes: ca16d5bee598 ("futex: Prevent robust futex exit race")
 Signed-off-by: Alexey Izbyshev <izbyshev@ispras.ru>
 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
 Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
 Link: https://lore.kernel.org/r/20221111215439.248185-1-izbyshev@ispras.ru
 ---
 kernel/futex/core.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)
 diff --git a/kernel/futex/core.c b/kernel/futex/core.c
 index b22ef1efe75118..514e4582b86341 100644
 --- a/kernel/futex/core.c
 +++ b/kernel/futex/core.c
@@ -638,6 +638,7 @@ static int handle_futex_death(u32 __user *uaddr, struct task_struct *curr,
 			      bool pi, bool pending_op)
 {
 	u32 uval, nval, mval;
 +	pid_t owner;
 	int err;
 	/* Futex address must be 32bit aligned */
@@ -659,6 +660,10 @@ static int handle_futex_death(u32 __user *uaddr, struct task_struct *curr,
 	 * 2. A woken up waiter is killed before it can acquire the
 	 *    futex in user space.
 	 *
 +	 * In the second case, the wake up notification could be generated
 +	 * by the unlock path in user space after setting the futex value
 +	 * to zero or by the kernel after setting the OWNER_DIED bit below.
 +	 *
 	 * In both cases the TID validation below prevents a wakeup of
 	 * potential waiters which can cause these waiters to block
 	 * forever.
@@ -667,24 +672,27 @@ static int handle_futex_death(u32 __user *uaddr, struct task_struct *curr,
 	 *
 	 *	1) task->robust_list->list_op_pending != NULL
 	 *	   @pending_op == true
 -	 *	2) User space futex value == 0
 +	 *	2) The owner part of user space futex value == 0
 	 *	3) Regular futex: @pi == false
 	 *
 	 * If these conditions are met, it is safe to attempt waking up a
 	 * potential waiter without touching the user space futex value and
 -	 * trying to set the OWNER_DIED bit. The user space futex value is
 -	 * uncontended and the rest of the user space mutex state is
 -	 * consistent, so a woken waiter will just take over the
 -	 * uncontended futex. Setting the OWNER_DIED bit would create
 -	 * inconsistent state and malfunction of the user space owner died
 -	 * handling.
 +	 * trying to set the OWNER_DIED bit. If the futex value is zero,
 +	 * the rest of the user space mutex state is consistent, so a woken
 +	 * waiter will just take over the uncontended futex. Setting the
 +	 * OWNER_DIED bit would create inconsistent state and malfunction
 +	 * of the user space owner died handling. Otherwise, the OWNER_DIED
 +	 * bit is already set, and the woken waiter is expected to deal with
 +	 * this.
 	 */
 -	if (pending_op && !pi && !uval) {
 +	owner = uval & FUTEX_TID_MASK;
 +
 +	if (pending_op && !pi && !owner) {
 		futex_wake(uaddr, 1, 1, FUTEX_BITSET_MATCH_ANY);
 		return 0;
 	}
 -	if ((uval & FUTEX_TID_MASK) != task_pid_vnr(curr))
 +	if (owner != task_pid_vnr(curr))
 		return 0;
 	/*
--- a/linux-tkg-patches/6.1/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/6.1/0013-fedora-rpm.patch
@@ -1,27 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
--- a/linux-tkg-patches/6.2/0002-clear-patches.patch
+++ b/linux-tkg-patches/6.2/0002-clear-patches.patch
@@ -358,3 +358,263 @@ index c0cd1b9..af1e2fb 100644
 -- 
 https://clearlinux.org
 From 676c2dc63592f52b716515573a3a825582a371e9 Mon Sep 17 00:00:00 2001
 From: Arjan van de Ven <arjan@linux.intel.com>
 Date: Sat, 8 Dec 2018 18:21:32 +0000
 Subject: [PATCH 1/9] x86/vdso: Use lfence instead of rep and nop
 Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 ---
 arch/x86/include/asm/vdso/processor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/arch/x86/include/asm/vdso/processor.h b/arch/x86/include/asm/vdso/processor.h
 index 57b1a7034c64..e2c45674f989 100644
 --- a/arch/x86/include/asm/vdso/processor.h
 +++ b/arch/x86/include/asm/vdso/processor.h
@@ -10,7 +10,7 @@
 /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
 static __always_inline void rep_nop(void)
 {
 -	asm volatile("rep; nop" ::: "memory");
 +	asm volatile("lfence" ::: "memory");
 }
 static __always_inline void cpu_relax(void)
 --
 2.39.1
 From 48dc9669f8db68adc480ffc2698ed8204440e45b Mon Sep 17 00:00:00 2001
 From: Arjan van de Ven <arjan@linux.intel.com>
 Date: Thu, 13 Dec 2018 01:00:49 +0000
 Subject: [PATCH 2/9] sched/wait: Do accept() in LIFO order for cache
 efficiency
 Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 ---
 include/linux/wait.h            |  2 ++
 kernel/sched/wait.c             | 24 ++++++++++++++++++++++++
 net/ipv4/inet_connection_sock.c |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)
 diff --git a/include/linux/wait.h b/include/linux/wait.h
 index a0307b516b09..edc21128f387 100644
 --- a/include/linux/wait.h
 +++ b/include/linux/wait.h
@@ -165,6 +165,7 @@ static inline bool wq_has_sleeper(struct wait_queue_head *wq_head)
 extern void add_wait_queue(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry);
 extern void add_wait_queue_exclusive(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry);
 +extern void add_wait_queue_exclusive_lifo(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry);
 extern void add_wait_queue_priority(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry);
 extern void remove_wait_queue(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry);
@@ -1192,6 +1193,7 @@ do {										\
  */
 void prepare_to_wait(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry, int state);
 bool prepare_to_wait_exclusive(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry, int state);
 +void prepare_to_wait_exclusive_lifo(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry, int state);
 long prepare_to_wait_event(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry, int state);
 void finish_wait(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry);
 long wait_woken(struct wait_queue_entry *wq_entry, unsigned mode, long timeout);
 diff --git a/kernel/sched/wait.c b/kernel/sched/wait.c
 index 133b74730738..1647fb8662eb 100644
 --- a/kernel/sched/wait.c
 +++ b/kernel/sched/wait.c
@@ -47,6 +47,17 @@ void add_wait_queue_priority(struct wait_queue_head *wq_head, struct wait_queue_
 }
 EXPORT_SYMBOL_GPL(add_wait_queue_priority);
 +void add_wait_queue_exclusive_lifo(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry)
 +{
 +	unsigned long flags;
 +
 +	wq_entry->flags |= WQ_FLAG_EXCLUSIVE;
 +	spin_lock_irqsave(&wq_head->lock, flags);
 +	__add_wait_queue(wq_head, wq_entry);
 +	spin_unlock_irqrestore(&wq_head->lock, flags);
 +}
 +EXPORT_SYMBOL(add_wait_queue_exclusive_lifo);
 +
 void remove_wait_queue(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry)
 {
 	unsigned long flags;
@@ -293,6 +304,19 @@ prepare_to_wait_exclusive(struct wait_queue_head *wq_head, struct wait_queue_ent
 }
 EXPORT_SYMBOL(prepare_to_wait_exclusive);
 +void prepare_to_wait_exclusive_lifo(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry, int state)
 +{
 +	unsigned long flags;
 +
 +	wq_entry->flags |= WQ_FLAG_EXCLUSIVE;
 +	spin_lock_irqsave(&wq_head->lock, flags);
 +	if (list_empty(&wq_entry->entry))
 +		__add_wait_queue(wq_head, wq_entry);
 +	set_current_state(state);
 +	spin_unlock_irqrestore(&wq_head->lock, flags);
 +}
 +EXPORT_SYMBOL(prepare_to_wait_exclusive_lifo);
 +
 void init_wait_entry(struct wait_queue_entry *wq_entry, int flags)
 {
 	wq_entry->flags = flags;
 diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
 index f2c43f67187d..9885bfb429a2 100644
 --- a/net/ipv4/inet_connection_sock.c
 +++ b/net/ipv4/inet_connection_sock.c
@@ -606,7 +606,7 @@ static int inet_csk_wait_for_connect(struct sock *sk, long timeo)
 	 * having to remove and re-insert us on the wait queue.
 	 */
 	for (;;) {
 -		prepare_to_wait_exclusive(sk_sleep(sk), &wait,
 +		prepare_to_wait_exclusive_lifo(sk_sleep(sk), &wait,
 					  TASK_INTERRUPTIBLE);
 		release_sock(sk);
 		if (reqsk_queue_empty(&icsk->icsk_accept_queue))
 --
 2.39.1
 From afa213811c5490906caf394b20bb4b616fc6f12a Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Thu, 25 Aug 2022 15:55:26 -0700
 Subject: [PATCH 3/9] sched/fair: Simplify asym_packing logic for SMT sched
 groups
 When the destination CPU is an SMT sibling and idle, it can only help the
 busiest group if all of its other SMT siblings are also idle. Otherwise,
 there is not increase in throughput.
 It does not matter whether the busiest group has SMT siblings. Simply
 check if there are any tasks running on the local group before proceeding.
 Cc: Ben Segall <bsegall@google.com>
 Cc: Daniel Bristot de Oliveira <bristot@redhat.com>
 Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>
 Cc: Len Brown <len.brown@intel.com>
 Cc: Mel Gorman <mgorman@suse.de>
 Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 Cc: Steven Rostedt <rostedt@goodmis.org>
 Cc: Tim C. Chen <tim.c.chen@intel.com>
 Cc: Valentin Schneider <vschneid@redhat.com>
 Cc: x86@kernel.org
 Cc: linux-kernel@vger.kernel.org
 Reviewed-by: Len Brown <len.brown@intel.com>
 Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 ---
 kernel/sched/fair.c | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)
 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
 index 345cc5e9fa6e..60f9690a5626 100644
 --- a/kernel/sched/fair.c
 +++ b/kernel/sched/fair.c
@@ -8921,12 +8921,10 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds,
 				    struct sched_group *sg)
 {
 #ifdef CONFIG_SCHED_SMT
 -	bool local_is_smt, sg_is_smt;
 +	bool local_is_smt;
 	int sg_busy_cpus;
 	local_is_smt = sds->local->flags & SD_SHARE_CPUCAPACITY;
 -	sg_is_smt = sg->flags & SD_SHARE_CPUCAPACITY;
 -
 	sg_busy_cpus = sgs->group_weight - sgs->idle_cpus;
 	if (!local_is_smt) {
@@ -8947,25 +8945,16 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds,
 		return sched_asym_prefer(dst_cpu, sg->asym_prefer_cpu);
 	}
 -	/* @dst_cpu has SMT siblings. */
 -
 -	if (sg_is_smt) {
 -		int local_busy_cpus = sds->local->group_weight -
 -				      sds->local_stat.idle_cpus;
 -		int busy_cpus_delta = sg_busy_cpus - local_busy_cpus;
 -
 -		if (busy_cpus_delta == 1)
 -			return sched_asym_prefer(dst_cpu, sg->asym_prefer_cpu);
 -
 -		return false;
 -	}
 -
 	/*
 -	 * @sg does not have SMT siblings. Ensure that @sds::local does not end
 -	 * up with more than one busy SMT sibling and only pull tasks if there
 -	 * are not busy CPUs (i.e., no CPU has running tasks).
 +	 * @dst_cpu has SMT siblings. When both @dst_cpu and the busiest core
 +	 * have one or more busy siblings, moving tasks between them results
 +	 * in the same throughput. Only if all the siblings of @dst_cpu are
 +	 * idle throughput can increase.
 +	 *
 +	 * If the difference in the number of busy CPUs is two or more, let
 +	 * find_busiest_group() take care of it.
 	 */
 -	if (!sds->local_stat.sum_nr_running)
 +	if (sg_busy_cpus == 1 && !sds->local_stat.sum_nr_running)
 		return sched_asym_prefer(dst_cpu, sg->asym_prefer_cpu);
 	return false;
 --
 2.39.1
 From a1f627fd10ced4f5eeae678bc4ba96ea7fa01d7e Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Thu, 25 Aug 2022 15:55:28 -0700
 Subject: [PATCH 4/9] sched/fair: Let lower-priority CPUs do active balancing
 When more than one SMT siblings of a physical core are busy, an idle CPU
 of lower priority can help.
 Indicate that the low priority CPU can do active balancing from the high-
 priority CPU only if they belong to separate cores.
 Cc: Ben Segall <bsegall@google.com>
 Cc: Daniel Bristot de Oliveira <bristot@redhat.com>
 Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>
 Cc: Len Brown <len.brown@intel.com>
 Cc: Mel Gorman <mgorman@suse.de>
 Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 Cc: Steven Rostedt <rostedt@goodmis.org>
 Cc: Tim C. Chen <tim.c.chen@intel.com>
 Cc: Valentin Schneider <vschneid@redhat.com>
 Cc: x86@kernel.org
 Cc: linux-kernel@vger.kernel.org
 Reviewed-by: Len Brown <len.brown@intel.com>
 Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 ---
 kernel/sched/fair.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
 index 60f9690a5626..67b0eacad0e9 100644
 --- a/kernel/sched/fair.c
 +++ b/kernel/sched/fair.c
@@ -10176,9 +10176,14 @@ asym_active_balance(struct lb_env *env)
 	 * ASYM_PACKING needs to force migrate tasks from busy but
 	 * lower priority CPUs in order to pack all tasks in the
 	 * highest priority CPUs.
 +	 *
 +	 * If the busy CPU has higher priority but is an SMT sibling
 +	 * in which other SMT siblings are also busy, a lower-priority
 +	 * CPU in a separate core can help.
 	 */
 	return env->idle != CPU_NOT_IDLE && (env->sd->flags & SD_ASYM_PACKING) &&
 -	       sched_asym_prefer(env->dst_cpu, env->src_cpu);
 +	       (sched_asym_prefer(env->dst_cpu, env->src_cpu) ||
 +		!(env->sd->flags & SD_SHARE_CPUCAPACITY));
 }
 static inline bool
 --
 2.39.1
--- a/linux-tkg-patches/6.2/0003-glitched-base.patch
+++ b/linux-tkg-patches/6.2/0003-glitched-base.patch
@@ -820,3 +820,31 @@ index a0b0397e29ee4c..87a983a356530c 100644
 	spin_unlock(&zone->lock);
 	return allocated;
 }
 From 6329525a0fa10cd13f39b76948b1296150f75c95 Mon Sep 17 00:00:00 2001
 From: Alexandre Frade <kernel@xanmod.org>
 Date: Mon, 29 Aug 2022 16:47:26 +0000
 Subject: [PATCH 14/16] XANMOD: Makefile: Disable GCC vectorization on trees
 Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 ---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)
 diff --git a/Makefile b/Makefile
 index 3f6628780eb2..35a5ae1ede42 100644
 --- a/Makefile
 +++ b/Makefile
@@ -1069,6 +1069,9 @@ endif
 KBUILD_CFLAGS-$(call gcc-min-version, 90100) += -Wno-alloc-size-larger-than
 KBUILD_CFLAGS += $(KBUILD_CFLAGS-y) $(CONFIG_CC_IMPLICIT_FALLTHROUGH)
 +# disable GCC vectorization on trees
 +KBUILD_CFLAGS	+= $(call cc-option, -fno-tree-vectorize)
 +
 # disable invalid "can't wrap" optimizations for signed / pointers
 KBUILD_CFLAGS	+= -fno-strict-overflow
 --
 2.39.1
--- a/linux-tkg-patches/6.2/0003-glitched-cfs-additions.patch
+++ b/linux-tkg-patches/6.2/0003-glitched-cfs-additions.patch
@@ -20,3 +20,265 @@ index 6b3b59cc51d6..2a0072192c3d 100644
 int sched_thermal_decay_shift;
 static int __init setup_sched_thermal_decay_shift(char *str)
 From 5d5b708e3731e135ea7ae168571ad78d883e63e8 Mon Sep 17 00:00:00 2001
 From: Alexandre Frade <kernel@xanmod.org>
 Date: Wed, 1 Feb 2023 10:17:47 +0000
 Subject: [PATCH 02/16] XANMOD: fair: Remove all energy efficiency functions
 Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 ---
 kernel/sched/fair.c | 224 +-------------------------------------------
 1 file changed, 3 insertions(+), 221 deletions(-)
 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
 index 0f8736991427..345cc5e9fa6e 100644
 --- a/kernel/sched/fair.c
 +++ b/kernel/sched/fair.c
@@ -19,6 +19,9 @@
  *
  *  Adaptive scheduling granularity, math enhancements by Peter Zijlstra
  *  Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra
 + *
 + *  Remove energy efficiency functions by Alexandre Frade
 + *  (C) 2021 Alexandre Frade <kernel@xanmod.org>
  */
 #include <linux/energy_model.h>
 #include <linux/mmap_lock.h>
@@ -7136,219 +7139,6 @@ eenv_pd_max_util(struct energy_env *eenv, struct cpumask *pd_cpus,
 	return min(max_util, eenv->cpu_cap);
 }
 -/*
 - * compute_energy(): Use the Energy Model to estimate the energy that @pd would
 - * consume for a given utilization landscape @eenv. When @dst_cpu < 0, the task
 - * contribution is ignored.
 - */
 -static inline unsigned long
 -compute_energy(struct energy_env *eenv, struct perf_domain *pd,
 -	       struct cpumask *pd_cpus, struct task_struct *p, int dst_cpu)
 -{
 -	unsigned long max_util = eenv_pd_max_util(eenv, pd_cpus, p, dst_cpu);
 -	unsigned long busy_time = eenv->pd_busy_time;
 -
 -	if (dst_cpu >= 0)
 -		busy_time = min(eenv->pd_cap, busy_time + eenv->task_busy_time);
 -
 -	return em_cpu_energy(pd->em_pd, max_util, busy_time, eenv->cpu_cap);
 -}
 -
 -/*
 - * find_energy_efficient_cpu(): Find most energy-efficient target CPU for the
 - * waking task. find_energy_efficient_cpu() looks for the CPU with maximum
 - * spare capacity in each performance domain and uses it as a potential
 - * candidate to execute the task. Then, it uses the Energy Model to figure
 - * out which of the CPU candidates is the most energy-efficient.
 - *
 - * The rationale for this heuristic is as follows. In a performance domain,
 - * all the most energy efficient CPU candidates (according to the Energy
 - * Model) are those for which we'll request a low frequency. When there are
 - * several CPUs for which the frequency request will be the same, we don't
 - * have enough data to break the tie between them, because the Energy Model
 - * only includes active power costs. With this model, if we assume that
 - * frequency requests follow utilization (e.g. using schedutil), the CPU with
 - * the maximum spare capacity in a performance domain is guaranteed to be among
 - * the best candidates of the performance domain.
 - *
 - * In practice, it could be preferable from an energy standpoint to pack
 - * small tasks on a CPU in order to let other CPUs go in deeper idle states,
 - * but that could also hurt our chances to go cluster idle, and we have no
 - * ways to tell with the current Energy Model if this is actually a good
 - * idea or not. So, find_energy_efficient_cpu() basically favors
 - * cluster-packing, and spreading inside a cluster. That should at least be
 - * a good thing for latency, and this is consistent with the idea that most
 - * of the energy savings of EAS come from the asymmetry of the system, and
 - * not so much from breaking the tie between identical CPUs. That's also the
 - * reason why EAS is enabled in the topology code only for systems where
 - * SD_ASYM_CPUCAPACITY is set.
 - *
 - * NOTE: Forkees are not accepted in the energy-aware wake-up path because
 - * they don't have any useful utilization data yet and it's not possible to
 - * forecast their impact on energy consumption. Consequently, they will be
 - * placed by find_idlest_cpu() on the least loaded CPU, which might turn out
 - * to be energy-inefficient in some use-cases. The alternative would be to
 - * bias new tasks towards specific types of CPUs first, or to try to infer
 - * their util_avg from the parent task, but those heuristics could hurt
 - * other use-cases too. So, until someone finds a better way to solve this,
 - * let's keep things simple by re-using the existing slow path.
 - */
 -static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu)
 -{
 -	struct cpumask *cpus = this_cpu_cpumask_var_ptr(select_rq_mask);
 -	unsigned long prev_delta = ULONG_MAX, best_delta = ULONG_MAX;
 -	unsigned long p_util_min = uclamp_is_used() ? uclamp_eff_value(p, UCLAMP_MIN) : 0;
 -	unsigned long p_util_max = uclamp_is_used() ? uclamp_eff_value(p, UCLAMP_MAX) : 1024;
 -	struct root_domain *rd = this_rq()->rd;
 -	int cpu, best_energy_cpu, target = -1;
 -	struct sched_domain *sd;
 -	struct perf_domain *pd;
 -	struct energy_env eenv;
 -
 -	rcu_read_lock();
 -	pd = rcu_dereference(rd->pd);
 -	if (!pd || READ_ONCE(rd->overutilized))
 -		goto unlock;
 -
 -	/*
 -	 * Energy-aware wake-up happens on the lowest sched_domain starting
 -	 * from sd_asym_cpucapacity spanning over this_cpu and prev_cpu.
 -	 */
 -	sd = rcu_dereference(*this_cpu_ptr(&sd_asym_cpucapacity));
 -	while (sd && !cpumask_test_cpu(prev_cpu, sched_domain_span(sd)))
 -		sd = sd->parent;
 -	if (!sd)
 -		goto unlock;
 -
 -	target = prev_cpu;
 -
 -	sync_entity_load_avg(&p->se);
 -	if (!uclamp_task_util(p, p_util_min, p_util_max))
 -		goto unlock;
 -
 -	eenv_task_busy_time(&eenv, p, prev_cpu);
 -
 -	for (; pd; pd = pd->next) {
 -		unsigned long util_min = p_util_min, util_max = p_util_max;
 -		unsigned long cpu_cap, cpu_thermal_cap, util;
 -		unsigned long cur_delta, max_spare_cap = 0;
 -		unsigned long rq_util_min, rq_util_max;
 -		unsigned long prev_spare_cap = 0;
 -		int max_spare_cap_cpu = -1;
 -		unsigned long base_energy;
 -
 -		cpumask_and(cpus, perf_domain_span(pd), cpu_online_mask);
 -
 -		if (cpumask_empty(cpus))
 -			continue;
 -
 -		/* Account thermal pressure for the energy estimation */
 -		cpu = cpumask_first(cpus);
 -		cpu_thermal_cap = arch_scale_cpu_capacity(cpu);
 -		cpu_thermal_cap -= arch_scale_thermal_pressure(cpu);
 -
 -		eenv.cpu_cap = cpu_thermal_cap;
 -		eenv.pd_cap = 0;
 -
 -		for_each_cpu(cpu, cpus) {
 -			struct rq *rq = cpu_rq(cpu);
 -
 -			eenv.pd_cap += cpu_thermal_cap;
 -
 -			if (!cpumask_test_cpu(cpu, sched_domain_span(sd)))
 -				continue;
 -
 -			if (!cpumask_test_cpu(cpu, p->cpus_ptr))
 -				continue;
 -
 -			util = cpu_util_next(cpu, p, cpu);
 -			cpu_cap = capacity_of(cpu);
 -
 -			/*
 -			 * Skip CPUs that cannot satisfy the capacity request.
 -			 * IOW, placing the task there would make the CPU
 -			 * overutilized. Take uclamp into account to see how
 -			 * much capacity we can get out of the CPU; this is
 -			 * aligned with sched_cpu_util().
 -			 */
 -			if (uclamp_is_used() && !uclamp_rq_is_idle(rq)) {
 -				/*
 -				 * Open code uclamp_rq_util_with() except for
 -				 * the clamp() part. Ie: apply max aggregation
 -				 * only. util_fits_cpu() logic requires to
 -				 * operate on non clamped util but must use the
 -				 * max-aggregated uclamp_{min, max}.
 -				 */
 -				rq_util_min = uclamp_rq_get(rq, UCLAMP_MIN);
 -				rq_util_max = uclamp_rq_get(rq, UCLAMP_MAX);
 -
 -				util_min = max(rq_util_min, p_util_min);
 -				util_max = max(rq_util_max, p_util_max);
 -			}
 -			if (!util_fits_cpu(util, util_min, util_max, cpu))
 -				continue;
 -
 -			lsub_positive(&cpu_cap, util);
 -
 -			if (cpu == prev_cpu) {
 -				/* Always use prev_cpu as a candidate. */
 -				prev_spare_cap = cpu_cap;
 -			} else if (cpu_cap > max_spare_cap) {
 -				/*
 -				 * Find the CPU with the maximum spare capacity
 -				 * among the remaining CPUs in the performance
 -				 * domain.
 -				 */
 -				max_spare_cap = cpu_cap;
 -				max_spare_cap_cpu = cpu;
 -			}
 -		}
 -
 -		if (max_spare_cap_cpu < 0 && prev_spare_cap == 0)
 -			continue;
 -
 -		eenv_pd_busy_time(&eenv, cpus, p);
 -		/* Compute the 'base' energy of the pd, without @p */
 -		base_energy = compute_energy(&eenv, pd, cpus, p, -1);
 -
 -		/* Evaluate the energy impact of using prev_cpu. */
 -		if (prev_spare_cap > 0) {
 -			prev_delta = compute_energy(&eenv, pd, cpus, p,
 -						    prev_cpu);
 -			/* CPU utilization has changed */
 -			if (prev_delta < base_energy)
 -				goto unlock;
 -			prev_delta -= base_energy;
 -			best_delta = min(best_delta, prev_delta);
 -		}
 -
 -		/* Evaluate the energy impact of using max_spare_cap_cpu. */
 -		if (max_spare_cap_cpu >= 0 && max_spare_cap > prev_spare_cap) {
 -			cur_delta = compute_energy(&eenv, pd, cpus, p,
 -						   max_spare_cap_cpu);
 -			/* CPU utilization has changed */
 -			if (cur_delta < base_energy)
 -				goto unlock;
 -			cur_delta -= base_energy;
 -			if (cur_delta < best_delta) {
 -				best_delta = cur_delta;
 -				best_energy_cpu = max_spare_cap_cpu;
 -			}
 -		}
 -	}
 -	rcu_read_unlock();
 -
 -	if (best_delta < prev_delta)
 -		target = best_energy_cpu;
 -
 -	return target;
 -
 -unlock:
 -	rcu_read_unlock();
 -
 -	return target;
 -}
 -
 /*
  * select_task_rq_fair: Select target runqueue for the waking task in domains
  * that have the relevant SD flag set. In practice, this is SD_BALANCE_WAKE,
@@ -7376,14 +7166,6 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int wake_flags)
 	lockdep_assert_held(&p->pi_lock);
 	if (wake_flags & WF_TTWU) {
 		record_wakee(p);
 -
 -		if (sched_energy_enabled()) {
 -			new_cpu = find_energy_efficient_cpu(p, prev_cpu);
 -			if (new_cpu >= 0)
 -				return new_cpu;
 -			new_cpu = prev_cpu;
 -		}
 -
 		want_affine = !wake_wide(p) && cpumask_test_cpu(cpu, p->cpus_ptr);
 	}
 --
 2.39.1
--- a/linux-tkg-patches/6.2/0003-glitched-cfs.patch
+++ b/linux-tkg-patches/6.2/0003-glitched-cfs.patch
@@ -88,3 +88,31 @@ index 6b423eebfd5d..61e3271675d6 100644
 #define MICRO_FREQUENCY_MIN_SAMPLE_RATE		(10000)
 #define MIN_FREQUENCY_UP_THRESHOLD		(1)
 #define MAX_FREQUENCY_UP_THRESHOLD		(100)
 From cba31b19f8c38696b13ba48e0e8b6dbe747d6bae Mon Sep 17 00:00:00 2001
 From: Alexandre Frade <admfrade@gmail.com>
 Date: Mon, 29 Jan 2018 17:31:25 +0000
 Subject: [PATCH 10/16] XANMOD: mm/vmscan: vm_swappiness = 30 decreases the
 amount of swapping
 Signed-off-by: Alexandre Frade <admfrade@gmail.com>
 Signed-off-by: Alexandre Frade <kernel@xanmod.org>
 ---
 mm/vmscan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/mm/vmscan.c b/mm/vmscan.c
 index 5b7b8d4f5297..549684b29418 100644
 --- a/mm/vmscan.c
 +++ b/mm/vmscan.c
@@ -190,7 +190,7 @@ struct scan_control {
 /*
  * From 0 .. 200.  Higher means more swappy.
  */
 -int vm_swappiness = 60;
 +int vm_swappiness = 30;
 static void set_task_reclaim_state(struct task_struct *task,
 				   struct reclaim_state *rs)
 --
 2.39.1
--- a/linux-tkg-patches/6.2/0005-glitched-pds.patch
+++ b/linux-tkg-patches/6.2/0005-glitched-pds.patch
@@ -0,0 +1,90 @@
 From f7f49141a5dbe9c99d78196b58c44307fb2e6be3 Mon Sep 17 00:00:00 2001
 From: Tk-Glitch <ti3nou@gmail.com>
 Date: Wed, 4 Jul 2018 04:30:08 +0200
 Subject: glitched - PDS
 diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
 index 2a202a846757..1d9c7ed79b11 100644
 --- a/kernel/Kconfig.hz
 +++ b/kernel/Kconfig.hz
@@ -4,7 +4,7 @@
 choice
 	prompt "Timer frequency"
 -	default HZ_250
 +	default HZ_500
 	help
 	 Allows the configuration of the timer frequency. It is customary
 	 to have the timer interrupt run at 1000 Hz but 100 Hz may be more
@@ -39,6 +39,13 @@ choice
 	 on SMP and NUMA systems and exactly dividing by both PAL and
 	 NTSC frame rates for video and multimedia work.
 +	config HZ_500
 +		bool "500 HZ"
 +	help
 +	 500 Hz is a balanced timer frequency. Provides fast interactivity
 +	 on desktops with great smoothness without increasing CPU power
 +	 consumption and sacrificing the battery life on laptops.
 +
 	config HZ_1000
 		bool "1000 HZ"
 	help
@@ -52,6 +59,7 @@ config HZ
 	default 100 if HZ_100
 	default 250 if HZ_250
 	default 300 if HZ_300
 +	default 500 if HZ_500
 	default 1000 if HZ_1000
 config SCHED_HRTICK
 diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
 index 2a202a846757..1d9c7ed79b11 100644
 --- a/kernel/Kconfig.hz
 +++ b/kernel/Kconfig.hz
@@ -4,7 +4,7 @@
 choice
 	prompt "Timer frequency"
 -	default HZ_500
 +	default HZ_750
 	help
 	 Allows the configuration of the timer frequency. It is customary
 	 to have the timer interrupt run at 1000 Hz but 100 Hz may be more
@@ -46,6 +46,13 @@ choice
 	 on desktops with great smoothness without increasing CPU power
 	 consumption and sacrificing the battery life on laptops.
 +	config HZ_750
 +		bool "750 HZ"
 +	help
 +	 750 Hz is a good timer frequency for desktops. Provides fast
 +	 interactivity with great smoothness without sacrificing too
 +	 much throughput.
 +
 	config HZ_1000
 		bool "1000 HZ"
 	help
@@ -60,6 +67,7 @@ config HZ
 	default 250 if HZ_250
 	default 300 if HZ_300
 	default 500 if HZ_500
 +	default 750 if HZ_750
 	default 1000 if HZ_1000
 config SCHED_HRTICK
 diff --git a/mm/vmscan.c b/mm/vmscan.c
 index 9270a4370d54..30d01e647417 100644
 --- a/mm/vmscan.c
 +++ b/mm/vmscan.c
@@ -169,7 +169,7 @@  
 /*
  * From 0 .. 200.  Higher means more swappy.
  */
 -int vm_swappiness = 60;
 +int vm_swappiness = 20;
 static void set_task_reclaim_state(struct task_struct *task,
 				   struct reclaim_state *rs)
--- a/linux-tkg-patches/6.2/0009-prjc_v6.2-r0.patch
+++ b/linux-tkg-patches/6.2/0009-prjc_v6.2-r0.patch
--- a/linux-tkg-patches/6.2/0012-misc-additions.patch
+++ b/linux-tkg-patches/6.2/0012-misc-additions.patch
@@ -64,253 +64,3 @@ index 2c7171e0b0010..85de313ddec29 100644
 	select CPU_FREQ_GOV_PERFORMANCE
 	help
 From 0c079d3f88df5f8286cd5c91b54bdac7c819be85 Mon Sep 17 00:00:00 2001
 From: Matthew Auld <matthew.auld@intel.com>
 Date: Tue, 6 Dec 2022 16:11:41 +0000
 Subject: [PATCH] drm/i915: improve the catch-all evict to handle lock
 contention
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 The catch-all evict can fail due to object lock contention, since it
 only goes as far as trylocking the object, due to us already holding the
 vm->mutex. Doing a full object lock here can deadlock, since the
 vm->mutex is always our inner lock. Add another execbuf pass which drops
 the vm->mutex and then tries to grab the object will the full lock,
 before then retrying the eviction. This should be good enough for now to
 fix the immediate regression with userspace seeing -ENOSPC from execbuf
 due to contended object locks during GTT eviction.
 Testcase: igt@gem_ppgtt@shrink-vs-evict-*
 Fixes: 7e00897be8bf ("drm/i915: Add object locking to i915_gem_evict_for_node and i915_gem_evict_something, v2.")
 References: https://gitlab.freedesktop.org/drm/intel/-/issues/7627
 References: https://gitlab.freedesktop.org/drm/intel/-/issues/7570
 References: https://bugzilla.mozilla.org/show_bug.cgi?id=1779558
 Signed-off-by: Matthew Auld <matthew.auld@intel.com>
 Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
 Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
 Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
 Cc: Andrzej Hajda <andrzej.hajda@intel.com>
 Cc: Mani Milani <mani@chromium.org>
 Cc: <stable@vger.kernel.org> # v5.18+
 Revision 1 of https://patchwork.freedesktop.org/series/111686/
 ---
 .../gpu/drm/i915/gem/i915_gem_execbuffer.c    | 25 +++++++++++--
 drivers/gpu/drm/i915/gem/i915_gem_mman.c      |  2 +-
 drivers/gpu/drm/i915/i915_gem_evict.c         | 37 ++++++++++++++-----
 drivers/gpu/drm/i915/i915_gem_evict.h         |  4 +-
 drivers/gpu/drm/i915/i915_vma.c               |  2 +-
 .../gpu/drm/i915/selftests/i915_gem_evict.c   |  4 +-
 6 files changed, 56 insertions(+), 18 deletions(-)
 diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
 index 845023c14eb36f..094e92ed28db4f 100644
 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
 +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -741,25 +741,44 @@ static int eb_reserve(struct i915_execbuffer *eb)
 	 *
 	 * Defragmenting is skipped if all objects are pinned at a fixed location.
 	 */
 -	for (pass = 0; pass <= 2; pass++) {
 +	for (pass = 0; pass <= 3; pass++) {
 		int pin_flags = PIN_USER | PIN_VALIDATE;
 		if (pass == 0)
 			pin_flags |= PIN_NONBLOCK;
 		if (pass >= 1)
 -			unpinned = eb_unbind(eb, pass == 2);
 +			unpinned = eb_unbind(eb, pass >= 2);
 		if (pass == 2) {
 			err = mutex_lock_interruptible(&eb->context->vm->mutex);
 			if (!err) {
 -				err = i915_gem_evict_vm(eb->context->vm, &eb->ww);
 +				err = i915_gem_evict_vm(eb->context->vm, &eb->ww, NULL);
 				mutex_unlock(&eb->context->vm->mutex);
 			}
 			if (err)
 				return err;
 		}
 +		if (pass == 3) {
 +retry:
 +			err = mutex_lock_interruptible(&eb->context->vm->mutex);
 +			if (!err) {
 +				struct drm_i915_gem_object *busy_bo = NULL;
 +
 +				err = i915_gem_evict_vm(eb->context->vm, &eb->ww, &busy_bo);
 +				mutex_unlock(&eb->context->vm->mutex);
 +				if (err && busy_bo) {
 +					err = i915_gem_object_lock(busy_bo, &eb->ww);
 +					i915_gem_object_put(busy_bo);
 +					if (!err)
 +						goto retry;
 +				}
 +			}
 +			if (err)
 +				return err;
 +		}
 +
 		list_for_each_entry(ev, &eb->unbound, bind_link) {
 			err = eb_reserve_vma(eb, ev, pin_flags);
 			if (err)
 diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
 index 73d9eda1d6b7a6..c83d98e1dc5da0 100644
 --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
 +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -369,7 +369,7 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf)
 		if (vma == ERR_PTR(-ENOSPC)) {
 			ret = mutex_lock_interruptible(&ggtt->vm.mutex);
 			if (!ret) {
 -				ret = i915_gem_evict_vm(&ggtt->vm, &ww);
 +				ret = i915_gem_evict_vm(&ggtt->vm, &ww, NULL);
 				mutex_unlock(&ggtt->vm.mutex);
 			}
 			if (ret)
 diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c
 index f025ee4fa52618..a4b4d9b7d26c7a 100644
 --- a/drivers/gpu/drm/i915/i915_gem_evict.c
 +++ b/drivers/gpu/drm/i915/i915_gem_evict.c
@@ -416,6 +416,11 @@ int i915_gem_evict_for_node(struct i915_address_space *vm,
  * @vm: Address space to cleanse
  * @ww: An optional struct i915_gem_ww_ctx. If not NULL, i915_gem_evict_vm
  * will be able to evict vma's locked by the ww as well.
 + * @busy_bo: Optional pointer to struct drm_i915_gem_object. If not NULL, then
 + * in the event i915_gem_evict_vm() is unable to trylock an object for eviction,
 + * then @busy_bo will point to it. -EBUSY is also returned. The caller must drop
 + * the vm->mutex, before trying again to acquire the contended lock. The caller
 + * also owns a reference to the object.
  *
  * This function evicts all vmas from a vm.
  *
@@ -425,7 +430,8 @@ int i915_gem_evict_for_node(struct i915_address_space *vm,
  * To clarify: This is for freeing up virtual address space, not for freeing
  * memory in e.g. the shrinker.
  */
 -int i915_gem_evict_vm(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww)
 +int i915_gem_evict_vm(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww,
 +		      struct drm_i915_gem_object **busy_bo)
 {
 	int ret = 0;
@@ -457,15 +463,22 @@ int i915_gem_evict_vm(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww)
 			 * the resv is shared among multiple objects, we still
 			 * need the object ref.
 			 */
 -			if (dying_vma(vma) ||
 +			if (!i915_gem_object_get_rcu(vma->obj) ||
 			    (ww && (dma_resv_locking_ctx(vma->obj->base.resv) == &ww->ctx))) {
 				__i915_vma_pin(vma);
 				list_add(&vma->evict_link, &locked_eviction_list);
 				continue;
 			}
 -			if (!i915_gem_object_trylock(vma->obj, ww))
 +			if (!i915_gem_object_trylock(vma->obj, ww)) {
 +				if (busy_bo) {
 +					*busy_bo = vma->obj; /* holds ref */
 +					ret = -EBUSY;
 +					break;
 +				}
 +				i915_gem_object_put(vma->obj);
 				continue;
 +			}
 			__i915_vma_pin(vma);
 			list_add(&vma->evict_link, &eviction_list);
@@ -473,25 +486,29 @@ int i915_gem_evict_vm(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww)
 		if (list_empty(&eviction_list) && list_empty(&locked_eviction_list))
 			break;
 -		ret = 0;
 		/* Unbind locked objects first, before unlocking the eviction_list */
 		list_for_each_entry_safe(vma, vn, &locked_eviction_list, evict_link) {
 			__i915_vma_unpin(vma);
 -			if (ret == 0)
 +			if (ret == 0) {
 				ret = __i915_vma_unbind(vma);
 -			if (ret != -EINTR) /* "Get me out of here!" */
 -				ret = 0;
 +				if (ret != -EINTR) /* "Get me out of here!" */
 +					ret = 0;
 +			}
 +			if (!dying_vma(vma))
 +				i915_gem_object_put(vma->obj);
 		}
 		list_for_each_entry_safe(vma, vn, &eviction_list, evict_link) {
 			__i915_vma_unpin(vma);
 -			if (ret == 0)
 +			if (ret == 0) {
 				ret = __i915_vma_unbind(vma);
 -			if (ret != -EINTR) /* "Get me out of here!" */
 -				ret = 0;
 +				if (ret != -EINTR) /* "Get me out of here!" */
 +					ret = 0;
 +			}
 			i915_gem_object_unlock(vma->obj);
 +			i915_gem_object_put(vma->obj);
 		}
 	} while (ret == 0);
 diff --git a/drivers/gpu/drm/i915/i915_gem_evict.h b/drivers/gpu/drm/i915/i915_gem_evict.h
 index e593c530f9bd7a..bf0ee0e4fe6088 100644
 --- a/drivers/gpu/drm/i915/i915_gem_evict.h
 +++ b/drivers/gpu/drm/i915/i915_gem_evict.h
@@ -11,6 +11,7 @@
 struct drm_mm_node;
 struct i915_address_space;
 struct i915_gem_ww_ctx;
 +struct drm_i915_gem_object;
 int __must_check i915_gem_evict_something(struct i915_address_space *vm,
 					  struct i915_gem_ww_ctx *ww,
@@ -23,6 +24,7 @@ int __must_check i915_gem_evict_for_node(struct i915_address_space *vm,
 					 struct drm_mm_node *node,
 					 unsigned int flags);
 int i915_gem_evict_vm(struct i915_address_space *vm,
 -		      struct i915_gem_ww_ctx *ww);
 +		      struct i915_gem_ww_ctx *ww,
 +		      struct drm_i915_gem_object **busy_bo);
 #endif /* __I915_GEM_EVICT_H__ */
 diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
 index f17c09ead7d778..4d06875de14a14 100644
 --- a/drivers/gpu/drm/i915/i915_vma.c
 +++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -1569,7 +1569,7 @@ static int __i915_ggtt_pin(struct i915_vma *vma, struct i915_gem_ww_ctx *ww,
 			 * locked objects when called from execbuf when pinning
 			 * is removed. This would probably regress badly.
 			 */
 -			i915_gem_evict_vm(vm, NULL);
 +			i915_gem_evict_vm(vm, NULL, NULL);
 			mutex_unlock(&vm->mutex);
 		}
 	} while (1);
 diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c
 index 8c6517d29b8e0c..37068542aafe7f 100644
 --- a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c
 +++ b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c
@@ -344,7 +344,7 @@ static int igt_evict_vm(void *arg)
 	/* Everything is pinned, nothing should happen */
 	mutex_lock(&ggtt->vm.mutex);
 -	err = i915_gem_evict_vm(&ggtt->vm, NULL);
 +	err = i915_gem_evict_vm(&ggtt->vm, NULL, NULL);
 	mutex_unlock(&ggtt->vm.mutex);
 	if (err) {
 		pr_err("i915_gem_evict_vm on a full GGTT returned err=%d]\n",
@@ -356,7 +356,7 @@ static int igt_evict_vm(void *arg)
 	for_i915_gem_ww(&ww, err, false) {
 		mutex_lock(&ggtt->vm.mutex);
 -		err = i915_gem_evict_vm(&ggtt->vm, &ww);
 +		err = i915_gem_evict_vm(&ggtt->vm, &ww, NULL);
 		mutex_unlock(&ggtt->vm.mutex);
 	}
--- a/linux-tkg-patches/6.2/0013-fedora-rpm.patch
+++ b/linux-tkg-patches/6.2/0013-fedora-rpm.patch
@@ -1,27 +1,53 @@
 # Remove the obsoletes line in kernel-headers
 # Add provides for kernel-devel so there's no conflict
 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
-index 7c477ca7d..1158f5559 100755
+index 70392fd2f..34f98648f 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,0 +26 @@ fi
+@@ -25,7 +25,7 @@ fi
 +PROVIDES_DRM=""
-@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
+ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
-@@ -30 +30,0 @@ fi
+ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
 $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
+ 	# $UTS_MACHINE as a fallback of _arch in case
@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 	Group: Development/System
 -	Obsoletes: kernel-headers
 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
-@@ -72,0 +75,3 @@ $S$M	Group: System Environment/Kernel
+ 	%description headers
@@ -75,2 +78,5 @@ $S$M	Summary: Development package for building kernel modules to match the $__KE
 $S$M	Group: System Environment/Kernel
 +$S$M	Provides: kernel-devel = %{version}
 +$S$M	Provides: kernel-devel-uname-r = %{version}
 +$S$M	Provides: installonlypkg(kernel) = %{version}
 $S$M	AutoReqProv: no
@@ -80,2 +86,18 @@ $S$M	against the $__KERNELRELEASE kernel package.
 $S$M
 +$S	# Opt out of a lot of Fedora hardening flags etc...
 +$S	# See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
 +$S	%undefine _package_note_file
 +$S	%undefine _auto_set_build_flags
 +$S	%undefine _include_frame_pointers
 +$S	%define _build_id_flags -Wl,--build-id=none
 +$S	%undefine _annotated_build
 +$S	%undefine _fortify_level
 +$S	%undefine _hardened_build
 +$S	%global _lto_cflags %{nil}
 +$S	%global _configure_gnuconfig_hack 0
 +$S	%global _configure_libtool_hardening_hack 0
 +$S	# Nearly had to go to the deep web to find documentation on this one... Gosh
 +$S	# See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
 +$S	%define _build_id_links none
 +$S
 $S	%prep
Author	SHA1	Message	Date
Sravan Balaji	2b2ee8f3e6	PDS Kernel Configuration	2023-03-05 09:49:37 -05:00
Tk-Glitch	1d2c0e5c66	Linux 6.2.y: Move cherry picks from `ee6cc74e03` to cfs and cfs-additions patches Fixes https://github.com/Frogging-Family/linux-tkg/issues/712	2023-03-05 02:04:05 +01:00
Tk-Glitch	ee6cc74e03	linux 6.2.y: glitched-base: Add cherry picks from xanmod kernel https://github.com/xanmod/linux-patches/tree/master/linux-6.2.y-xanmod/xanmod	2023-03-03 13:20:55 +01:00
Tk-Glitch	e9bc6b34e4	linux 6.2.y: clear-patches: Add a few cherry picks from xanmod https://github.com/xanmod/linux-patches/tree/master/linux-6.2.y-xanmod/clearlinux	2023-03-03 13:17:10 +01:00
Tk-Glitch	e1372ce04b	Set `CONFIG_PSI_DEFAULT_DISABLED` to enabled by default when using Project C CPU schedulers.	2023-02-23 13:13:29 +01:00
ptr1337	ccbf7e5a82	6.2: Update prjc patchset (#710 ) Signed-off-by: Peter Jung <admin@ptr1337.dev>	2023-02-23 13:01:29 +01:00
ptr1337	0213d7503f	6.2: Sync config (#709 ) Signed-off-by: Peter Jung <admin@ptr1337.dev>	2023-02-23 13:00:11 +01:00
Tk-Glitch	3fd1eaddc4	linux 6.1.y: misc_additions: Remove `Revert "drm/display/dp_mst: Move all payload info into the atomic state"` Fixed upstream Fixes https://github.com/Frogging-Family/linux-tkg/issues/703	2023-02-01 14:01:05 +01:00
Tk-Glitch	cf3ee4415a	cfg: Enable _futex_waitv by default and move all the legacy or deprecated options to a "legacy options" section. LTS-only options are considered as legacy	2023-01-29 17:06:48 +01:00
Tk-Glitch	ccc1e5cb69	Revert "linux 6.1.y: Update Project C patchset to v6.1-r3 - https://gitlab.com/alfredchen/linux-prjc/-/commits/linux-6.1.y-prjc " This reverts commit `3c4f81daa3`.	2023-01-26 16:03:52 +01:00
Tk-Glitch	4616e8a334	linux 6.1.y: NR_CPUS is buggy on 6.1, let's ignore the setting with a warning https://bugzilla.kernel.org/show_bug.cgi?id=216823 https://github.com/Frogging-Family/linux-tkg/issues/696	2023-01-23 15:35:45 +01:00
Tk-Glitch	0669717533	linux 6.2 rc: Import and allow Project C CPU schedulers Based on v6.1-r3 - https://gitlab.com/alfredchen/linux-prjc/-/commits/linux-6.1.y-prjc	2023-01-19 18:30:22 +01:00
Tk-Glitch	3eb0fca482	linux 6.2 rc: misc_additions: Get rid of merged patch "drm/i915: improve the catch-all evict to handle lock contention"	2023-01-19 18:15:34 +01:00
Tk-Glitch	3c4f81daa3	linux 6.1.y: Update Project C patchset to v6.1-r3 - https://gitlab.com/alfredchen/linux-prjc/-/commits/linux-6.1.y-prjc	2023-01-19 18:14:53 +01:00
Tk-Glitch	d465b7bbd0	linux 6.1.y: misc_additions: Remove merged patch `netfilter: nft_payload: incorrect arithmetics when fetching VLAN header bits`	2023-01-19 01:28:09 +01:00
Tk-Glitch	17d26874f0	Typo Fixes `8fa230cc47`	2023-01-15 19:10:08 +01:00
Tk-Glitch	8fa230cc47	Don't rewrite _kernel_work_folder_abs and _kernel_source_folder_abs values when they are already available	2023-01-15 18:23:38 +01:00
Tk-Glitch	5c7f413670	cfg: Add tt and bore to the cpu schedulers options comment	2023-01-14 18:17:48 +01:00
Tk-Glitch	430895448e	readme: Add TT to the cpu schedulers list	2023-01-14 18:17:09 +01:00
Tk-Glitch	12f4af77d1	linux 6.1.y: misc_additions: Add `revert "drm/display/dp_mst: Move all payload info into the atomic state"` and `netfilter: nft_payload: incorrect arithmetics when fetching VLAN header bits` From Arch's v6.1.6-arch1 - `9c911dbf75` Fixes https://github.com/Frogging-Family/linux-tkg/issues/691	2023-01-14 18:01:15 +01:00
Tk-Glitch	9f4e3a6ab4	CI: Make sure we're using strings for _kernel_work_folder and _kernel_source_folder	2023-01-14 17:50:44 +01:00
Tk-Glitch	b711bc9d4b	Always nuke remnant customization.cfg There is a small windows where the exit cleanup won't be triggered and people then think everything is broken	2023-01-14 17:50:13 +01:00
Tk-Glitch	27a63d3151	Write _kernel_work_folder_abs and _kernel_source_folder_abs to BIG_UGLY_FROGMINER	2023-01-14 17:49:08 +01:00
Tk-Glitch	129d26c332	Get rid of _srcpath	2023-01-14 17:45:58 +01:00
Tk-Glitch	a7110488dd	Drop broken Void Linux explicit support. Void Linux users should use the Generic install as a replacement. Fixes https://github.com/Frogging-Family/linux-tkg/issues/655	2023-01-14 16:26:31 +01:00
Tk-Glitch	8d7c65690a	readme: Warn about the disk space requirements to build the kernel Fixes https://github.com/Frogging-Family/linux-tkg/issues/692	2023-01-14 16:25:38 +01:00
ptr1337	2fb0ab964e	README: Add BORE to alternative schedulers (#686 ) Signed-off-by: Peter Jung <admin@ptr1337.dev> Signed-off-by: Peter Jung <admin@ptr1337.dev>	2023-01-11 20:03:32 +01:00
Tk-Glitch	c146fa94b6	linux 6.1.y: Update bcachefs patch for 6.1.4	2023-01-11 18:11:04 +01:00
Tk-Glitch	3d2b09d984	Apply glitched-cfs patch to all the CFS schedulers I'm pretty sure we used to do that. Oh, well. Fixes https://github.com/Frogging-Family/linux-tkg/issues/687	2023-01-10 14:01:59 +01:00
Tk-Glitch	d9aa0ce0e6	CI: Use "/tmp" as work and source dir Following `3a62d00e93`	2023-01-09 17:49:11 +01:00
Tk-Glitch	3a62d00e93	Always create a subfolder for source and work directories with hardcoded names (linux-src-git and linux-kernel.git for source and work dirs respectively). If an absolute path is used, create a linux-tkg subdir to contain those. This allows using the same root path for both as well as defaulting to an empty value that mimics our previous behavior. The main motivation for this is to offer more safety as using an existing non-empty dir might result in unwanted behavior. Fixes https://github.com/Frogging-Family/linux-tkg/issues/685	2023-01-09 17:43:24 +01:00
Tk-Glitch	3cdda62d46	makepkg: Fix not dynamically setting our source symlink, which is needed as of `a38ef1643c`	2023-01-09 17:26:21 +01:00
Tk-Glitch	2a3ef54e6e	linux 6.1.y: misc_additions: Remove patch `drm/i915: improve the catch-all evict to handle lock contention` Merged in 6.1.4	2023-01-07 20:55:02 +01:00
Adel Kara Slimane	cce2db1c9f	Various fixes for the RPM target (#684 ) * prepare: always patch RPM mkspec Like this we can notice earlier if it doesn't apply any longer Otherwise I only test RPM when issues get openned * RPM: fix RPM mkspecp atch, thanks @W3sG for the heads up! - Only part of the patch was applying - Fixed also the fact that packages conflict because of unneeded build-id files in /usr/lib/.build-id - Removed all the hardening flags Fedora uses by default "we do not do that here" Fixes: #669 #609 * install.sh: uninstall-help: fix Fedora query for installed TKG packages * install.sh: RPM: fix typo in variable Used the non absolute path for the work folder x)	2023-01-07 20:51:15 +01:00
Tk-Glitch	06eb48b3e3	linux 6.1.y: Update prjc to v6.1-r1 (official release) with the pending fix for boot failure - https://gitlab.com/alfredchen/linux-prjc/-/issues/68#note_1226803051 Now we should be back on track !	2023-01-04 19:22:19 +01:00
Adel Kara Slimane	a38ef1643c	Improve customization of source and work folders (#672 ) * customization.cfg: add new entries for kernel paths Two choices: - Where to put git bare repository, - Will be implemented as a bare repository, the folder will have only compressed blobs and will be around ~400MB. Should be good to have even in HDDs - This is meant to be in a permanent storage like HDD or SSD. But some uses could have it on a tmpfs if the storage is very slow when compared to a full git (shallow) clone - Where to have the work/build folder - This will be implemented through a git worktree, where the bare repo will be decompressed. This is best on a tmpfs folder but needs >=32GB for a full kernel build. Otherwise should be okay with modprobed-db * customization.cfg: remove obsolete entries the tmpfs related entries can be set with the previously added entries, i.e. _kernel_work_folder and _kernel_source_folder * prepare: check if obsoleted vars get set, warn if so and exit Like this users will get notified about the change and act accordingly * prepare: remove unused kernel subver patching code this used to bump from kernel x.y to x.y.z * prepare: add func to define kernel abs paths We will use these absolute paths to refer to kernel folders (work and source) * prepare: rewrite git fetching code - Rename to "_setup_kernel_work_folder" - Now we simply fetch directly the "commit hash" / "git tag" from the user chosen remote, no branches - The source folder (the one that is preferably on disk) is only a bare repo with a small size (~400MB) - The work folder is then (re)created / updated (as need) as a git worktree * prepare: tkg_patcher: embed patch name into the message Otherwise it doesn't work on the install.sh approach, which reimplements a simple msg2 function that doesn't support %s replacement * PKGBUILD: use new path variable for work folder * install.sh: use new path variable for work folder * CI: setup source and build folder in /tmp * prepare: update diffconfig with new kernel work folder var	2023-01-04 15:27:41 +01:00
Tk-Glitch	86578256b7	linux 5.15.y: Update fsync backport for new futex dir hierarchy Fixes https://github.com/Frogging-Family/linux-tkg/issues/683	2023-01-04 15:25:18 +01:00
Dmitry Skvortsov	5298957d9b	linux 5.15.y: Update compatibility fix for old Fsync ABI (#680 ) addition to `a6877bd422`	2023-01-03 11:43:27 +01:00
ptr1337	8c776ecf64	Remove futex patch, it got merged into upstream 6.1.2 (#677 ) Signed-off-by: Peter Jung <admin@ptr1337.dev> Signed-off-by: Peter Jung <admin@ptr1337.dev>	2023-01-02 13:33:10 +01:00
Dmitry Skvortsov	a6877bd422	linux 5.15.y: futex_waitv fixup (#676 ) following https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.86&id=fd8a10d44c11f8f53d640db6b97486045b7e0b81	2023-01-02 13:32:21 +01:00