Merge tag 'compiler-attributes-for-linus-v4.20' of https://github.com/ojeda/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Dec 2018 22:29:21 +0000 (14:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Dec 2018 22:29:21 +0000 (14:29 -0800)
commit1104bd96eb2af9707dce69a22c63bd432a41380a
treee488b9ba589cda03ce8a20bc73c4b3ecee835403
parent38c0ecf6087a8cb2af24ddd2124e9ca3c666dcdf
parent71391bdd2e9aab188f86bf1ecd9b232531ec7eea
Merge tag 'compiler-attributes-for-linus-v4.20' of https://github.com/ojeda/linux

Pull compiler_types.h fix from Miguel Ojeda:
 "A cleanup for userspace in compiler_types.h: don't pollute userspace
  with macro definitions (Xiaozhou Liu)

  This is harmless for the kernel, but v4.19 was released with a few
  macros exposed to userspace as the patch explains; which this removes,
  so it *could* happen that we break something for someone (although
  leaving inline redefined is probably worse)"

* tag 'compiler-attributes-for-linus-v4.20' of https://github.com/ojeda/linux:
  include/linux/compiler_types.h: don't pollute userspace with macro definitions