Subject: linux-next: manual merge of the tip tree with the kselftest-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 14 May 2015 14:32:26 +1000

Hi all,

Today's linux-next merge of the tip tree got a conflict in
tools/testing/selftests/x86/Makefile between commit e9886ace222e
("selftests, x86: Rework x86 target architecture detection") from the
kselftest-fixes tree and commit e22438f8e997 ("x86, selftests: Add a
test for the "sysret_ss_attrs" bug") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc tools/testing/selftests/x86/Makefile
index 5bdb781163d1,9309097f58e8..000000000000
--- a/tools/testing/selftests/x86/Makefile
+++ b/tools/testing/selftests/x86/Makefile
@@@ -1,10 -1,6 +1,10 @@@
 -.PHONY: all all_32 all_64 check_build32 clean run_tests
 +all:
 +
 +include ../lib.mk
 +
 +.PHONY: all all_32 all_64 warn_32bit_failure clean
  
- TARGETS_C_BOTHBITS := sigreturn single_step_syscall
+ TARGETS_C_BOTHBITS := sigreturn single_step_syscall sysret_ss_attrs
  
  BINARIES_32 := $(TARGETS_C_BOTHBITS:%=%_32)
  BINARIES_64 := $(TARGETS_C_BOTHBITS:%=%_64)
@@@ -38,20 -33,19 +38,23 @@@ $(TARGETS_C_BOTHBITS:%=%_32): %_32: %.
  $(TARGETS_C_BOTHBITS:%=%_64): %_64: %.c
  	$(CC) -m64 -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl
  
 -check_build32:
 -	@if ! $(CC) -m32 -o /dev/null trivial_32bit_program.c; then	\
 -	  echo "Warning: you seem to have a broken 32-bit build" 2>&1; 	\
 -	  echo "environment.  If you are using a Debian-like";		\
 -	  echo " distribution, try:"; 					\
 -	  echo "";							\
 -	  echo "  apt-get install gcc-multilib libc6-i386 libc6-dev-i386"; \
 -	  echo "";							\
 -	  echo "If you are using a Fedora-like distribution, try:";	\
 -	  echo "";							\
 -	  echo "  yum install glibc-devel.*i686";			\
 -	  exit 1;							\
 -	fi
 +# x86_64 users should be encouraged to install 32-bit libraries
 +ifeq ($(CAN_BUILD_I386)$(CAN_BUILD_X86_64),01)
 +all: warn_32bit_failure
 +
 +warn_32bit_failure:
 +	@echo "Warning: you seem to have a broken 32-bit build" 2>&1; 	\
 +	echo "environment.  This will reduce test coverage of 64-bit" 2>&1; \
 +	echo "kernels.  If you are using a Debian-like distribution," 2>&1; \
 +	echo "try:"; 2>&1; \
 +	echo "";							\
 +	echo "  apt-get install gcc-multilib libc6-i386 libc6-dev-i386"; \
 +	echo "";							\
 +	echo "If you are using a Fedora-like distribution, try:";	\
 +	echo "";							\
 +	echo "  yum install glibc-devel.*i686";				\
 +	exit 0;
 +endif
+ 
+ # Some tests have additional dependencies.
+ sysret_ss_attrs_64: thunks.S