PDS Kernel Configuration

.github/workflows/build-current-kernel-arch.yml

@@ -10,8 +10,6 @@ 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
 

PKGBUILD

@@ -48,6 +48,8 @@ fi
 
 source "$_where"/BIG_UGLY_FROGMINER
 
+_srcpath="linux-src-git"
+
 if [ -n "$_custom_pkgbase" ]; then
   pkgbase="${_custom_pkgbase}"
 else
@@ -79,12 +81,10 @@ 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
 
-  _define_kernel_abs_paths
-  if [ -e "${srcdir}/customization.cfg" ]; then
-    msg2 "Nuking remnant customization.cfg symlink" && rm -rf "${srcdir}/customization.cfg"
-  fi
-  ln -s "${_where}/customization.cfg" "${srcdir}"
-  ln -s "${_kernel_work_folder_abs}" "${srcdir}"
+  ln -s "${_where}/customization.cfg" "${srcdir}" # workaround
+  ln -s "${_where}/linux-src-git" "${srcdir}" # workaround, this doesn't respect tmpfs choice
+
+  cd "${srcdir}/${_srcpath}"
 
   source "${_where}/current_env"
 
@@ -92,7 +92,7 @@ prepare() {
 }
 
 build() {
-  cd "$_kernel_work_folder_abs"
+  cd "${srcdir}/${_srcpath}"
 
   # Use custom compiler paths if defined
   if [ "$_compiler_name" = "-llvm" ] && [ -n "${CUSTOM_LLVM_PATH}" ]; then
@@ -143,8 +143,7 @@ hackbase() {
   fi
   replaces=(virtualbox-guest-modules-arch wireguard-arch)
 
-  _define_kernel_abs_paths
-  cd "$_kernel_work_folder_abs"
+  cd "${srcdir}/${_srcpath}"
 
   # get kernel version
   local _kernver="$(<version)"
@@ -174,9 +173,9 @@ hackbase() {
   install -Dm644 "${srcdir}"/customization-full.cfg "${pkgdir}/usr/share/doc/${pkgbase}/customization.cfg"
 
   # workaround for missing header with winesync
-  if [ -e "${_kernel_work_folder_abs}/include/uapi/linux/winesync.h" ]; then
+  if [ -e "${srcdir}/${_srcpath}/include/uapi/linux/winesync.h" ]; then
     msg2 "Workaround missing winesync header"
-    install -Dm644 "${_kernel_work_folder_abs}"/include/uapi/linux/winesync.h "${pkgdir}/usr/include/linux/winesync.h"
+    install -Dm644 "${srcdir}/${_srcpath}"/include/uapi/linux/winesync.h "${pkgdir}/usr/include/linux/winesync.h"
   fi
 
   # load winesync module at boot
@@ -203,9 +202,7 @@ hackheaders() {
     ;;
   esac
 
-  _define_kernel_abs_paths
-  cd "$_kernel_work_folder_abs"
-
+  cd "${srcdir}/${_srcpath}"
   local builddir="${pkgdir}/usr/lib/modules/$(<version)/build"
 
   msg2 "Installing build files..."

README.md

@@ -7,7 +7,6 @@ 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`
@@ -20,10 +19,8 @@ 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 - CFS based : [code repository](https://github.com/hamadmarri/cacule-cpu-scheduler)
-- 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.
+- CacULE by Hamad Marri: [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.
 
 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
@@ -122,6 +119,17 @@ 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

customization.cfg

@@ -1,6 +1,6 @@
 # linux-TkG config file
 
-# Linux distribution you are using, options are "Arch", "Ubuntu", "Debian", "Fedora", "Suse", "Gentoo", "Generic".
+# Linux distribution you are using, options are "Arch", "Void", "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,20 +23,6 @@ _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=""
@@ -68,6 +54,17 @@ _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"
 
@@ -96,7 +93,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", "tt", "bore" or "cfs" (kernel's default)
+# CPU scheduler - Options are "upds" (TkG's Undead PDS), "pds", "bmq", "muqss", "cacule" or "cfs" (kernel's default)
 _cpusched="pds"
 
 # Compiler to use - Options are "gcc" or "llvm".
@@ -163,6 +160,24 @@ _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"
@@ -190,6 +205,9 @@ _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"
 
@@ -206,6 +224,10 @@ _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"
 
@@ -239,41 +261,14 @@ _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 ####
 

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 \$_kernel_work_folder, 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 linux-src-git, 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,9 +136,24 @@ 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="$_kernel_work_folder_abs/.."
+  _build_dir="$_where"
+  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
@@ -206,8 +221,6 @@ 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"
@@ -249,7 +262,10 @@ if [ "$1" = "install" ]; then
       _extra_ver_str="_${_kernel_flavor}"
     fi
 
-    _fedora_work_dir="$_kernel_work_folder_abs/linux-tkg-rpmbuild"
+    _fedora_work_dir="${HOME}/.cache/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}"
@@ -416,7 +432,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 | grep -i "tkg"
+    dnf list --installed kernel*
     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"

linux-tkg-config/6.2/config.x86_64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.2.0-rc4 Kernel Configuration
+# Linux/x86 6.2.0-rc1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
@@ -206,7 +206,6 @@ 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
@@ -242,7 +241,6 @@ 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
@@ -2548,7 +2546,6 @@ 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 is not set
 CONFIG_ATA_OVER_ETH=m
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_BLKDEV_BACKEND=m

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")
-  elif [ "$_kver" = "602" ]; then
-    _avail_cpu_scheds=("cfs" "pds" "bmq" "tt" "bore")
     _projectc_unoff=1
+  elif [ "$_kver" = "602" ]; then
+    _avail_cpu_scheds=("cfs" "tt" "bore")
   else
     _avail_cpu_scheds=("cfs")
   fi
@@ -382,31 +382,8 @@ _set_compiler(){
   echo -e "_compiler_name='$_compiler_name'\nllvm_opt='$llvm_opt'" >> "$_where"/BIG_UGLY_FROGMINER
 }
 
-_define_kernel_abs_paths() {
 
-  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
+_linux_git_branch_checkout() {
 
   if [ -z "$_kernel_git_tag" ]; then
     warning "internal error: kernel version should be chosen before cloning kernel sources"
@@ -415,44 +392,85 @@ _setup_kernel_work_folder() {
 
   cd "$_where"
 
-  if ! [ -d "$_kernel_source_folder_abs" ]; then
+  if ! [ -d linux-src-git ] || ( [ "$_source_in_tmpfs" = "true" ] && ! [ -d /tmp/linux-src-git ] ); then
     msg2 "First initialization of the linux source code git folder"
-    mkdir -p "$_kernel_source_folder_abs"
-    cd "$_kernel_source_folder_abs"
-    git init --bare
+    if [ "$_source_in_tmpfs" = "true" ]; then
+      rm -rf "${_where}/linux-src-git"
+      mkdir "/tmp/linux-src-git"
+      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 "$_kernel_source_folder_abs"
+    cd linux-src-git
+
+    # 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 "Fetching tag: $_kernel_git_tag from mirror $_git_mirror"
-  git fetch --depth 1 $_git_mirror tag "$_kernel_git_tag"
+    msg2 "Current branch: $(git branch | grep "\*")"
+    msg2 "Reseting files to their original state"
 
-  msg2 "Checking out tag: $_kernel_git_tag"
-  msg2 "   in the work folder: $_kernel_work_folder_abs"
-
-  # The space ' ' in grep -w "$_kernel_work_folder_abs " is important
-  # to not match an existing folder with a longer name with the same prefix name
-  if [ -d "$_kernel_work_folder_abs" ] && \
-     ( 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
-    # In all other cases, just force create the work tree
-    rm -rf "$_kernel_work_folder_abs"
-    git worktree add -f "$_kernel_work_folder_abs" "$_kernel_git_tag"
+    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 "master branch exists locally, updating..."
+      git checkout master-${_git_mirror}
+      git fetch --depth 1 $_git_mirror tag "$_kernel_git_tag"
+      git reset --hard ${_git_mirror}/master
+    fi
+    msg2 "Checking out latest RC tag: $_kernel_git_tag"
+    git checkout "$_kernel_git_tag"
+  else
+    msg2 "Switching to linux-${_basekernel}.y"
+    if ! git branch --list | grep -w "linux-${_basekernel}-${_git_mirror}" ; then
+      msg2 "${_basekernel}.y branch doesn't locally exist, shallow cloning..."
+      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
 }
 
 
@@ -470,23 +488,6 @@ _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"
@@ -494,7 +495,11 @@ _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"
@@ -506,8 +511,13 @@ _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
@@ -516,7 +526,7 @@ _tkg_initscript() {
     echo -e "_custom_pkgbase=\"$_custom_pkgbase\"" >> "$_where"/BIG_UGLY_FROGMINER
   fi
 
-  _setup_kernel_work_folder
+  _linux_git_branch_checkout
 }
 
 user_patcher() {
@@ -583,16 +593,12 @@ _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 ${tkgpatch##*/}...\n         (unavailable for this kernel version)"
+    msg2 "Skipping patch %s...\n         (unavailable for this kernel version)" "${tkgpatch##*/}" #"
   fi
 }
 
 _tkg_srcprep() {
 
-  _define_kernel_abs_paths
-
-  cd "$_kernel_work_folder_abs"
-
   msg2 "Setting version..."
   scripts/setlocalversion --save-scmversion
 
@@ -601,6 +607,13 @@ _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
@@ -616,6 +629,9 @@ _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"
@@ -681,8 +697,10 @@ _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."
@@ -722,8 +740,6 @@ _tkg_srcprep() {
     rev=1
   elif [ "$_kver" = "518" ]; then
     rev=2
-  elif [ "$_kver" = "601" ]; then
-    rev=1
   else
     rev=0
   fi
@@ -785,6 +801,16 @@ _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
@@ -794,27 +820,40 @@ _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
-  elif [ "${_cpusched}" = "cfs" ]; then
-    _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
+  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
 
   fi
@@ -877,7 +916,8 @@ _tkg_srcprep() {
 
   # ccache fix
   if [ "$_noccache" != "true" ]; then
-    if { [ "$_distro" = "Arch" ] && pacman -Qq ccache &> /dev/null; } || { [ "$_distro" = "Ubuntu" ] && dpkg -l ccache > /dev/null; }; then
+    if { [ "$_distro" = "Arch" ] && pacman -Qq ccache &> /dev/null; } || { [ "$_distro" = "Ubuntu" ] && dpkg -l ccache > /dev/null; }\
+	    || { [ "$_distro" = "Void" ] && xbps-query -s ccache > /dev/null; } ; then
       _disable "GCC_PLUGINS"
     fi
   fi
@@ -1573,21 +1613,17 @@ 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 "${_kernel_work_folder_abs}"
+      cd "$_where/.." && git clone https://github.com/Frogging-Family/community-patches.git && cd "${srcdir}/${_srcpath}"
     fi
     _community_patches=($_community_patches)
     mkdir -p "$_where"/linux"$_basever"-tkg-userpatches
@@ -1613,7 +1649,7 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
     rm -f "$_where"/linux"$_basever"-tkg-userpatches/$_p
   done
 
-  if [ "$_distro" = "Arch" ]; then
+  if [ "$_distro" = "Arch" ] || [ "$_distro" = "Void" ]; then
     # don't run depmod on 'make install'. We'll do this ourselves in packaging
     sed -i '2iexit 0' scripts/depmod.sh
 
@@ -1682,12 +1718,17 @@ 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" ]; then
+  if [ -z "$_menunconfig" ] && [ "$_distro" != "Void" ]; then
     plain ""
     plain "*Optional* For advanced users - Do you want to use make menuconfig or nconfig"
     plain "to configure the kernel before building it?"
@@ -1729,11 +1770,16 @@ 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
-        pushd "$_kernel_work_folder_abs"
-        scripts/diffconfig -m .config.orig .config > "$_where/$_diffconfig_name"
-        popd
+          prev_pwd="${PWD:-$(pwd)}"
+          cd "$_where" || exit
         fi
+        "${prev_pwd}/scripts/diffconfig" -m "${prev_pwd}/.config.orig" "${prev_pwd}/.config" > "$_diffconfig_name"
+      ) fi
     fi
     rm .config.orig
   fi
@@ -1763,6 +1809,12 @@ 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"
@@ -1850,5 +1902,7 @@ exit_cleanup() {
     sed -i 's/\x1b(B//g' "$_where"/logs/shell-output.log.txt
   fi
 }
-
-trap exit_cleanup EXIT
+# Void has its own clean function, this breaks it so ignore it
+if [ "$_distro" != "Void" ]; then
+  trap exit_cleanup EXIT
+fi

linux-tkg-patches/5.10/0013-fedora-rpm.patch

@@ -1,53 +1,28 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/5.11/0013-fedora-rpm.patch

@@ -1,53 +1,28 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/5.12/0013-fedora-rpm.patch

@@ -1,53 +1,28 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/5.13/0013-fedora-rpm.patch

@@ -1,53 +1,28 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/5.14/0013-fedora-rpm.patch

@@ -1,53 +1,28 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

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/core.c             | 348 +++++++++++++++++++++++++++++++++++++
+ kernel/futex.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/core.c b/kernel/futex/core.c
+diff --git a/kernel/futex.c b/kernel/futex.c
 index 408cad5e89680f..c30930a955cece 100644
---- a/kernel/futex/core.c
-+++ b/kernel/futex/core.c
+--- a/kernel/futex.c
++++ b/kernel/futex.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/core.c             | 3 ++-
+ kernel/futex.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/core.c b/kernel/futex/core.c
+diff --git a/kernel/futex.c b/kernel/futex.c
 index c30930a955cece..aa33e66df5c9df 100644
---- a/kernel/futex/core.c
-+++ b/kernel/futex/core.c
+--- a/kernel/futex.c
++++ b/kernel/futex.c
 @@ -4002,7 +4002,7 @@ futex_init_timeout(u32 cmd, u32 op, struct timespec64 *ts, ktime_t *t)
  		return -EINVAL;
 

linux-tkg-patches/5.15/0013-fedora-rpm.patch

@@ -1,53 +1,28 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/5.16/0013-fedora-rpm.patch

@@ -1,53 +1,28 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/5.17/0013-fedora-rpm.patch

@@ -1,53 +1,28 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/5.18/0013-fedora-rpm.patch

@@ -1,53 +1,27 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/5.19/0013-fedora-rpm.patch

@@ -1,53 +1,27 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/5.4/0013-fedora-rpm.patch

@@ -1,53 +1,28 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/5.7/0013-fedora-rpm.patch

@@ -1,53 +1,28 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/5.8/0013-fedora-rpm.patch

@@ -1,53 +1,28 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/5.9/0013-fedora-rpm.patch

@@ -1,53 +1,28 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/6.0/0013-fedora-rpm.patch

@@ -1,53 +1,27 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

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);
-@@ -6793,7 +6789,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
+@@ -6792,12 +6788,12 @@ 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,19 +90621,7 @@ index 5cfc95a52bc3..be075882450a 100644
  
  		ret = print_trace_line(iter);
  		if (ret == TRACE_TYPE_PARTIAL_LINE) {
-@@ -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 */
+ 			/* don't print partial lines */
 -			iter->seq.seq.len = save_len;
 +			iter->seq.seq.pos = save_pos;
  			break;

linux-tkg-patches/6.1/0012-misc-additions.patch

@@ -63,3 +63,254 @@ 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);
+ 	}
+

linux-tkg-patches/6.1/0013-fedora-rpm.patch

@@ -1,53 +1,27 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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

linux-tkg-patches/6.2/0005-glitched-pds.patch

@@ -1,90 +0,0 @@
-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)

linux-tkg-patches/6.2/0012-misc-additions.patch

@@ -64,3 +64,253 @@ 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);
+ 	}
+

linux-tkg-patches/6.2/0013-fedora-rpm.patch

@@ -1,53 +1,27 @@
+# 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 70392fd2f..34f98648f 100755
+index 7c477ca7d..1158f5559 100755
 --- a/scripts/package/mkspec
 +++ b/scripts/package/mkspec
-@@ -25,7 +25,7 @@ fi
-
+@@ -25,0 +26 @@ fi
 +PROVIDES_DRM=""
- if grep -q CONFIG_DRM=y .config; then
+@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then
 -	PROVIDES=kernel-drm
 +	PROVIDES_DRM="Provides: kernel-drm = %{version}"
- fi
-
+@@ -30 +30,0 @@ fi
 -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
- __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
+@@ -51 +51,3 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Provides: $PROVIDES
 +	$PROVIDES_DRM
 +	Provides: kernel = %{version}
 +	Provides: kernel-uname-r = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	# $UTS_MACHINE as a fallback of _arch in case
-@@ -63,4 +66,4 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
- 	Group: Development/System
+@@ -61 +63 @@ $S	Source: kernel-$__KERNELRELEASE.tar.gz
 -	Obsoletes: kernel-headers
- 	Provides: kernel-headers = %{version}
 +	Provides: installonlypkg(kernel) = %{version}
- 	%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
+@@ -72,0 +75,3 @@ $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