git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ba27ae 2838307)
Merge tag 'x86_build_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Dec 2020 21:54:50 +0000 (13:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Dec 2020 21:54:50 +0000 (13:54 -0800)
Pull x86 build updates from Borislav Petkov:
 "Two x86 build fixes:

   - Fix the vmlinux size check on 64-bit along with adding useful
     clarifications on the topic (Arvind Sankar)

   - Remove -m16 workaround now that the GCC versions that need it are
     unsupported (Nick Desaulniers)"

* tag 'x86_build_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build: Remove -m16 workaround for unsupported versions of GCC
  x86/build: Fix vmlinux size check on 64-bit

1  2 
arch/x86/Makefile patch | diff1 | diff2 | blob | history
arch/x86/kernel/head_64.S patch | diff1 | diff2 | blob | history

diff --cc arch/x86/Makefile
Simple merge
diff --cc arch/x86/kernel/head_64.S
Simple merge
Unnamed repository; edit this file 'description' to name the repository.