mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-28 16:52:18 +00:00
Merge branch 'bpf-next/master' into for-next
No conflict. Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
This commit is contained in:
commit
459765af03
@ -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 = {
|
||||
|
Loading…
Reference in New Issue
Block a user