[GIT PULL] apparmor fixes for 5.0-rc5

[John Johansen]

Can you please pull the following 2 bug fixes for apparmor



The following changes since commit f17b5f06cb92ef2250513a1e154c47b78df07d40:

  Linux 5.0-rc4 (2019-01-27 15:18:05 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor tags/apparmor-pr-2019-02-01

for you to fetch changes up to d6d478aee003e19ef90321176552a8ad2929a47f:

  apparmor: Fix aa_label_build() error handling for failed merges (2019-02-01 08:01:39 -0800)

----------------------------------------------------------------
Bug Fixes
- Fix aa_label_build() error handling for failed merges
- Fix warning about unused function apparmor_ipv6_postroute

----------------------------------------------------------------
John Johansen (1):
      apparmor: Fix aa_label_build() error handling for failed merges

Petr Vorel (1):
      apparmor: Fix warning about unused function apparmor_ipv6_postroute

 security/apparmor/domain.c | 5 ++++-
 security/apparmor/lsm.c    | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)