Subject: Re: Temporary changes regarding btrfs branch in linux-next and development patches

From: David Sterba <[email-masked]>
Date: Fri, 14 Jul 2017 16:31:36 +0200

On Mon, Jul 03, 2017 at 04:21:08PM +0200, David Sterba wrote:
> in order to allow merging new btrfs patches and also keep linux-next merging
> sane [1], I'm going to freeze any changes to my k.org [2] branch for-next until
> 4.13-rc1 is released, expecting that the conflicting branches get merged as
> well.

The btrfs for-next is going return to it's normal workflow, ie. it'll
get populated by development patches that have been now in the
for-next-test branch. A quick merge test with current linus/master or
linux-next/master shows no problems.

The preferred patch base is still for-4.13-part1, as there's not yet a
public branch for the next pull request.