From: Greg Kroah-Hartman Date: Thu, 22 Jun 2023 08:09:56 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v4.14.320~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4582dcd9c374f7c6e87ccd5b4ce500f8fe2f6414;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: selftests-mount_setattr-fix-redefine-struct-mount_attr-build-error.patch --- diff --git a/queue-5.15/selftests-mount_setattr-fix-redefine-struct-mount_attr-build-error.patch b/queue-5.15/selftests-mount_setattr-fix-redefine-struct-mount_attr-build-error.patch new file mode 100644 index 00000000000..22d61fcf97a --- /dev/null +++ b/queue-5.15/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 +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 + +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 +Cc: Hardik Garg +Signed-off-by: Greg Kroah-Hartman +--- + 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-5.15/series b/queue-5.15/series index b35b13a233a..2651f5832ad 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -7,3 +7,4 @@ drm-amd-display-add-wrapper-to-call-planes-and-stream-update.patch tick-common-align-tick-period-during-sched_timer-setup.patch selftests-mptcp-lib-skip-if-missing-symbol.patch selftests-mptcp-lib-skip-if-not-below-kernel-version.patch +selftests-mount_setattr-fix-redefine-struct-mount_attr-build-error.patch