From: Linus Torvalds Date: Sat, 14 Jan 2017 01:40:22 +0000 (-0800) Subject: Merge branch 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e96f8f18c81b2f5b290206fc0da74b551e82646d;p=linux-beck.git 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 --- e96f8f18c81b2f5b290206fc0da74b551e82646d