tree 360902b579dcb09201705fa3bd3132ad4939655a
parent 308c470bc482c46b5acbb2c2072df303d6526250
parent c7858bf16c0b2cc62f475f31e6df28c3a68da1d6
author Linus Torvalds <torvalds@linux-foundation.org> 1483811263 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1483811263 -0800

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