]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 387186f 464919a)
zygo: cherry-picked up to 464919a (extra args linus/master --remotes=btrfs-next/...
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Tue, 31 Mar 2015 14:28:36 +0000 (10:28 -0400)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Tue, 31 Mar 2015 14:28:36 +0000 (10:28 -0400)
Commits included:

++++ 9266ff8 Btrfs: fix ASSERT(list_empty(&cur_trans->dirty_bgs_list)
++++ aa4661f Btrfs: prepare block group cache before writing
---- 2e0adf0 fix qgroups
---- 777414a Btrfs: fix merge delalloc logic
---- 3075d58 Btrfs: account for the correct number of extents for delalloc reservations
---- 2fdbf36 Btrfs: just free dummy extent buffers
---- 464919a Btrfs: add sanity test for outstanding_extents accounting


Trivial merge
Linux kernels and configurations used by Zygo.