summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/power.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-17 22:25:17 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-17 22:25:17 +0200
commiteea036475df8995e5b87cd6b8c8e682e071159cd (patch)
tree1164e7816565678cd2d2ed68b7580b20baefadde /drivers/acpi/power.c
parentMerge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma (diff)
parenttarget: Fix bug in handling of FILEIO + block_device resize ops (diff)
downloadlinux-eea036475df8995e5b87cd6b8c8e682e071159cd.tar.xz
linux-eea036475df8995e5b87cd6b8c8e682e071159cd.zip
Merge branch '3.4-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Pull two more target-core updates from Nicholas Bellinger: "The first patch addresses a SPC-2 reservations RELEASE bug in a special (iscsi specific) multi-ISID setup case that was allowing the same initiator to be able to incorrect release it's own reservation on a different SCSI path with enforce_pr_isid=1 operation. This bug was caught by Bernhard Kohl. The second patch is to address a bug with FILEIO backends where the incorrect number of blocks for READ_CAPACITY was being reported after an underlying device-mapper block_device size change. This patch uses now i_size_read() in fd_get_blocks() for FILEIO backends with an underlying block_device, instead of trying to determine this value at setup time during fd_create_virtdevice(). (hch CC'ed) Both are CC'ed to stable." * '3.4-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: target: Fix bug in handling of FILEIO + block_device resize ops target: Fix SPC-2 RELEASE bug for multi-session iSCSI client setups
Diffstat (limited to 'drivers/acpi/power.c')
0 files changed, 0 insertions, 0 deletions