summaryrefslogtreecommitdiffstats
path: root/patch-5.17-redhat.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-05-18 09:54:22 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2022-05-18 09:54:22 +0200
commitfafa421559885ef3f8eb130fe516d620c7ed5e5d (patch)
tree843a093b8c8031fc087fd8a760e0863d0086e6cb /patch-5.17-redhat.patch
parente7a5ef891659e6a9196f10f1c2f64d522ac814a2 (diff)
parente0b8e89ba87c4c72d856a93e74267a91bc3b82f4 (diff)
downloadkernel-fafa421559885ef3f8eb130fe516d620c7ed5e5d.tar.gz
kernel-fafa421559885ef3f8eb130fe516d620c7ed5e5d.tar.xz
kernel-fafa421559885ef3f8eb130fe516d620c7ed5e5d.zip
Merge remote-tracking branch 'origin/f36' into f36-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.17-redhat.patch')
-rw-r--r--patch-5.17-redhat.patch4
1 files changed, 2 insertions, 2 deletions
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)