6.1-stable patches

added patches:
	selftests-mount_setattr-fix-redefine-struct-mount_attr-build-error.patch

diff --git a/queue-6.1/selftests-mount_setattr-fix-redefine-struct-mount_attr-build-error.patch b/queue-6.1/selftests-mount_setattr-fix-redefine-struct-mount_attr-build-error.patch
new file mode 100644 (file)
index 0000000..22d61fc
--- /dev/null
+++ b/queue-6.1/selftests-mount_setattr-fix-redefine-struct-mount_attr-build-error.patch
@@ -0,0 +1,49 @@
+From d8e45bf1aed2e5fddd8985b5bb1aaf774a97aba8 Mon Sep 17 00:00:00 2001
+From: Shuah Khan <skhan@linuxfoundation.org>
+Date: Mon, 13 Feb 2023 11:20:07 -0700
+Subject: selftests/mount_setattr: fix redefine struct mount_attr build error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Shuah Khan <skhan@linuxfoundation.org>
+
+commit d8e45bf1aed2e5fddd8985b5bb1aaf774a97aba8 upstream.
+
+Fix the following build error due to redefining struct mount_attr by
+removing duplicate define from mount_setattr_test.c
+
+gcc -g -isystem .../tools/testing/selftests/../../../usr/include -Wall -O2 -pthread     mount_setattr_test.c  -o .../tools/testing/selftests/mount_setattr/mount_setattr_test
+mount_setattr_test.c:107:8: error: redefinition of ‘struct mount_attr’
+  107 | struct mount_attr {
+      |        ^~~~~~~~~~
+In file included from /usr/include/x86_64-linux-gnu/sys/mount.h:32,
+                 from mount_setattr_test.c:10:
+.../usr/include/linux/mount.h:129:8: note: originally defined here
+  129 | struct mount_attr {
+      |        ^~~~~~~~~~
+make: *** [../lib.mk:145: .../tools/testing/selftests/mount_setattr/mount_setattr_test] Error 1
+
+Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
+Cc: Hardik Garg <hargar@linux.microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/mount_setattr/mount_setattr_test.c |    7 -------
+ 1 file changed, 7 deletions(-)
+
+--- a/tools/testing/selftests/mount_setattr/mount_setattr_test.c
++++ b/tools/testing/selftests/mount_setattr/mount_setattr_test.c
+@@ -104,13 +104,6 @@
+       #else
+               #define __NR_mount_setattr 442
+       #endif
+-
+-struct mount_attr {
+-      __u64 attr_set;
+-      __u64 attr_clr;
+-      __u64 propagation;
+-      __u64 userns_fd;
+-};
+ #endif
+ 
+ #ifndef __NR_open_tree

diff --git a/queue-6.1/series b/queue-6.1/series
index 2e97bb84958a10b2b9930a0b791edea07367f338..77254e233d57c3ffe55dd644d58f3285975b2657 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -33,3 +33,4 @@ selftests-mptcp-join-skip-implicit-tests-if-not-supported.patch
 selftests-mptcp-join-skip-backup-if-set-flag-on-id-not-supported.patch
 selftests-mptcp-join-skip-fullmesh-flag-tests-if-not-supported.patch
 selftests-mptcp-join-skip-mpc-backups-tests-if-not-supported.patch
+selftests-mount_setattr-fix-redefine-struct-mount_attr-build-error.patch