From e4d7b7bfc6e3d0b81f4cc4756ceaa466af963c80 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Thu, 25 Jan 2024 11:17:48 +0000
Subject: [PATCH] Whitelist s390x cio_ignore kernel argument

---
 src/modules/BootArch.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/modules/BootArch.rb b/src/modules/BootArch.rb
index 89a11bf63..2c98d6b2f 100644
--- a/src/modules/BootArch.rb
+++ b/src/modules/BootArch.rb
@@ -36,13 +36,17 @@ def main
     end
 
     # list of regexp to match kernel params that should be added
-    # from installation to running kernel on s390 (bsc#1086665)
+    # from installation to running kernel on s390 (bsc#1086665, bsc#1210525)
     S390_WHITELIST = [
       /net\.ifnames=\S*/,
       /fips=\S*/,
       /mitigations=\S*/,
       /rd\.zdev=\S*/,
+<<<<<<< Updated upstream
       /zfcp\.allow_lun_scan=\S*/
+=======
+      /cio_ignore=\S*/
+>>>>>>> Stashed changes
     ].freeze
 
     # Get parameters for the default kernel