]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ce6153 68658ca)
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jul 2017 17:41:19 +0000 (10:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jul 2017 17:41:19 +0000 (10:41 -0700)
Pull core fixes from Ingo Molnar:
 "A fix to WARN_ON_ONCE() done by modules, plus a MAINTAINERS update"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  debug: Fix WARN_ON_ONCE() for modules
  MAINTAINERS: Update the PTRACE entry

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/sh/include/asm/bug.h patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/sh/include/asm/bug.h
Simple merge
Linux Kernel Source Tree.