summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-10-28Add linux-next specific files for 20081028next-20081028Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-28cpu_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-28coda: 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-28nfsctl: 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-28ftrace: 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-28Work 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-28sparc: qlogicpti fallout from sbus removalStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-28Merge commit 'cpu_alloc/cpu_alloc'Stephen Rothwell
Conflicts: kernel/lockdep.c kernel/module.c
2008-10-28Merge commit 'proc/proc'Stephen Rothwell
2008-10-28Merge commit 'watchdog/master'Stephen Rothwell
2008-10-28Merge commit 'creds/creds-v4'Stephen Rothwell
2008-10-28Merge commit 'voltage/for-linus'Stephen Rothwell
2008-10-28Merge commit 'drm/drm-next'Stephen Rothwell
2008-10-28Merge commit 'hdlc/hdlc-next'Stephen Rothwell
2008-10-28Merge commit 'mfd/for-next'Stephen Rothwell
2008-10-28Merge commit 'kmemcheck/auto-kmemcheck-next'Stephen Rothwell
Conflicts: MAINTAINERS arch/x86/mm/Makefile mm/slab.c mm/slub.c
2008-10-28Merge commit 'md/for-next'Stephen Rothwell
2008-10-28Merge commit 'slab/for-next'Stephen Rothwell
Conflicts: mm/Makefile
2008-10-28Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2008-10-28Merge commit 'pcmcia/master'Stephen Rothwell
2008-10-28Merge commit 'firmware/master'Stephen Rothwell
Conflicts: drivers/scsi/qlogicpti.c firmware/WHENCE
2008-10-28Merge commit 'block/for-next'Stephen Rothwell
2008-10-28Merge commit 'trivial/next'Stephen Rothwell
Conflicts: Documentation/edac.txt include/linux/securebits.h
2008-10-28Merge commit 'semaphore-removal/semaphore-removal'Stephen Rothwell
Conflicts: net/9p/trans_virtio.c
2008-10-28Merge commit 'gfs2/master'Stephen Rothwell
2008-10-28x86: cpumask change falloutStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-28Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/s390/Kconfig arch/x86/Kconfig arch/x86/include/asm/ipi.h kernel/params.c kernel/sched.c kernel/stop_machine.c
2008-10-28Merge commit 'v9fs/for-next'Stephen Rothwell
2008-10-28Merge commit 'sound/for-next'Stephen Rothwell
2008-10-28Merge commit 'crypto/master'Stephen Rothwell
2008-10-28Merge commit 'mtd/master'Stephen Rothwell
2008-10-28Merge commit 'ocfs2/linux-next'Stephen Rothwell
2008-10-28Merge commit 'tests/master'Stephen Rothwell
Conflicts: lib/Kconfig.debug
2008-10-28Merge commit 'kvm/master'Stephen Rothwell
2008-10-28Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-10-28Merge commit 'acpi/test'Stephen Rothwell
2008-10-28Merge commit 'xfs/master'Stephen Rothwell
2008-10-28Merge branch 'quilt/ide'Stephen Rothwell
2008-10-28Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2008-10-28Merge branch 'quilt/i2c'Stephen Rothwell
2008-10-28Merge commit 'pci/linux-next'Stephen Rothwell
2008-10-28Merge commit 'stackprotector/auto-stackprotector-next'Stephen Rothwell
Conflicts: arch/x86/include/asm/pda.h
2008-10-28Merge commit 'sched/auto-sched-next'Stephen Rothwell
2008-10-28Merge commit 'safe-poison-pointers/auto-safe-poison-pointers-next'Stephen Rothwell
2008-10-28Merge commit 'ftrace/auto-ftrace-next'Stephen Rothwell
2008-10-28Merge commit 'cpus4096/auto-cpus4096-next'Stephen Rothwell
2008-10-28Merge commit 'tip-core/auto-core-next'Stephen Rothwell
Conflicts: arch/um/include/asm/system.h
2008-10-28Revert "USB: remove warn() macro from usb.h"Stephen Rothwell
This reverts commit 56142c3f24c0986b0eecd2f205e2f8bae4f75a2d.
2008-10-28Revert "USB: remove info() macro from usb.h"Stephen Rothwell
This reverts commit 4861b57b3f571b6becf6832264cc9403ba582528.
2008-10-28Merge branch 'quilt/usb'Stephen Rothwell
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-23 19:51:41 +0000