Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Jul 2018 17:44:24 +0000 (10:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Jul 2018 17:44:24 +0000 (10:44 -0700)
Pull s390 fix from Martin Schwidefsky.

Guenter Roeck reports that the s390 allmodconfig build fails because of
a gcc plugin problem.  The fix won't be in-tree until 4.19, so for now
disable the gcc plugins on s390.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: disable gcc plugins


Trivial merge