Skip to contentSkip to conversation

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

DISCUSSION [email protected] 3 participants 3 messages Dec 10, 2021 – Dec 17, 2021 Linux-next tree

lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

Hi all,

Today's linux-next merge of the nvdimm tree got a conflict in:

fs/ext4/super.c

between at least commits:

7edfd85b1ffd3 ("ext4: Completely separate options parsing and sb setup") bdd3c50d83bf7 ("dax: remove bdev_dax_supported")

from the ext4 tree and commits:

89b93a7b15f75 ("ext4: cleanup the dax handling in ext4_fill_super") 7b0800d00dae8 ("dax: remove dax_capable")

from the nvdimm tree.

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.

#1 lore raw
Quoted 3 lines · On Fri, Dec 10, 2021 at 05:47:40PM +0000, [email protected] 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

#2 lore raw

Hi all,

Quoted 10 lines · On Thu, 16 Dec 2021 09:28:33 +0100 Christoph Hellwig <[email protected]> wrote:
Quoted 3 lines · On Fri, Dec 10, 2021 at 05:47:40PM +0000, [email protected] 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.

Signature · 2 lines
Cheers,
Stephen Rothwell