From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Mar 2022 19:53:00 +0000 (-0700)
Subject: Merge tag 'linux-kselftest-next-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v6.1-rc5~1768
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23d1dea55520c5cf89849279cd25de4da8392687;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'linux-kselftest-next-5.18-rc1' of git://git./linux/kernel/git/shuah/linux-kselftest

Pull Kselftest updates from Shuah Khan:
 "Several build and cleanup fixes:

   - removing obsolete config options

   - removing dependency on internal kernel macros

   - adding config options

   - several build fixes related to headers and install paths"

* tag 'linux-kselftest-next-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (22 commits)
  selftests: Fix build when $(O) points to a relative path
  selftests: netfilter: fix a build error on openSUSE
  selftests: kvm: add generated file to the .gitignore
  selftests/exec: add generated files to .gitignore
  selftests: add kselftest_install to .gitignore
  selftests/rtc: continuously read RTC in a loop for 30s
  selftests/lkdtm: Add UBSAN config
  selftests/lkdtm: Remove dead config option
  selftests/exec: Rename file binfmt_script to binfmt_script.py
  selftests: Use -isystem instead of -I to include headers
  selftests: vm: remove dependecy from internal kernel macros
  selftests: vm: Add the uapi headers include variable
  selftests: mptcp: Add the uapi headers include variable
  selftests: net: Add the uapi headers include variable
  selftests: landlock: Add the uapi headers include variable
  selftests: kvm: Add the uapi headers include variable
  selftests: futex: Add the uapi headers include variable
  selftests: Correct the headers install path
  selftests: Add and export a kernel uapi headers path
  selftests: set the BUILD variable to absolute path
  ...
---

23d1dea55520c5cf89849279cd25de4da8392687
diff --cc tools/testing/selftests/netfilter/Makefile
index 7e81c9a,8136c1f..600e3a1
--- a/tools/testing/selftests/netfilter/Makefile
+++ b/tools/testing/selftests/netfilter/Makefile
@@@ -8,7 -8,8 +8,8 @@@ TEST_PROGS := nft_trans_stress.sh nft_f
  	ipip-conntrack-mtu.sh conntrack_tcp_unreplied.sh \
  	conntrack_vrf.sh nft_synproxy.sh
  
+ CFLAGS += $(shell pkg-config --cflags libmnl 2>/dev/null || echo "-I/usr/include/libmnl")
  LDLIBS = -lmnl
 -TEST_GEN_FILES =  nf-queue
 +TEST_GEN_FILES =  nf-queue connect_close
  
  include ../lib.mk