summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-10-29Add linux-next specific files for 20081029next-20081029Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-29ia64-fix-arch-ia64-kernel-iosapicc-buildAndrew Morton
- someone can't type (or test) - nr_cpu_ids is declared in cpumask.h. Include it. Cc: "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2008-10-29cpu_alloc: per_cpu_offset is already defined for !CONFIG_SMPStephen Rothwell
in asm-generic/percpu.h which is included by asm/percpu.h on all architectures except alpha. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-29coda: credentials errorRandy Dunlap
Needs a header file for credentials struct: linux-next-20081023/fs/coda/file.c:177: error: dereferencing pointer to incomplete type Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
2008-10-29nfsctl: credentials errorRandy Dunlap
Needs headers help for current_cred: Adding only cred.h wasn't enough. linux-next-20081023/fs/nfsctl.c:45: error: implicit declaration of function 'current_cred' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
2008-10-29ftrace: rename FTRACE to FUNCTION_TRACER more successfully.Paul Mundt
The ftrace tree has conveniently renamed this out from underneath us, as the ftrace people appear to have been unsuccessful in their endeavour to grep linux-next or wait for the merge window to close before making the rather dubious decision that renaming config options was a good idea. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2008-10-29Work around ld bug in older binutilsPaul Mackerras
Commit 549e8152de8039506f69c677a4546e5427aa6ae7 ("powerpc: Make the 64-bit kernel as a position-independent executable") added lines to vmlinux.lds.S to add the extra sections needed to implement a relocatable kernel. However, those lines seem to trigger a bug in older versions of GNU ld (such as 2.16.1) when building a non-relocatable kernel. Since ld 2.16.1 is still a popular choice for cross-toolchains, this adds an #ifdef to vmlinux.lds.S so the added lines are only included when building a relocatable kernel. Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-10-29sparc: qlogicpti fallout from sbus removalStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-29Merge commit 'userns/next'Stephen Rothwell
2008-10-29Merge commit 'cpu_alloc/cpu_alloc'Stephen Rothwell
Conflicts: kernel/lockdep.c kernel/module.c
2008-10-29Merge commit 'proc/proc'Stephen Rothwell
2008-10-29Merge commit 'watchdog/master'Stephen Rothwell
2008-10-29Merge commit 'sparseirq/auto-sparseirq-next'Stephen Rothwell
2008-10-29Merge commit 'creds/creds-v4'Stephen Rothwell
2008-10-29Merge commit 'voltage/for-linus'Stephen Rothwell
2008-10-29Merge commit 'drm/drm-next'Stephen Rothwell
2008-10-29Merge commit 'hdlc/hdlc-next'Stephen Rothwell
Conflicts: drivers/net/wan/syncppp.c
2008-10-29Merge commit 'mfd/for-next'Stephen Rothwell
2008-10-29Merge commit 'kmemcheck/auto-kmemcheck-next'Stephen Rothwell
Conflicts: MAINTAINERS arch/x86/mm/Makefile mm/slab.c mm/slub.c
2008-10-29Merge commit 'md/for-next'Stephen Rothwell
2008-10-29Merge commit 'slab/for-next'Stephen Rothwell
Conflicts: mm/Makefile
2008-10-29Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2008-10-29Merge commit 'pcmcia/master'Stephen Rothwell
2008-10-29Merge commit 'firmware/master'Stephen Rothwell
Conflicts: drivers/scsi/qlogicpti.c firmware/WHENCE
2008-10-29Merge commit 'block/for-next'Stephen Rothwell
2008-10-29Merge commit 'trivial/next'Stephen Rothwell
Conflicts: Documentation/edac.txt include/linux/securebits.h
2008-10-29Merge commit 'semaphore-removal/semaphore-removal'Stephen Rothwell
Conflicts: net/9p/trans_virtio.c
2008-10-29Merge commit 'input/next'Stephen Rothwell
2008-10-29Merge commit 'gfs2/master'Stephen Rothwell
2008-10-29Merge commit 'v9fs/for-next'Stephen Rothwell
2008-10-29Merge commit 'sound/for-next'Stephen Rothwell
2008-10-29Merge commit 'crypto/master'Stephen Rothwell
2008-10-29Merge commit 'mtd/master'Stephen Rothwell
2008-10-29Merge commit 'net/master'Stephen Rothwell
Conflicts: drivers/net/wireless/p54/p54common.c
2008-10-29Merge commit 'ocfs2/linux-next'Stephen Rothwell
2008-10-29Merge commit 'tests/master'Stephen Rothwell
Conflicts: lib/Kconfig.debug
2008-10-29Merge commit 'kvm/master'Stephen Rothwell
Conflicts: include/linux/kvm_host.h virt/kvm/kvm_main.c
2008-10-29Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-10-29Merge commit 'acpi/test'Stephen Rothwell
2008-10-29Merge commit 'infiniband/for-next'Stephen Rothwell
2008-10-29Merge commit 'xfs/master'Stephen Rothwell
2008-10-29Merge branch 'quilt/ide'Stephen Rothwell
2008-10-29v4l-dvb: fallout from DVB_DYNAMIC_MINORS additionStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-29Merge commit 'v4l-dvb/master'Stephen Rothwell
2008-10-29Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2008-10-29Merge branch 'quilt/i2c'Stephen Rothwell
2008-10-29Merge commit 'pci/linux-next'Stephen Rothwell
2008-10-29Merge commit 'timers/auto-timers-next'Stephen Rothwell
2008-10-29Merge commit 'stackprotector/auto-stackprotector-next'Stephen Rothwell
2008-10-29Merge commit 'sched/auto-sched-next'Stephen Rothwell