joy/android_kernel_sony_sdm845
Watch
1
Fork
You've already forked android_kernel_sony_sdm845
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'ovl-fixes' into for-linus

Browse source 
Backmerge to resolve a conflict in ovl_lookup_real();
"ovl_lookup_real(): use lookup_one_len_unlocked()" instead,
but it was too late in the cycle to rebase.
This commit is contained in:
Al Viro 2016-05-17 02:17:59 -04:00
commit 0e0162bb8c
1 changed files with 7529 additions and 4038 deletions
Download patch file Download diff file Expand all files Collapse all files

4
security/integrity/ima/ima_policy.c
View file

@ -884,10 +884,10 @@ static char *func_tokens[] = {
"BPRM_CHECK",
"MODULE_CHECK",
"FIRMWARE_CHECK",
"POST_SETATTR",
"KEXEC_KERNEL_CHECK",
"KEXEC_INITRAMFS_CHECK",
"POLICY_CHECK",
"POST_SETATTR"
"POLICY_CHECK"
};
void *ima_policy_start(struct seq_file *m, loff_t *pos)