diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-08-26 15:29:05 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-08-26 15:29:05 +0000 |
| commit | 498d6443146f2a1576e222ce8b50fafc0c604954 (patch) | |
| tree | bf4286db07a3c5c6b4dff8302e56b2d53f5980df /MAINTAINERS | |
| parent | 952671071125edd74e401656820e52b3f87db446 (diff) | |
| parent | 6576d69aac94cd8409636dfa86e0df39facdf0d2 (diff) | |
Merge tag 'v5.4.61' into 5.4-2.1.x-imx
This is the 5.4.61 stable release
Conflicts (manual resolve, upstream version taken):
- drivers/xen/swiotlb-xen.c
Port upstream commit cca58a166920a to NXP tree, manual hunk was
resolved during merge.
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ab8ef4498880..b47719da52b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4028,6 +4028,7 @@ B: https://github.com/ClangBuiltLinux/linux/issues C: irc://chat.freenode.net/clangbuiltlinux S: Supported K: \b(?i:clang|llvm)\b +F: Documentation/kbuild/llvm.rst CLEANCACHE API M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |