diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-15 20:38:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-15 20:38:23 -0700 |
| commit | fa3b39cdafbfd5d9b1d064f5cf63cf0314f1d070 (patch) | |
| tree | 35221e219586c61f6de0ebed3e2c027f4f4dc3c3 | |
| parent | 25ca1d74c6731d9d5f8e660195235050252a33ef (diff) | |
| parent | 16b7db4c8150ba12e7eb63a5de962e1b05b3b612 (diff) | |
Merge tag 'clang-format-for-linus-v4.19' of git://github.com/ojeda/linux
Pull clang-format updates from Miguel Ojeda:
"Two improvements for .clang-format:
- Set IndentWrappedFunctionNames false (Jason Gunthorpe)
- Add MAINTAINERS entry (Miguel Ojeda)"
* tag 'clang-format-for-linus-v4.19' of git://github.com/ojeda/linux:
MAINTAINERS: Add .clang-format entry
clang-format: Set IndentWrappedFunctionNames false
| -rw-r--r-- | .clang-format | 2 | ||||
| -rw-r--r-- | MAINTAINERS | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format index faffc0d5af4e..1d5da22e0ba5 100644 --- a/.clang-format +++ b/.clang-format @@ -382,7 +382,7 @@ IncludeIsMainRegex: '(Test)?$' IndentCaseLabels: false #IndentPPDirectives: None # Unknown to clang-format-5.0 IndentWidth: 8 -IndentWrappedFunctionNames: true +IndentWrappedFunctionNames: false JavaScriptQuotes: Leave JavaScriptWrapImports: true KeepEmptyLinesAtTheStartOfBlocks: false diff --git a/MAINTAINERS b/MAINTAINERS index 9f89543b2ffd..64ddcd5041ae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3545,6 +3545,11 @@ M: Dave Goodell <dgoodell@cisco.com> S: Supported F: drivers/infiniband/hw/usnic/ +CLANG-FORMAT FILE +M: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> +S: Maintained +F: .clang-format + CLEANCACHE API M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> L: linux-kernel@vger.kernel.org |