diff --git a/docs/kernels.md b/docs/kernels.md index 6009bb3c2..0b4fa0e89 100644 --- a/docs/kernels.md +++ b/docs/kernels.md @@ -18,7 +18,7 @@ We publish the following kernel images: * primary kernel * debug kernel -* tools for the specific kernel build +* tools for the specific kernel build - bcc and perf * builder image for the specific kernel build, useful for compiling compatible kernel modules ### Primary Kernel Images @@ -163,24 +163,33 @@ Throughout the document, the terms used are: * kernel version: actual semver version of a kernel, e.g. `6.6.13` or `5.15.27` * kernel series: major.minor version of a kernel, e.g. `6.6.x` or `5.15.x` -Each series of kernels has a config file dedicated to it in [../kernel/](../kernel), -e.g. [config-5.10.x-x86_64](../kernel/config-5.10.x-x86_64), -one per target architecture. Note that the architecture used as the `uname -m` one -and not the alpine or golang one. Thus `x86_64` rather than `amd64`, and `aarch64` rather -than `arm64`. +Throughout this document, the architecture used is the kernel-recognized one, available +on most systems as `uname -m`, e.g. `aarch64` or `x86_64`. You may be familiar with the alpine +or golang one, e.g. `amd64` or `amd64`, which are not used here. -The series+arch config file is applied during the kernel build process. +Each series of kernels has a dedicated directory in [../kernel/](../kernel), +e.g. [6.6.x](../kernel/6.6.x) or [5.15.x](../kernel/5.15.x). +Variants, like rt kernels, have their own directory as well, e.g. [5.11.x-rt](../kernel/5.11.x-rt). +However, for variants, the patches from _both_ the common kernel, e.g. [5.11.x](../kernel/5.11.x), +and the variant, e.g. [5.11.x-rt](../kernel/5.11.x-rt), are applied, and the configs from _both_ are combined. + +Within the series-dedicated directory, there are: + +* kernel config file for each architecture named `config-`, e.g. [6.6.13/config-x86_64](../kernel/6.6.13/config-x86_64), one per target architecture. +* optional patches directory, e.g. [6.6.13/patches](../kernel/6.6.13/patches), which contains patches to apply to the kernel source + +The config file and patches are applied during the kernel build process. **Note**: We try to keep the differences between kernel versions and architectures to a minimum, so if you make changes to one configuration also try to apply it to the others. The script [kconfig-split.py](../scripts/kconfig-split.py) can be used to compare kernel config files. For example: ```sh -../scripts/kconfig-split.py config-4.9.x-aarch64 config-4.9.x-x86_64 +../scripts/kconfig-split.py 5.15.x/config-aarch64 5.15.x/config-x86_64 ``` creates a file with the common and the x86_64 and arm64 specific -config options for the 4.9.x kernel series. +config options for the 5.15.x kernel series. **Note**: The CI pipeline does *not* push out kernel images. Anyone modifying a kernel should: @@ -293,7 +302,7 @@ the modified config file will be in `.config`; save the file back to `/src`, e.g. ```sh -cp .config /src/kernel-config-6.6.x-x86_64 +cp .config /src/6.6.x/config-x86_64 ``` You can also configure other architectures other than the native @@ -332,27 +341,34 @@ docker run --rm -ti -v $(pwd):/src linuxkit/kconfig ``` 1. In the container, change directory to the kernel source directory for the new version, e.g. `cd /linux-5.15.148`. 1. Run `make defconfig` to create the default config file. -1. If the config file has changed, copy it out of the container and check it in, e.g. `cp .config /src/kernel-config-5.15.x-x86_64`. +1. If the config file has changed, copy it out of the container and check it in, e.g. `cp .config /src/5.15.x/config-x86_64`. 1. Repeat for other architectures. 1. Commit the changed config files. 1. Test that you can build the kernel with that config as `make build-`, e.g. `make build-5.15.148`. ## Adding a new kernel series -To add a new kernel series, you need to create a new config file. Since the last major series -likely is the best basis for the new one, subject to additional modifications, you can use +To add a new kernel series, you need to: + +1. Create new directory for the series, e.g. `6.7.x` +1. Create config files for each architecture in that directory +1. Optionally, create a `patches/` subdirectory in that directory with any patches to add +1. Update the list of kernels to build in the `Makefile` + +Since the last major series likely is the best basis for the new one, subject to additional modifications, you can use the previous one as a starting point. 1. Modify the list of kernels inside the `Makefile` to include the new version. You do not need to specify the series anywhere, as the `Makefile` calculates it. E.g. adding `7.0.5` will cause it to calculate the series as `7.0.x` automatically. +1. Make the directory for the new series, e.g. `mkdir 7.0.x` 1. Create a new `linuxkit/kconfig` container image: `make kconfig`. This is not pushed out. 1. Run a container based on `linuxkit/kconfig`. ```sh docker run --rm -ti -v $(pwd):/src linuxkit/kconfig ``` 1. In the container, change directory to the kernel source directory for the new version, e.g. `cd /linux-7.0.5`. -1. Copy the existing config file for the previous series, e.g. `cp /src/kernel-config-6.6.x-x86_64 .config`. +1. Copy the existing config file for the previous series, e.g. `cp /src/6.6.x/config-x86_64 .config`. 1. Run `make oldconfig` to create the config file for the new series from the old one. Answer any questions. -1. Save the newly generated config file `.config` to the source directory, e.g. `cp .config /src/kernel-config-7.0.x-x86_64`. +1. Save the newly generated config file `.config` to the source directory, e.g. `cp .config /src/7.0.x/config-x86_64`. 1. Repeat for other architectures. 1. Commit the new config files. 1. Test that you can build the kernel with that config as `make build-`, e.g. `make build-7.0.5`. diff --git a/kernel/config-5.10.x-aarch64 b/kernel/5.10.x/config-aarch64 similarity index 100% rename from kernel/config-5.10.x-aarch64 rename to kernel/5.10.x/config-aarch64 diff --git a/kernel/config-5.10.x-x86_64 b/kernel/5.10.x/config-x86_64 similarity index 100% rename from kernel/config-5.10.x-x86_64 rename to kernel/5.10.x/config-x86_64 diff --git a/kernel/patches-5.10.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch b/kernel/5.10.x/patches/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch similarity index 100% rename from kernel/patches-5.10.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch rename to kernel/5.10.x/patches/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch diff --git a/kernel/config-5.11.x-aarch64-rt b/kernel/5.11.x-rt/config-aarch64 similarity index 100% rename from kernel/config-5.11.x-aarch64-rt rename to kernel/5.11.x-rt/config-aarch64 diff --git a/kernel/config-5.11.x-x86_64-rt b/kernel/5.11.x-rt/config-x86_64 similarity index 100% rename from kernel/config-5.11.x-x86_64-rt rename to kernel/5.11.x-rt/config-x86_64 diff --git a/kernel/patches-5.11.x-rt/0001-highmem-Don-t-disable-preemption-on-RT-in-kmap_atomi.patch b/kernel/5.11.x-rt/patches/0001-highmem-Don-t-disable-preemption-on-RT-in-kmap_atomi.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0001-highmem-Don-t-disable-preemption-on-RT-in-kmap_atomi.patch rename to kernel/5.11.x-rt/patches/0001-highmem-Don-t-disable-preemption-on-RT-in-kmap_atomi.patch diff --git a/kernel/patches-5.11.x-rt/0002-timers-Move-clearing-of-base-timer_running-under-bas.patch b/kernel/5.11.x-rt/patches/0002-timers-Move-clearing-of-base-timer_running-under-bas.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0002-timers-Move-clearing-of-base-timer_running-under-bas.patch rename to kernel/5.11.x-rt/patches/0002-timers-Move-clearing-of-base-timer_running-under-bas.patch diff --git a/kernel/patches-5.11.x-rt/0003-0001-mm-zswap-add-a-flag-to-indicate-if-zpool-can-do-slee.patch b/kernel/5.11.x-rt/patches/0003-0001-mm-zswap-add-a-flag-to-indicate-if-zpool-can-do-slee.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0003-0001-mm-zswap-add-a-flag-to-indicate-if-zpool-can-do-slee.patch rename to kernel/5.11.x-rt/patches/0003-0001-mm-zswap-add-a-flag-to-indicate-if-zpool-can-do-slee.patch diff --git a/kernel/patches-5.11.x-rt/0004-0002-mm-set-the-sleep_mapped-to-true-for-zbud-and-z3fold.patch b/kernel/5.11.x-rt/patches/0004-0002-mm-set-the-sleep_mapped-to-true-for-zbud-and-z3fold.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0004-0002-mm-set-the-sleep_mapped-to-true-for-zbud-and-z3fold.patch rename to kernel/5.11.x-rt/patches/0004-0002-mm-set-the-sleep_mapped-to-true-for-zbud-and-z3fold.patch diff --git a/kernel/patches-5.11.x-rt/0005-blk-mq-Always-complete-remote-completions-requests-i.patch b/kernel/5.11.x-rt/patches/0005-blk-mq-Always-complete-remote-completions-requests-i.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0005-blk-mq-Always-complete-remote-completions-requests-i.patch rename to kernel/5.11.x-rt/patches/0005-blk-mq-Always-complete-remote-completions-requests-i.patch diff --git a/kernel/patches-5.11.x-rt/0006-blk-mq-Use-llist_head-for-blk_cpu_done.patch b/kernel/5.11.x-rt/patches/0006-blk-mq-Use-llist_head-for-blk_cpu_done.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0006-blk-mq-Use-llist_head-for-blk_cpu_done.patch rename to kernel/5.11.x-rt/patches/0006-blk-mq-Use-llist_head-for-blk_cpu_done.patch diff --git a/kernel/patches-5.11.x-rt/0007-0001-kthread-Move-prio-affinite-change-into-the-newly-cre.patch b/kernel/5.11.x-rt/patches/0007-0001-kthread-Move-prio-affinite-change-into-the-newly-cre.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0007-0001-kthread-Move-prio-affinite-change-into-the-newly-cre.patch rename to kernel/5.11.x-rt/patches/0007-0001-kthread-Move-prio-affinite-change-into-the-newly-cre.patch diff --git a/kernel/patches-5.11.x-rt/0008-0002-genirq-Move-prio-assignment-into-the-newly-created-t.patch b/kernel/5.11.x-rt/patches/0008-0002-genirq-Move-prio-assignment-into-the-newly-created-t.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0008-0002-genirq-Move-prio-assignment-into-the-newly-created-t.patch rename to kernel/5.11.x-rt/patches/0008-0002-genirq-Move-prio-assignment-into-the-newly-created-t.patch diff --git a/kernel/patches-5.11.x-rt/0009-notifier-Make-atomic_notifiers-use-raw_spinlock.patch b/kernel/5.11.x-rt/patches/0009-notifier-Make-atomic_notifiers-use-raw_spinlock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0009-notifier-Make-atomic_notifiers-use-raw_spinlock.patch rename to kernel/5.11.x-rt/patches/0009-notifier-Make-atomic_notifiers-use-raw_spinlock.patch diff --git a/kernel/patches-5.11.x-rt/0010-0001-rcu-Make-RCU_BOOST-default-on-CONFIG_PREEMPT_RT.patch b/kernel/5.11.x-rt/patches/0010-0001-rcu-Make-RCU_BOOST-default-on-CONFIG_PREEMPT_RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0010-0001-rcu-Make-RCU_BOOST-default-on-CONFIG_PREEMPT_RT.patch rename to kernel/5.11.x-rt/patches/0010-0001-rcu-Make-RCU_BOOST-default-on-CONFIG_PREEMPT_RT.patch diff --git a/kernel/patches-5.11.x-rt/0011-0002-rcu-Unconditionally-use-rcuc-threads-on-PREEMPT_RT.patch b/kernel/5.11.x-rt/patches/0011-0002-rcu-Unconditionally-use-rcuc-threads-on-PREEMPT_RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0011-0002-rcu-Unconditionally-use-rcuc-threads-on-PREEMPT_RT.patch rename to kernel/5.11.x-rt/patches/0011-0002-rcu-Unconditionally-use-rcuc-threads-on-PREEMPT_RT.patch diff --git a/kernel/patches-5.11.x-rt/0012-0003-rcu-Enable-rcu_normal_after_boot-unconditionally-for.patch b/kernel/5.11.x-rt/patches/0012-0003-rcu-Enable-rcu_normal_after_boot-unconditionally-for.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0012-0003-rcu-Enable-rcu_normal_after_boot-unconditionally-for.patch rename to kernel/5.11.x-rt/patches/0012-0003-rcu-Enable-rcu_normal_after_boot-unconditionally-for.patch diff --git a/kernel/patches-5.11.x-rt/0013-0004-doc-Update-RCU-s-requirements-page-about-the-PREEMPT.patch b/kernel/5.11.x-rt/patches/0013-0004-doc-Update-RCU-s-requirements-page-about-the-PREEMPT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0013-0004-doc-Update-RCU-s-requirements-page-about-the-PREEMPT.patch rename to kernel/5.11.x-rt/patches/0013-0004-doc-Update-RCU-s-requirements-page-about-the-PREEMPT.patch diff --git a/kernel/patches-5.11.x-rt/0014-0005-doc-Use-CONFIG_PREEMPTION.patch b/kernel/5.11.x-rt/patches/0014-0005-doc-Use-CONFIG_PREEMPTION.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0014-0005-doc-Use-CONFIG_PREEMPTION.patch rename to kernel/5.11.x-rt/patches/0014-0005-doc-Use-CONFIG_PREEMPTION.patch diff --git a/kernel/patches-5.11.x-rt/0015-0001-tracing-Merge-irqflags-preempt-counter.patch b/kernel/5.11.x-rt/patches/0015-0001-tracing-Merge-irqflags-preempt-counter.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0015-0001-tracing-Merge-irqflags-preempt-counter.patch rename to kernel/5.11.x-rt/patches/0015-0001-tracing-Merge-irqflags-preempt-counter.patch diff --git a/kernel/patches-5.11.x-rt/0016-0002-tracing-Inline-tracing_gen_ctx_flags.patch b/kernel/5.11.x-rt/patches/0016-0002-tracing-Inline-tracing_gen_ctx_flags.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0016-0002-tracing-Inline-tracing_gen_ctx_flags.patch rename to kernel/5.11.x-rt/patches/0016-0002-tracing-Inline-tracing_gen_ctx_flags.patch diff --git a/kernel/patches-5.11.x-rt/0017-0003-tracing-Use-in_serving_softirq-to-deduct-softirq-sta.patch b/kernel/5.11.x-rt/patches/0017-0003-tracing-Use-in_serving_softirq-to-deduct-softirq-sta.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0017-0003-tracing-Use-in_serving_softirq-to-deduct-softirq-sta.patch rename to kernel/5.11.x-rt/patches/0017-0003-tracing-Use-in_serving_softirq-to-deduct-softirq-sta.patch diff --git a/kernel/patches-5.11.x-rt/0018-0004-tracing-Remove-NULL-check-from-current-in-tracing_ge.patch b/kernel/5.11.x-rt/patches/0018-0004-tracing-Remove-NULL-check-from-current-in-tracing_ge.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0018-0004-tracing-Remove-NULL-check-from-current-in-tracing_ge.patch rename to kernel/5.11.x-rt/patches/0018-0004-tracing-Remove-NULL-check-from-current-in-tracing_ge.patch diff --git a/kernel/patches-5.11.x-rt/0019-tpm-remove-tpm_dev_wq_lock.patch b/kernel/5.11.x-rt/patches/0019-tpm-remove-tpm_dev_wq_lock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0019-tpm-remove-tpm_dev_wq_lock.patch rename to kernel/5.11.x-rt/patches/0019-tpm-remove-tpm_dev_wq_lock.patch diff --git a/kernel/patches-5.11.x-rt/0020-powerpc-mm-Move-the-linear_mapping_mutex-to-the-ifde.patch b/kernel/5.11.x-rt/patches/0020-powerpc-mm-Move-the-linear_mapping_mutex-to-the-ifde.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0020-powerpc-mm-Move-the-linear_mapping_mutex-to-the-ifde.patch rename to kernel/5.11.x-rt/patches/0020-powerpc-mm-Move-the-linear_mapping_mutex-to-the-ifde.patch diff --git a/kernel/patches-5.11.x-rt/0021-0002-printk-limit-second-loop-of-syslog_print_all.patch b/kernel/5.11.x-rt/patches/0021-0002-printk-limit-second-loop-of-syslog_print_all.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0021-0002-printk-limit-second-loop-of-syslog_print_all.patch rename to kernel/5.11.x-rt/patches/0021-0002-printk-limit-second-loop-of-syslog_print_all.patch diff --git a/kernel/patches-5.11.x-rt/0022-0003-printk-kmsg_dump-remove-unused-fields.patch b/kernel/5.11.x-rt/patches/0022-0003-printk-kmsg_dump-remove-unused-fields.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0022-0003-printk-kmsg_dump-remove-unused-fields.patch rename to kernel/5.11.x-rt/patches/0022-0003-printk-kmsg_dump-remove-unused-fields.patch diff --git a/kernel/patches-5.11.x-rt/0023-0004-printk-refactor-kmsg_dump_get_buffer.patch b/kernel/5.11.x-rt/patches/0023-0004-printk-refactor-kmsg_dump_get_buffer.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0023-0004-printk-refactor-kmsg_dump_get_buffer.patch rename to kernel/5.11.x-rt/patches/0023-0004-printk-refactor-kmsg_dump_get_buffer.patch diff --git a/kernel/patches-5.11.x-rt/0024-0005-printk-consolidate-kmsg_dump_get_buffer-syslog_print.patch b/kernel/5.11.x-rt/patches/0024-0005-printk-consolidate-kmsg_dump_get_buffer-syslog_print.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0024-0005-printk-consolidate-kmsg_dump_get_buffer-syslog_print.patch rename to kernel/5.11.x-rt/patches/0024-0005-printk-consolidate-kmsg_dump_get_buffer-syslog_print.patch diff --git a/kernel/patches-5.11.x-rt/0025-0006-printk-introduce-CONSOLE_LOG_MAX-for-improved-multi-.patch b/kernel/5.11.x-rt/patches/0025-0006-printk-introduce-CONSOLE_LOG_MAX-for-improved-multi-.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0025-0006-printk-introduce-CONSOLE_LOG_MAX-for-improved-multi-.patch rename to kernel/5.11.x-rt/patches/0025-0006-printk-introduce-CONSOLE_LOG_MAX-for-improved-multi-.patch diff --git a/kernel/patches-5.11.x-rt/0026-0007-printk-use-seqcount_latch-for-clear_seq.patch b/kernel/5.11.x-rt/patches/0026-0007-printk-use-seqcount_latch-for-clear_seq.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0026-0007-printk-use-seqcount_latch-for-clear_seq.patch rename to kernel/5.11.x-rt/patches/0026-0007-printk-use-seqcount_latch-for-clear_seq.patch diff --git a/kernel/patches-5.11.x-rt/0027-0008-printk-use-atomic64_t-for-devkmsg_user.seq.patch b/kernel/5.11.x-rt/patches/0027-0008-printk-use-atomic64_t-for-devkmsg_user.seq.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0027-0008-printk-use-atomic64_t-for-devkmsg_user.seq.patch rename to kernel/5.11.x-rt/patches/0027-0008-printk-use-atomic64_t-for-devkmsg_user.seq.patch diff --git a/kernel/patches-5.11.x-rt/0028-0009-printk-add-syslog_lock.patch b/kernel/5.11.x-rt/patches/0028-0009-printk-add-syslog_lock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0028-0009-printk-add-syslog_lock.patch rename to kernel/5.11.x-rt/patches/0028-0009-printk-add-syslog_lock.patch diff --git a/kernel/patches-5.11.x-rt/0029-0010-printk-introduce-a-kmsg_dump-iterator.patch b/kernel/5.11.x-rt/patches/0029-0010-printk-introduce-a-kmsg_dump-iterator.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0029-0010-printk-introduce-a-kmsg_dump-iterator.patch rename to kernel/5.11.x-rt/patches/0029-0010-printk-introduce-a-kmsg_dump-iterator.patch diff --git a/kernel/patches-5.11.x-rt/0030-0011-um-synchronize-kmsg_dumper.patch b/kernel/5.11.x-rt/patches/0030-0011-um-synchronize-kmsg_dumper.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0030-0011-um-synchronize-kmsg_dumper.patch rename to kernel/5.11.x-rt/patches/0030-0011-um-synchronize-kmsg_dumper.patch diff --git a/kernel/patches-5.11.x-rt/0031-0012-printk-remove-logbuf_lock.patch b/kernel/5.11.x-rt/patches/0031-0012-printk-remove-logbuf_lock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0031-0012-printk-remove-logbuf_lock.patch rename to kernel/5.11.x-rt/patches/0031-0012-printk-remove-logbuf_lock.patch diff --git a/kernel/patches-5.11.x-rt/0032-0013-printk-kmsg_dump-remove-_nolock-variants.patch b/kernel/5.11.x-rt/patches/0032-0013-printk-kmsg_dump-remove-_nolock-variants.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0032-0013-printk-kmsg_dump-remove-_nolock-variants.patch rename to kernel/5.11.x-rt/patches/0032-0013-printk-kmsg_dump-remove-_nolock-variants.patch diff --git a/kernel/patches-5.11.x-rt/0033-0014-printk-kmsg_dump-use-kmsg_dump_rewind.patch b/kernel/5.11.x-rt/patches/0033-0014-printk-kmsg_dump-use-kmsg_dump_rewind.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0033-0014-printk-kmsg_dump-use-kmsg_dump_rewind.patch rename to kernel/5.11.x-rt/patches/0033-0014-printk-kmsg_dump-use-kmsg_dump_rewind.patch diff --git a/kernel/patches-5.11.x-rt/0034-0015-printk-console-remove-unnecessary-safe-buffer-usage.patch b/kernel/5.11.x-rt/patches/0034-0015-printk-console-remove-unnecessary-safe-buffer-usage.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0034-0015-printk-console-remove-unnecessary-safe-buffer-usage.patch rename to kernel/5.11.x-rt/patches/0034-0015-printk-console-remove-unnecessary-safe-buffer-usage.patch diff --git a/kernel/patches-5.11.x-rt/0035-0016-printk-track-limit-recursion.patch b/kernel/5.11.x-rt/patches/0035-0016-printk-track-limit-recursion.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0035-0016-printk-track-limit-recursion.patch rename to kernel/5.11.x-rt/patches/0035-0016-printk-track-limit-recursion.patch diff --git a/kernel/patches-5.11.x-rt/0036-0017-printk-remove-safe-buffers.patch b/kernel/5.11.x-rt/patches/0036-0017-printk-remove-safe-buffers.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0036-0017-printk-remove-safe-buffers.patch rename to kernel/5.11.x-rt/patches/0036-0017-printk-remove-safe-buffers.patch diff --git a/kernel/patches-5.11.x-rt/0037-0018-printk-convert-syslog_lock-to-spin_lock.patch b/kernel/5.11.x-rt/patches/0037-0018-printk-convert-syslog_lock-to-spin_lock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0037-0018-printk-convert-syslog_lock-to-spin_lock.patch rename to kernel/5.11.x-rt/patches/0037-0018-printk-convert-syslog_lock-to-spin_lock.patch diff --git a/kernel/patches-5.11.x-rt/0038-0019-console-add-write_atomic-interface.patch b/kernel/5.11.x-rt/patches/0038-0019-console-add-write_atomic-interface.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0038-0019-console-add-write_atomic-interface.patch rename to kernel/5.11.x-rt/patches/0038-0019-console-add-write_atomic-interface.patch diff --git a/kernel/patches-5.11.x-rt/0039-0020-serial-8250-implement-write_atomic.patch b/kernel/5.11.x-rt/patches/0039-0020-serial-8250-implement-write_atomic.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0039-0020-serial-8250-implement-write_atomic.patch rename to kernel/5.11.x-rt/patches/0039-0020-serial-8250-implement-write_atomic.patch diff --git a/kernel/patches-5.11.x-rt/0040-0021-printk-relocate-printk_delay-and-vprintk_default.patch b/kernel/5.11.x-rt/patches/0040-0021-printk-relocate-printk_delay-and-vprintk_default.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0040-0021-printk-relocate-printk_delay-and-vprintk_default.patch rename to kernel/5.11.x-rt/patches/0040-0021-printk-relocate-printk_delay-and-vprintk_default.patch diff --git a/kernel/patches-5.11.x-rt/0041-0022-printk-combine-boot_delay_msec-into-printk_delay.patch b/kernel/5.11.x-rt/patches/0041-0022-printk-combine-boot_delay_msec-into-printk_delay.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0041-0022-printk-combine-boot_delay_msec-into-printk_delay.patch rename to kernel/5.11.x-rt/patches/0041-0022-printk-combine-boot_delay_msec-into-printk_delay.patch diff --git a/kernel/patches-5.11.x-rt/0042-0023-printk-change-console_seq-to-atomic64_t.patch b/kernel/5.11.x-rt/patches/0042-0023-printk-change-console_seq-to-atomic64_t.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0042-0023-printk-change-console_seq-to-atomic64_t.patch rename to kernel/5.11.x-rt/patches/0042-0023-printk-change-console_seq-to-atomic64_t.patch diff --git a/kernel/patches-5.11.x-rt/0043-0024-printk-introduce-kernel-sync-mode.patch b/kernel/5.11.x-rt/patches/0043-0024-printk-introduce-kernel-sync-mode.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0043-0024-printk-introduce-kernel-sync-mode.patch rename to kernel/5.11.x-rt/patches/0043-0024-printk-introduce-kernel-sync-mode.patch diff --git a/kernel/patches-5.11.x-rt/0044-0025-printk-move-console-printing-to-kthreads.patch b/kernel/5.11.x-rt/patches/0044-0025-printk-move-console-printing-to-kthreads.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0044-0025-printk-move-console-printing-to-kthreads.patch rename to kernel/5.11.x-rt/patches/0044-0025-printk-move-console-printing-to-kthreads.patch diff --git a/kernel/patches-5.11.x-rt/0045-0026-printk-remove-deferred-printing.patch b/kernel/5.11.x-rt/patches/0045-0026-printk-remove-deferred-printing.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0045-0026-printk-remove-deferred-printing.patch rename to kernel/5.11.x-rt/patches/0045-0026-printk-remove-deferred-printing.patch diff --git a/kernel/patches-5.11.x-rt/0046-0027-printk-add-console-handover.patch b/kernel/5.11.x-rt/patches/0046-0027-printk-add-console-handover.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0046-0027-printk-add-console-handover.patch rename to kernel/5.11.x-rt/patches/0046-0027-printk-add-console-handover.patch diff --git a/kernel/patches-5.11.x-rt/0047-0028-printk-add-pr_flush.patch b/kernel/5.11.x-rt/patches/0047-0028-printk-add-pr_flush.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0047-0028-printk-add-pr_flush.patch rename to kernel/5.11.x-rt/patches/0047-0028-printk-add-pr_flush.patch diff --git a/kernel/patches-5.11.x-rt/0048-kcov-Remove-kcov-include-from-sched.h-and-move-it-to.patch b/kernel/5.11.x-rt/patches/0048-kcov-Remove-kcov-include-from-sched.h-and-move-it-to.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0048-kcov-Remove-kcov-include-from-sched.h-and-move-it-to.patch rename to kernel/5.11.x-rt/patches/0048-kcov-Remove-kcov-include-from-sched.h-and-move-it-to.patch diff --git a/kernel/patches-5.11.x-rt/0049-cgroup-use-irqsave-in-cgroup_rstat_flush_locked.patch b/kernel/5.11.x-rt/patches/0049-cgroup-use-irqsave-in-cgroup_rstat_flush_locked.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0049-cgroup-use-irqsave-in-cgroup_rstat_flush_locked.patch rename to kernel/5.11.x-rt/patches/0049-cgroup-use-irqsave-in-cgroup_rstat_flush_locked.patch diff --git a/kernel/patches-5.11.x-rt/0050-mm-workingset-replace-IRQ-off-check-with-a-lockdep-a.patch b/kernel/5.11.x-rt/patches/0050-mm-workingset-replace-IRQ-off-check-with-a-lockdep-a.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0050-mm-workingset-replace-IRQ-off-check-with-a-lockdep-a.patch rename to kernel/5.11.x-rt/patches/0050-mm-workingset-replace-IRQ-off-check-with-a-lockdep-a.patch diff --git a/kernel/patches-5.11.x-rt/0051-shmem-Use-raw_spinlock_t-for-stat_lock.patch b/kernel/5.11.x-rt/patches/0051-shmem-Use-raw_spinlock_t-for-stat_lock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0051-shmem-Use-raw_spinlock_t-for-stat_lock.patch rename to kernel/5.11.x-rt/patches/0051-shmem-Use-raw_spinlock_t-for-stat_lock.patch diff --git a/kernel/patches-5.11.x-rt/0052-net--Move-lockdep-where-it-belongs.patch b/kernel/5.11.x-rt/patches/0052-net--Move-lockdep-where-it-belongs.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0052-net--Move-lockdep-where-it-belongs.patch rename to kernel/5.11.x-rt/patches/0052-net--Move-lockdep-where-it-belongs.patch diff --git a/kernel/patches-5.11.x-rt/0053-tcp-Remove-superfluous-BH-disable-around-listening_h.patch b/kernel/5.11.x-rt/patches/0053-tcp-Remove-superfluous-BH-disable-around-listening_h.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0053-tcp-Remove-superfluous-BH-disable-around-listening_h.patch rename to kernel/5.11.x-rt/patches/0053-tcp-Remove-superfluous-BH-disable-around-listening_h.patch diff --git a/kernel/patches-5.11.x-rt/0054-smp-Wake-ksoftirqd-on-PREEMPT_RT-instead-do_softirq.patch b/kernel/5.11.x-rt/patches/0054-smp-Wake-ksoftirqd-on-PREEMPT_RT-instead-do_softirq.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0054-smp-Wake-ksoftirqd-on-PREEMPT_RT-instead-do_softirq.patch rename to kernel/5.11.x-rt/patches/0054-smp-Wake-ksoftirqd-on-PREEMPT_RT-instead-do_softirq.patch diff --git a/kernel/patches-5.11.x-rt/0055-0001-tasklets-Replace-barrier-with-cpu_relax-in-tasklet_u.patch b/kernel/5.11.x-rt/patches/0055-0001-tasklets-Replace-barrier-with-cpu_relax-in-tasklet_u.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0055-0001-tasklets-Replace-barrier-with-cpu_relax-in-tasklet_u.patch rename to kernel/5.11.x-rt/patches/0055-0001-tasklets-Replace-barrier-with-cpu_relax-in-tasklet_u.patch diff --git a/kernel/patches-5.11.x-rt/0056-0002-tasklets-Use-static-inlines-for-stub-implementations.patch b/kernel/5.11.x-rt/patches/0056-0002-tasklets-Use-static-inlines-for-stub-implementations.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0056-0002-tasklets-Use-static-inlines-for-stub-implementations.patch rename to kernel/5.11.x-rt/patches/0056-0002-tasklets-Use-static-inlines-for-stub-implementations.patch diff --git a/kernel/patches-5.11.x-rt/0057-0003-tasklets-Provide-tasklet_disable_in_atomic.patch b/kernel/5.11.x-rt/patches/0057-0003-tasklets-Provide-tasklet_disable_in_atomic.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0057-0003-tasklets-Provide-tasklet_disable_in_atomic.patch rename to kernel/5.11.x-rt/patches/0057-0003-tasklets-Provide-tasklet_disable_in_atomic.patch diff --git a/kernel/patches-5.11.x-rt/0058-0004-tasklets-Use-spin-wait-in-tasklet_disable-temporaril.patch b/kernel/5.11.x-rt/patches/0058-0004-tasklets-Use-spin-wait-in-tasklet_disable-temporaril.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0058-0004-tasklets-Use-spin-wait-in-tasklet_disable-temporaril.patch rename to kernel/5.11.x-rt/patches/0058-0004-tasklets-Use-spin-wait-in-tasklet_disable-temporaril.patch diff --git a/kernel/patches-5.11.x-rt/0059-0005-tasklets-Replace-spin-wait-in-tasklet_unlock_wait.patch b/kernel/5.11.x-rt/patches/0059-0005-tasklets-Replace-spin-wait-in-tasklet_unlock_wait.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0059-0005-tasklets-Replace-spin-wait-in-tasklet_unlock_wait.patch rename to kernel/5.11.x-rt/patches/0059-0005-tasklets-Replace-spin-wait-in-tasklet_unlock_wait.patch diff --git a/kernel/patches-5.11.x-rt/0060-0006-tasklets-Replace-spin-wait-in-tasklet_kill.patch b/kernel/5.11.x-rt/patches/0060-0006-tasklets-Replace-spin-wait-in-tasklet_kill.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0060-0006-tasklets-Replace-spin-wait-in-tasklet_kill.patch rename to kernel/5.11.x-rt/patches/0060-0006-tasklets-Replace-spin-wait-in-tasklet_kill.patch diff --git a/kernel/patches-5.11.x-rt/0061-0007-tasklets-Prevent-tasklet_unlock_spin_wait-deadlock-o.patch b/kernel/5.11.x-rt/patches/0061-0007-tasklets-Prevent-tasklet_unlock_spin_wait-deadlock-o.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0061-0007-tasklets-Prevent-tasklet_unlock_spin_wait-deadlock-o.patch rename to kernel/5.11.x-rt/patches/0061-0007-tasklets-Prevent-tasklet_unlock_spin_wait-deadlock-o.patch diff --git a/kernel/patches-5.11.x-rt/0062-0008-net-jme-Replace-link-change-tasklet-with-work.patch b/kernel/5.11.x-rt/patches/0062-0008-net-jme-Replace-link-change-tasklet-with-work.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0062-0008-net-jme-Replace-link-change-tasklet-with-work.patch rename to kernel/5.11.x-rt/patches/0062-0008-net-jme-Replace-link-change-tasklet-with-work.patch diff --git a/kernel/patches-5.11.x-rt/0063-0009-net-sundance-Use-tasklet_disable_in_atomic.patch b/kernel/5.11.x-rt/patches/0063-0009-net-sundance-Use-tasklet_disable_in_atomic.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0063-0009-net-sundance-Use-tasklet_disable_in_atomic.patch rename to kernel/5.11.x-rt/patches/0063-0009-net-sundance-Use-tasklet_disable_in_atomic.patch diff --git a/kernel/patches-5.11.x-rt/0064-0010-ath9k-Use-tasklet_disable_in_atomic.patch b/kernel/5.11.x-rt/patches/0064-0010-ath9k-Use-tasklet_disable_in_atomic.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0064-0010-ath9k-Use-tasklet_disable_in_atomic.patch rename to kernel/5.11.x-rt/patches/0064-0010-ath9k-Use-tasklet_disable_in_atomic.patch diff --git a/kernel/patches-5.11.x-rt/0065-0011-atm-eni-Use-tasklet_disable_in_atomic-in-the-send-ca.patch b/kernel/5.11.x-rt/patches/0065-0011-atm-eni-Use-tasklet_disable_in_atomic-in-the-send-ca.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0065-0011-atm-eni-Use-tasklet_disable_in_atomic-in-the-send-ca.patch rename to kernel/5.11.x-rt/patches/0065-0011-atm-eni-Use-tasklet_disable_in_atomic-in-the-send-ca.patch diff --git a/kernel/patches-5.11.x-rt/0066-0012-PCI-hv-Use-tasklet_disable_in_atomic.patch b/kernel/5.11.x-rt/patches/0066-0012-PCI-hv-Use-tasklet_disable_in_atomic.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0066-0012-PCI-hv-Use-tasklet_disable_in_atomic.patch rename to kernel/5.11.x-rt/patches/0066-0012-PCI-hv-Use-tasklet_disable_in_atomic.patch diff --git a/kernel/patches-5.11.x-rt/0067-0013-firewire-ohci-Use-tasklet_disable_in_atomic-where-re.patch b/kernel/5.11.x-rt/patches/0067-0013-firewire-ohci-Use-tasklet_disable_in_atomic-where-re.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0067-0013-firewire-ohci-Use-tasklet_disable_in_atomic-where-re.patch rename to kernel/5.11.x-rt/patches/0067-0013-firewire-ohci-Use-tasklet_disable_in_atomic-where-re.patch diff --git a/kernel/patches-5.11.x-rt/0068-0014-tasklets-Switch-tasklet_disable-to-the-sleep-wait-va.patch b/kernel/5.11.x-rt/patches/0068-0014-tasklets-Switch-tasklet_disable-to-the-sleep-wait-va.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0068-0014-tasklets-Switch-tasklet_disable-to-the-sleep-wait-va.patch rename to kernel/5.11.x-rt/patches/0068-0014-tasklets-Switch-tasklet_disable-to-the-sleep-wait-va.patch diff --git a/kernel/patches-5.11.x-rt/0069-0015-softirq-Add-RT-specific-softirq-accounting.patch b/kernel/5.11.x-rt/patches/0069-0015-softirq-Add-RT-specific-softirq-accounting.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0069-0015-softirq-Add-RT-specific-softirq-accounting.patch rename to kernel/5.11.x-rt/patches/0069-0015-softirq-Add-RT-specific-softirq-accounting.patch diff --git a/kernel/patches-5.11.x-rt/0070-0016-irqtime-Make-accounting-correct-on-RT.patch b/kernel/5.11.x-rt/patches/0070-0016-irqtime-Make-accounting-correct-on-RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0070-0016-irqtime-Make-accounting-correct-on-RT.patch rename to kernel/5.11.x-rt/patches/0070-0016-irqtime-Make-accounting-correct-on-RT.patch diff --git a/kernel/patches-5.11.x-rt/0071-0017-softirq-Move-various-protections-into-inline-helpers.patch b/kernel/5.11.x-rt/patches/0071-0017-softirq-Move-various-protections-into-inline-helpers.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0071-0017-softirq-Move-various-protections-into-inline-helpers.patch rename to kernel/5.11.x-rt/patches/0071-0017-softirq-Move-various-protections-into-inline-helpers.patch diff --git a/kernel/patches-5.11.x-rt/0072-0018-softirq-Make-softirq-control-and-processing-RT-aware.patch b/kernel/5.11.x-rt/patches/0072-0018-softirq-Make-softirq-control-and-processing-RT-aware.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0072-0018-softirq-Make-softirq-control-and-processing-RT-aware.patch rename to kernel/5.11.x-rt/patches/0072-0018-softirq-Make-softirq-control-and-processing-RT-aware.patch diff --git a/kernel/patches-5.11.x-rt/0073-0019-tick-sched-Prevent-false-positive-softirq-pending-wa.patch b/kernel/5.11.x-rt/patches/0073-0019-tick-sched-Prevent-false-positive-softirq-pending-wa.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0073-0019-tick-sched-Prevent-false-positive-softirq-pending-wa.patch rename to kernel/5.11.x-rt/patches/0073-0019-tick-sched-Prevent-false-positive-softirq-pending-wa.patch diff --git a/kernel/patches-5.11.x-rt/0074-0020-rcu-Prevent-false-positive-softirq-warning-on-RT.patch b/kernel/5.11.x-rt/patches/0074-0020-rcu-Prevent-false-positive-softirq-warning-on-RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0074-0020-rcu-Prevent-false-positive-softirq-warning-on-RT.patch rename to kernel/5.11.x-rt/patches/0074-0020-rcu-Prevent-false-positive-softirq-warning-on-RT.patch diff --git a/kernel/patches-5.11.x-rt/0075-0001-chelsio-cxgb-Replace-the-workqueue-with-threaded-int.patch b/kernel/5.11.x-rt/patches/0075-0001-chelsio-cxgb-Replace-the-workqueue-with-threaded-int.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0075-0001-chelsio-cxgb-Replace-the-workqueue-with-threaded-int.patch rename to kernel/5.11.x-rt/patches/0075-0001-chelsio-cxgb-Replace-the-workqueue-with-threaded-int.patch diff --git a/kernel/patches-5.11.x-rt/0076-0002-chelsio-cxgb-Disable-the-card-on-error-in-threaded-i.patch b/kernel/5.11.x-rt/patches/0076-0002-chelsio-cxgb-Disable-the-card-on-error-in-threaded-i.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0076-0002-chelsio-cxgb-Disable-the-card-on-error-in-threaded-i.patch rename to kernel/5.11.x-rt/patches/0076-0002-chelsio-cxgb-Disable-the-card-on-error-in-threaded-i.patch diff --git a/kernel/patches-5.11.x-rt/0077-0001-locking-rtmutex-Remove-cruft.patch b/kernel/5.11.x-rt/patches/0077-0001-locking-rtmutex-Remove-cruft.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0077-0001-locking-rtmutex-Remove-cruft.patch rename to kernel/5.11.x-rt/patches/0077-0001-locking-rtmutex-Remove-cruft.patch diff --git a/kernel/patches-5.11.x-rt/0078-0002-locking-rtmutex-Remove-output-from-deadlock-detector.patch b/kernel/5.11.x-rt/patches/0078-0002-locking-rtmutex-Remove-output-from-deadlock-detector.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0078-0002-locking-rtmutex-Remove-output-from-deadlock-detector.patch rename to kernel/5.11.x-rt/patches/0078-0002-locking-rtmutex-Remove-output-from-deadlock-detector.patch diff --git a/kernel/patches-5.11.x-rt/0079-0003-locking-rtmutex-Move-rt_mutex_init-outside-of-CONFIG.patch b/kernel/5.11.x-rt/patches/0079-0003-locking-rtmutex-Move-rt_mutex_init-outside-of-CONFIG.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0079-0003-locking-rtmutex-Move-rt_mutex_init-outside-of-CONFIG.patch rename to kernel/5.11.x-rt/patches/0079-0003-locking-rtmutex-Move-rt_mutex_init-outside-of-CONFIG.patch diff --git a/kernel/patches-5.11.x-rt/0080-0004-locking-rtmutex-Remove-rt_mutex_timed_lock.patch b/kernel/5.11.x-rt/patches/0080-0004-locking-rtmutex-Remove-rt_mutex_timed_lock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0080-0004-locking-rtmutex-Remove-rt_mutex_timed_lock.patch rename to kernel/5.11.x-rt/patches/0080-0004-locking-rtmutex-Remove-rt_mutex_timed_lock.patch diff --git a/kernel/patches-5.11.x-rt/0081-0005-locking-rtmutex-Handle-the-various-new-futex-race-co.patch b/kernel/5.11.x-rt/patches/0081-0005-locking-rtmutex-Handle-the-various-new-futex-race-co.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0081-0005-locking-rtmutex-Handle-the-various-new-futex-race-co.patch rename to kernel/5.11.x-rt/patches/0081-0005-locking-rtmutex-Handle-the-various-new-futex-race-co.patch diff --git a/kernel/patches-5.11.x-rt/0082-0006-futex-Fix-bug-on-when-a-requeued-RT-task-times-out.patch b/kernel/5.11.x-rt/patches/0082-0006-futex-Fix-bug-on-when-a-requeued-RT-task-times-out.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0082-0006-futex-Fix-bug-on-when-a-requeued-RT-task-times-out.patch rename to kernel/5.11.x-rt/patches/0082-0006-futex-Fix-bug-on-when-a-requeued-RT-task-times-out.patch diff --git a/kernel/patches-5.11.x-rt/0083-0007-locking-rtmutex-Make-lock_killable-work.patch b/kernel/5.11.x-rt/patches/0083-0007-locking-rtmutex-Make-lock_killable-work.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0083-0007-locking-rtmutex-Make-lock_killable-work.patch rename to kernel/5.11.x-rt/patches/0083-0007-locking-rtmutex-Make-lock_killable-work.patch diff --git a/kernel/patches-5.11.x-rt/0084-0008-locking-spinlock-Split-the-lock-types-header.patch b/kernel/5.11.x-rt/patches/0084-0008-locking-spinlock-Split-the-lock-types-header.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0084-0008-locking-spinlock-Split-the-lock-types-header.patch rename to kernel/5.11.x-rt/patches/0084-0008-locking-spinlock-Split-the-lock-types-header.patch diff --git a/kernel/patches-5.11.x-rt/0085-0009-locking-rtmutex-Avoid-include-hell.patch b/kernel/5.11.x-rt/patches/0085-0009-locking-rtmutex-Avoid-include-hell.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0085-0009-locking-rtmutex-Avoid-include-hell.patch rename to kernel/5.11.x-rt/patches/0085-0009-locking-rtmutex-Avoid-include-hell.patch diff --git a/kernel/patches-5.11.x-rt/0086-0010-lockdep-Reduce-header-files-in-debug_locks.h.patch b/kernel/5.11.x-rt/patches/0086-0010-lockdep-Reduce-header-files-in-debug_locks.h.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0086-0010-lockdep-Reduce-header-files-in-debug_locks.h.patch rename to kernel/5.11.x-rt/patches/0086-0010-lockdep-Reduce-header-files-in-debug_locks.h.patch diff --git a/kernel/patches-5.11.x-rt/0087-0011-locking-split-out-the-rbtree-definition.patch b/kernel/5.11.x-rt/patches/0087-0011-locking-split-out-the-rbtree-definition.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0087-0011-locking-split-out-the-rbtree-definition.patch rename to kernel/5.11.x-rt/patches/0087-0011-locking-split-out-the-rbtree-definition.patch diff --git a/kernel/patches-5.11.x-rt/0088-0012-locking-rtmutex-Provide-rt_mutex_slowlock_locked.patch b/kernel/5.11.x-rt/patches/0088-0012-locking-rtmutex-Provide-rt_mutex_slowlock_locked.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0088-0012-locking-rtmutex-Provide-rt_mutex_slowlock_locked.patch rename to kernel/5.11.x-rt/patches/0088-0012-locking-rtmutex-Provide-rt_mutex_slowlock_locked.patch diff --git a/kernel/patches-5.11.x-rt/0089-0013-locking-rtmutex-export-lockdep-less-version-of-rt_mu.patch b/kernel/5.11.x-rt/patches/0089-0013-locking-rtmutex-export-lockdep-less-version-of-rt_mu.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0089-0013-locking-rtmutex-export-lockdep-less-version-of-rt_mu.patch rename to kernel/5.11.x-rt/patches/0089-0013-locking-rtmutex-export-lockdep-less-version-of-rt_mu.patch diff --git a/kernel/patches-5.11.x-rt/0090-0014-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch b/kernel/5.11.x-rt/patches/0090-0014-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0090-0014-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch rename to kernel/5.11.x-rt/patches/0090-0014-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch diff --git a/kernel/patches-5.11.x-rt/0091-0015-locking-rtmutex-add-sleeping-lock-implementation.patch b/kernel/5.11.x-rt/patches/0091-0015-locking-rtmutex-add-sleeping-lock-implementation.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0091-0015-locking-rtmutex-add-sleeping-lock-implementation.patch rename to kernel/5.11.x-rt/patches/0091-0015-locking-rtmutex-add-sleeping-lock-implementation.patch diff --git a/kernel/patches-5.11.x-rt/0092-0016-locking-rtmutex-Allow-rt_mutex_trylock-on-PREEMPT_RT.patch b/kernel/5.11.x-rt/patches/0092-0016-locking-rtmutex-Allow-rt_mutex_trylock-on-PREEMPT_RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0092-0016-locking-rtmutex-Allow-rt_mutex_trylock-on-PREEMPT_RT.patch rename to kernel/5.11.x-rt/patches/0092-0016-locking-rtmutex-Allow-rt_mutex_trylock-on-PREEMPT_RT.patch diff --git a/kernel/patches-5.11.x-rt/0093-0017-locking-rtmutex-add-mutex-implementation-based-on-rt.patch b/kernel/5.11.x-rt/patches/0093-0017-locking-rtmutex-add-mutex-implementation-based-on-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0093-0017-locking-rtmutex-add-mutex-implementation-based-on-rt.patch rename to kernel/5.11.x-rt/patches/0093-0017-locking-rtmutex-add-mutex-implementation-based-on-rt.patch diff --git a/kernel/patches-5.11.x-rt/0094-0018-locking-rtmutex-add-rwsem-implementation-based-on-rt.patch b/kernel/5.11.x-rt/patches/0094-0018-locking-rtmutex-add-rwsem-implementation-based-on-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0094-0018-locking-rtmutex-add-rwsem-implementation-based-on-rt.patch rename to kernel/5.11.x-rt/patches/0094-0018-locking-rtmutex-add-rwsem-implementation-based-on-rt.patch diff --git a/kernel/patches-5.11.x-rt/0095-0019-locking-rtmutex-add-rwlock-implementation-based-on-r.patch b/kernel/5.11.x-rt/patches/0095-0019-locking-rtmutex-add-rwlock-implementation-based-on-r.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0095-0019-locking-rtmutex-add-rwlock-implementation-based-on-r.patch rename to kernel/5.11.x-rt/patches/0095-0019-locking-rtmutex-add-rwlock-implementation-based-on-r.patch diff --git a/kernel/patches-5.11.x-rt/0096-0020-locking-rtmutex-wire-up-RT-s-locking.patch b/kernel/5.11.x-rt/patches/0096-0020-locking-rtmutex-wire-up-RT-s-locking.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0096-0020-locking-rtmutex-wire-up-RT-s-locking.patch rename to kernel/5.11.x-rt/patches/0096-0020-locking-rtmutex-wire-up-RT-s-locking.patch diff --git a/kernel/patches-5.11.x-rt/0097-0021-locking-rtmutex-add-ww_mutex-addon-for-mutex-rt.patch b/kernel/5.11.x-rt/patches/0097-0021-locking-rtmutex-add-ww_mutex-addon-for-mutex-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0097-0021-locking-rtmutex-add-ww_mutex-addon-for-mutex-rt.patch rename to kernel/5.11.x-rt/patches/0097-0021-locking-rtmutex-add-ww_mutex-addon-for-mutex-rt.patch diff --git a/kernel/patches-5.11.x-rt/0098-0022-locking-rtmutex-Use-custom-scheduling-function-for-s.patch b/kernel/5.11.x-rt/patches/0098-0022-locking-rtmutex-Use-custom-scheduling-function-for-s.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0098-0022-locking-rtmutex-Use-custom-scheduling-function-for-s.patch rename to kernel/5.11.x-rt/patches/0098-0022-locking-rtmutex-Use-custom-scheduling-function-for-s.patch diff --git a/kernel/patches-5.11.x-rt/0099-signal-revert-ptrace-preempt-magic.patch b/kernel/5.11.x-rt/patches/0099-signal-revert-ptrace-preempt-magic.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0099-signal-revert-ptrace-preempt-magic.patch rename to kernel/5.11.x-rt/patches/0099-signal-revert-ptrace-preempt-magic.patch diff --git a/kernel/patches-5.11.x-rt/0100-preempt-nort-rt-variants.patch b/kernel/5.11.x-rt/patches/0100-preempt-nort-rt-variants.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0100-preempt-nort-rt-variants.patch rename to kernel/5.11.x-rt/patches/0100-preempt-nort-rt-variants.patch diff --git a/kernel/patches-5.11.x-rt/0101-mm-make-vmstat-rt-aware.patch b/kernel/5.11.x-rt/patches/0101-mm-make-vmstat-rt-aware.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0101-mm-make-vmstat-rt-aware.patch rename to kernel/5.11.x-rt/patches/0101-mm-make-vmstat-rt-aware.patch diff --git a/kernel/patches-5.11.x-rt/0102-mm-memcontrol-Disable-preemption-in-__mod_memcg_lruv.patch b/kernel/5.11.x-rt/patches/0102-mm-memcontrol-Disable-preemption-in-__mod_memcg_lruv.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0102-mm-memcontrol-Disable-preemption-in-__mod_memcg_lruv.patch rename to kernel/5.11.x-rt/patches/0102-mm-memcontrol-Disable-preemption-in-__mod_memcg_lruv.patch diff --git a/kernel/patches-5.11.x-rt/0103-0024-xfrm-Use-sequence-counter-with-associated-spinlock.patch b/kernel/5.11.x-rt/patches/0103-0024-xfrm-Use-sequence-counter-with-associated-spinlock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0103-0024-xfrm-Use-sequence-counter-with-associated-spinlock.patch rename to kernel/5.11.x-rt/patches/0103-0024-xfrm-Use-sequence-counter-with-associated-spinlock.patch diff --git a/kernel/patches-5.11.x-rt/0104-u64_stats-Disable-preemption-on-32bit-UP-SMP-with-RT.patch b/kernel/5.11.x-rt/patches/0104-u64_stats-Disable-preemption-on-32bit-UP-SMP-with-RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0104-u64_stats-Disable-preemption-on-32bit-UP-SMP-with-RT.patch rename to kernel/5.11.x-rt/patches/0104-u64_stats-Disable-preemption-on-32bit-UP-SMP-with-RT.patch diff --git a/kernel/patches-5.11.x-rt/0105-fs-dcache-use-swait_queue-instead-of-waitqueue.patch b/kernel/5.11.x-rt/patches/0105-fs-dcache-use-swait_queue-instead-of-waitqueue.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0105-fs-dcache-use-swait_queue-instead-of-waitqueue.patch rename to kernel/5.11.x-rt/patches/0105-fs-dcache-use-swait_queue-instead-of-waitqueue.patch diff --git a/kernel/patches-5.11.x-rt/0106-fs-dcache-disable-preemption-on-i_dir_seq-s-write-si.patch b/kernel/5.11.x-rt/patches/0106-fs-dcache-disable-preemption-on-i_dir_seq-s-write-si.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0106-fs-dcache-disable-preemption-on-i_dir_seq-s-write-si.patch rename to kernel/5.11.x-rt/patches/0106-fs-dcache-disable-preemption-on-i_dir_seq-s-write-si.patch diff --git a/kernel/patches-5.11.x-rt/0107-net-Qdisc-use-a-seqlock-instead-seqcount.patch b/kernel/5.11.x-rt/patches/0107-net-Qdisc-use-a-seqlock-instead-seqcount.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0107-net-Qdisc-use-a-seqlock-instead-seqcount.patch rename to kernel/5.11.x-rt/patches/0107-net-Qdisc-use-a-seqlock-instead-seqcount.patch diff --git a/kernel/patches-5.11.x-rt/0108-net-Properly-annotate-the-try-lock-for-the-seqlock.patch b/kernel/5.11.x-rt/patches/0108-net-Properly-annotate-the-try-lock-for-the-seqlock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0108-net-Properly-annotate-the-try-lock-for-the-seqlock.patch rename to kernel/5.11.x-rt/patches/0108-net-Properly-annotate-the-try-lock-for-the-seqlock.patch diff --git a/kernel/patches-5.11.x-rt/0109-kconfig-disable-a-few-options-rt.patch b/kernel/5.11.x-rt/patches/0109-kconfig-disable-a-few-options-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0109-kconfig-disable-a-few-options-rt.patch rename to kernel/5.11.x-rt/patches/0109-kconfig-disable-a-few-options-rt.patch diff --git a/kernel/patches-5.11.x-rt/0110-mm-disable-sloub-rt.patch b/kernel/5.11.x-rt/patches/0110-mm-disable-sloub-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0110-mm-disable-sloub-rt.patch rename to kernel/5.11.x-rt/patches/0110-mm-disable-sloub-rt.patch diff --git a/kernel/patches-5.11.x-rt/0111-sched-disable-rt-group-sched-on-rt.patch b/kernel/5.11.x-rt/patches/0111-sched-disable-rt-group-sched-on-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0111-sched-disable-rt-group-sched-on-rt.patch rename to kernel/5.11.x-rt/patches/0111-sched-disable-rt-group-sched-on-rt.patch diff --git a/kernel/patches-5.11.x-rt/0112-net_disable_NET_RX_BUSY_POLL.patch b/kernel/5.11.x-rt/patches/0112-net_disable_NET_RX_BUSY_POLL.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0112-net_disable_NET_RX_BUSY_POLL.patch rename to kernel/5.11.x-rt/patches/0112-net_disable_NET_RX_BUSY_POLL.patch diff --git a/kernel/patches-5.11.x-rt/0113-efi-Disable-runtime-services-on-RT.patch b/kernel/5.11.x-rt/patches/0113-efi-Disable-runtime-services-on-RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0113-efi-Disable-runtime-services-on-RT.patch rename to kernel/5.11.x-rt/patches/0113-efi-Disable-runtime-services-on-RT.patch diff --git a/kernel/patches-5.11.x-rt/0114-efi-Allow-efi-runtime.patch b/kernel/5.11.x-rt/patches/0114-efi-Allow-efi-runtime.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0114-efi-Allow-efi-runtime.patch rename to kernel/5.11.x-rt/patches/0114-efi-Allow-efi-runtime.patch diff --git a/kernel/patches-5.11.x-rt/0115-rt-local-irq-lock.patch b/kernel/5.11.x-rt/patches/0115-rt-local-irq-lock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0115-rt-local-irq-lock.patch rename to kernel/5.11.x-rt/patches/0115-rt-local-irq-lock.patch diff --git a/kernel/patches-5.11.x-rt/0116-oleg-signal-rt-fix.patch b/kernel/5.11.x-rt/patches/0116-oleg-signal-rt-fix.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0116-oleg-signal-rt-fix.patch rename to kernel/5.11.x-rt/patches/0116-oleg-signal-rt-fix.patch diff --git a/kernel/patches-5.11.x-rt/0117-add_cpu_light.patch b/kernel/5.11.x-rt/patches/0117-add_cpu_light.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0117-add_cpu_light.patch rename to kernel/5.11.x-rt/patches/0117-add_cpu_light.patch diff --git a/kernel/patches-5.11.x-rt/0118-ftrace-migrate-disable-tracing.patch b/kernel/5.11.x-rt/patches/0118-ftrace-migrate-disable-tracing.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0118-ftrace-migrate-disable-tracing.patch rename to kernel/5.11.x-rt/patches/0118-ftrace-migrate-disable-tracing.patch diff --git a/kernel/patches-5.11.x-rt/0119-locking-don-t-check-for-__LINUX_SPINLOCK_TYPES_H-on-.patch b/kernel/5.11.x-rt/patches/0119-locking-don-t-check-for-__LINUX_SPINLOCK_TYPES_H-on-.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0119-locking-don-t-check-for-__LINUX_SPINLOCK_TYPES_H-on-.patch rename to kernel/5.11.x-rt/patches/0119-locking-don-t-check-for-__LINUX_SPINLOCK_TYPES_H-on-.patch diff --git a/kernel/patches-5.11.x-rt/0120-0001-mm-sl-au-b-Change-list_lock-to-raw_spinlock_t.patch b/kernel/5.11.x-rt/patches/0120-0001-mm-sl-au-b-Change-list_lock-to-raw_spinlock_t.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0120-0001-mm-sl-au-b-Change-list_lock-to-raw_spinlock_t.patch rename to kernel/5.11.x-rt/patches/0120-0001-mm-sl-au-b-Change-list_lock-to-raw_spinlock_t.patch diff --git a/kernel/patches-5.11.x-rt/0121-0002-mm-slub-Make-object_map_lock-a-raw_spinlock_t.patch b/kernel/5.11.x-rt/patches/0121-0002-mm-slub-Make-object_map_lock-a-raw_spinlock_t.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0121-0002-mm-slub-Make-object_map_lock-a-raw_spinlock_t.patch rename to kernel/5.11.x-rt/patches/0121-0002-mm-slub-Make-object_map_lock-a-raw_spinlock_t.patch diff --git a/kernel/patches-5.11.x-rt/0122-0003-mm-slub-Enable-irqs-for-__GFP_WAIT.patch b/kernel/5.11.x-rt/patches/0122-0003-mm-slub-Enable-irqs-for-__GFP_WAIT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0122-0003-mm-slub-Enable-irqs-for-__GFP_WAIT.patch rename to kernel/5.11.x-rt/patches/0122-0003-mm-slub-Enable-irqs-for-__GFP_WAIT.patch diff --git a/kernel/patches-5.11.x-rt/0123-0004-mm-slub-Move-discard_slab-invocations-out-of-IRQ-off.patch b/kernel/5.11.x-rt/patches/0123-0004-mm-slub-Move-discard_slab-invocations-out-of-IRQ-off.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0123-0004-mm-slub-Move-discard_slab-invocations-out-of-IRQ-off.patch rename to kernel/5.11.x-rt/patches/0123-0004-mm-slub-Move-discard_slab-invocations-out-of-IRQ-off.patch diff --git a/kernel/patches-5.11.x-rt/0124-0005-mm-slub-Move-flush_cpu_slab-invocations-__free_slab-.patch b/kernel/5.11.x-rt/patches/0124-0005-mm-slub-Move-flush_cpu_slab-invocations-__free_slab-.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0124-0005-mm-slub-Move-flush_cpu_slab-invocations-__free_slab-.patch rename to kernel/5.11.x-rt/patches/0124-0005-mm-slub-Move-flush_cpu_slab-invocations-__free_slab-.patch diff --git a/kernel/patches-5.11.x-rt/0125-0006-mm-slub-Don-t-resize-the-location-tracking-cache-on-.patch b/kernel/5.11.x-rt/patches/0125-0006-mm-slub-Don-t-resize-the-location-tracking-cache-on-.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0125-0006-mm-slub-Don-t-resize-the-location-tracking-cache-on-.patch rename to kernel/5.11.x-rt/patches/0125-0006-mm-slub-Don-t-resize-the-location-tracking-cache-on-.patch diff --git a/kernel/patches-5.11.x-rt/0126-0007-mm-page_alloc-Use-migrate_disable-in-drain_local_pag.patch b/kernel/5.11.x-rt/patches/0126-0007-mm-page_alloc-Use-migrate_disable-in-drain_local_pag.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0126-0007-mm-page_alloc-Use-migrate_disable-in-drain_local_pag.patch rename to kernel/5.11.x-rt/patches/0126-0007-mm-page_alloc-Use-migrate_disable-in-drain_local_pag.patch diff --git a/kernel/patches-5.11.x-rt/0127-0008-mm-page_alloc-Use-a-local_lock-instead-of-explicit-l.patch b/kernel/5.11.x-rt/patches/0127-0008-mm-page_alloc-Use-a-local_lock-instead-of-explicit-l.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0127-0008-mm-page_alloc-Use-a-local_lock-instead-of-explicit-l.patch rename to kernel/5.11.x-rt/patches/0127-0008-mm-page_alloc-Use-a-local_lock-instead-of-explicit-l.patch diff --git a/kernel/patches-5.11.x-rt/0128-mm-slub-Don-t-enable-partial-CPU-caches-on-PREEMPT_R.patch b/kernel/5.11.x-rt/patches/0128-mm-slub-Don-t-enable-partial-CPU-caches-on-PREEMPT_R.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0128-mm-slub-Don-t-enable-partial-CPU-caches-on-PREEMPT_R.patch rename to kernel/5.11.x-rt/patches/0128-mm-slub-Don-t-enable-partial-CPU-caches-on-PREEMPT_R.patch diff --git a/kernel/patches-5.11.x-rt/0129-mm-memcontrol-Provide-a-local_lock-for-per-CPU-memcg.patch b/kernel/5.11.x-rt/patches/0129-mm-memcontrol-Provide-a-local_lock-for-per-CPU-memcg.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0129-mm-memcontrol-Provide-a-local_lock-for-per-CPU-memcg.patch rename to kernel/5.11.x-rt/patches/0129-mm-memcontrol-Provide-a-local_lock-for-per-CPU-memcg.patch diff --git a/kernel/patches-5.11.x-rt/0130-mm-memcontrol-Don-t-call-schedule_work_on-in-preempt.patch b/kernel/5.11.x-rt/patches/0130-mm-memcontrol-Don-t-call-schedule_work_on-in-preempt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0130-mm-memcontrol-Don-t-call-schedule_work_on-in-preempt.patch rename to kernel/5.11.x-rt/patches/0130-mm-memcontrol-Don-t-call-schedule_work_on-in-preempt.patch diff --git a/kernel/patches-5.11.x-rt/0131-mm-memcontrol-do_not_disable_irq.patch b/kernel/5.11.x-rt/patches/0131-mm-memcontrol-do_not_disable_irq.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0131-mm-memcontrol-do_not_disable_irq.patch rename to kernel/5.11.x-rt/patches/0131-mm-memcontrol-do_not_disable_irq.patch diff --git a/kernel/patches-5.11.x-rt/0132-mm_zsmalloc_copy_with_get_cpu_var_and_locking.patch b/kernel/5.11.x-rt/patches/0132-mm_zsmalloc_copy_with_get_cpu_var_and_locking.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0132-mm_zsmalloc_copy_with_get_cpu_var_and_locking.patch rename to kernel/5.11.x-rt/patches/0132-mm_zsmalloc_copy_with_get_cpu_var_and_locking.patch diff --git a/kernel/patches-5.11.x-rt/0133-x86-kvm-require-const-tsc-for-rt.patch b/kernel/5.11.x-rt/patches/0133-x86-kvm-require-const-tsc-for-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0133-x86-kvm-require-const-tsc-for-rt.patch rename to kernel/5.11.x-rt/patches/0133-x86-kvm-require-const-tsc-for-rt.patch diff --git a/kernel/patches-5.11.x-rt/0134-wait.h-include-atomic.h.patch b/kernel/5.11.x-rt/patches/0134-wait.h-include-atomic.h.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0134-wait.h-include-atomic.h.patch rename to kernel/5.11.x-rt/patches/0134-wait.h-include-atomic.h.patch diff --git a/kernel/patches-5.11.x-rt/0135-sched-limit-nr-migrate.patch b/kernel/5.11.x-rt/patches/0135-sched-limit-nr-migrate.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0135-sched-limit-nr-migrate.patch rename to kernel/5.11.x-rt/patches/0135-sched-limit-nr-migrate.patch diff --git a/kernel/patches-5.11.x-rt/0136-sched-mmdrop-delayed.patch b/kernel/5.11.x-rt/patches/0136-sched-mmdrop-delayed.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0136-sched-mmdrop-delayed.patch rename to kernel/5.11.x-rt/patches/0136-sched-mmdrop-delayed.patch diff --git a/kernel/patches-5.11.x-rt/0137-kernel-sched-move-stack-kprobe-clean-up-to-__put_tas.patch b/kernel/5.11.x-rt/patches/0137-kernel-sched-move-stack-kprobe-clean-up-to-__put_tas.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0137-kernel-sched-move-stack-kprobe-clean-up-to-__put_tas.patch rename to kernel/5.11.x-rt/patches/0137-kernel-sched-move-stack-kprobe-clean-up-to-__put_tas.patch diff --git a/kernel/patches-5.11.x-rt/0138-sched-might-sleep-do-not-account-rcu-depth.patch b/kernel/5.11.x-rt/patches/0138-sched-might-sleep-do-not-account-rcu-depth.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0138-sched-might-sleep-do-not-account-rcu-depth.patch rename to kernel/5.11.x-rt/patches/0138-sched-might-sleep-do-not-account-rcu-depth.patch diff --git a/kernel/patches-5.11.x-rt/0139-sched-disable-ttwu-queue.patch b/kernel/5.11.x-rt/patches/0139-sched-disable-ttwu-queue.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0139-sched-disable-ttwu-queue.patch rename to kernel/5.11.x-rt/patches/0139-sched-disable-ttwu-queue.patch diff --git a/kernel/patches-5.11.x-rt/0140-softirq-preempt-fix-3-re.patch b/kernel/5.11.x-rt/patches/0140-softirq-preempt-fix-3-re.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0140-softirq-preempt-fix-3-re.patch rename to kernel/5.11.x-rt/patches/0140-softirq-preempt-fix-3-re.patch diff --git a/kernel/patches-5.11.x-rt/0141-softirq-disable-softirq-stacks-for-rt.patch b/kernel/5.11.x-rt/patches/0141-softirq-disable-softirq-stacks-for-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0141-softirq-disable-softirq-stacks-for-rt.patch rename to kernel/5.11.x-rt/patches/0141-softirq-disable-softirq-stacks-for-rt.patch diff --git a/kernel/patches-5.11.x-rt/0142-net-core-use-local_bh_disable-in-netif_rx_ni.patch b/kernel/5.11.x-rt/patches/0142-net-core-use-local_bh_disable-in-netif_rx_ni.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0142-net-core-use-local_bh_disable-in-netif_rx_ni.patch rename to kernel/5.11.x-rt/patches/0142-net-core-use-local_bh_disable-in-netif_rx_ni.patch diff --git a/kernel/patches-5.11.x-rt/0143-pid.h-include-atomic.h.patch b/kernel/5.11.x-rt/patches/0143-pid.h-include-atomic.h.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0143-pid.h-include-atomic.h.patch rename to kernel/5.11.x-rt/patches/0143-pid.h-include-atomic.h.patch diff --git a/kernel/patches-5.11.x-rt/0144-ptrace-fix-ptrace-vs-tasklist_lock-race.patch b/kernel/5.11.x-rt/patches/0144-ptrace-fix-ptrace-vs-tasklist_lock-race.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0144-ptrace-fix-ptrace-vs-tasklist_lock-race.patch rename to kernel/5.11.x-rt/patches/0144-ptrace-fix-ptrace-vs-tasklist_lock-race.patch diff --git a/kernel/patches-5.11.x-rt/0145-ptrace-fix-ptrace_unfreeze_traced-race-with-rt-lock.patch b/kernel/5.11.x-rt/patches/0145-ptrace-fix-ptrace_unfreeze_traced-race-with-rt-lock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0145-ptrace-fix-ptrace_unfreeze_traced-race-with-rt-lock.patch rename to kernel/5.11.x-rt/patches/0145-ptrace-fix-ptrace_unfreeze_traced-race-with-rt-lock.patch diff --git a/kernel/patches-5.11.x-rt/0146-locking-Make-spinlock_t-and-rwlock_t-a-RCU-section-o.patch b/kernel/5.11.x-rt/patches/0146-locking-Make-spinlock_t-and-rwlock_t-a-RCU-section-o.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0146-locking-Make-spinlock_t-and-rwlock_t-a-RCU-section-o.patch rename to kernel/5.11.x-rt/patches/0146-locking-Make-spinlock_t-and-rwlock_t-a-RCU-section-o.patch diff --git a/kernel/patches-5.11.x-rt/0147-rcutorture-Avoid-problematic-critical-section-nestin.patch b/kernel/5.11.x-rt/patches/0147-rcutorture-Avoid-problematic-critical-section-nestin.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0147-rcutorture-Avoid-problematic-critical-section-nestin.patch rename to kernel/5.11.x-rt/patches/0147-rcutorture-Avoid-problematic-critical-section-nestin.patch diff --git a/kernel/patches-5.11.x-rt/0148-mm-vmalloc-use-get-cpu-light.patch b/kernel/5.11.x-rt/patches/0148-mm-vmalloc-use-get-cpu-light.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0148-mm-vmalloc-use-get-cpu-light.patch rename to kernel/5.11.x-rt/patches/0148-mm-vmalloc-use-get-cpu-light.patch diff --git a/kernel/patches-5.11.x-rt/0149-block-mq-drop-preempt-disable.patch b/kernel/5.11.x-rt/patches/0149-block-mq-drop-preempt-disable.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0149-block-mq-drop-preempt-disable.patch rename to kernel/5.11.x-rt/patches/0149-block-mq-drop-preempt-disable.patch diff --git a/kernel/patches-5.11.x-rt/0150-md-raid5-percpu-handling-rt-aware.patch b/kernel/5.11.x-rt/patches/0150-md-raid5-percpu-handling-rt-aware.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0150-md-raid5-percpu-handling-rt-aware.patch rename to kernel/5.11.x-rt/patches/0150-md-raid5-percpu-handling-rt-aware.patch diff --git a/kernel/patches-5.11.x-rt/0151-scsi-fcoe-rt-aware.patch b/kernel/5.11.x-rt/patches/0151-scsi-fcoe-rt-aware.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0151-scsi-fcoe-rt-aware.patch rename to kernel/5.11.x-rt/patches/0151-scsi-fcoe-rt-aware.patch diff --git a/kernel/patches-5.11.x-rt/0152-sunrpc-make-svc_xprt_do_enqueue-use-get_cpu_light.patch b/kernel/5.11.x-rt/patches/0152-sunrpc-make-svc_xprt_do_enqueue-use-get_cpu_light.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0152-sunrpc-make-svc_xprt_do_enqueue-use-get_cpu_light.patch rename to kernel/5.11.x-rt/patches/0152-sunrpc-make-svc_xprt_do_enqueue-use-get_cpu_light.patch diff --git a/kernel/patches-5.11.x-rt/0153-rt-introduce-cpu-chill.patch b/kernel/5.11.x-rt/patches/0153-rt-introduce-cpu-chill.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0153-rt-introduce-cpu-chill.patch rename to kernel/5.11.x-rt/patches/0153-rt-introduce-cpu-chill.patch diff --git a/kernel/patches-5.11.x-rt/0154-fs-namespace-use-cpu-chill-in-trylock-loops.patch b/kernel/5.11.x-rt/patches/0154-fs-namespace-use-cpu-chill-in-trylock-loops.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0154-fs-namespace-use-cpu-chill-in-trylock-loops.patch rename to kernel/5.11.x-rt/patches/0154-fs-namespace-use-cpu-chill-in-trylock-loops.patch diff --git a/kernel/patches-5.11.x-rt/0155-debugobjects-rt.patch b/kernel/5.11.x-rt/patches/0155-debugobjects-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0155-debugobjects-rt.patch rename to kernel/5.11.x-rt/patches/0155-debugobjects-rt.patch diff --git a/kernel/patches-5.11.x-rt/0156-skbufhead-raw-lock.patch b/kernel/5.11.x-rt/patches/0156-skbufhead-raw-lock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0156-skbufhead-raw-lock.patch rename to kernel/5.11.x-rt/patches/0156-skbufhead-raw-lock.patch diff --git a/kernel/patches-5.11.x-rt/0157-net-Dequeue-in-dev_cpu_dead-without-the-lock.patch b/kernel/5.11.x-rt/patches/0157-net-Dequeue-in-dev_cpu_dead-without-the-lock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0157-net-Dequeue-in-dev_cpu_dead-without-the-lock.patch rename to kernel/5.11.x-rt/patches/0157-net-Dequeue-in-dev_cpu_dead-without-the-lock.patch diff --git a/kernel/patches-5.11.x-rt/0158-net-dev-always-take-qdisc-s-busylock-in-__dev_xmit_s.patch b/kernel/5.11.x-rt/patches/0158-net-dev-always-take-qdisc-s-busylock-in-__dev_xmit_s.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0158-net-dev-always-take-qdisc-s-busylock-in-__dev_xmit_s.patch rename to kernel/5.11.x-rt/patches/0158-net-dev-always-take-qdisc-s-busylock-in-__dev_xmit_s.patch diff --git a/kernel/patches-5.11.x-rt/0159-irqwork-push_most_work_into_softirq_context.patch b/kernel/5.11.x-rt/patches/0159-irqwork-push_most_work_into_softirq_context.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0159-irqwork-push_most_work_into_softirq_context.patch rename to kernel/5.11.x-rt/patches/0159-irqwork-push_most_work_into_softirq_context.patch diff --git a/kernel/patches-5.11.x-rt/0160-x86-crypto-reduce-preempt-disabled-regions.patch b/kernel/5.11.x-rt/patches/0160-x86-crypto-reduce-preempt-disabled-regions.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0160-x86-crypto-reduce-preempt-disabled-regions.patch rename to kernel/5.11.x-rt/patches/0160-x86-crypto-reduce-preempt-disabled-regions.patch diff --git a/kernel/patches-5.11.x-rt/0161-crypto-Reduce-preempt-disabled-regions-more-algos.patch b/kernel/5.11.x-rt/patches/0161-crypto-Reduce-preempt-disabled-regions-more-algos.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0161-crypto-Reduce-preempt-disabled-regions-more-algos.patch rename to kernel/5.11.x-rt/patches/0161-crypto-Reduce-preempt-disabled-regions-more-algos.patch diff --git a/kernel/patches-5.11.x-rt/0162-crypto-limit-more-FPU-enabled-sections.patch b/kernel/5.11.x-rt/patches/0162-crypto-limit-more-FPU-enabled-sections.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0162-crypto-limit-more-FPU-enabled-sections.patch rename to kernel/5.11.x-rt/patches/0162-crypto-limit-more-FPU-enabled-sections.patch diff --git a/kernel/patches-5.11.x-rt/0163-crypto-cryptd-add-a-lock-instead-preempt_disable-loc.patch b/kernel/5.11.x-rt/patches/0163-crypto-cryptd-add-a-lock-instead-preempt_disable-loc.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0163-crypto-cryptd-add-a-lock-instead-preempt_disable-loc.patch rename to kernel/5.11.x-rt/patches/0163-crypto-cryptd-add-a-lock-instead-preempt_disable-loc.patch diff --git a/kernel/patches-5.11.x-rt/0164-panic-disable-random-on-rt.patch b/kernel/5.11.x-rt/patches/0164-panic-disable-random-on-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0164-panic-disable-random-on-rt.patch rename to kernel/5.11.x-rt/patches/0164-panic-disable-random-on-rt.patch diff --git a/kernel/patches-5.11.x-rt/0165-x86-stackprot-no-random-on-rt.patch b/kernel/5.11.x-rt/patches/0165-x86-stackprot-no-random-on-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0165-x86-stackprot-no-random-on-rt.patch rename to kernel/5.11.x-rt/patches/0165-x86-stackprot-no-random-on-rt.patch diff --git a/kernel/patches-5.11.x-rt/0166-random-make-it-work-on-rt.patch b/kernel/5.11.x-rt/patches/0166-random-make-it-work-on-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0166-random-make-it-work-on-rt.patch rename to kernel/5.11.x-rt/patches/0166-random-make-it-work-on-rt.patch diff --git a/kernel/patches-5.11.x-rt/0167-upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch b/kernel/5.11.x-rt/patches/0167-upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0167-upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch rename to kernel/5.11.x-rt/patches/0167-upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch diff --git a/kernel/patches-5.11.x-rt/0168-lockdep-no-softirq-accounting-on-rt.patch b/kernel/5.11.x-rt/patches/0168-lockdep-no-softirq-accounting-on-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0168-lockdep-no-softirq-accounting-on-rt.patch rename to kernel/5.11.x-rt/patches/0168-lockdep-no-softirq-accounting-on-rt.patch diff --git a/kernel/patches-5.11.x-rt/0169-lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch b/kernel/5.11.x-rt/patches/0169-lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0169-lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch rename to kernel/5.11.x-rt/patches/0169-lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch diff --git a/kernel/patches-5.11.x-rt/0170-lockdep-selftest-fix-warnings-due-to-missing-PREEMPT.patch b/kernel/5.11.x-rt/patches/0170-lockdep-selftest-fix-warnings-due-to-missing-PREEMPT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0170-lockdep-selftest-fix-warnings-due-to-missing-PREEMPT.patch rename to kernel/5.11.x-rt/patches/0170-lockdep-selftest-fix-warnings-due-to-missing-PREEMPT.patch diff --git a/kernel/patches-5.11.x-rt/0171-lockdep-disable-self-test.patch b/kernel/5.11.x-rt/patches/0171-lockdep-disable-self-test.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0171-lockdep-disable-self-test.patch rename to kernel/5.11.x-rt/patches/0171-lockdep-disable-self-test.patch diff --git a/kernel/patches-5.11.x-rt/0172-drmradeoni915_Use_preempt_disableenable_rt()_where_recommended.patch b/kernel/5.11.x-rt/patches/0172-drmradeoni915_Use_preempt_disableenable_rt()_where_recommended.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0172-drmradeoni915_Use_preempt_disableenable_rt()_where_recommended.patch rename to kernel/5.11.x-rt/patches/0172-drmradeoni915_Use_preempt_disableenable_rt()_where_recommended.patch diff --git a/kernel/patches-5.11.x-rt/0173-drm-i915-Don-t-disable-interrupts-on-PREEMPT_RT-duri.patch b/kernel/5.11.x-rt/patches/0173-drm-i915-Don-t-disable-interrupts-on-PREEMPT_RT-duri.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0173-drm-i915-Don-t-disable-interrupts-on-PREEMPT_RT-duri.patch rename to kernel/5.11.x-rt/patches/0173-drm-i915-Don-t-disable-interrupts-on-PREEMPT_RT-duri.patch diff --git a/kernel/patches-5.11.x-rt/0174-drm-i915-disable-tracing-on-RT.patch b/kernel/5.11.x-rt/patches/0174-drm-i915-disable-tracing-on-RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0174-drm-i915-disable-tracing-on-RT.patch rename to kernel/5.11.x-rt/patches/0174-drm-i915-disable-tracing-on-RT.patch diff --git a/kernel/patches-5.11.x-rt/0175-drm-i915-skip-DRM_I915_LOW_LEVEL_TRACEPOINTS-with-NO.patch b/kernel/5.11.x-rt/patches/0175-drm-i915-skip-DRM_I915_LOW_LEVEL_TRACEPOINTS-with-NO.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0175-drm-i915-skip-DRM_I915_LOW_LEVEL_TRACEPOINTS-with-NO.patch rename to kernel/5.11.x-rt/patches/0175-drm-i915-skip-DRM_I915_LOW_LEVEL_TRACEPOINTS-with-NO.patch diff --git a/kernel/patches-5.11.x-rt/0176-drm-i915-gt-Only-disable-interrupts-for-the-timeline.patch b/kernel/5.11.x-rt/patches/0176-drm-i915-gt-Only-disable-interrupts-for-the-timeline.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0176-drm-i915-gt-Only-disable-interrupts-for-the-timeline.patch rename to kernel/5.11.x-rt/patches/0176-drm-i915-gt-Only-disable-interrupts-for-the-timeline.patch diff --git a/kernel/patches-5.11.x-rt/0177-cpuset-Convert-callback_lock-to-raw_spinlock_t.patch b/kernel/5.11.x-rt/patches/0177-cpuset-Convert-callback_lock-to-raw_spinlock_t.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0177-cpuset-Convert-callback_lock-to-raw_spinlock_t.patch rename to kernel/5.11.x-rt/patches/0177-cpuset-Convert-callback_lock-to-raw_spinlock_t.patch diff --git a/kernel/patches-5.11.x-rt/0178-x86-Enable-RT.patch b/kernel/5.11.x-rt/patches/0178-x86-Enable-RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0178-x86-Enable-RT.patch rename to kernel/5.11.x-rt/patches/0178-x86-Enable-RT.patch diff --git a/kernel/patches-5.11.x-rt/0179-mm-scatterlist-dont-disable-irqs-on-RT.patch b/kernel/5.11.x-rt/patches/0179-mm-scatterlist-dont-disable-irqs-on-RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0179-mm-scatterlist-dont-disable-irqs-on-RT.patch rename to kernel/5.11.x-rt/patches/0179-mm-scatterlist-dont-disable-irqs-on-RT.patch diff --git a/kernel/patches-5.11.x-rt/0180-preempt-lazy-support.patch b/kernel/5.11.x-rt/patches/0180-preempt-lazy-support.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0180-preempt-lazy-support.patch rename to kernel/5.11.x-rt/patches/0180-preempt-lazy-support.patch diff --git a/kernel/patches-5.11.x-rt/0181-x86-entry-Use-should_resched-in-idtentry_exit_cond_r.patch b/kernel/5.11.x-rt/patches/0181-x86-entry-Use-should_resched-in-idtentry_exit_cond_r.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0181-x86-entry-Use-should_resched-in-idtentry_exit_cond_r.patch rename to kernel/5.11.x-rt/patches/0181-x86-entry-Use-should_resched-in-idtentry_exit_cond_r.patch diff --git a/kernel/patches-5.11.x-rt/0182-x86-preempt-lazy.patch b/kernel/5.11.x-rt/patches/0182-x86-preempt-lazy.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0182-x86-preempt-lazy.patch rename to kernel/5.11.x-rt/patches/0182-x86-preempt-lazy.patch diff --git a/kernel/patches-5.11.x-rt/0183-arm-preempt-lazy-support.patch b/kernel/5.11.x-rt/patches/0183-arm-preempt-lazy-support.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0183-arm-preempt-lazy-support.patch rename to kernel/5.11.x-rt/patches/0183-arm-preempt-lazy-support.patch diff --git a/kernel/patches-5.11.x-rt/0184-powerpc-preempt-lazy-support.patch b/kernel/5.11.x-rt/patches/0184-powerpc-preempt-lazy-support.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0184-powerpc-preempt-lazy-support.patch rename to kernel/5.11.x-rt/patches/0184-powerpc-preempt-lazy-support.patch diff --git a/kernel/patches-5.11.x-rt/0185-arch-arm64-Add-lazy-preempt-support.patch b/kernel/5.11.x-rt/patches/0185-arch-arm64-Add-lazy-preempt-support.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0185-arch-arm64-Add-lazy-preempt-support.patch rename to kernel/5.11.x-rt/patches/0185-arch-arm64-Add-lazy-preempt-support.patch diff --git a/kernel/patches-5.11.x-rt/0186-jump-label-rt.patch b/kernel/5.11.x-rt/patches/0186-jump-label-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0186-jump-label-rt.patch rename to kernel/5.11.x-rt/patches/0186-jump-label-rt.patch diff --git a/kernel/patches-5.11.x-rt/0187-leds-trigger-disable-CPU-trigger-on-RT.patch b/kernel/5.11.x-rt/patches/0187-leds-trigger-disable-CPU-trigger-on-RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0187-leds-trigger-disable-CPU-trigger-on-RT.patch rename to kernel/5.11.x-rt/patches/0187-leds-trigger-disable-CPU-trigger-on-RT.patch diff --git a/kernel/patches-5.11.x-rt/0188-drivers-tty-fix-omap-lock-crap.patch b/kernel/5.11.x-rt/patches/0188-drivers-tty-fix-omap-lock-crap.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0188-drivers-tty-fix-omap-lock-crap.patch rename to kernel/5.11.x-rt/patches/0188-drivers-tty-fix-omap-lock-crap.patch diff --git a/kernel/patches-5.11.x-rt/0189-drivers-tty-pl011-irq-disable-madness.patch b/kernel/5.11.x-rt/patches/0189-drivers-tty-pl011-irq-disable-madness.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0189-drivers-tty-pl011-irq-disable-madness.patch rename to kernel/5.11.x-rt/patches/0189-drivers-tty-pl011-irq-disable-madness.patch diff --git a/kernel/patches-5.11.x-rt/0190-ARM-enable-irq-in-translation-section-permission-fau.patch b/kernel/5.11.x-rt/patches/0190-ARM-enable-irq-in-translation-section-permission-fau.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0190-ARM-enable-irq-in-translation-section-permission-fau.patch rename to kernel/5.11.x-rt/patches/0190-ARM-enable-irq-in-translation-section-permission-fau.patch diff --git a/kernel/patches-5.11.x-rt/0191-genirq-update-irq_set_irqchip_state-documentation.patch b/kernel/5.11.x-rt/patches/0191-genirq-update-irq_set_irqchip_state-documentation.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0191-genirq-update-irq_set_irqchip_state-documentation.patch rename to kernel/5.11.x-rt/patches/0191-genirq-update-irq_set_irqchip_state-documentation.patch diff --git a/kernel/patches-5.11.x-rt/0192-KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch b/kernel/5.11.x-rt/patches/0192-KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0192-KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch rename to kernel/5.11.x-rt/patches/0192-KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch diff --git a/kernel/patches-5.11.x-rt/0193-arm64-fpsimd-use-preemp_disable-in-addition-to-local.patch b/kernel/5.11.x-rt/patches/0193-arm64-fpsimd-use-preemp_disable-in-addition-to-local.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0193-arm64-fpsimd-use-preemp_disable-in-addition-to-local.patch rename to kernel/5.11.x-rt/patches/0193-arm64-fpsimd-use-preemp_disable-in-addition-to-local.patch diff --git a/kernel/patches-5.11.x-rt/0194-x86-Enable-RT-also-on-32bit.patch b/kernel/5.11.x-rt/patches/0194-x86-Enable-RT-also-on-32bit.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0194-x86-Enable-RT-also-on-32bit.patch rename to kernel/5.11.x-rt/patches/0194-x86-Enable-RT-also-on-32bit.patch diff --git a/kernel/patches-5.11.x-rt/0195-ARM-Allow-to-enable-RT.patch b/kernel/5.11.x-rt/patches/0195-ARM-Allow-to-enable-RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0195-ARM-Allow-to-enable-RT.patch rename to kernel/5.11.x-rt/patches/0195-ARM-Allow-to-enable-RT.patch diff --git a/kernel/patches-5.11.x-rt/0196-ARM64-Allow-to-enable-RT.patch b/kernel/5.11.x-rt/patches/0196-ARM64-Allow-to-enable-RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0196-ARM64-Allow-to-enable-RT.patch rename to kernel/5.11.x-rt/patches/0196-ARM64-Allow-to-enable-RT.patch diff --git a/kernel/patches-5.11.x-rt/0197-powerpc-traps.patch b/kernel/5.11.x-rt/patches/0197-powerpc-traps.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0197-powerpc-traps.patch rename to kernel/5.11.x-rt/patches/0197-powerpc-traps.patch diff --git a/kernel/patches-5.11.x-rt/0198-powerpc-pseries-iommu-Use-a-locallock-instead-local_ir.patch b/kernel/5.11.x-rt/patches/0198-powerpc-pseries-iommu-Use-a-locallock-instead-local_ir.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0198-powerpc-pseries-iommu-Use-a-locallock-instead-local_ir.patch rename to kernel/5.11.x-rt/patches/0198-powerpc-pseries-iommu-Use-a-locallock-instead-local_ir.patch diff --git a/kernel/patches-5.11.x-rt/0199-powerpc-kvm-Disable-in-kernel-MPIC-emulation-for-PRE.patch b/kernel/5.11.x-rt/patches/0199-powerpc-kvm-Disable-in-kernel-MPIC-emulation-for-PRE.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0199-powerpc-kvm-Disable-in-kernel-MPIC-emulation-for-PRE.patch rename to kernel/5.11.x-rt/patches/0199-powerpc-kvm-Disable-in-kernel-MPIC-emulation-for-PRE.patch diff --git a/kernel/patches-5.11.x-rt/0200-powerpc-stackprotector-work-around-stack-guard-init-.patch b/kernel/5.11.x-rt/patches/0200-powerpc-stackprotector-work-around-stack-guard-init-.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0200-powerpc-stackprotector-work-around-stack-guard-init-.patch rename to kernel/5.11.x-rt/patches/0200-powerpc-stackprotector-work-around-stack-guard-init-.patch diff --git a/kernel/patches-5.11.x-rt/0201-powerpc-Avoid-recursive-header-includes.patch b/kernel/5.11.x-rt/patches/0201-powerpc-Avoid-recursive-header-includes.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0201-powerpc-Avoid-recursive-header-includes.patch rename to kernel/5.11.x-rt/patches/0201-powerpc-Avoid-recursive-header-includes.patch diff --git a/kernel/patches-5.11.x-rt/0202-POWERPC-Allow-to-enable-RT.patch b/kernel/5.11.x-rt/patches/0202-POWERPC-Allow-to-enable-RT.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0202-POWERPC-Allow-to-enable-RT.patch rename to kernel/5.11.x-rt/patches/0202-POWERPC-Allow-to-enable-RT.patch diff --git a/kernel/patches-5.11.x-rt/0203-drivers-block-zram-Replace-bit-spinlocks-with-rtmute.patch b/kernel/5.11.x-rt/patches/0203-drivers-block-zram-Replace-bit-spinlocks-with-rtmute.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0203-drivers-block-zram-Replace-bit-spinlocks-with-rtmute.patch rename to kernel/5.11.x-rt/patches/0203-drivers-block-zram-Replace-bit-spinlocks-with-rtmute.patch diff --git a/kernel/patches-5.11.x-rt/0204-tpm_tis-fix-stall-after-iowrite-s.patch b/kernel/5.11.x-rt/patches/0204-tpm_tis-fix-stall-after-iowrite-s.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0204-tpm_tis-fix-stall-after-iowrite-s.patch rename to kernel/5.11.x-rt/patches/0204-tpm_tis-fix-stall-after-iowrite-s.patch diff --git a/kernel/patches-5.11.x-rt/0205-signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch b/kernel/5.11.x-rt/patches/0205-signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0205-signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch rename to kernel/5.11.x-rt/patches/0205-signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch diff --git a/kernel/patches-5.11.x-rt/0206-genirq-disable-irqpoll-on-rt.patch b/kernel/5.11.x-rt/patches/0206-genirq-disable-irqpoll-on-rt.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0206-genirq-disable-irqpoll-on-rt.patch rename to kernel/5.11.x-rt/patches/0206-genirq-disable-irqpoll-on-rt.patch diff --git a/kernel/patches-5.11.x-rt/0207-sysfs-realtime-entry.patch b/kernel/5.11.x-rt/patches/0207-sysfs-realtime-entry.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0207-sysfs-realtime-entry.patch rename to kernel/5.11.x-rt/patches/0207-sysfs-realtime-entry.patch diff --git a/kernel/patches-5.11.x-rt/0208-localversion.patch b/kernel/5.11.x-rt/patches/0208-localversion.patch similarity index 100% rename from kernel/patches-5.11.x-rt/0208-localversion.patch rename to kernel/5.11.x-rt/patches/0208-localversion.patch diff --git a/kernel/config-5.11.x-aarch64 b/kernel/5.11.x/config-aarch64 similarity index 100% rename from kernel/config-5.11.x-aarch64 rename to kernel/5.11.x/config-aarch64 diff --git a/kernel/config-5.11.x-x86_64 b/kernel/5.11.x/config-x86_64 similarity index 100% rename from kernel/config-5.11.x-x86_64 rename to kernel/5.11.x/config-x86_64 diff --git a/kernel/patches-5.11.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch b/kernel/5.11.x/patches/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch similarity index 100% rename from kernel/patches-5.11.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch rename to kernel/5.11.x/patches/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch diff --git a/kernel/patches-5.11.x/0002-gcc12-subcmd-build-issues.patch b/kernel/5.11.x/patches/0002-gcc12-subcmd-build-issues.patch similarity index 100% rename from kernel/patches-5.11.x/0002-gcc12-subcmd-build-issues.patch rename to kernel/5.11.x/patches/0002-gcc12-subcmd-build-issues.patch diff --git a/kernel/config-5.15.x-aarch64 b/kernel/5.15.x/config-aarch64 similarity index 100% rename from kernel/config-5.15.x-aarch64 rename to kernel/5.15.x/config-aarch64 diff --git a/kernel/config-5.15.x-x86_64 b/kernel/5.15.x/config-x86_64 similarity index 100% rename from kernel/config-5.15.x-x86_64 rename to kernel/5.15.x/config-x86_64 diff --git a/kernel/config-5.4.x-x86_64 b/kernel/5.4.x/config-x86_64 similarity index 100% rename from kernel/config-5.4.x-x86_64 rename to kernel/5.4.x/config-x86_64 diff --git a/kernel/patches-5.4.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch b/kernel/5.4.x/patches/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch similarity index 100% rename from kernel/patches-5.4.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch rename to kernel/5.4.x/patches/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch diff --git a/kernel/patches-5.4.x/0002-gcc12-subcmd-build-issues.patch b/kernel/5.4.x/patches/0002-gcc12-subcmd-build-issues.patch similarity index 100% rename from kernel/patches-5.4.x/0002-gcc12-subcmd-build-issues.patch rename to kernel/5.4.x/patches/0002-gcc12-subcmd-build-issues.patch diff --git a/kernel/config-6.6.x-aarch64 b/kernel/6.6.x/config-aarch64 similarity index 100% rename from kernel/config-6.6.x-aarch64 rename to kernel/6.6.x/config-aarch64 diff --git a/kernel/config-6.6.x-x86_64 b/kernel/6.6.x/config-x86_64 similarity index 100% rename from kernel/config-6.6.x-x86_64 rename to kernel/6.6.x/config-x86_64 diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 02acebae1..53f0235f8 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -40,9 +40,9 @@ ARG EXTRA ARG DEBUG # We copy the entire directory. This copies some unneeded files, but -# allows us to check for the existence /patches-${KERNEL_SERIES} to +# allows us to check for the existence /${KERNEL_SERIES}/patches to # build kernels without patches. -COPY / / +COPY / /src/ RUN mkdir -p /out/src @@ -83,20 +83,21 @@ RUN set -e && \ WORKDIR /linux + # Apply local specific patches if present RUN set -e && \ - if [ -n "${EXTRA}" ] && [ -d /patches-${KERNEL_SERIES}${EXTRA} ]; then \ - echo "Patching ${EXTRA} kernel"; \ - for patch in /patches-${KERNEL_SERIES}${EXTRA}/*.patch; do \ + if [ -n "${EXTRA}" ] && [ -d /src/${KERNEL_SERIES}${EXTRA}/patches ]; then \ + echo "Patching ${EXTRA} kernel"; \ + for patch in /src/${KERNEL_SERIES}${EXTRA}/patches/*.patch; do \ echo "Applying $patch"; \ patch -t -F0 -N -u -p1 < "$patch"; \ - done; \ + done; \ fi # Apply local common patches if present RUN set -e && \ - if [ -d /patches-${KERNEL_SERIES} ]; then \ - for patch in /patches-${KERNEL_SERIES}/*.patch; do \ + if [ -d /src/${KERNEL_SERIES}/patches ]; then \ + for patch in /src/${KERNEL_SERIES}/patches/*.patch; do \ echo "Applying $patch"; \ patch -t -F0 -N -u -p1 < "$patch"; \ done; \ @@ -114,14 +115,14 @@ RUN case $(uname -m) in \ KERNEL_DEF_CONF=/linux/arch/arm64/configs/defconfig; \ ;; \ esac && \ - cp /config-${KERNEL_SERIES}-$(uname -m) ${KERNEL_DEF_CONF}; \ - if [ -n "${EXTRA}" ] && [ -f "/config-${KERNEL_SERIES}-$(uname -m)${EXTRA}" ]; then \ - cat /config-${KERNEL_SERIES}-$(uname -m)${EXTRA} >> ${KERNEL_DEF_CONF}; \ + cp /src/${KERNEL_SERIES}/config-$(uname -m) ${KERNEL_DEF_CONF}; \ + if [ -n "${EXTRA}" ] && [ -f "/src/${KERNEL_SERIES}-${EXTRA}/config-$(uname -m)" ]; then \ + cat /src/${KERNEL_SERIES}-${EXTRA}/config-$(uname -m) >> ${KERNEL_DEF_CONF}; \ fi; \ sed -i "s/CONFIG_LOCALVERSION=\"-linuxkit\"/CONFIG_LOCALVERSION=\"-linuxkit${EXTRA}${DEBUG}\"/" ${KERNEL_DEF_CONF}; \ if [ -n "${DEBUG}" ]; then \ sed -i 's/CONFIG_PANIC_ON_OOPS=y/# CONFIG_PANIC_ON_OOPS is not set/' ${KERNEL_DEF_CONF}; \ - cat /config${DEBUG} >> ${KERNEL_DEF_CONF}; \ + cat /src/config${DEBUG} >> ${KERNEL_DEF_CONF}; \ fi && \ make defconfig && \ make oldconfig && \