From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Jan 2017 17:47:43 +0000 (-0800)
Subject: Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=87bc610730a944b49f1c53ab9f4230d85f35df0c;p=linux-beck.git

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kbuild fix from Michal Marek:
 "The asm-prototypes.h file added in the last merge window results in
  invalid code with CONFIG_KMEMCHECK=y. The net result is that genksyms
  segfaults.

  This pull request fixes the header, the genksyms fix is in my kbuild
  branch for 4.11"

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  asm-prototypes: Clear any CPP defines before declaring the functions
---

87bc610730a944b49f1c53ab9f4230d85f35df0c