Messages in this thread | | | Date | Thu, 19 May 2016 00:49:55 +0200 | From | David Sterba <> | Subject | Re: incoming merge conflict to linux-next |
| |
On Wed, May 18, 2016 at 05:10:43PM -0400, Chris Mason wrote: > 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.
JFYI, the enospc branch was not the way to Linus because there were some unexpected warnings, the v2 patch update hasn't fixed them. So I won't redo the for-chris branch yet, but will keep the enospc patchset in my for-next for other testing.
| |