Merge remote-tracking branch 'upstream/f41' into 6.11-bazzite

hhd-dev · Dec 17, 2024 · 68053b3 · 68053b3
2 parents f0d3977 + 84da1a7
commit 68053b3
Show file tree

Hide file tree

Showing 40 changed files with 99,118 additions and 3,254 deletions.
diff --git a/Patchlist.changelog b/Patchlist.changelog
diff --git a/def_variants.yaml.fedora b/def_variants.yaml.fedora
@@ -42,7 +42,7 @@ rules:
   - drivers/cdx/.*: modules-core
   - drivers/char/mwave.*: modules
   - drivers/char/.*: modules-core
-  - drivers/clk/.*test.*: modules-internal
+  - drivers/clk/.*(test|kunit).*: modules-internal
   - drivers/clk/.*: modules-core
   - drivers/counter/.*: modules-core
   - drivers/cpufreq/.*: modules-core
@@ -424,6 +424,7 @@ rules:
   - kernel/.*: modules-core
 
   - lib/.*(test|kunit).*: modules-internal
+    exact_pkg: True
   - lib/.*: modules-core
 
   - mm/kasan/kasan_test: modules-internal

diff --git a/def_variants.yaml.rhel b/def_variants.yaml.rhel
@@ -47,7 +47,7 @@ rules:
   - drivers/cdx/.*: modules-core
   - drivers/char/mwave.*: modules
   - drivers/char/.*: modules-core
-  - drivers/clk/.*test.*: modules-internal
+  - drivers/clk/.*(test|kunit).*: modules-internal
   - drivers/clk/.*: modules-core
   - drivers/counter/.*: modules-core
   - drivers/cpufreq/amd-pstate-ut.ko: modules-internal
@@ -350,7 +350,7 @@ rules:
   - drivers/usb/misc/.*: modules
   - drivers/usb/serial/.*: modules
   - drivers/usb/typec/mux/nb7vpq904m.*: modules
-  - drivers/usb/usbip/.*: modules-extra
+  - drivers/usb/usbip/.*: modules-internal
   - drivers/usb/.*: modules-core
 
   - drivers/vdpa/mlx5/mlx5_vdpa.*: modules
@@ -433,6 +433,7 @@ rules:
 
   - lib/test_lockup.*: modules-extra
   - lib/.*(test|kunit).*: modules-internal
+    exact_pkg: True
   - lib/.*: modules-core
 
   - mm/kasan/kasan_test: modules-internal

diff --git a/dracut-virt.conf b/dracut-virt.conf
@@ -6,7 +6,7 @@ compress="xz"
 early_microcode="no"
 
 # modules: basics
-dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus dbus-broker usrmount shutdown "
+dracutmodules+=" dracut-systemd i18n shutdown "
 
 # modules: storage support
 dracutmodules+=" dm lvm rootfs-block fs-lib "