Hi Ingo, On Wed, 8 Apr 2015 17:13:51 +0200 Ingo Molnar <[email protected]> wrote: > > > * Stephen Rothwell <[email protected]> wrote: > > > Today's linux-next merge of the akpm tree got a conflict in > > arch/x86/kernel/cpu/common.c between commit 6b51311c9765 > > ("x86/asm/entry/64: Use a define for an invalid segment selector") from > > the tip tree and commit f28c11e4b695 ("arch/x86/kernel/cpu/common.c: > > fix warning") from the akpm tree. > > So f28c11e4b695 doesn't appear to be in linux-next as fetched a minute > ago: > > triton:~/linux.trees.git> git log f28c11e4b695 -- > fatal: bad revision 'f28c11e4b695' > triton:~/linux.trees.git> git describe > next-20150408 > > How am I supposed to fetch and interpret such sha1's?
Sorry, this was a special case. This was a patch in the part of Andrew's series that gets rebased on top of the rest of linux-next each day (as that part has dependencies on other things in linux-next). In this case, the resolution was to drop the patch entirely as it had become unnecessary. This was it: From: Andrew Morton <[email protected]> Subject: arch/x86/kernel/cpu/common.c: fix warning x86_64 allnoconfig: arch/x86/kernel/cpu/common.c: In function 'syscall_init': arch/x86/kernel/cpu/common.c:1225: warning: right shift count >= width of type Fixes: a76c7f4604937bc ("x86/asm/entry/64: Fold syscall32_cpu_init() into its sole user") Cc: Denys Vlasenko <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Ingo Molnar <[email protected]> Signed-off-by: Andrew Morton <[email protected]> --- arch/x86/kernel/cpu/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/x86/kernel/cpu/common.c~arch-x86-kernel-cpu-commonc-fix-warning arch/x86/kernel/cpu/common.c --- a/arch/x86/kernel/cpu/common.c~arch-x86-kernel-cpu-commonc-fix-warning +++ a/arch/x86/kernel/cpu/common.c @@ -1222,7 +1222,7 @@ void syscall_init(void) wrmsrl_safe(MSR_IA32_SYSENTER_EIP, (u64)ia32_sysenter_target); #else wrmsrl(MSR_CSTAR, ignore_sysret); - wrmsrl_safe(MSR_IA32_SYSENTER_CS, 0); + wrmsrl_safe(MSR_IA32_SYSENTER_CS, 0ULL); wrmsrl_safe(MSR_IA32_SYSENTER_ESP, 0ULL); wrmsrl_safe(MSR_IA32_SYSENTER_EIP, 0ULL); #endif _ -- Cheers, Stephen Rothwell [email protected]
pgpJ86y10sB1M.pgp
Description: OpenPGP digital signature
