From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andy Lutomirski <luto@amacapital•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the luto-misc tree with Linus' tree
Date: Fri, 15 Jan 2016 13:45:28 +1100 [thread overview]
Message-ID: <20160115134528.5e2831a7@canb.auug.org.au> (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)
next reply other threads:[~2016-01-15 2:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 2:45 Stephen Rothwell [this message]
2016-01-15 16:34 ` linux-next: manual merge of the luto-misc tree with Linus' tree Andy Lutomirski
2016-01-15 22:56 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160115134528.5e2831a7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luto@amacapital$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox