Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1403366

Re: incoming merge conflict to linux-next

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

incoming merge conflict to linux-next Chris Mason <clm@fb.com> - 2016-05-18 23:20 +0200
  Re: incoming merge conflict to linux-next David Sterba <dsterba@suse.cz> - 2016-05-19 01:00 +0200
  Re: incoming merge conflict to linux-next Stephen Rothwell <sfr@canb.auug.org.au> - 2016-05-19 02:20 +0200

csiph-web