diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-14 02:40:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-14 02:40:22 +0100 |
| commit | e96f8f18c81b2f5b290206fc0da74b551e82646d (patch) | |
| tree | 325bc21cf8afc3a9673cc0e75f50bd48b13774d0 /drivers/dma/omap-dma.c | |
| parent | Merge tag 'ceph-for-4.10-rc4' of git://github.com/ceph/ceph-client (diff) | |
| parent | Merge branch 'tracepoint-updates-4.10' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| download | linux-e96f8f18c81b2f5b290206fc0da74b551e82646d.tar.xz linux-e96f8f18c81b2f5b290206fc0da74b551e82646d.zip | |
Merge branch 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"These are all over the place.
The tracepoint part of the pull fixes a crash and adds a little more
information to two tracepoints, while the rest are good old fashioned
fixes"
* 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: make tracepoint format strings more compact
Btrfs: add truncated_len for ordered extent tracepoints
Btrfs: add 'inode' for extent map tracepoint
btrfs: fix crash when tracepoint arguments are freed by wq callbacks
Btrfs: adjust outstanding_extents counter properly when dio write is split
Btrfs: fix lockdep warning about log_mutex
Btrfs: use down_read_nested to make lockdep silent
btrfs: fix locking when we put back a delayed ref that's too new
btrfs: fix error handling when run_delayed_extent_op fails
btrfs: return the actual error value from from btrfs_uuid_tree_iterate
Diffstat (limited to 'drivers/dma/omap-dma.c')
0 files changed, 0 insertions, 0 deletions