Changes in Makefile-os-Linux

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/arch/um/Makefile-os-Linux

a9de18eb761f7c1c860964b2e5addc1a35c7e861 - Merge branch 'linus' into stackprotector

Wed, 31 Dec 2008 08:31:57 +0100

Merge branch 'linus' into stackprotectorConflicts: arch/x86/include/asm/pda.h kernel/fork.c List of files: /linux/arch/um/Makefile-os-Linux

55fa518867978e1f5fd8353098f80d125ac734d7 - Merge branch 'topic/pcsp-fix' into topic/misc

Sat, 20 Dec 2008 23:39:47 +0100

Merge branch 'topic/pcsp-fix' into topic/misc List of files: /linux/arch/um/Makefile-os-Linux

0ff555192a8d20385d49d1c420e2e8d409b3c0da - Merge branch 'fix/hda' into topic/hda

Fri, 19 Dec 2008 08:22:57 +0100

Merge branch 'fix/hda' into topic/hda List of files: /linux/arch/um/Makefile-os-Linux

e18d7af85296cb6999aae171e8a9f8612bea5ae0 - Merge commit 'v2.6.28-rc8' into x86/mm

Fri, 12 Dec 2008 11:53:43 +0100

Merge commit 'v2.6.28-rc8' into x86/mm List of files: /linux/arch/um/Makefile-os-Linux

7fbb8759eff9a348efa5f352ffaa51c364837c4b - Merge commit 'v2.6.28-rc6' into core/debug

Wed, 26 Nov 2008 08:22:50 +0100

Merge commit 'v2.6.28-rc6' into core/debug List of files: /linux/arch/um/Makefile-os-Linux

3e1d7a6219ab64e13b10b1a77c0625db9a8bd8db - Merge branch 'linus' into core/futexes

Mon, 24 Nov 2008 19:54:37 +0100

Merge branch 'linus' into core/futexes List of files: /linux/arch/um/Makefile-os-Linux

a5a64498c194c82ecad3a2d67cff6231cda8d3dd - Merge commit 'v2.6.28-rc4' into timers/rtc

Mon, 10 Nov 2008 09:10:44 +0100

Merge commit 'v2.6.28-rc4' into timers/rtcConflicts: drivers/rtc/rtc-cmos.c List of files: /linux/arch/um/Makefile-os-Linux

7b3b6e42032e94a6132a85642e95106f5346650e - Merge commit 'v2.6.28-rc2' into topic/asoc

Fri, 31 Oct 2008 17:13:10 +0100

Merge commit 'v2.6.28-rc2' into topic/asoc List of files: /linux/arch/um/Makefile-os-Linux

d1a76187a5be4f89c6cb19d800cb5fb7aac735c5 - Merge commit 'v2.6.28-rc2' into core/locking

Tue, 28 Oct 2008 16:54:49 +0100

Merge commit 'v2.6.28-rc2' into core/lockingConflicts: arch/um/include/asm/system.h List of files: /linux/arch/um/Makefile-os-Linux

2011a067281565494494aee194ca5081e52d6c3f - Merge commit 'v2.6.28-rc2' into x86/doc

Tue, 28 Oct 2008 16:46:59 +0100

Merge commit 'v2.6.28-rc2' into x86/doc List of files: /linux/arch/um/Makefile-os-Linux

7a9787e1eba95a166265e6a260cf30af04ef0a99 - Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks

Tue, 28 Oct 2008 16:26:12 +0100

Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks List of files: /linux/arch/um/Makefile-os-Linux

5292ae11babca23c3ff82593630d2d7eebc350a9 - Merge commit 'v2.6.28-rc2' into x86/uv

Mon, 27 Oct 2008 12:38:02 +0100

Merge commit 'v2.6.28-rc2' into x86/uv List of files: /linux/arch/um/Makefile-os-Linux

e21e696edb498c7f7eed42ba3096f6bbe13927b6 - Merge branch 'master' into next

Thu, 06 Nov 2008 00:12:34 +0100

Merge branch 'master' into next List of files: /linux/arch/um/Makefile-os-Linux

4944dd62de21230af039eda7cd218e9a09021d11 - Merge commit 'v2.6.28-rc2' into tracing/urgent

