projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1cc1570 c3aff08)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Nov 2017 23:04:27 +0000 (16:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Nov 2017 23:04:27 +0000 (16:04 -0700)
commit3a99df9a3d14cd866b5516f8cba515a3bfd554ab
tree0bb1f9e9243f0d99e188a0b5f46c8ea09a6a7765tree | snapshot
parent1cc15701cd89b0ce695bbc5cff3a2bf3e2efd25fcommit | diff
parentc3aff086ea11f17f5c0bec77bdbf4365ba6b41fccommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/ebiederm/user-namespace

Pull signal bugfix from Eric Biederman:
 "When making the generic support for SIGEMT conditional on the presence
  of SIGEMT I made a typo that causes it to fail to activate. It was
  noticed comparatively quickly but the bug report just made it to me
  today"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  signal: Fix name of SIGEMT in #if defined() check
John Crispins staging tree