diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-18 11:17:55 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-18 11:17:55 +0200 |
| commit | a098e624ae614ee7b44601a99b9208c1088e8d7a (patch) | |
| tree | 703a6a6a090f2f8755faf3a3b49513f1532ef79e /patch-5.17-redhat.patch | |
| parent | f57c2012f8ec8186b31d552b4dcd4fdbd7cc7709 (diff) | |
| parent | 9a2a61286e5d506fc4065d992649f448ebe2c0e5 (diff) | |
| download | kernel-a098e624ae614ee7b44601a99b9208c1088e8d7a.tar.gz kernel-a098e624ae614ee7b44601a99b9208c1088e8d7a.tar.xz kernel-a098e624ae614ee7b44601a99b9208c1088e8d7a.zip | |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.17-redhat.patch')
| -rw-r--r-- | patch-5.17-redhat.patch | 4 |
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) |