Mon, 27 Oct 2008 10:50:54 +0100

Merge commit 'v2.6.28-rc2' into tracing/urgent List of files: /linux/arch/um/Makefile-os-Linux

8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 - Merge commit 'v2.6.28-rc1' into sched/urgent

Fri, 24 Oct 2008 12:48:46 +0200

Merge commit 'v2.6.28-rc1' into sched/urgent List of files: /linux/arch/um/Makefile-os-Linux

5b34653963de7a6d0d8c783527457d68fddc60fb - Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Thu, 23 Oct 2008 19:22:01 +0200

Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip* 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits) x86: canonicalize remaining header guards x86: drop double underscores from header guards x86: Fix ASM_X86__ header guards x86, um: get rid of uml-config.h x86, um: get rid of arch/um/Kconfig.arch x86, um: get rid of arch/um/os symlink x86, um: get rid of excessive includes of uml-config.h x86, um: get rid of header symlinks x86, um: merge Kconfig.i386 and Kconfig.x86_64 x86, um: get rid of sysdep symlink x86, um: trim the junk from uml ptrace-*.h x86, um: take vm-flags.h to sysdep x86, um: get rid of uml asm/arch x86, um: get rid of uml highmem.h x86, um: get rid of uml unistd.h x86, um: get rid of system.h -> system.h include x86, um: uml atomic.h is not needed anymore x86, um: untangle uml ldt.h x86, um: get rid of more uml asm/arch uses x86, um: remove dead header (uml module-generic.h; never used these days) ... List of files: /linux/arch/um/Makefile-os-Linux

ec82c32d45644998a28abad0a6a9ccdd721a054e - x86, um: get rid of arch/um/os symlink

Mon, 25 Aug 2008 10:14:29 +0200

x86, um: get rid of arch/um/os symlinkwe can get DEV_NULL defined for arch/um/drivers/null.c in lessconvoluted ways, TYVM...Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin List of files: /linux/arch/um/Makefile-os-Linux

821f3eff7cdb9d6c7076effabd46c96c322daed1 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

Tue, 16 Oct 2007 20:23:06 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits) kbuild: introduce ccflags-y, asflags-y and ldflags-y kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP kbuild: enable use of AFLAGS and CFLAGS on commandline kbuild: enable 'make AFLAGS=...' to add additional options to AS kbuild: fix AFLAGS use in h8300 and m68knommu kbuild: check for wrong use of CFLAGS kbuild: enable 'make CFLAGS=...' to add additional options to CC kbuild: fix up CFLAGS usage kbuild: make modpost detect unterminated device id lists kbuild: call export_report from the Makefile kbuild: move Kai Germaschewski to CREDITS kconfig/menuconfig: distinguish between selected-by-another options and comments kconfig: tristate choices with mixed tristate and boolean values include/linux/Kbuild: remove duplicate entries kbuild: kill backward compatibility checks kbuild: kill EXTRA_ARFLAGS kbuild: fix documentation in makefiles.txt kbuild: call make once for all targets when O=.. is used kbuild: pass -g to assembler under CONFIG_DEBUG_INFO kbuild: update _shipped files for kconfig syntax cleanup ...Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually. List of files: /linux/arch/um/Makefile-os-Linux

a0f97e06a43cf524e616f09e6af3398e1e9c1c5b - kbuild: enable 'make CFLAGS=...' to add additional options to CC

Sun, 14 Oct 2007 22:21:35 +0200

kbuild: enable 'make CFLAGS=...' to add additional options to CCThe variable CFLAGS is a wellknown variable and the usage bykbuild may result in unexpected behaviour.On top of that several people over time has asked for a way topass in additional flags to gcc.This patch replace use of CFLAGS with KBUILD_CFLAGS all over thetree and enabling one to use:make CFLAGS=...to specify additional gcc commandline options.One usecase is when trying to find gcc bugs but otheruse cases has been requested too.Patch was tested on following architectures:alpha, arm, i386, x86_64, mips, sparc, sparc64, ia64, m68kTest was simple to do a defconfig build, apply the patch and checkthat nothing got rebuild.Signed-off-by: Sam Ravnborg List of files: /linux/arch/um/Makefile-os-Linux