All of lore.kernel.org
 help / color / mirror / Atom feed
From: Damien Le Moal <Damien.LeMoal@wdc.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: interesting merge in the zonefs tree
Date: Wed, 22 Jul 2020 14:39:24 +0000	[thread overview]
Message-ID: <CY4PR04MB37519AA66C3B84BDF00C658CE7790@CY4PR04MB3751.namprd04.prod.outlook.com> (raw)
In-Reply-To: 20200722235802.1f01457e@canb.auug.org.au

On 2020/07/22 22:58, Stephen Rothwell wrote:
> Hi all,
> 
> It looks an old version of the block tree has been merged into the
> zonefs tree.  Is that deliberate?  Other trees should not be merged unless
> they are guaranteed not to be rebased (which is what has happened here).
> 

I rebuild zonefs for-5.9 branch: 5.8-rc6 base + Jens block tree for-5.9/drivers
branch merged on top (not rebased). zonefs for-next branch is now identical to
that. Please let me know if there is still a problem.

Thanks !

-- 
Damien Le Moal
Western Digital Research

      parent reply	other threads:[~2020-07-22 14:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-22 13:58 linux-next: interesting merge in the zonefs tree Stephen Rothwell
2020-07-22 14:19 ` Damien Le Moal
2020-07-22 14:39 ` Damien Le Moal [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=CY4PR04MB37519AA66C3B84BDF00C658CE7790@CY4PR04MB3751.namprd04.prod.outlook.com \
    --to=damien.lemoal@wdc.com \
    --cc=axboe@kernel.dk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.