android_kernel_xiaomi_sm8350/init
Linus Torvalds 2e1ca21d46 Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
* master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild: (46 commits)
  kbuild: remove obsoleted scripts/reference_* files
  kbuild: fix make help & make *pkg
  kconfig: fix time ordering of writes to .kconfig.d and include/linux/autoconf.h
  Kconfig: remove the CONFIG_CC_ALIGN_* options
  kbuild: add -fverbose-asm to i386 Makefile
  kbuild: clean-up genksyms
  kbuild: Lindent genksyms.c
  kbuild: fix genksyms build error
  kbuild: in makefile.txt note that Makefile is preferred name for kbuild files
  kbuild: replace PHONY with FORCE
  kbuild: Fix bug in crc symbol generating of kernel and modules
  kbuild: change kbuild to not rely on incorrect GNU make behavior
  kbuild: when warning symbols exported twice now tell user this is the problem
  kbuild: fix make dir/file.xx when asm symlink is missing
  kbuild: in the section mismatch check try harder to find symbols
  kbuild: fix section mismatch check for unwind on IA64
  kbuild: kill false positives from section mismatch warnings for powerpc
  kbuild: kill trailing whitespace in modpost & friends
  kbuild: small update of allnoconfig description
  kbuild: make namespace.pl CROSS_COMPILE happy
  ...

Trivial conflict in arch/ppc/boot/Makefile manually fixed up
2006-03-25 08:48:48 -08:00
..
calibrate.c
do_mounts_devfs.c
do_mounts_initrd.c [PATCH] swsusp: userland interface 2006-03-23 07:38:07 -08:00
do_mounts_md.c [PATCH] md: remove personality numbering from md 2006-01-06 08:34:06 -08:00
do_mounts_rd.c [PATCH] s390: cleanup Kconfig 2006-01-06 08:33:53 -08:00
do_mounts.c [PATCH] vfs: MS_VERBOSE should be MS_SILENT 2006-03-24 07:33:15 -08:00
do_mounts.h
initramfs.c [PATCH] BLK_DEV_INITRD: do not require BLK_DEV_RAM=y 2006-03-25 08:22:57 -08:00
Kconfig Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild 2006-03-25 08:48:48 -08:00
main.c [PATCH] add a proper prototype for setup_arch() 2006-03-25 08:22:56 -08:00
Makefile kbuild: "PREEMPT" in UTS_VERSION 2005-07-14 20:18:07 +00:00
version.c