From 317c870692ebee470ee9056f76e92689301bf38f Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 25 May 2022 08:35:50 -0500 Subject: kernel-5.17.10-0 * Wed May 25 2022 Justin M. Forbes [5.17.10-0] - fedora: Re-enable efifb and vesafb drivers (Javier Martinez Canillas) - drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 ++ kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel.spec | 12 +++++--- patch-5.17-redhat.patch | 61 +++++++++++++++++++++++++++++++-------- sources | 6 ++-- 6 files changed, 65 insertions(+), 21 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 174e80350..2d1781fbe 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/205bec68a0ea67b6bff6fea9603b7b8aeacc9d46 + 205bec68a0ea67b6bff6fea9603b7b8aeacc9d46 drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set + "https://gitlab.com/cki-project/kernel-ark/-/commit"/8a35d9b408eeb4798a147fb76eb3f10368133de8 8a35d9b408eeb4798a147fb76eb3f10368133de8 efi: x86: Set the NX-compatibility flag in the PE header diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 8d561026a..b62de1508 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1857,7 +1857,7 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_CARMINE is not set # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 032d346f7..685d31c32 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1840,7 +1840,7 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FB_CARMINE is not set # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set diff --git a/kernel.spec b/kernel.spec index 3b7031d62..0aaba80fa 100755 --- a/kernel.spec +++ b/kernel.spec @@ -130,7 +130,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.17 -%define rpmversion 5.17.9 +%define rpmversion 5.17.10 %define patchversion 5.17 %define pkgrelease 300 @@ -695,7 +695,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17.9.tar.xz +Source0: linux-5.17.10.tar.xz Source1: Makefile.rhelver @@ -1387,8 +1387,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17.9 -c -mv linux-5.17.9 linux-%{KVERREL} +%setup -q -n kernel-5.17.10 -c +mv linux-5.17.10 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3015,6 +3015,10 @@ fi # # %changelog +* Wed May 25 2022 Justin M. Forbes [5.17.10-0] +- fedora: Re-enable efifb and vesafb drivers (Javier Martinez Canillas) +- drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas) + * Wed May 18 2022 Justin M. Forbes [5.17.9-0] - Fix changelog for 5.17.8 (Justin M. Forbes) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 42a316da2..04ce78fa6 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -24,6 +24,7 @@ drivers/firmware/efi/libstub/efistub.h | 74 ++++++++++++ drivers/firmware/efi/libstub/x86-stub.c | 119 +++++++++++++++++++- drivers/firmware/efi/secureboot.c | 38 +++++++ + drivers/firmware/sysfb.c | 18 ++- drivers/gpu/drm/i915/display/intel_bios.c | 6 + drivers/gpu/drm/i915/display/intel_psr.c | 9 ++ drivers/gpu/drm/i915/display/intel_vbt_defs.h | 3 + @@ -59,7 +60,7 @@ security/lockdown/Kconfig | 13 +++ security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 61 files changed, 980 insertions(+), 212 deletions(-) + 62 files changed, 997 insertions(+), 213 deletions(-) diff --git a/Documentation/core-api/dma-attributes.rst b/Documentation/core-api/dma-attributes.rst index 1887d92e8e92..17706dc91ec9 100644 @@ -111,7 +112,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index aba139bbd1c7..01a8c0b291ac 100644 +index 318597a4147e..739e5da2072e 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1249,6 +1250,42 @@ index 000000000000..de0a3714a5d4 + } + } +} +diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c +index 2bfbb05f7d89..a504f7234f35 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 __init int sysfb_init(void) + { + struct screen_info *si = &screen_info; +@@ -45,7 +61,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) { + ret = sysfb_create_simplefb(si, &mode); + if (!ret) + return 0; diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index 9d989c9f5da4..5d97a251d3dc 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c @@ -1684,7 +1721,7 @@ index 107dcf5938d6..225a9797e39d 100644 * Changes the default domain of an iommu group that has *only* one device * diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 10f7c79caac2..8ac0161d2aef 100644 +index 0abd772c57f0..3c9889ce56ac 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -244,6 +244,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1751,7 +1788,7 @@ index 10f7c79caac2..8ac0161d2aef 100644 } EXPORT_SYMBOL_GPL(nvme_complete_rq); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index a703f1f5fb64..d77c24333cb4 100644 +index 189175fff7e4..c0627a9d1274 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -101,14 +101,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags) @@ -1787,7 +1824,7 @@ index a703f1f5fb64..d77c24333cb4 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) { -@@ -870,8 +876,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -891,8 +897,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) int error = 0; /* check if multipath is enabled and we have the capability */ @@ -1798,7 +1835,7 @@ index a703f1f5fb64..d77c24333cb4 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 68c42e831117..6a7091335257 100644 +index 85f3f55c71c5..aad43c21c0a4 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -794,6 +794,7 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); @@ -1809,7 +1846,7 @@ index 68c42e831117..6a7091335257 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id); -@@ -832,6 +833,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, +@@ -833,6 +834,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, static inline void nvme_failover_req(struct request *req) { } @@ -2144,10 +2181,10 @@ index ab7eea01ab42..fff7c5f737fc 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index 25b3ef71f495..d37a6c88c69f 100644 +index 7fc4e9f49f54..6f0b0b2dc73d 100644 --- a/include/linux/security.h +++ b/include/linux/security.h -@@ -471,6 +471,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); +@@ -473,6 +473,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen); int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); int security_locked_down(enum lockdown_reason what); @@ -2155,7 +2192,7 @@ index 25b3ef71f495..d37a6c88c69f 100644 #else /* CONFIG_SECURITY */ static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data) -@@ -1347,6 +1348,10 @@ static inline int security_locked_down(enum lockdown_reason what) +@@ -1349,6 +1350,10 @@ static inline int security_locked_down(enum lockdown_reason what) { return 0; } @@ -2365,10 +2402,10 @@ index 87cbdc64d272..18555cf18da7 100644 static int __init lockdown_lsm_init(void) diff --git a/security/security.c b/security/security.c -index b7cf5cbfdc67..3cde9062fcf6 100644 +index aaf6566deb9f..86926966c15d 100644 --- a/security/security.c +++ b/security/security.c -@@ -2623,6 +2623,12 @@ int security_locked_down(enum lockdown_reason what) +@@ -2625,6 +2625,12 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); diff --git a/sources b/sources index 4ebecf435..94e968162 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.17.9.tar.xz) = b78f45f3001d63801353145ad54525848ad12cbdfaa460d51dc2a8ff0ac3172281aed4b78a876b862e5ccf323a6d51d7d3dfe03e54b13e526fbc8972e9e1c175 -SHA512 (kernel-abi-stablelists-5.17.9-300.tar.bz2) = 2d27c6075d6dae7a2851fe03ef38282e7ba887f9b9c3ddb2eebdf2d65b8b7480a1637eebbc5628a22b88217d8a39d855e94875e1693a591ccfd6e5d2de706601 -SHA512 (kernel-kabi-dw-5.17.9-300.tar.bz2) = a479834338f3a72e0b7c66cc7c7ed93a291f66daa947969bb5263c5ffacc3896e9ef9d6c7febe2303b3b3a01edc374d9f04cf417b4afbbc5ed7d00c849a5cbff +SHA512 (linux-5.17.10.tar.xz) = 547b10b4d5765e11da4da7bb9e582b964bf42154b32571f892a9565c3e0d6b5e0b5600fc69edd8da8e1058ddc8fa7e142a8c27392762b6096373116a06c1085e +SHA512 (kernel-abi-stablelists-5.17.10-300.tar.bz2) = e358110730c886de579c70d8c057de4eeddb724ac5604f57ad47bf5fb9bd138f094b30b62ebcce0abfc875578559ce0ce63d0bc968ef540c67b07c6873131cbc +SHA512 (kernel-kabi-dw-5.17.10-300.tar.bz2) = 26524ec79ebbbdbc3674b0fe48a34374970567db0df78c559049a5082c12c2bb156e5737ab2472d70c78591211844b2863aaded929f9298a5fa217963cfa3763 -- cgit From e916ca478150e25e9f251369dcd44f05fd9a22d4 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 25 May 2022 09:28:41 -0500 Subject: kernel-5.17.11-0 * Wed May 25 2022 Justin M. Forbes [5.17.11-0] - Linux v5.17.11 (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel.spec | 14 ++++++++++---- patch-5.17-redhat.patch | 2 +- sources | 6 +++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/kernel.spec b/kernel.spec index 0aaba80fa..07e9104c2 100755 --- a/kernel.spec +++ b/kernel.spec @@ -130,7 +130,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.17 -%define rpmversion 5.17.10 +%define rpmversion 5.17.11 %define patchversion 5.17 %define pkgrelease 300 @@ -695,7 +695,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17.10.tar.xz +Source0: linux-5.17.11.tar.xz Source1: Makefile.rhelver @@ -1387,8 +1387,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17.10 -c -mv linux-5.17.10 linux-%{KVERREL} +%setup -q -n kernel-5.17.11 -c +mv linux-5.17.11 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3015,6 +3015,12 @@ fi # # %changelog +* Wed May 25 2022 Justin M. Forbes [5.17.11-0] +- Linux v5.17.11 (Justin M. Forbes) + +* Wed May 25 2022 Justin M. Forbes [5.17.11-0] +- Linux v5.17.11 + * Wed May 25 2022 Justin M. Forbes [5.17.10-0] - fedora: Re-enable efifb and vesafb drivers (Javier Martinez Canillas) - drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 04ce78fa6..187a9f9e3 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -112,7 +112,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index 318597a4147e..739e5da2072e 100644 +index b821f270a4ca..72a7c6958ea5 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 94e968162..5f67dc4c9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.17.10.tar.xz) = 547b10b4d5765e11da4da7bb9e582b964bf42154b32571f892a9565c3e0d6b5e0b5600fc69edd8da8e1058ddc8fa7e142a8c27392762b6096373116a06c1085e -SHA512 (kernel-abi-stablelists-5.17.10-300.tar.bz2) = e358110730c886de579c70d8c057de4eeddb724ac5604f57ad47bf5fb9bd138f094b30b62ebcce0abfc875578559ce0ce63d0bc968ef540c67b07c6873131cbc -SHA512 (kernel-kabi-dw-5.17.10-300.tar.bz2) = 26524ec79ebbbdbc3674b0fe48a34374970567db0df78c559049a5082c12c2bb156e5737ab2472d70c78591211844b2863aaded929f9298a5fa217963cfa3763 +SHA512 (linux-5.17.11.tar.xz) = 6a2a02537326b8425ca90ab3f3e23b5551956c400a15818eeaac77701e83ddd31629d44875887332fb4ac05fc2dbd0a0a964291f90efa428012f0f7d682e694a +SHA512 (kernel-abi-stablelists-5.17.11-300.tar.bz2) = 9f30c4a984c4588d6fae8945dade766a19ffb835672d156c22adf83bc1c4ce43fb2de4444b8f206c8827d5d723339a989f56630a819713cadba157dd9c9e5db0 +SHA512 (kernel-kabi-dw-5.17.11-300.tar.bz2) = a151ebd022193373624fb17d9e67ab6319bc20aba15e94e44cf1ae87e071eeee1f2baf9afa9a71722c1ceebe420ad65f57f480d0bd441c93926f87b09beeeedd -- cgit