Commit 18bc284
committed
Merge: Rebase the Bluetooth driver to sync with recent upstream branch v6.15
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7002
# Merge Request Required Information
Rebase the Bluetooth driver to sync with recent upstream branch 6.15
## Summary of Changes
JIRA: https://issues.redhat.com/browse/RHEL-93657
Omitted-fix: 6851a0c Bluetooth: hci_dev: replace 'quirks' integer by 'quirk_flags' bitmap
```
Note - The problem it fixes only applies to 32-bit systems, which we don't support, so it can wait for the next rebase.
```
Omitted-fix: 631c868 Bluetooth: L2CAP: Fix not checking l2cap_chan security level
```
Note - This fix was applied through upstream commit:
7af8479 Bluetooth: L2CAP: Fix not checking l2cap_chan security level
in this rebase.
```
Omitted-fix: 7af4d7b Bluetooth: hci_devcd_dump: fix out-of-bounds via dev_coredumpv
```
Note - This fix is in the 'net-next' tree, so we'll wait to see if it lands in Linus' tree before pulling it in.
```
Signed-off-by: David Marlin <dmarlin@redhat.com>
Approved-by: Bastien Nocera <bnocera@redhat.com>
Approved-by: José Ignacio Tornos Martínez <jtornosm@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>
Merged-by: Augusto Caringi <acaringi@redhat.com>File tree
44 files changed
+2764
-1031
lines changed- Documentation/ABI/stable
- drivers/bluetooth
- include/net/bluetooth
- net/bluetooth
- rfcomm
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
44 files changed
+2764
-1031
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3464 | 3464 | | |
3465 | 3465 | | |
3466 | 3466 | | |
| 3467 | + | |
3467 | 3468 | | |
3468 | 3469 | | |
3469 | 3470 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
365 | 365 | | |
366 | 366 | | |
367 | 367 | | |
368 | | - | |
| 368 | + | |
369 | 369 | | |
370 | | - | |
371 | 370 | | |
372 | 371 | | |
373 | 372 | | |
| |||
0 commit comments