projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 308c470 c7858bf)
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Jan 2017 17:47:43 +0000 (09:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Jan 2017 17:47:43 +0000 (09:47 -0800)
commit87bc610730a944b49f1c53ab9f4230d85f35df0c
tree360902b579dcb09201705fa3bd3132ad4939655atree | snapshot
parent308c470bc482c46b5acbb2c2072df303d6526250commit | diff
parentc7858bf16c0b2cc62f475f31e6df28c3a68da1d6commit | diff
Merge branch 'rc-fixes' of git://git./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
John Crispins staging tree