diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-08 16:20:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-08 16:20:43 +0100 |
| commit | 3887f7f8a1f1bfac2d41ea59cca2bc66aeb60fdf (patch) | |
| tree | 49fb9e72dd0c2f891a7435fad726716fcea18cd0 /scripts | |
| parent | 7a98dc3cfd2ea8962279797a39d96237bb927fc7 (diff) | |
| parent | 755cf7adf8dd2d12627cb7de223d35b12228e2f5 (diff) | |
| download | linux-next-3887f7f8a1f1bfac2d41ea59cca2bc66aeb60fdf.tar.gz linux-next-3887f7f8a1f1bfac2d41ea59cca2bc66aeb60fdf.zip | |
Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
# Conflicts:
# net/bluetooth/hci_sync.c
# net/bluetooth/l2cap_core.c
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/context-analysis-suppression.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/context-analysis-suppression.txt b/scripts/context-analysis-suppression.txt index 1c51b6153f08..d4476d9ed10a 100644 --- a/scripts/context-analysis-suppression.txt +++ b/scripts/context-analysis-suppression.txt @@ -32,3 +32,4 @@ src:*include/linux/seqlock*.h=emit src:*include/linux/spinlock*.h=emit src:*include/linux/srcu*.h=emit src:*include/linux/ww_mutex.h=emit +src:*include/net/bluetooth/*=emit |