Thread (3 messages) 3 messages, 3 authors, 2016-05-19

Re: incoming merge conflict to linux-next

From: David Sterba <hidden>
Date: 2016-05-18 22:50:25
Also in: lkml

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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help