summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2008-06-16Merge commit 'input/next'Stephen Rothwell
2008-06-16Merge commit 'mmc/next'Stephen Rothwell
2008-06-16Merge branch 'quilt/rr'Stephen Rothwell
2008-06-16Merge commit 'cpufreq/next'Stephen Rothwell
Conflicts: drivers/cpufreq/cpufreq.c
2008-06-16Merge commit 'arm/devel'Stephen Rothwell
Conflicts: arch/arm/mach-at91/board-yl-9200.c arch/arm/mach-pxa/tosa.c
2008-06-16Merge commit 'sound/master'Stephen Rothwell
2008-06-16Merge commit 'crypto/master'Stephen Rothwell
2008-06-16Merge commit 'mtd/master'Stephen Rothwell
2008-06-16Merge commit 'galak/powerpc-next'Stephen Rothwell
Conflicts: Documentation/powerpc/booting-without-of.txt
2008-06-16Merge commit 'sparc/master'Stephen Rothwell
2008-06-16Merge commit 'net/master'Stephen Rothwell
Conflicts: Documentation/powerpc/booting-without-of.txt drivers/net/wireless/rt2x00/Kconfig drivers/net/wireless/rt2x00/rt2x00usb.c
2008-06-16Merge commit 'ext4/next'Stephen Rothwell
2008-06-16Merge commit 'powerpc/powerpc-next'Stephen Rothwell
2008-06-16Merge branch 'quilt/m68k'Stephen Rothwell
2008-06-16Merge commit 'selinux/for-akpm'Stephen Rothwell
2008-06-16Merge commit 'ia64/test'Stephen Rothwell
2008-06-16Merge commit 'scsi/master'Stephen Rothwell
2008-06-16Merge commit 'kvm/master'Stephen Rothwell
2008-06-16Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-06-16Merge commit 'nfsd/nfsd-next'Stephen Rothwell
Conflicts: net/sunrpc/svc.c
2008-06-16Merge commit 'acpi/test'Stephen Rothwell
Conflicts: drivers/acpi/processor_throttling.c drivers/acpi/sleep/main.c
2008-06-16Merge commit 'infiniband/for-next'Stephen Rothwell
2008-06-16Merge commit 'xfs/master'Stephen Rothwell
2008-06-16Merge commit 'libata/NEXT'Stephen Rothwell
2008-06-16Merge branch 'quilt/ide'Stephen Rothwell
2008-06-16Merge commit 'kbuild/master'Stephen Rothwell
2008-06-16Merge commit 'sh/master'Stephen Rothwell
2008-06-16Merge commit 's390/features'Stephen Rothwell
Conflicts: drivers/s390/block/dasd.c drivers/s390/block/dasd_eckd.c drivers/s390/block/dasd_fba.c drivers/s390/char/tape_core.c drivers/s390/cio/device_fsm.c drivers/s390/net/claw.c drivers/s390/net/ctcm_main.c drivers/s390/net/lcs.c
2008-06-16Merge commit 'v4l-dvb/stable'Stephen Rothwell
2008-06-16Merge commit 'avr32/avr32-arch'Stephen Rothwell
2008-06-16Merge branch 'quilt/i2c'Stephen Rothwell
Conflicts: drivers/i2c/i2c-core.c
2008-06-16Merge commit 'pci/linux-next'Stephen Rothwell
Conflicts: arch/x86/pci/irq.c include/linux/device.h
2008-06-16Merge commit 'x86/auto-x86-next'Stephen Rothwell
Conflicts: arch/x86/kernel/io_apic_32.c arch/x86/kernel/nmi_32.c arch/x86/kernel/process_32.c arch/x86/kernel/process_64.c
2008-06-16Merge commit 'timers/auto-timers-next'Stephen Rothwell
2008-06-16Merge commit 'stackprotector/auto-stackprotector-next'Stephen Rothwell
2008-06-16Merge commit 'sched/auto-sched-next'Stephen Rothwell
Conflicts: kernel/Makefile
2008-06-16Merge commit 'safe-poison-pointers/auto-safe-poison-pointers-next'Stephen Rothwell
2008-06-16Merge commit 'genirq/auto-genirq-next'Stephen Rothwell
2008-06-16Merge commit 'ftrace/auto-ftrace-next'Stephen Rothwell
2008-06-16Merge commit 'cpus4096/auto-cpus4096-next'Stephen Rothwell
2008-06-16Merge commit 'tip-core/auto-core-next'Stephen Rothwell
2008-06-16Merge branch 'quilt/usb'Stephen Rothwell
2008-06-16Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: drivers/scsi/hosts.c
2008-06-16Merge branch 'quilt/driver-core.current'Stephen Rothwell
2008-06-16Merge commit 'pci-current/for-linus'Stephen Rothwell
2008-06-16misc:down_nowait-drivers_usb_core_usbRusty Russell
down_trylock -> down_try for usb_trylock_device() I took the liberty of reversing the sense of usb_trylock_device(): it only has one user anyway. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-16misc:down_nowait-documentationRusty Russell
down_trylock -> down_try in documentation and comments. Fix up kernel-locking.tmpl and random bitching about down_trylock. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-16misc:down_nowaitRusty Russell
Deprecate down_trylock() down_trylock() returns 1 on failure, 0 on success. This differs from spin_trylock(), mutex_trylock() and common sense. Or as ocfs2 put it "kernel 1, world 0". Deprecate it and make down_try() the primary function. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-16misc:introduce-down_nowaitRusty Russell
Introduce down_try() I planned on removing the much-disliked down_trylock() (with its backwards return codes) in 2.6.27, but it's creating something of a logjam with other patches in -mm and linux-next. Andrew suggested introducing "down_try" as a wrapper now, to make the transition easier. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Christoph Hellwig <hch@infradead.org> Cc: Matthew Wilcox <matthew@wil.cx> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
2008-06-16misc:timer-typesafeRusty Russell
This patch lets timer callback functions have their natural type (ie. exactly match the data pointer type); it allows the old "unsigned long data" type as well. Downside: if you use the old "unsigned long" callback type, you won't get a warning if your data is not an unsigned long, due to the cast. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-14 19:27:44 +0000