Merge branch 'factory' into slfo-main

0001-man-document-static-ip-setup-differences-to-dracut-n.patch

@@ -33,3 +33,4 @@ index 312edff2ee..c4ea8baf8f 100644
          order in which they are announced by udev. If multiple
 -- 
 2.49.0
+

NetworkManager.changes

@@ -103,14 +103,6 @@ Wed Jun 11 06:59:12 UTC 2025 - Thomas Blume <thomas.blume@suse.com>
 - document static ip setup on boot (bsc#1244072)
   add 0001-man-document-static-ip-setup-differences-to-dracut-n.patch
 
--------------------------------------------------------------------
-Mon May 26 09:15:36 UTC 2025 - Callum Farmer <gmbr3@opensuse.org>
-
-- Stop relying on the UsrMerge symlinks and ensure we look directly
-  in /usr:
-  + Use _firmwaredir for kernel_firmware_dir
-  + Use /usr/sbin/modprobe (was /sbin/modprobe)
-
 -------------------------------------------------------------------
 Wed Apr  9 02:42:56 UTC 2025 - Jonathan Kang <songchuan.kang@suse.com>
 

NetworkManager.spec

@@ -345,8 +345,6 @@ export PYTHON=%{_bindir}/python3
     -Dudev_dir=%{_udevdir} \
     -Ddbus_conf_dir=%{_dbusconfdir} \
     -Ddnsmasq=%{_sbindir}/dnsmasq \
-    -Dmodprobe=%{_sbindir}/modprobe \
-    -Dkernel_firmware_dir=%{_firmwaredir} \
     -Ddist_version=%{version} \
     -Dpolkit_agent_helper_1=%{_libexecdir}/polkit-1/polkit-agent-helper-1 \
     -Dlibaudit=%{libaudit_meson_opt} \