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)
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


Trivial merge