summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-05-18 11:17:55 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2022-05-18 11:17:55 +0200
commita098e624ae614ee7b44601a99b9208c1088e8d7a (patch)
tree703a6a6a090f2f8755faf3a3b49513f1532ef79e
parentf57c2012f8ec8186b31d552b4dcd4fdbd7cc7709 (diff)
parent9a2a61286e5d506fc4065d992649f448ebe2c0e5 (diff)
downloadkernel-a098e624ae614ee7b44601a99b9208c1088e8d7a.tar.gz
kernel-a098e624ae614ee7b44601a99b9208c1088e8d7a.tar.xz
kernel-a098e624ae614ee7b44601a99b9208c1088e8d7a.zip
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
-rwxr-xr-xkernel.spec3
-rw-r--r--patch-5.17-redhat.patch4
-rw-r--r--sources6
3 files changed, 8 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index 86b53cdae..6c976d4e6 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -3020,6 +3020,9 @@ fi
#
#
%changelog
+* Sun May 15 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.8-0]
+- Linux v5.17.8
+
* Thu May 12 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.7-0]
- Set CONFIG_EFI_DXE_MEM_ATTRIBUTES (Justin M. Forbes)
- efi: x86: Set the NX-compatibility flag in the PE header (Peter Jones)
diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch
index 4000bd1d0..07901a9c3 100644
--- a/patch-5.17-redhat.patch
+++ b/patch-5.17-redhat.patch
@@ -111,7 +111,7 @@ index 000000000000..733a26bd887a
+
+endmenu
diff --git a/Makefile b/Makefile
-index ce65b393a2b4..c7526eac960f 100644
+index 3cf179812f0f..ca873b29f0b2 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -2244,7 +2244,7 @@ index 8723ae70ea1f..fb2d773498c2 100644
+ return ret;
}
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
-index 2882bc7d79d7..bc3a11ec0c27 100644
+index 9e9713f7ddb8..57646a96cb2d 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3667,8 +3667,8 @@ static void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb)
diff --git a/sources b/sources
index a89f94bac..6a0ee84a7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17.7.tar.xz) = 582fd92a27f96518e6593e95bd059ea620a6553348502e09bad1b58115b359e1e861d2023e20f822b7bd72ea44f370b56bb3cac2674fd01c2ec629d44ca37ddc
-SHA512 (kernel-abi-stablelists-5.17.7-100.tar.bz2) = b736dd54cf3b0dec5c4fd306c101d4fa205e0adb62d7fca2e79de1dbdf273d595a4fbb80a2a268cc3ec14fb9b4199849b3213e63d0971cec5a5ab5d5d9c01498
-SHA512 (kernel-kabi-dw-5.17.7-100.tar.bz2) = 85a43ea53ebf9b507b97fc262f40cfcf1b47f3f2d281e9c4030a441785d65372578cd01abdf331a3857cef6a7f1ef67006288472ec2d574d554e7c33c40e06eb
+SHA512 (linux-5.17.8.tar.xz) = 20d9e1772503d7a0b290375795e218aacdd79b56e6e04693cb938c5da3739e5e5219daa3fa0871ebb57ad9e35cfd9007abefad01cf3c9906402c78ff31680c98
+SHA512 (kernel-abi-stablelists-5.17.8-100.tar.bz2) = afc0acdf322257055a1634612f34b2bdf51125b83393158e8c70d681a4e613e4c08a6205137a070e3b6b1df3239467575c2162bfb877722e1cd8f323a6fd7913
+SHA512 (kernel-kabi-dw-5.17.8-100.tar.bz2) = f6b63ca9f35810863da59334b09db97908c0246d7da0e5399354e8a4929aab65b9e0c9ee01a117ecbdc16416712ea21cb82771877a24a8e7d11abec36354a19f