* incoming merge conflict to linux-next
@ 2016-05-18 21:10 Chris Mason
2016-05-18 22:49 ` David Sterba
2016-05-19 0:19 ` Stephen Rothwell
0 siblings, 2 replies; 3+ messages in thread
From: Chris Mason @ 2016-05-18 21:10 UTC (permalink / raw)
To: Stephen Rothwell, LKML, btrfs; +Cc: David Sterba, Filipe Manana
Hi Stephen,
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.
-chris
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: incoming merge conflict to linux-next
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
1 sibling, 0 replies; 3+ messages in thread
From: David Sterba @ 2016-05-18 22:49 UTC (permalink / raw)
To: Chris Mason, Stephen Rothwell, LKML, btrfs, David Sterba,
Filipe Manana
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: incoming merge conflict to linux-next
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
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2016-05-19 0:19 UTC (permalink / raw)
To: Chris Mason; +Cc: LKML, btrfs, David Sterba, Filipe Manana
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-19 0:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).