* linux-next: manual merge of the luto-misc tree with Linus' tree
@ 2016-01-15 2:45 Stephen Rothwell
2016-01-15 16:34 ` Andy Lutomirski
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2016-01-15 2:45 UTC (permalink / raw)
To: Andy Lutomirski; +Cc: linux-next, linux-kernel
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)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the luto-misc tree with Linus' tree
2016-01-15 2:45 linux-next: manual merge of the luto-misc tree with Linus' tree Stephen Rothwell
@ 2016-01-15 16:34 ` Andy Lutomirski
2016-01-15 22:56 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Andy Lutomirski @ 2016-01-15 16:34 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
On Thu, Jan 14, 2016 at 6:45 PM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> 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).
This isn't quite correct. I'll fix it up, since semantically it's
more a functionality change than a merge issue.
--Andy
>
> --
> 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)
--
Andy Lutomirski
AMA Capital Management, LLC
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the luto-misc tree with Linus' tree
2016-01-15 16:34 ` Andy Lutomirski
@ 2016-01-15 22:56 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2016-01-15 22:56 UTC (permalink / raw)
To: Andy Lutomirski; +Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Hi Andy,
On Fri, 15 Jan 2016 08:34:25 -0800 Andy Lutomirski <luto@amacapital•net> wrote:
>
> This isn't quite correct. I'll fix it up, since semantically it's
> more a functionality change than a merge issue.
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-01-15 22:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-15 2:45 linux-next: manual merge of the luto-misc tree with Linus' tree Stephen Rothwell
2016-01-15 16:34 ` Andy Lutomirski
2016-01-15 22:56 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox