Merge branch 'master' into next

2026-04-23 05:56:14 -04:00 · 2010-05-06 10:56:07 +10:00
parent 4e5d6f7ec3 7ebd467551
commit 0ffbe2699c
5014 changed files with 37859 additions and 10471 deletions
--- a/security/integrity/ima/ima_init.c
+++ b/security/integrity/ima/ima_init.c
@@ -16,6 +16,7 @@
 */
 #include <linux/module.h>
 #include <linux/scatterlist.h>
+#include <linux/slab.h>
 #include <linux/err.h>
 #include "ima.h"