kernel 6.3.6

21 files changed, 71 insertions, 26 deletions

diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog
index acb53ce..8dbaf79 100644
--- a/SOURCES/Patchlist.changelog
+++ b/SOURCES/Patchlist.changelog
@@ -1,3 +1,6 @@
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/ac99dd89b9e59639ebec28116dd57302b0148c16
+ ac99dd89b9e59639ebec28116dd57302b0148c16 drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set
+
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/0e410712ded4b03690a7f8216433dd4a4f3a5fe7
  0e410712ded4b03690a7f8216433dd4a4f3a5fe7 xfs: fix livelock in delayed allocation at ENOSPC
 
diff --git a/SOURCES/kernel-aarch64-debug-fedora.config b/SOURCES/kernel-aarch64-debug-fedora.config
index ea305a6..eaf5651 100644
--- a/SOURCES/kernel-aarch64-debug-fedora.config
+++ b/SOURCES/kernel-aarch64-debug-fedora.config
@@ -2004,7 +2004,7 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SSD130X_I2C=m
 CONFIG_DRM_SSD130X=m
 CONFIG_DRM_SSD130X_SPI=m
diff --git a/SOURCES/kernel-aarch64-debug-rhel.config b/SOURCES/kernel-aarch64-debug-rhel.config
index 074a9fc..09f95f2 100644
--- a/SOURCES/kernel-aarch64-debug-rhel.config
+++ b/SOURCES/kernel-aarch64-debug-rhel.config
@@ -1530,7 +1530,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII9234 is not set
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SIMPLE_BRIDGE is not set
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_SSD130X is not set
 # CONFIG_DRM_TEGRA is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
diff --git a/SOURCES/kernel-aarch64-fedora.config b/SOURCES/kernel-aarch64-fedora.config
index 6041499..6656fe0 100644
--- a/SOURCES/kernel-aarch64-fedora.config
+++ b/SOURCES/kernel-aarch64-fedora.config
@@ -1995,7 +1995,7 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SSD130X_I2C=m
 CONFIG_DRM_SSD130X=m
 CONFIG_DRM_SSD130X_SPI=m
diff --git a/SOURCES/kernel-aarch64-rhel.config b/SOURCES/kernel-aarch64-rhel.config
index d29c080..25852e4 100644
--- a/SOURCES/kernel-aarch64-rhel.config
+++ b/SOURCES/kernel-aarch64-rhel.config
@@ -1522,7 +1522,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII9234 is not set
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SIMPLE_BRIDGE is not set
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_SSD130X is not set
 # CONFIG_DRM_TEGRA is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
diff --git a/SOURCES/kernel-armv7hl-debug-fedora.config b/SOURCES/kernel-armv7hl-debug-fedora.config
index 92fb4cf..5edb52c 100644
--- a/SOURCES/kernel-armv7hl-debug-fedora.config
+++ b/SOURCES/kernel-armv7hl-debug-fedora.config
@@ -1985,7 +1985,7 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SSD130X_I2C=m
 CONFIG_DRM_SSD130X=m
 CONFIG_DRM_SSD130X_SPI=m
diff --git a/SOURCES/kernel-armv7hl-fedora.config b/SOURCES/kernel-armv7hl-fedora.config
index 627832d..61348dc 100644
--- a/SOURCES/kernel-armv7hl-fedora.config
+++ b/SOURCES/kernel-armv7hl-fedora.config
@@ -1977,7 +1977,7 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SSD130X_I2C=m
 CONFIG_DRM_SSD130X=m
 CONFIG_DRM_SSD130X_SPI=m
diff --git a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config
index 66e379f..73e991d 100644
--- a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config
+++ b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config
@@ -1942,7 +1942,7 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SSD130X_I2C=m
 CONFIG_DRM_SSD130X=m
 CONFIG_DRM_SSD130X_SPI=m
diff --git a/SOURCES/kernel-armv7hl-lpae-fedora.config b/SOURCES/kernel-armv7hl-lpae-fedora.config
index 111897f..4625508 100644
--- a/SOURCES/kernel-armv7hl-lpae-fedora.config
+++ b/SOURCES/kernel-armv7hl-lpae-fedora.config
@@ -1934,7 +1934,7 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SSD130X_I2C=m
 CONFIG_DRM_SSD130X=m
 CONFIG_DRM_SSD130X_SPI=m
