Re: incoming merge conflict to linux-next

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: incoming merge conflict to linux-next
Date	Thu, 19 May 2016 02:20:01 +0200
Message-ID	<rAjQZ-Li-1@gated-at.bofh.it> (permalink)
References	<rAh2N-7md-11@gated-at.bofh.it>
X-Original-To	Chris Mason <clm@fb.com>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1463617164; bh=vRfZfL3ozEbU8HsQ6lWOba8P9vY5eQA5oLldOcaB2D4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=TK7D9iWvtZKDg58Vm6+x2NMFUu1BWftSqFE0d3K/rCWcgte/jrNnHvBSVBzgoSraa nWARq/e4rTWkoMnwJmMaw9EXxP1vrA48wv/GOH7OU8IN83mjQKPpYH9LgbQVAvjbql nu1Oj3in1l+joM7s6lbMi8rS0mrpV4hPTW1Hu68o=
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	27
Organization	linux.* mail to news gateway
X-Original-Cc	LKML <linux-kernel@vger.kernel.org>, btrfs <linux-btrfs@vger.kernel.org>, David Sterba <dsterba@suse.com>, Filipe Manana <fdmanana@suse.com>
X-Original-Date	Thu, 19 May 2016 10:19:21 +1000
X-Original-Message-ID	<20160519101921.3a45e559@canb.auug.org.au>
X-Original-References	<20160518211043.qqzesbrmbbr7xba2@floor.thefacebook.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1403366

Show key headers only | 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