Skip to content

Commit

Permalink
Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/git/jj/linux-apparmor
  • Loading branch information
sfrothwell committed Mar 7, 2025
2 parents 18897e4 + 3e45553 commit 34ba695
Show file tree
Hide file tree
Showing 29 changed files with 1,636 additions and 232 deletions.
2 changes: 1 addition & 1 deletion security/apparmor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
apparmor-y := apparmorfs.o audit.o capability.o task.o ipc.o lib.o match.o \
path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
resource.o secid.o file.o policy_ns.o label.o mount.o net.o \
policy_compat.o
policy_compat.o af_unix.o
apparmor-$(CONFIG_SECURITY_APPARMOR_HASH) += crypto.o

obj-$(CONFIG_SECURITY_APPARMOR_KUNIT_TEST) += apparmor_policy_unpack_test.o
Expand Down
Loading

0 comments on commit 34ba695

Please sign in to comment.