summaryrefslogtreecommitdiff
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-02 16:37:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-02 16:37:56 -0700
commit4e8a4830dc9f0883d5302b871adb9e6179338d24 (patch)
treeff388b85950caf6d3d8770211ea2a4c9977efa68 /block/blk-merge.c
parentb0838b150160f90be0903a38a2ce11d764962752 (diff)
parentdbcf988653e91681305189fc8b8c54aa4ae9033c (diff)
Merge tag 'irqchip-fixes-4.0-2' of git://git.infradead.org/users/jcooper/linux
Pull irqchip fixes from Jason Cooper: "This is the second round of fixes for irqchip. It contains some fixes found while the arm64 guys were writing the kvm gicv3 its emulation. GICv3 ITS: - Small batch of fixes discovered while writing the kvm ITS emulation" * tag 'irqchip-fixes-4.0-2' of git://git.infradead.org/users/jcooper/linux: irqchip: gicv3-its: Use non-cacheable accesses when no shareability irqchip: gicv3-its: Fix PROP/PEND and BASE/CBASE confusion irqchip: gicv3-its: Fix device ID encoding irqchip: gicv3-its: Fix encoding of collection's target redistributor
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions