diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-09 09:47:40 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-09 09:47:40 +0200 |
| commit | 5f87100666922f694f3fb11258bfc87ce38c2a8f (patch) | |
| tree | 57c5a87e581df31cab4b6bbab34bc362cd6d0758 | |
| parent | b837bfe4c1ea62f0aba95fc6066cfaa92e1e3a2f (diff) | |
| parent | f20aa9d1023a1912c5ef522d47b7deab27fae207 (diff) | |
| download | kernel-5f87100666922f694f3fb11258bfc87ce38c2a8f.tar.gz kernel-5f87100666922f694f3fb11258bfc87ce38c2a8f.tar.xz kernel-5f87100666922f694f3fb11258bfc87ce38c2a8f.zip | |
Merge remote-tracking branch 'origin/f36' into f36-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 6 | ||||
| -rw-r--r-- | patch-5.17-redhat.patch | 12 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 15 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec index 825de7e21..686859467 100755 --- a/kernel.spec +++ b/kernel.spec @@ -3020,6 +3020,12 @@ fi # # %changelog +* 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) - Revert "net: bcmgenet: Use stronger register read/writes to assure ordering" (Justin M. Forbes) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 905be3a85..786f7b7b4 100644 --- a/patch-5.17-redhat.patch +++ b/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) { } @@ -1,3 +1,3 @@ -SHA512 (linux-5.17.4.tar.xz) = cc04ca4e1b925f7ee4ae7513e3ddaf848021a5ee5f7e39e96450f30dc4ba19891d8eed014e5467bf85f35bb3495297291685ee7a6e93d8f66aa7b1e617d610eb -SHA512 (kernel-abi-stablelists-5.17.4-300.tar.bz2) = 7db9cbac440599e6e04f59f88a139529cafb1804f3b94644593e16244bdbe1b5f9ece90a2ff5bf15b31f1cf657b95482a9bb2f0b1a686872850cb3f48efa3a72 -SHA512 (kernel-kabi-dw-5.17.4-300.tar.bz2) = f89906fae867bef6df9806bd098311c02d373c7930439c205f684140eeb6e32d5e0b3ba450784414c9c34960d933953c1805fcc3dc52716c2f8a2c1325f4baa8 +SHA512 (linux-5.17.5.tar.xz) = 6c2e22f74c0a91bf27c6586e440ef53110d13dd62b9b1a0f0a62d325b16d7c804edf5c10f58a4e0376f99e3e77c0daff09ba58764330aa6f4358b988e131d6ae +SHA512 (kernel-abi-stablelists-5.17.5-300.tar.bz2) = 2cbbdeaf38d9d76448f68a27b8aebcd5c1055226b7a2ec9879299c66806fb6051ba52e4df808b8f173c3474089818795789f21e41090605cb58b4b480c479af2 +SHA512 (kernel-kabi-dw-5.17.5-300.tar.bz2) = b72cc98ac387091adabf2ff5a2c8078bbb5a67d149361826b77ef5edddd9822ac9dab82b33e0778e5dad0687ef0aeb96174934f4546a861aaeeb4bbfafec4bea |