From 02afc25d13905b4f3444da24a66c61087792c68f Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Mon, 5 Jun 2023 12:00:00 -0300 Subject: [PATCH] kernel-6.3.6-200 * Mon Jun 05 2023 Augusto Caringi [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 Resolves: Signed-off-by: Augusto Caringi --- Patchlist.changelog | 3 +++ kernel.spec | 13 +++++++++---- patch-6.3-redhat.patch | 41 +++++++++++++++++++++++++++++++++++++++-- sources | 6 +++--- 4 files changed, 54 insertions(+), 9 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index acb53cea6..8dbaf798c 100644 --- a/Patchlist.changelog +++ b/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/kernel.spec b/kernel.spec index fcde00323..673d15ed6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -142,18 +142,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%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 200%{?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 @@ -3406,6 +3406,11 @@ fi # # %changelog +* Mon Jun 05 2023 Augusto Caringi [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 [6.3.5-0] - Drop rhelver for 6.3.5 (Justin M. Forbes) - Linux v6.3.5 diff --git a/patch-6.3-redhat.patch b/patch-6.3-redhat.patch index bf8058468..fa1fd8aff 100644 --- a/patch-6.3-redhat.patch +++ b/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 + #include + ++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/sources b/sources index 5c46e9009..0d843ff2e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.3.5.tar.xz) = 250ddb5493a770121e87b7fc9fb60235c5d5bf15142759b191ea9a5e1cda90ec78aa3885c8f955c4c7b20e30ae1e5d5f45dae6c95a60d8558af91083303a8bb1 -SHA512 (kernel-abi-stablelists-6.3.5.tar.bz2) = 0eddb52b7ff500d142971dca8004ec286df13298d93a86449e7c41ca8028b6cdbef1901f308cdf1d4beb4d19c597bd00961277dbb04e1847a3e59866b6337c18 -SHA512 (kernel-kabi-dw-6.3.5.tar.bz2) = f4fe340f8fd03cf4f008eefd7eee6abcce24c8801941159c86debaf9e5fcbca6a0e18567bbca506c73ff4381fd772b3811dc74bb4c06555964693dc3d8ed7e21 +SHA512 (linux-6.3.6.tar.xz) = 4080e84e92f262475c16006f0f49e1f91f41d87f60f7cc267399e5f1f9ebfef89902de9ebd434956d20769b7b9de265227a457fc0c29a1a0c60726d7c2e629c2 +SHA512 (kernel-abi-stablelists-6.3.6.tar.bz2) = 7d2e4150a4449be014888cbc0b3fee0713b034b429f07fd53b0ced69a89ab41e1df1652efc020907796068e583a3bed729371947ce041ebc48f8ae9e220637aa +SHA512 (kernel-kabi-dw-6.3.6.tar.bz2) = 374713aeca67bfe0ee05caf08b8911c573aadd41a6d1cc4d05cb788efa913f012a4b587dbc4d8af8342ad106f784fcc395e99095a5e56b726890d0c478418ac9