Merge tag 'apparmor-pr-2019-12-03' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull apparmor updates from John Johansen:
 "Features:

   - increase left match history buffer size to provide improved
     conflict resolution in overlapping execution rules.

   - switch buffer allocation to use a memory pool and GFP_KERNEL where
     possible.

   - add compression of policy blobs to reduce memory usage.

  Cleanups:

   - fix spelling mistake "immutible" -> "immutable"

  Bug fixes:

   - fix unsigned len comparison in update_for_len macro

   - fix sparse warning for type-casting of current->real_cred"

* tag 'apparmor-pr-2019-12-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
  apparmor: make it so work buffers can be allocated from atomic context
  apparmor: reduce rcu_read_lock scope for aa_file_perm mediation
  apparmor: fix wrong buffer allocation in aa_new_mount
  apparmor: fix unsigned len comparison with less than zero
  apparmor: increase left match history buffer size
  apparmor: Switch to GFP_KERNEL where possible
  apparmor: Use a memory pool instead per-CPU caches
  apparmor: Force type-casting of current->real_cred
  apparmor: fix spelling mistake "immutible" -> "immutable"
  apparmor: fix blob compression when ns is forced on a policy load
  apparmor: fix missing ZLIB defines
  apparmor: fix blob compression build failure on ppc
  apparmor: Initial implementation of raw policy blob compression

diff --cc security/apparmor/Kconfig
Simple merge

diff --cc security/apparmor/apparmorfs.c
index 45d13b6,9c0e593..09996f2
--- 1/security/apparmor/apparmorfs.c
--- 2/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@@ -19,8 -23,8 +19,9 @@@
  #include <linux/capability.h>
  #include <linux/rcupdate.h>
  #include <linux/fs.h>
 +#include <linux/fs_context.h>
  #include <linux/poll.h>
+ #include <linux/zlib.h>
  #include <uapi/linux/major.h>
  #include <uapi/linux/magic.h>
  

diff --cc security/apparmor/domain.c
Simple merge

diff --cc security/apparmor/file.c
Simple merge

diff --cc security/apparmor/include/apparmor.h
Simple merge

diff --cc security/apparmor/include/file.h
Simple merge

diff --cc security/apparmor/include/match.h
Simple merge

diff --cc security/apparmor/include/path.h
Simple merge

diff --cc security/apparmor/include/policy_unpack.h
Simple merge

diff --cc security/apparmor/label.c
Simple merge

diff --cc security/apparmor/lsm.c
Simple merge

diff --cc security/apparmor/match.c
Simple merge

diff --cc security/apparmor/mount.c
Simple merge

diff --cc security/apparmor/policy.c
Simple merge

diff --cc security/apparmor/policy_unpack.c
Simple merge