public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: David Sterba <dsterba@suse•cz>
To: dsterba@suse•cz, linux-btrfs@vger•kernel.org,
	sfr@canb•auug.org.au, linux-next@vger•kernel.org
Subject: Re: Temporary changes regarding btrfs branch in linux-next and development patches
Date: Fri, 14 Jul 2017 16:31:36 +0200	[thread overview]
Message-ID: <20170714143135.GI2866@twin.jikos.cz> (raw)
In-Reply-To: <20170703142108.GZ2866@suse.cz>

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.

      reply	other threads:[~2017-07-14 14:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-03 14:21 Temporary changes regarding btrfs branch in linux-next and development patches David Sterba
2017-07-14 14:31 ` David Sterba [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=20170714143135.GI2866@twin.jikos.cz \
    --to=dsterba@suse$(echo .)cz \
    --cc=linux-btrfs@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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