From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Dec 2018 22:29:21 +0000 (-0800)
Subject: Merge tag 'compiler-attributes-for-linus-v4.20' of https://github.com/ojeda/linux
X-Git-Tag: v5.4-rc1~2018
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1104bd96eb2af9707dce69a22c63bd432a41380a;p=platform%2Fkernel%2Flinux-rpi.git

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

1104bd96eb2af9707dce69a22c63bd432a41380a