Patch "selftests/core: fix conflicting types compile error for close_range()" has been added to the 5.14-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    selftests/core: fix conflicting types compile error for close_range()

to the 5.14-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:
     selftests-core-fix-conflicting-types-compile-error-f.patch
and it can be found in the queue-5.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 9411fc307f6fac84fbb2b058e0728676a5eba4f0
Author: Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx>
Date:   Wed Oct 27 13:26:19 2021 -0600

    selftests/core: fix conflicting types compile error for close_range()
    
    [ Upstream commit f35dcaa0a8a29188ed61083d153df1454cf89d08 ]
    
    close_range() test type conflicts with close_range() library call in
    x86_64-linux-gnu/bits/unistd_ext.h. Fix it by changing the name to
    core_close_range().
    
    gcc -g -I../../../../usr/include/    close_range_test.c  -o ../tools/testing/selftests/core/close_range_test
    In file included from close_range_test.c:16:
    close_range_test.c:57:6: error: conflicting types for ‘close_range’; have ‘void(struct __test_metadata *)’
       57 | TEST(close_range)
          |      ^~~~~~~~~~~
    ../kselftest_harness.h:181:21: note: in definition of macro ‘__TEST_IMPL’
      181 |         static void test_name(struct __test_metadata *_metadata); \
          |                     ^~~~~~~~~
    close_range_test.c:57:1: note: in expansion of macro ‘TEST’
       57 | TEST(close_range)
          | ^~~~
    In file included from /usr/include/unistd.h:1204,
                     from close_range_test.c:13:
    /usr/include/x86_64-linux-gnu/bits/unistd_ext.h:56:12: note: previous declaration of ‘close_range’ with type ‘int(unsigned int,  unsigned int,  int)’
       56 | extern int close_range (unsigned int __fd, unsigned int __max_fd,
          |            ^~~~~~~~~~~
    
    Signed-off-by: Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/core/close_range_test.c b/tools/testing/selftests/core/close_range_test.c
index 73eb29c916d1b..aa7d13d91963f 100644
--- a/tools/testing/selftests/core/close_range_test.c
+++ b/tools/testing/selftests/core/close_range_test.c
@@ -54,7 +54,7 @@ static inline int sys_close_range(unsigned int fd, unsigned int max_fd,
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif
 
-TEST(close_range)
+TEST(core_close_range)
 {
 	int i, ret;
 	int open_fds[101];