This is a note to let you know that I've just added the patch titled
perf beauty: Update copy of linux/socket.h with the kernel sources
to the 5.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
perf-beauty-update-copy-of-linux-socket.h-with-the-kernel-sources.patch
and it can be found in the queue-5.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From ef83f9efe8461b8fd71eb60b53dbb6a5dd7b39e9 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date: Sat, 19 Jun 2021 10:09:08 -0300
Subject: perf beauty: Update copy of linux/socket.h with the kernel sources
From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
commit ef83f9efe8461b8fd71eb60b53dbb6a5dd7b39e9 upstream.
To pick the changes in:
ea6932d70e223e02 ("net: make get_net_ns return error if NET_NS is disabled")
That don't result in any changes in the tables generated from that
header.
This silences this perf build warning:
Warning: Kernel ABI header at 'tools/perf/trace/beauty/include/linux/socket.h' differs from latest version at 'include/linux/socket.h'
diff -u tools/perf/trace/beauty/include/linux/socket.h include/linux/socket.h
Cc: Changbin Du <changbin.du@xxxxxxxxx>
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/perf/trace/beauty/include/linux/socket.h | 2 --
1 file changed, 2 deletions(-)
--- a/tools/perf/trace/beauty/include/linux/socket.h
+++ b/tools/perf/trace/beauty/include/linux/socket.h
@@ -438,6 +438,4 @@ extern int __sys_socketpair(int family,
int __user *usockvec);
extern int __sys_shutdown_sock(struct socket *sock, int how);
extern int __sys_shutdown(int fd, int how);
-
-extern struct ns_common *get_net_ns(struct ns_common *ns);
#endif /* _LINUX_SOCKET_H */
Patches currently in stable-queue which might be from acme@xxxxxxxxxx are
queue-5.12/perf-beauty-update-copy-of-linux-socket.h-with-the-kernel-sources.patch
queue-5.12/tools-headers-uapi-sync-linux-in.h-copy-with-the-kernel-sources.patch
queue-5.12/perf-metricgroup-return-error-code-from-metricgroup_.patch
queue-5.12/perf-metricgroup-fix-find_evsel_group-event-selector.patch
