From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Chris Mason <clm@fb.com>
Cc: 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 10:19:21 +1000 [thread overview]
Message-ID: <20160519101921.3a45e559@canb.auug.org.au> (raw)
In-Reply-To: <20160518211043.qqzesbrmbbr7xba2@floor.thefacebook.com>
Hi Chris,
On Wed, 18 May 2016 17:10:43 -0400 Chris Mason <clm@fb.com> 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.
>
> Long story short, you'll get a merge conflict from my next branch:
>
> https://git.kernel.org/cgit/linux/kernel/git/mason/linux-btrfs.git next
>
> I've got the sample resolution in next-merge:
>
> https://git.kernel.org/cgit/linux/kernel/git/mason/linux-btrfs.git next-merge
>
> Please let us know if you have any problems.
A bit of a mess, but I sorted it out, thanks for the test merge.
--
Cheers,
Stephen Rothwell
prev parent reply other threads:[~2016-05-19 0:19 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
2016-05-19 0:19 ` Stephen Rothwell [this message]
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=20160519101921.3a45e559@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=fdmanana@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).