From 526b11488e4e43d787fb0df0806bd92997d076a5 Mon Sep 17 00:00:00 2001
From: Tony Jones <tonyj@suse.de>
Date: May 27 2025 20:04:24 +0000
Subject: Merge remote-tracking branch 'origin/users/ailiopoulos/SLE15-SP6/for-next' into SLE15-SP6


---

diff --git a/patches.suse/NFSv3-only-use-NFS-timeout-for-MOUNT-when-protocols-.patch b/patches.suse/NFSv3-only-use-NFS-timeout-for-MOUNT-when-protocols-.patch
index ea96073..599ad02 100644
--- a/patches.suse/NFSv3-only-use-NFS-timeout-for-MOUNT-when-protocols-.patch
+++ b/patches.suse/NFSv3-only-use-NFS-timeout-for-MOUNT-when-protocols-.patch
@@ -4,7 +4,7 @@ Subject: [PATCH] NFSv3: only use NFS timeout for MOUNT when protocols are
  compatible
 Patch-mainline: v6.12-rc5
 Git-commit: 6e2a10343ecb71c4457bc16be05758f9c7aae7d9
-References: bsc#1231016 CVE-2024-50106 bsc#1232882
+References: bsc#1231016
 
 If a timeout is specified in the mount options, it currently applies to
 both the NFS protocol and (with v3) the MOUNT protocol.  This is