Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa3b39cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 25ca1d74 16b7db4c

.clang-format

+1 −1
Original line number Diff line number Diff line
@@ -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

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -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