From: Chris Mason <clm@fb.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next conflict resolution branch for btrfs
Date: Fri, 21 Aug 2015 11:23:40 -0400 [thread overview]
Message-ID: <20150821152340.GA28016@ret> (raw)
In-Reply-To: <20150821104524.2f759d74@canb.auug.org.au>
On Fri, Aug 21, 2015 at 10:45:24AM +1000, Stephen Rothwell wrote:
> Hi Chris,
>
> On Thu, 20 Aug 2015 13:39:18 -0400 Chris Mason <clm@fb.com> wrote:
> >
> > 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
>
> Thanks for that. It seems to have merged OK but maybe it conflicts
> with something later in linux-next. Unfortunately see my other email
> about a build problem. I will keep this example merge in mind for
> later.
Ok, sorry about that one. We probably want the ifdefs up in Tejun's
code, but I'll talk with him about it today and get it fixed up.
Thanks,
Chris
next prev parent reply other threads:[~2015-08-21 15:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-20 17:39 linux-next conflict resolution branch for btrfs Chris Mason
2015-08-21 0:45 ` Stephen Rothwell
2015-08-21 15:23 ` Chris Mason [this message]
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=20150821152340.GA28016@ret \
--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).