linux-next: manual merge of the apparmor tree with Linus' tree

Hi all, Today's linux-next merge of the apparmor tree got a conflict in: security/apparmor/include/policy.h between commit: 23375b13f98c ("apparmor: fix PROFILE_MEDIATES for untrusted input") from Linus' tree and commit: 06c13f554a71 ("apparmor: re-introduce a variant of PROFILE_MEDIATE

linux-next: manual merge of the apparmor tree with Linus' tree

Hi all, Today's linux-next merge of the apparmor tree got a conflict in: security/apparmor/lsm.c between commit: e33c1b992377 ("apparmor: Restore Y/N in /sys for apparmor's "enabled"") from Linus' tree and commit: 876dd866c084 ("apparmor: Initial implementation of raw policy blob compr