diff options
| -rw-r--r-- | SOURCES/patch-5.17-redhat.patch | 12 | ||||
| -rwxr-xr-x | SPECS/kernel.spec | 23 |
2 files changed, 19 insertions, 16 deletions
diff --git a/SOURCES/patch-5.17-redhat.patch b/SOURCES/patch-5.17-redhat.patch index 905be3a..786f7b7 100644 --- a/SOURCES/patch-5.17-redhat.patch +++ b/SOURCES/patch-5.17-redhat.patch @@ -106,7 +106,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index d7747e4c216e..7a429bc431b4 100644 +index 3ad5dc6be393..10a8609ca03f 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -937,7 +937,7 @@ index 9d989c9f5da4..5d97a251d3dc 100644 return 297000; case HDMI_MAX_DATA_RATE_165: diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c -index b00de57cc957..c613b531b281 100644 +index cd32e1470b3c..0f6da3a0ed2a 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -744,6 +744,15 @@ static bool intel_psr2_sel_fetch_config_valid(struct intel_dp *intel_dp, @@ -1354,7 +1354,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 6215d50ed3e7..10f1629e0940 100644 +index 10f7c79caac2..8ac0161d2aef 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) @@ -1468,10 +1468,10 @@ index a703f1f5fb64..d77c24333cb4 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 730cc80d84ff..3a57441b3ff3 100644 +index 68c42e831117..6a7091335257 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -789,6 +789,7 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); +@@ -794,6 +794,7 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys); bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags); void nvme_failover_req(struct request *req); @@ -1479,7 +1479,7 @@ index 730cc80d84ff..3a57441b3ff3 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); -@@ -827,6 +828,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, +@@ -832,6 +833,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) { } diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 92eec70..7424c40 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -130,15 +130,15 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.17 -%define rpmversion 5.17.4 +%define rpmversion 5.17.5 %define patchversion 5.17 -%define pkgrelease 302 +%define pkgrelease 301 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 302%{?buildid}%{?dist} +%define specrelease 301%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -695,7 +695,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17.4.tar.xz +Source0: linux-5.17.5.tar.xz Source1: Makefile.rhelver @@ -1398,8 +1398,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17.4 -c -mv linux-5.17.4 linux-%{KVERREL} +%setup -q -n kernel-5.17.5 -c +mv linux-5.17.5 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3037,11 +3037,14 @@ fi # # %changelog -* Tue Apr 26 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 5.17.4-302.fsync -- linux-surface +* Mon May 02 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 5.17.5-301.fsync +- Linux v5.17.5 futex2 zen openrgb -* Sat Apr 23 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 5.17.4-301-fsync -- Linux v5.17.4 futex2 zen openrgb +* Thu Apr 28 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.5-300] +- Update changelog (Justin M. Forbes) + +* Thu Apr 28 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.5-0] +- Linux v5.17.5 * Wed Apr 20 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.4-0] - Add F34 and F35 as release targets (Justin M. Forbes) |