Hi Stephen, Dave Sterba's tree in linux-next has a few btrfs patches that we're not sending yet into Linus. We've got an update for Josef's enospc work that'll get sent in next week.
So he prepped a pull for me that merged up a number of his branches but didn't include Josef's new code. It has all been in -next for some time, and then I put some fixes from Filipe on top. Long story short, you'll get a merge conflict from my next branch: https://git.kernel.org/cgit/linux/kernel/git/mason/linux-btrfs.git next I've got the sample resolution in next-merge: https://git.kernel.org/cgit/linux/kernel/git/mason/linux-btrfs.git next-merge Please let us know if you have any problems. -chris
