From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoph Hellwig <hch@lst.de>
Cc: broonie@kernel.org, Dan Williams <dan.j.williams@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lukas Czerner <lczerner@redhat.com>,
Theodore Ts'o <tytso@mit.edu>
Subject: Re: linux-next: manual merge of the nvdimm tree with the ext4 tree
Date: Fri, 17 Dec 2021 19:24:10 +1100 [thread overview]
Message-ID: <20211217192410.3fedc457@canb.auug.org.au> (raw)
In-Reply-To: <20211216082833.GA24677@lst.de>
[-- Attachment #1: Type: text/plain, Size: 643 bytes --]
Hi all,
On Thu, 16 Dec 2021 09:28:33 +0100 Christoph Hellwig <hch@lst.de> wrote:
>
> On Fri, Dec 10, 2021 at 05:47:40PM +0000, broonie@kernel.org wrote:
> > I'm not comfortable with resolving this in something as critical as ext4
> > at this point on a Friday evening with the code motion that's going on
> > so I've dropped the nvdimm tree for today, I'll look again on Monday.
>
> Given that it is Thursday now I've done the (pretty simple) merge
> myself, it can be found here:
>
> http://git.infradead.org/users/hch/misc.git/shortlog/refs/heads/ext4-dax-merge
I have used that today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-12-17 8:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-10 17:47 linux-next: manual merge of the nvdimm tree with the ext4 tree broonie
2021-12-16 8:28 ` Christoph Hellwig
2021-12-17 8:24 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-11-03 6:59 Stephen Rothwell
2017-11-03 6:17 Stephen Rothwell
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=20211217192410.3fedc457@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@kernel.org \
--cc=dan.j.williams@intel.com \
--cc=hch@lst.de \
--cc=lczerner@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tytso@mit.edu \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox