Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1309832

linux-next: manual merge of the luto-misc tree with Linus' tree

Show all headers | View raw

Hi Andy,

Today's linux-next merge of the luto-misc tree got a conflict in:

  tools/testing/selftests/x86/Makefile

between commit:

  0f672809f91a ("selftests/x86: Disable the ldt_gdt_64 test for now")

from Linus' tree and commit:

  4b154c54fff1 ("x86/signal/64: Re-add support for SS in the 64-bit signal context")

from the luto-misc tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc tools/testing/selftests/x86/Makefile
index d0c473f65850,7d01da819d83..000000000000
--- a/tools/testing/selftests/x86/Makefile
+++ b/tools/testing/selftests/x86/Makefile
@@@ -4,11 -4,9 +4,11 @@@ include ../lib.m
  
  .PHONY: all all_32 all_64 warn_32bit_failure clean
  
- TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt ptrace_syscall
- TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault sigreturn test_syscall_vdso unwind_vdso \
 -TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs ldt_gdt syscall_nt ptrace_syscall sigreturn
++TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt ptrace_syscall sigreturn
+ TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault test_syscall_vdso unwind_vdso \
 -			test_FCMOV test_FCOMI test_FISTTP
 +			test_FCMOV test_FCOMI test_FISTTP \
 +			ldt_gdt \
 +			vdso_restorer
  
  TARGETS_C_32BIT_ALL := $(TARGETS_C_BOTHBITS) $(TARGETS_C_32BIT_ONLY)
  BINARIES_32 := $(TARGETS_C_32BIT_ALL:%=%_32)

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the luto-misc tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-15 03:50 +0100
  Re: linux-next: manual merge of the luto-misc tree with Linus' tree Andy Lutomirski <luto@amacapital.net> - 2016-01-15 17:40 +0100
    Re: linux-next: manual merge of the luto-misc tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-16 00:00 +0100

csiph-web