diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-09 11:25:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-09 11:25:27 +0200 |
| commit | c2d2547783444a8c18d8c35a7ceffea85b02b0f6 (patch) | |
| tree | b5981811da5a31d0f6a364a7b3c3f0bdec8958c2 /MAINTAINERS | |
| parent | Linux 6.12-rc2 (diff) | |
| parent | Merge net-next/main to resolve conflicts (diff) | |
| download | linux-c2d2547783444a8c18d8c35a7ceffea85b02b0f6.tar.xz linux-c2d2547783444a8c18d8c35a7ceffea85b02b0f6.zip | |
Merge wireless-next into staging-next
This merges up to commit a0efa2f362a6 ("Merge net-next/main to resolve
conflicts") from wireless-next into the staging-next branch to handle
the removal of a staging driver easier (it happened in the wireless-next
branch). That way we don't have developers confused and start
submitting changes for this driver that is now deleted.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a097afd76ded..75202205f495 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17475,6 +17475,7 @@ S: Supported F: Documentation/core-api/packing.rst F: include/linux/packing.h F: lib/packing.c +F: lib/packing_test.c PADATA PARALLEL EXECUTION MECHANISM M: Steffen Klassert <steffen.klassert@secunet.com> |