tree 0bb1f9e9243f0d99e188a0b5f46c8ea09a6a7765
parent 1cc15701cd89b0ce695bbc5cff3a2bf3e2efd25f
parent c3aff086ea11f17f5c0bec77bdbf4365ba6b41fc
author Linus Torvalds <torvalds@linux-foundation.org> 1509577467 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1509577467 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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