Merge tag 'linux_kselftest-next-6.10-rc1-fixes' of git://git.kernel.org/pub/scm/linux...

Pull kselftest fixes from Shuah Khan:
 "Revert framework change to add D_GNU_SOURCE to KHDR_INCLUDES to
  Makefile, lib.mk, and kselftest_harness.h and follow-on changes to
  cgroup and sgx test as they are causing build failures and warnings"

* tag 'linux_kselftest-next-6.10-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  Revert "selftests/cgroup: Drop define _GNU_SOURCE"
  Revert "selftests/sgx: Include KHDR_INCLUDES in Makefile"
  Revert "selftests: Compile kselftest headers with -D_GNU_SOURCE"

diff --cc tools/testing/selftests/cgroup/test_zswap.c
Simple merge

diff --cc tools/testing/selftests/lib.mk
index 3023e0e2f58f639880a30dbe97ba431ce3113f27,09e8a854f0fcfe00120b0b7e730209884396f2ba..429535816dbd430724c34b2d74093c676f269150
--- 1/tools/testing/selftests/lib.mk
--- 2/tools/testing/selftests/lib.mk
+++ b/tools/testing/selftests/lib.mk
@@@ -67,18 -67,9 +67,18 @@@ MAKEFLAGS += --no-print-director
  endif
  
  ifeq ($(KHDR_INCLUDES),)
- KHDR_INCLUDES := -D_GNU_SOURCE -isystem $(top_srcdir)/usr/include
+ KHDR_INCLUDES := -isystem $(top_srcdir)/usr/include
  endif
  
 +# In order to use newer items that haven't yet been added to the user's system
 +# header files, add $(TOOLS_INCLUDES) to the compiler invocation in each
 +# each selftest.
 +# You may need to add files to that location, or to refresh an existing file. In
 +# order to do that, run "make headers" from $(top_srcdir), then copy the
 +# header file that you want from $(top_srcdir)/usr/include/... , to the matching
 +# subdir in $(TOOLS_INCLUDE).
 +TOOLS_INCLUDES := -isystem $(top_srcdir)/tools/include/uapi
 +
  # The following are built by lib.mk common compile rules.
  # TEST_CUSTOM_PROGS should be used by tests that require
  # custom build rule and prevent common build rule use.