From: Chris Mason <clm@fb.com>
To: "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next conflict resolution branch for btrfs
Date: Thu, 20 Aug 2015 13:39:18 -0400 [thread overview]
Message-ID: <20150820173918.GA10637@ret.thefacebook.com> (raw)
Hi Stephen,
There are a few conflicts for btrfs in linux-next this time. They are
small, but I pushed out the merge commit I'm using here:
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next-merge
-chris
next reply other threads:[~2015-08-20 17:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-20 17:39 Chris Mason [this message]
2015-08-21 0:45 ` linux-next conflict resolution branch for btrfs Stephen Rothwell
2015-08-21 15:23 ` Chris Mason
2015-08-21 18:06 ` Chris Mason
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=20150820173918.GA10637@ret.thefacebook.com \
--to=clm@fb.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).