commit b7bd29b530b9e8c0456ef703e64e773830185724
author Linus Torvalds <torvalds@linux-foundation.org> Fri Feb 01 16:18:38 2019 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Feb 01 16:18:38 2019 -0800
tree 18dc768711f45a17923061863bcab3dbe64fd5e8
parent 5eeb63359b1ec4914d9898e24aa357ff930e6ee1
parent d6d478aee003e19ef90321176552a8ad2929a47f

Merge tag 'apparmor-pr-2019-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor

Pull apparmor bug fixes from John Johansen:
 "Two bug fixes for apparmor:

   - Fix aa_label_build() error handling for failed merges

   - Fix warning about unused function apparmor_ipv6_postroute"

* tag 'apparmor-pr-2019-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
  apparmor: Fix aa_label_build() error handling for failed merges
  apparmor: Fix warning about unused function apparmor_ipv6_postroute