diff --git a/SOURCES/kernel-ppc64le-debug-fedora.config b/SOURCES/kernel-ppc64le-debug-fedora.config
index b8d8abb..4a76723 100644
--- a/SOURCES/kernel-ppc64le-debug-fedora.config
+++ b/SOURCES/kernel-ppc64le-debug-fedora.config
@@ -1536,7 +1536,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SSD130X_I2C=m
 CONFIG_DRM_SSD130X=m
 CONFIG_DRM_SSD130X_SPI=m
diff --git a/SOURCES/kernel-ppc64le-debug-rhel.config b/SOURCES/kernel-ppc64le-debug-rhel.config
index 4f38ca9..83a841e 100644
--- a/SOURCES/kernel-ppc64le-debug-rhel.config
+++ b/SOURCES/kernel-ppc64le-debug-rhel.config
@@ -1346,7 +1346,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII9234 is not set
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SIMPLE_BRIDGE is not set
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_SSD130X is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TI_DLPC3433 is not set
diff --git a/SOURCES/kernel-ppc64le-fedora.config b/SOURCES/kernel-ppc64le-fedora.config
index 7efe74f..c99213d 100644
--- a/SOURCES/kernel-ppc64le-fedora.config
+++ b/SOURCES/kernel-ppc64le-fedora.config
@@ -1525,7 +1525,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SSD130X_I2C=m
 CONFIG_DRM_SSD130X=m
 CONFIG_DRM_SSD130X_SPI=m
diff --git a/SOURCES/kernel-ppc64le-rhel.config b/SOURCES/kernel-ppc64le-rhel.config
index 89d5b78..64b5e42 100644
--- a/SOURCES/kernel-ppc64le-rhel.config
+++ b/SOURCES/kernel-ppc64le-rhel.config
@@ -1338,7 +1338,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII9234 is not set
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SIMPLE_BRIDGE is not set
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_SSD130X is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TI_DLPC3433 is not set
diff --git a/SOURCES/kernel-s390x-debug-fedora.config b/SOURCES/kernel-s390x-debug-fedora.config
index 1055ed3..588356d 100644
--- a/SOURCES/kernel-s390x-debug-fedora.config
+++ b/SOURCES/kernel-s390x-debug-fedora.config
@@ -1542,7 +1542,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SSD130X_I2C=m
 CONFIG_DRM_SSD130X=m
 CONFIG_DRM_SSD130X_SPI=m
diff --git a/SOURCES/kernel-s390x-fedora.config b/SOURCES/kernel-s390x-fedora.config
index 98380bb..9d3a8d3 100644
--- a/SOURCES/kernel-s390x-fedora.config
+++ b/SOURCES/kernel-s390x-fedora.config
@@ -1531,7 +1531,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SSD130X_I2C=m
 CONFIG_DRM_SSD130X=m
 CONFIG_DRM_SSD130X_SPI=m
diff --git a/SOURCES/kernel-x86_64-debug-fedora.config b/SOURCES/kernel-x86_64-debug-fedora.config
index 12075c8..d49643e 100644
--- a/SOURCES/kernel-x86_64-debug-fedora.config
+++ b/SOURCES/kernel-x86_64-debug-fedora.config
@@ -1672,7 +1672,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SSD130X_I2C=m
 CONFIG_DRM_SSD130X=m
 CONFIG_DRM_SSD130X_SPI=m
diff --git a/SOURCES/kernel-x86_64-debug-rhel.config b/SOURCES/kernel-x86_64-debug-rhel.config
index 50a2c45..8c2aa34 100644
--- a/SOURCES/kernel-x86_64-debug-rhel.config
+++ b/SOURCES/kernel-x86_64-debug-rhel.config
@@ -1430,7 +1430,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII9234 is not set
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SIMPLE_BRIDGE is not set
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_SSD130X is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TI_DLPC3433 is not set
diff --git a/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config
index 18209cf..3355aa6 100644
--- a/SOURCES/kernel-x86_64-fedora.config
+++ b/SOURCES/kernel-x86_64-fedora.config
@@ -1661,7 +1661,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SSD130X_I2C=m
 CONFIG_DRM_SSD130X=m
 CONFIG_DRM_SSD130X_SPI=m
