From: David Sterba <dsterba@suse.cz>
To: Chris Mason <clm@fb.com>, Stephen Rothwell <sfr@canb.auug.org.au>,
LKML <linux-kernel@vger.kernel.org>,
btrfs <linux-btrfs@vger.kernel.org>,
David Sterba <dsterba@suse.com>,
Filipe Manana <fdmanana@suse.com>
Subject: Re: incoming merge conflict to linux-next
Date: Thu, 19 May 2016 00:49:55 +0200 [thread overview]
Message-ID: <20160518224955.GD511@twin.jikos.cz> (raw)
In-Reply-To: <20160518211043.qqzesbrmbbr7xba2@floor.thefacebook.com>
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.
next prev parent reply other threads:[~2016-05-18 22:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-18 21:10 incoming merge conflict to linux-next Chris Mason
2016-05-18 22:49 ` David Sterba [this message]
2016-05-19 0:19 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160518224955.GD511@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=fdmanana@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).