summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2010-05-27Merge remote branch 'sfi/sfi-test'Stephen Rothwell
2010-05-27Merge remote branch 'devicetree/next-devicetree'Stephen Rothwell
2010-05-27Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
2010-05-27Merge remote branch 'alacrity/linux-next'Stephen Rothwell
2010-05-27Merge remote branch 'irda/for-next'Stephen Rothwell
Conflicts: drivers/net/irda/irda-usb.c
2010-05-27Merge branch 'quilt/aoe'Stephen Rothwell
2010-05-27Merge remote branch 'uwb/for-upstream'Stephen Rothwell
2010-05-27Merge remote branch 'viafb/viafb-next'Stephen Rothwell
2010-05-27Merge remote branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/dma/Makefile drivers/dma/timb_dma.c
2010-05-27Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-05-27Merge remote branch 'backlight/for-mm'Stephen Rothwell
2010-05-27Merge commit 'refs/next/20100526/leds'Stephen Rothwell
2010-05-27Merge branch 'quilt/device-mapper'Stephen Rothwell
2010-05-27Merge branch 'quilt/rr'Stephen Rothwell
2010-05-27Merge remote branch 'cpufreq/next'Stephen Rothwell
2010-05-27Merge remote branch 'crypto/master'Stephen Rothwell
2010-05-27Merge remote branch 'mtd/master'Stephen Rothwell
2010-05-27Merge remote branch 'async_tx/next'Stephen Rothwell
2010-05-27Merge remote branch 'scsi/master'Stephen Rothwell
2010-05-27Merge remote branch 'ibft/master'Stephen Rothwell
2010-05-27Merge remote branch 'ieee1394/for-next'Stephen Rothwell
Conflicts: Documentation/feature-removal-schedule.txt
2010-05-27Merge remote branch 'acpi/test'Stephen Rothwell
2010-05-27Merge remote branch 'infiniband/for-next'Stephen Rothwell
2010-05-27Merge remote branch 'libata/NEXT'Stephen Rothwell
2010-05-27Merge remote branch 'v4l-dvb/master'Stephen Rothwell
2010-05-27Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2010-05-27Merge remote branch 'hid/for-next'Stephen Rothwell
2010-05-27Merge remote branch 'ext3/for_next'Stephen Rothwell
2010-05-27Merge remote branch 'genesis/master'Stephen Rothwell
Conflicts: include/linux/serial_sci.h
2010-05-27Merge remote branch 'sh/master'Stephen Rothwell
2010-05-27Merge remote branch 's390/features'Stephen Rothwell
2010-05-27Merge remote branch '52xx-and-virtex/next'Stephen Rothwell
Conflicts: drivers/serial/mpc52xx_uart.c
2010-05-27Merge remote branch 'mips/mips-for-linux-next'Stephen Rothwell
2010-05-27Merge remote branch 'm68k/for-next'Stephen Rothwell
2010-05-27Merge remote branch 'msm/for-next'Stephen Rothwell
2010-05-27Merge remote branch 'input-current/for-linus'Stephen Rothwell
2010-05-27Merge remote branch 'wireless-current/master'Stephen Rothwell
2010-05-27Merge remote branch 'net-current/master'Stephen Rothwell
2010-05-27Merge remote branch 'm68k-current/for-linus'Stephen Rothwell
2010-05-27Merge remote branch 'fixes/fixes'Stephen Rothwell
2010-05-27dm-snapshot-persistent-use-define-for-disk-header-chunk-sizeTomohiro Kusumi
This patch fixes hard-coded value for the size of a chunk that includes disk header for persistent snapshot. It should be changed to existing macro NUM_SNAPSHOT_HDR_CHUNKS instead of using hard-coded value 1. Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@jp.fujitsu.com> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2010-05-27dm-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-27dm-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-27dm-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-27dm-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-27dm-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-26Merge branches 'misc' and 'qib' into for-nextRoland Dreier
2010-05-26IB/qib: Use a single txselect module parameter for serdes tuningRalph Campbell
As part of the earlier patches submitted and reviewed, it was agreed to change the way serdes tuning parameters were specified to the driver. The updated patch got dropped by the linux-rdma email list so the earlier version of qib_iba7322.c ended up being used. This patch updates qib_iab7322.c to the simpler, single parameter method of setting the serdes parameters. Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
2010-05-26IB/qib: Don't rely on (undefined) order of function parameter evaluationRoland Dreier
Some of the qib sysfs code passes a buffer pointer into simple_read_from_buffer() but relies on a function call in another parameter of the same call to initialize that pointer. Since the order of evaluation of function parameters is undefined, this will break if gcc chooses the wrong order. Fix this by splitting the code into two separate function calls. This was noticed because of warnings like the following on ppc: drivers/infiniband/hw/qib/qib_fs.c: In function 'portcntrs_2_read': drivers/infiniband/hw/qib/qib_fs.c:203: warning: 'counters' is used uninitialized in this function Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Roland Dreier <rolandd@cisco.com>
2010-05-26Merge branch 'drm-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: agp: amd64, fix pci reference leaks drm/edid: Allow non-fatal checksum errors in CEA blocks drm/radeon/kms: suppress a build warning (unused variable) drm: Fixes linux-next & linux-2.6 checkstack warnings: nouveau: fix acpi_lid_open undefined drm/radeon/kms: release AGP bridge at suspend