Merge branch 'bpf-next/master' into for-next

No conflict. Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
kernel-patches · Dec 16, 2024 · 459765a · 459765a
2 parents 09430e4 + 58ecb3a
commit 459765a
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/security/bpf/hooks.c b/security/bpf/hooks.c
@@ -13,7 +13,6 @@ static struct security_hook_list bpf_lsm_hooks[] __ro_after_init = {
 	#include <linux/lsm_hook_defs.h>
 	#undef LSM_HOOK
 	LSM_HOOK_INIT(inode_free_security, bpf_inode_storage_free),
-	LSM_HOOK_INIT(task_free, bpf_task_storage_free),
 };
 
 static const struct lsm_id bpf_lsmid = {