Merge 9e9fb7655e ("Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline

Steps on the way to 5.15-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I49577d606b2710975407eae3fee60bc331397810
This commit is contained in:
Greg Kroah-Hartman
2021-09-07 14:40:16 +02:00
2060 changed files with 89095 additions and 44417 deletions
+3 -1
View File
@@ -247,6 +247,8 @@ struct security_class_mapping secclass_map[] = {
NULL } },
{ "xdp_socket",
{ COMMON_SOCK_PERMS, NULL } },
{ "mctp_socket",
{ COMMON_SOCK_PERMS, NULL } },
{ "perf_event",
{ "open", "cpu", "kernel", "tracepoint", "read", "write", NULL } },
{ "lockdown",
@@ -256,6 +258,6 @@ struct security_class_mapping secclass_map[] = {
{ NULL }
};
#if PF_MAX > 45
#if PF_MAX > 46
#error New address family defined, please update secclass_map.
#endif