Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
Linus Torvalds [Tue, 1 Jun 2010 15:55:52 +0000 (08:55 -0700)]
* 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
  kbuild: Revert part of e8d400a to resolve a conflict
  kbuild: Fix checking of scm-identifier variable
  gconfig: add support to show hidden options that have prompts
  menuconfig: add support to show hidden options which have prompts
  gconfig: remove show_debug option
  gconfig: remove dbg_print_ptype() and dbg_print_stype()
  kconfig: fix zconfdump()
  kconfig: some small fixes
  add random binaries to .gitignore
  kbuild: Include gen_initramfs_list.sh and the file list in the .d file
  kconfig: recalc symbol value before showing search results
  .gitignore: ignore *.lzo files
  headerdep: perlcritic warning
  scripts/Makefile.lib: Align the output of LZO
  kbuild: Generate modules.builtin in make modules_install
  Revert "kbuild: specify absolute paths for cscope"
  kbuild: Do not unnecessarily regenerate modules.builtin
  headers_install: use local file handles
  headers_check: fix perl warnings
  export_report: fix perl warnings
  ...

25 files changed:
1  2 
.gitignore
MAINTAINERS
Makefile
arch/ia64/include/asm/percpu.h
arch/ia64/kernel/ivt.S
arch/parisc/include/asm/system.h
arch/powerpc/include/asm/cache.h
arch/s390/kernel/swsusp_asm64.S
arch/sh/include/asm/cache.h
arch/sparc/include/asm/cache.h
arch/x86/kernel/setup_percpu.c
arch/x86/kernel/vmlinux.lds.S
include/asm-generic/percpu.h
include/asm-generic/vmlinux.lds.h
include/linux/init_task.h
include/linux/percpu-defs.h
include/linux/spinlock.h
init/Kconfig
kernel/module.c
scripts/Makefile.lib
scripts/gen_initramfs_list.sh
scripts/kconfig/Makefile
scripts/kconfig/util.c
scripts/markup_oops.pl
scripts/package/mkspec

diff --cc .gitignore
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/module.c
@@@ -403,11 -397,10 +403,11 @@@ static unsigned int find_pcpusec(Elf_Eh
                                 Elf_Shdr *sechdrs,
                                 const char *secstrings)
  {
-       return find_sec(hdr, sechdrs, secstrings, ".data.percpu");
+       return find_sec(hdr, sechdrs, secstrings, ".data..percpu");
  }
  
 -static void percpu_modcopy(void *pcpudest, const void *from, unsigned long size)
 +static void percpu_modcopy(struct module *mod,
 +                         const void *from, unsigned long size)
  {
        int cpu;
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge