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:19:44 +0000 [thread overview]
Message-ID: <CY4PR04MB375191BC8B3ED61678D16CB2E7790@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 must have done something wrong. Patches for zonefs for 5.9 depend on patches
in Jens tree. So I merged Jens for-next tree into zonefs for-5.9 branch as a
base for the new patches. zonefs for-next branch should contain the same, but I
may have screwed up somewhere... Let me check.
--
Damien Le Moal
Western Digital Research
next prev parent reply other threads:[~2020-07-22 14:20 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 [this message]
2020-07-22 14:39 ` Damien Le Moal
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=CY4PR04MB375191BC8B3ED61678D16CB2E7790@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.