From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 Feb 2019 00:18:38 +0000 (-0800)
Subject: Merge tag 'apparmor-pr-2019-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.0-rc5~14
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b7bd29b530b9e8c0456ef703e64e773830185724;p=uclinux-h8%2Flinux.git

Merge tag 'apparmor-pr-2019-02-01' of git://git./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
---

b7bd29b530b9e8c0456ef703e64e773830185724