Re: linux-next: manual merge of the nvdimm tree with the ext4 tree

From: Stephen Rothwell
Date: Fri Dec 17 2021 - 03:24:19 EST


Hi all,

On Thu, 16 Dec 2021 09:28:33 +0100 Christoph Hellwig <hch@xxxxxx> wrote:
>
> On Fri, Dec 10, 2021 at 05:47:40PM +0000, broonie@xxxxxxxxxx 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: pgpFEcVXTRWI0.pgp
Description: OpenPGP digital signature