summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-01 07:44:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-01 07:44:32 -0700
commit036f351e2566eaa5826581c8512dd55f6585ad01 (patch)
treea50de0e08a9379c0ed7cafc75acf55cec0bbdc47 /fs/btrfs
parent4a152c3913fb46fc2e29081d0251862106c3d55f (diff)
parent8291fd04d86b97869bd34e796bcac3141b9d5432 (diff)
downloadlinux-036f351e2566eaa5826581c8512dd55f6585ad01.tar.gz
linux-036f351e2566eaa5826581c8512dd55f6585ad01.tar.bz2
linux-036f351e2566eaa5826581c8512dd55f6585ad01.zip
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Will Deacon: "Not too much here, but we've addressed a couple of nasty issues in the dma-mapping code as well as adding the halfword and byte variants of load_acquire/store_release following on from the CSD locking bug that you fixed in the core. - fix perf devicetree warnings at probe time - fix memory leak in __dma_free() - ensure DMA buffers are always zeroed - show IRQ trigger in /proc/interrupts (for parity with ARM) - implement byte and halfword access for smp_{load_acquire,store_release}" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: perf: Fix the pmu node name in warning message arm64: perf: don't warn about missing interrupt-affinity property for PPIs arm64: add missing PAGE_ALIGN() to __dma_free() arm64: dma-mapping: always clear allocated buffers ARM64: Enable CONFIG_GENERIC_IRQ_SHOW_LEVEL arm64: add missing data types in smp_load_acquire/smp_store_release
Diffstat (limited to 'fs/btrfs')
0 files changed, 0 insertions, 0 deletions