From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Jun 2009 22:30:41 +0000 (-0700)
Subject: Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=82782ca77d1bfb32b0334cce40a25b91bd8ec016;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'x86-kbuild-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (46 commits)
  x86, boot: add new generated files to the appropriate .gitignore files
  x86, boot: correct the calculation of ZO_INIT_SIZE
  x86-64: align __PHYSICAL_START, remove __KERNEL_ALIGN
  x86, boot: correct sanity checks in boot/compressed/misc.c
  x86: add extension fields for bootloader type and version
  x86, defconfig: update kernel position parameters
  x86, defconfig: update to current, no material changes
  x86: make CONFIG_RELOCATABLE the default
  x86: default CONFIG_PHYSICAL_START and CONFIG_PHYSICAL_ALIGN to 16 MB
  x86: document new bzImage fields
  x86, boot: make kernel_alignment adjustable; new bzImage fields
  x86, boot: remove dead code from boot/compressed/head_*.S
  x86, boot: use LOAD_PHYSICAL_ADDR on 64 bits
  x86, boot: make symbols from the main vmlinux available
  x86, boot: determine compressed code offset at compile time
  x86, boot: use appropriate rep string for move and clear
  x86, boot: zero EFLAGS on 32 bits
  x86, boot: set up the decompression stack as early as possible
  x86, boot: straighten out ranges to copy/zero in compressed/head*.S
  x86, boot: stylistic cleanups for boot/compressed/head_64.S
  ...

Fixed trivial conflict in arch/x86/configs/x86_64_defconfig manually
---

82782ca77d1bfb32b0334cce40a25b91bd8ec016
diff --cc arch/x86/configs/x86_64_defconfig
index 27b8ce0f5908,4ba7d4ef9aac..cee1dd2e69b2
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@@ -195,11 -209,11 +209,10 @@@ CONFIG_HIGH_RES_TIMERS=
  CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
  CONFIG_SMP=y
  CONFIG_SPARSE_IRQ=y
- CONFIG_X86_FIND_SMP_CONFIG=y
 -# CONFIG_NUMA_MIGRATE_IRQ_DESC is not set
  CONFIG_X86_MPPARSE=y
- # CONFIG_X86_ELAN is not set
- # CONFIG_X86_GENERICARCH is not set
+ CONFIG_X86_EXTENDED_PLATFORM=y
  # CONFIG_X86_VSMP is not set
+ # CONFIG_X86_UV is not set
  CONFIG_SCHED_OMIT_FRAME_POINTER=y
  # CONFIG_PARAVIRT_GUEST is not set
  # CONFIG_MEMTEST is not set