| #
c54f9da1 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/irqstats
|
| #
d939d285 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/irq
|
| #
c444deba |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into timers/hpet
|
| #
8bbd54d6 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/softlockup
|
| #
9583f3d9 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/softirq
|
| #
6d72b795 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/rodata
|
| #
766d0278 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/rcu
|
| #
688d22e2 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/xen
|
| #
fd2c17e1 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/timers
|
| #
3557b18f |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/ptemask
|
| #
faeca31d |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/pat
|
| #
064a32d8 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/memtest
|
| #
1791a78c |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cleanups
|
| #
ed9e4996 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/sysprof
|
| #
cb9aa97c |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/mmiotrace-mergefixups
|
| #
e765ee90 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/ftrace
|
| #
28638ea4 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/nmi
Conflicts:
arch/x86/kernel/nmi_32.c
|
|
Revision tags: v2.6.26-rc6 |
|
| #
bb6dfb32 |
| 12-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/gart
|
| #
65b53e4c |
| 10-Jun-2008 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
|
| #
8a3e1c67 |
| 08-Jun-2008 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'merge'
Conflicts:
arch/powerpc/sysdev/fsl_soc.c
|
|
Revision tags: v2.6.26-rc5 |
|
| #
f38bb7de |
| 04-Jun-2008 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
b09916e4 |
| 02-Jun-2008 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kbuild: fix $(src) assignmnet with external modules
|
| #
96d97f26 |
| 31-May-2008 |
Sam Ravnborg <sam@ravnborg.org> |
kbuild: fix $(src) assignmnet with external modules
When we introduced support for KBUILD_EXTRA_SYMBOLS
we started to include the externam module's kbuild
file when doing the final modpost step.
As
kbuild: fix $(src) assignmnet with external modules
When we introduced support for KBUILD_EXTRA_SYMBOLS
we started to include the externam module's kbuild
file when doing the final modpost step.
As external modules often do:
ccflags-y := -I$(src)
We had problems because $(src) was unassinged and
gcc then used the next parameter for -I resulting in
strange build failures.
Fix is to assign $(src) and $(obj) when building
external modules.
This fixes: http://bugzilla.kernel.org/show_bug.cgi?id=10798
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Tvrtko <tvrtko.ursulin@sophos.com>
Cc: Andrea Arcangeli <andrea@qumranet.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
show more ...
|
|
Revision tags: v2.6.26-rc4, v2.6.26-rc3, v2.6.26-rc2 |
|
| #
7022b15e |
| 06-May-2008 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
|
Revision tags: v2.6.26-rc1 |
|
| #
96916090 |
| 30-Apr-2008 |
Len Brown <len.brown@intel.com> |
Merge branches 'release', 'acpica', 'bugzilla-10224', 'bugzilla-9772', 'bugzilla-9916', 'ec', 'eeepc', 'idle', 'misc', 'pm-legacy', 'sysfs-links-2.6.26', 'thermal', 'thinkpad' and 'video' into release
|