summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-01-21 07:23:42 +1300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-01-21 07:23:42 +1300
commit315a6d850a8290919c499cfbed08737f6164c7bd (patch)
tree5e4e81f97fff519bd4bb0d56495de0ff6bb5fb0d
parentfbfaf851902cd9293f392f3a1735e0543016d530 (diff)
parent3e2ffd655cc6a694608d997738989ff5572a8266 (diff)
parent99e309b6ed75fab4a43afd9e523441ecc5a1f511 (diff)
downloadlinux-315a6d850a8290919c499cfbed08737f6164c7bd.tar.bz2
Merge tags 'compiler-attributes-for-linus-v5.0-rc3' and 'clang-format-for-linus-v5.0-rc3' of git://github.com/ojeda/linux
Pull misc clang fixes from Miguel Ojeda: - A fix for OPTIMIZER_HIDE_VAR from Michael S Tsirkin - Update clang-format with the latest for_each macro list from Jason Gunthorpe * tag 'compiler-attributes-for-linus-v5.0-rc3' of git://github.com/ojeda/linux: include/linux/compiler*.h: fix OPTIMIZER_HIDE_VAR * tag 'clang-format-for-linus-v5.0-rc3' of git://github.com/ojeda/linux: clang-format: Update .clang-format with the latest for_each macro list