summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2010-05-25Revert "tun: Update classid on packet injection"Stephen Rothwell
This reverts commit 8286274284e15b11b0f531b6ceeef21fbe00a8dd.
2010-05-25Merge remote branch 'spi/next-spi'Stephen Rothwell
2010-05-25Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
2010-05-25Merge remote branch 'alacrity/linux-next'Stephen Rothwell
2010-05-25Merge remote branch 'irda/for-next'Stephen Rothwell
Conflicts: drivers/net/irda/irda-usb.c
2010-05-25Merge branch 'quilt/aoe'Stephen Rothwell
2010-05-25Merge remote branch 'watchdog/master'Stephen Rothwell
2010-05-25Merge remote branch 'uwb/for-upstream'Stephen Rothwell
2010-05-25Merge remote branch 'voltage/for-next'Stephen Rothwell
2010-05-25Merge remote branch 'drm/drm-next'Stephen Rothwell
2010-05-25Merge remote branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/dma/Makefile drivers/dma/timb_dma.c
2010-05-25Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-05-25Merge remote branch 'backlight/for-mm'Stephen Rothwell
2010-05-25Merge remote branch 'leds/for-mm'Stephen Rothwell
2010-05-25Merge branch 'quilt/device-mapper'Stephen Rothwell
2010-05-25Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: drivers/net/virtio_net.c drivers/net/wireless/libertas_tf/if_usb.c drivers/staging/rtl8187se/r8180_core.c
2010-05-25Merge remote branch 'cpufreq/next'Stephen Rothwell
2010-05-25Merge remote branch 'mtd/master'Stephen Rothwell
2010-05-25Merge remote branch 'async_tx/next'Stephen Rothwell
2010-05-25Merge remote branch 'scsi/master'Stephen Rothwell
2010-05-25Merge remote branch 'ibft/master'Stephen Rothwell
2010-05-25Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2010-05-25Merge remote branch 'acpi/test'Stephen Rothwell
2010-05-25Merge remote branch 'infiniband/for-next'Stephen Rothwell
2010-05-25Merge remote branch 'v4l-dvb/master'Stephen Rothwell
2010-05-25Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2010-05-25Merge remote branch 'ext3/for_next'Stephen Rothwell
Conflicts: fs/super.c
2010-05-25Merge remote branch 'genesis/master'Stephen Rothwell
2010-05-25Merge remote branch 's390/features'Stephen Rothwell
2010-05-25Merge remote branch '52xx-and-virtex/next'Stephen Rothwell
Conflicts: drivers/serial/mpc52xx_uart.c
2010-05-25Merge remote branch 'mips/mips-for-linux-next'Stephen Rothwell
2010-05-25Merge remote branch 'm68knommu/for-next'Stephen Rothwell
2010-05-25Merge remote branch 'm68k/for-next'Stephen Rothwell
2010-05-25Merge remote branch 'msm/for-next'Stephen Rothwell
2010-05-25Merge remote branch 'arm/devel'Stephen Rothwell
2010-05-25Merge remote branch 'input-current/for-linus'Stephen Rothwell
2010-05-25Merge branch 'quilt/driver-core.current'Stephen Rothwell
2010-05-25Merge remote branch 'wireless-current/master'Stephen Rothwell
2010-05-25Merge remote branch 'net-current/master'Stephen Rothwell
2010-05-25dm-ioctl-return-uevent-flag-after-renamePeter Rajnoha
Allow data to be returned to userspace after a rename ioctl is processed. It carries important information for userspace code to react properly, now checking new DM_UEVENT_GENERATED_FLAG that has been added recently. Signed-off-by: Peter Rajnoha <prajnoha@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2010-05-25dm-ioctl-make-__dev_status-voidAlasdair G Kergon
__dev_status() cannot fail so make it void and simplify callers. Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2010-05-25dm-ioctl-remove-__dev_status-from-geometry-and-target-messagePeter Rajnoha
Remove useless __dev_status call while processing an ioctl that sets up device geometry and target message. The data is not returned to userspace so there is no point collecting it and in the case of target_message it is collected before processing the message so if it did return it might be stale. Signed-off-by: Peter Rajnoha <prajnoha@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2010-05-25dm-crypt-use-kstrdupJulia Lawall
Use kstrdup when the goal of an allocation is copy a string into the allocated region. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression from,to; expression flag,E1,E2; statement S; @@ - to = kmalloc(strlen(from) + 1,flag); + to = kstrdup(from, flag); ... when != \(from = E1 \| to = E1 \) if (to==NULL || ...) S ... when != \(from = E2 \| to = E2 \) - strcpy(to, from); // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2010-05-25dm-ioctl-use-nonseekable_openArnd Bergmann
The dm control device does not implement read/write, so it has no use for seeking. Using no_llseek prevents falling back to default_llseek, which requires the BKL. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2010-05-24Merge remote branch 'dwalker/msm-mmc_sdcc' into for-nextDaniel Walker
2010-05-24Merge branch 'devel-stable' into develRussell King
2010-05-24net: mac8390 - Sort out memory/MMIO accesses and castsGeert Uytterhoeven
commit 5c7fffd0e3b57cb63f50bbd710868f012d67654f ("drivers/net/mac8390.c: Remove useless memcpy casting") removed too many casts, introducing the following warnings: | drivers/net/mac8390.c:248: warning: passing argument 1 of '__builtin_memcpy' makes pointer from integer without a cast | drivers/net/mac8390.c:253: warning: passing argument 1 of 'word_memcpy_tocard' makes pointer from integer without a cast | drivers/net/mac8390.c:255: warning: passing argument 2 of 'word_memcpy_fromcard' makes pointer from integer without a cast Instead of just readding the casts, - move all casts inside word_memcpy_{to,from}card(), - replace an incorrect memcpy() by memcpy_toio(), - add memcmp_withio() as a wrapper around memcmp(), - replace an incorrect memcpy_toio() by memcpy_fromio(). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2010-05-24m68k: amiga - Parallel port platform device conversionGeert Uytterhoeven
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2010-05-24m68k: amiga - Serial port platform device conversionGeert Uytterhoeven
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2010-05-24m68k: amiga - Mouse platform device conversionGeert Uytterhoeven
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 15:38:28 +0000