Merge branch 'next-integrity-for-james' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-integrity

Browse source

From Mimi:

"This pull request contains just three patches, the remainder are
either included in other pull requests (eg. audit, lockdown) or will
be upstreamed via other subsystems (eg. kselftests, Power).  Included
in this pull request is one bug fix, one documentation update, and
extending the x86 IMA arch policy rules to coordinate the different
kernel module signature verification methods."

...

This commit is contained in:

James Morris 2019-04-12 15:20:23 -07:00

parent fe9fd2ef38 41475a3eba

commit 2bfebea90d

4 changed files with 21 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

Documentation/admin-guide/kernel-parameters.txt

View file

10

arch/x86/kernel/ima_arch.c

View file

5

include/linux/module.h

View file

5

kernel/module.c

View file