diff --git a/SOURCES/kernel-x86_64-rhel.config b/SOURCES/kernel-x86_64-rhel.config
index 414eafa..2416d03 100644
--- a/SOURCES/kernel-x86_64-rhel.config
+++ b/SOURCES/kernel-x86_64-rhel.config
@@ -1422,7 +1422,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII9234 is not set
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SIMPLE_BRIDGE is not set
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_SSD130X is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TI_DLPC3433 is not set
diff --git a/SOURCES/patch-6.3-redhat.patch b/SOURCES/patch-6.3-redhat.patch
index bf80584..fa1fd8a 100644
--- a/SOURCES/patch-6.3-redhat.patch
+++ b/SOURCES/patch-6.3-redhat.patch
@@ -14,6 +14,7 @@
  drivers/firmware/efi/Makefile                      |   1 +
  drivers/firmware/efi/efi.c                         | 124 +++++++++++++++------
  drivers/firmware/efi/secureboot.c                  |  38 +++++++
+ drivers/firmware/sysfb.c                           |  18 ++-
  drivers/hid/hid-rmi.c                              |  66 -----------
  drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 ++++
  drivers/input/rmi4/rmi_driver.c                    | 124 ++++++++++++---------
@@ -36,10 +37,10 @@
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
  sound/pci/hda/patch_realtek.c                      |   2 +
- 38 files changed, 502 insertions(+), 186 deletions(-)
+ 39 files changed, 519 insertions(+), 187 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index d710ff6a3d56..fafd28dd7b62 100644
+index 1dffadbf1f87..3775e1adc6c6 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -557,6 +558,42 @@ index 000000000000..de0a3714a5d4
 +		}
 +	}
 +}
+diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c
+index 3c197db42c9d..16e4a2e90fae 100644
+--- a/drivers/firmware/sysfb.c
++++ b/drivers/firmware/sysfb.c
+@@ -34,6 +34,22 @@
+ #include <linux/screen_info.h>
+ #include <linux/sysfb.h>
+
++static int skip_simpledrm;
++
++static int __init simpledrm_disable(char *opt)
++{
++	if (!opt)
++                return -EINVAL;
++
++	get_option(&opt, &skip_simpledrm);
++
++	if (skip_simpledrm)
++		pr_info("The simpledrm driver will not be probed\n");
++
++	return 0;
++}
++early_param("nvidia-drm.modeset", simpledrm_disable);
++
+ static struct platform_device *pd;
+ static DEFINE_MUTEX(disable_lock);
+ static bool disabled;
+@@ -85,7 +101,7 @@ static __init int sysfb_init(void)
+
+ 	/* try to create a simple-framebuffer device */
+ 	compatible = sysfb_parse_mode(si, &mode);
+-	if (compatible) {
++	if (compatible && !skip_simpledrm) {
+ 		pd = sysfb_create_simplefb(si, &mode);
+ 		if (!IS_ERR(pd))
+ 			goto unlock_mutex;
 diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
 index 84e7ba5314d3..efc96776f761 100644
 --- a/drivers/hid/hid-rmi.c
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 131d39a..342f828 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -142,18 +142,18 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 %define buildid .fsync
-%define specrpmversion 6.3.5
-%define specversion 6.3.5
+%define specrpmversion 6.3.6
+%define specversion 6.3.6
 %define patchversion 6.3
 %define pkgrelease 200
 %define kversion 6
-%define tarfile_release 6.3.5
+%define tarfile_release 6.3.6
 # This is needed to do merge window version magic
 %define patchlevel 3
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 201%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.3.5
+%define kabiversion 6.3.6
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -3448,8 +3448,13 @@ fi
 #
 #
 %changelog
-* Sun Jun 04 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.3.5-201.fsync
-- kernel-fsync v6.3.5
+* Sat Jun 10 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.3.6-201.fsync
+- kernel-fsync v6.3.6
+
+* Mon Jun 05 2023 Augusto Caringi <acaringi@redhat.com> [6.3.6-0]
+- Add the nvidia bug to BugsFixed (Justin M. Forbes)
+- drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas)
+- Linux v6.3.6
 
 * Tue May 30 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.3.5-0]
 - Drop rhelver for 6.3.5 (Justin M. Forbes)