Merge tag 'apparmor-pr-2017-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Nov 2017 23:56:41 +0000 (18:56 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Nov 2017 23:56:41 +0000 (18:56 -0500)
commitdf8ba95c572a187ed2aa7403e97a7a7f58c01f00
treed84f8538a98bcfcf549ccf581ff281e84cd8f7e1
parent42062b988270ae2f55f2a563861f6ba3d980e9b8
parentb12cbb21586277f72533769832c24cc6c1d60ab3
Merge tag 'apparmor-pr-2017-11-30' of git://git./linux/kernel/git/jj/linux-apparmor

Pull apparmor bugfix from John Johansen:
 "Fix oops in audit_signal_cb hook marked for stable"

* tag 'apparmor-pr-2017-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
  apparmor: fix oops in audit_signal_cb hook