]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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


Trivial merge