linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 4491 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  tools/testing/selftests/Makefile

between commit:

  073d71c5118f4 ("selftests/filesystems: add a test for freezing a shared block device")

from the vfs-brauner-fixes tree and commit:

  c6c917c1ecb48 ("Merge branch 'vfs-7.4.misc' into vfs.all")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined tools/testing/selftests/Makefile
index 07c3719f8b04b,32dde7b95848e..0000000000000
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@@ -34,13 -34,11 +34,13 @@@ TARGETS += exe
  TARGETS += fchmodat2
  TARGETS += filesystems
  TARGETS += filesystems/binderfs
 +TARGETS += filesystems/configfs
  TARGETS += filesystems/epoll
  TARGETS += filesystems/eventfd
  TARGETS += filesystems/failfs
  TARGETS += filesystems/fat
  TARGETS += filesystems/file_stressor
 +TARGETS += filesystems/freeze
  TARGETS += filesystems/openat2
  TARGETS += filesystems/open_tree_ns
  TARGETS += filesystems/overlayfs
@@@ -99,7 -97,6 +99,7 @@@ TARGETS += net/packetdril
  TARGETS += net/ppp
  TARGETS += net/rds
  TARGETS += net/tcp_ao
 +TARGETS += nfsd
  TARGETS += nolibc
  TARGETS += pci_endpoint
  TARGETS += pcie_bwctrl
@@@ -180,10 -177,6 +180,10 @@@ endi
  # of the targets gets built.
  FORCE_TARGETS ?=
  
 +# Remember dry runs for the build report before MAKEFLAGS may be cleared.
 +KSFT_BUILD_REPORT_DRY_RUN := $(strip $(foreach f,n t q,$(findstring $(f),$(firstword -$(MAKEFLAGS)))))
 +export KSFT_BUILD_REPORT_DRY_RUN
 +
  # Clear LDFLAGS and MAKEFLAGS when implicit rules are missing.  This provides
  # implicit rules to sub-test Makefiles which avoids build failures in test
  # Makefile that don't have explicit build rules.
@@@ -228,10 -221,6 +228,10 @@@ ARCH           ?= $(SUBARCH
  export BUILD
  export KHDR_INCLUDES
  
 +# Version of the optional KSFT_BUILD_REPORT format written by these rules.
 +KSFT_BUILD_REPORT_VERSION := 1
 +include $(top_srcdir)/tools/testing/selftests/build_report.mk
 +
  # set default goal to all, so make without a target runs all, even when
  # all isn't the first target in the file.
  .DEFAULT_GOAL := all
@@@ -240,13 -229,11 +240,13 @@@ all
  	@ret=1;							\
  	for TARGET in $(TARGETS) $(INSTALL_DEP_TARGETS); do	\
  		BUILD_TARGET=$$BUILD/$$TARGET;			\
 -		mkdir $$BUILD_TARGET  -p;			\
 +		mkdir -p $$BUILD_TARGET &&			\
  		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET	\
 -				O=$(abs_objtree)		\
 -				$(if $(FORCE_TARGETS),|| exit);	\
 -		ret=$$((ret * $$?));				\
 +				O=$(abs_objtree);		\
 +		status=$$?;					\
 +		$(call ksft_record_build_status,all,$$TARGET);	\
 +		$(if $(FORCE_TARGETS),[ $$status -eq 0 ] || exit $$status;) \
 +		[ $$status -eq 0 ] && ret=0;			\
  	done; exit $$ret;
  
  run_tests: all
@@@ -303,7 -290,7 +303,7 @@@ ifdef INSTALL_PAT
  	install -m 744 kselftest/ktap_helpers.sh $(INSTALL_PATH)/kselftest/
  	install -m 744 kselftest/ksft.py $(INSTALL_PATH)/kselftest/
  	install -m 744 run_kselftest.sh $(INSTALL_PATH)/
 -	rm -f $(TEST_LIST)
 +	: > $(TEST_LIST)
  	@ret=1;	\
  	for TARGET in $(TARGETS) $(INSTALL_DEP_TARGETS); do \
  		BUILD_TARGET=$$BUILD/$$TARGET;	\
@@@ -311,11 -298,9 +311,11 @@@
  				INSTALL_PATH=$(INSTALL_PATH)/$$TARGET \
  				SRC_PATH=$(shell readlink -e $$(pwd)) \
  				OBJ_PATH=$(INSTALL_PATH) \
 -				O=$(abs_objtree)		\
 -				$(if $(FORCE_TARGETS),|| exit);	\
 -		ret=$$((ret * $$?));		\
 +				O=$(abs_objtree);		\
 +		status=$$?;				\
 +		$(call ksft_record_build_status,install,$$TARGET); \
 +		$(if $(FORCE_TARGETS),[ $$status -eq 0 ] || exit $$status;) \
 +		[ $$status -eq 0 ] && ret=0;		\
  	done; exit $$ret;
  
  
@@@ -329,9 -314,6 +329,9 @@@
  		printf "Emit Tests for $$TARGET\n"; \
  		$(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET COLLECTION=$$TARGET \
  			-C $$TARGET emit_tests >> $(TEST_LIST); \
 +		status=$$?; \
 +		$(call ksft_record_build_status,install,$$TARGET); \
 +		(exit $$status); \
  	done;
  	@VERSION=$$(git describe HEAD 2>/dev/null); \
  	if [ -n "$$VERSION" ]; then \

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]