Re: linux-next: manual merge of the fs-next tree with the mm-nonmm-unstable tree

Andrew Morton
2026-04-06T16:25:54Z

On Mon, 6 Apr 2026 14:13:49 +0100 Mark Brown <broonie@kernel.org> wrote:

> Today's linux-next merge of the fs-next tree got a conflict in:
>
> fs/ocfs2/dir.c
>
> between commits:
>
> bdff37e327275 ("ocfs2: validate dx_root extent list fields during block read")
> 28c33de101792 ("ocfs2: remove empty extent list check in ocfs2_dx_dir_lookup_rec()")
>
> from the mm-nonmm-unstable tree and commit:
>
> 0b2600f81cefc ("treewide: change inode->i_ino from unsigned long to u64")
>
> from the fs-next tree.

Thanks. That's a nasty-looking conflict due to the applying order. The
0b2600f81cefc change is actually small, below.

Hopefully Linus can figure it out ;)

--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -794,7 +794,7 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode,
if (le16_to_cpu(el->l_count) !=
ocfs2_extent_recs_per_dx_root(inode->i_sb)) {
ret = ocfs2_error(inode->i_sb,
- "Inode %lu has invalid extent list length %u\n",
+ "Inode %llu has invalid extent list length %u\n",
inode->i_ino, le16_to_cpu(el->l_count));
goto out;
}
@@ -812,7 +812,7 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode,

if (el->l_tree_depth) {
ret = ocfs2_error(inode->i_sb,
- "Inode %lu has non zero tree depth in btree tree block %llu\n",
+ "Inode %llu has non zero tree depth in btree tree block %llu\n",
inode->i_ino,
(unsigned long long)eb_bh->b_blocknr);
goto out;
@@ -821,7 +821,7 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode,

if (le16_to_cpu(el->l_next_free_rec) == 0) {
ret = ocfs2_error(inode->i_sb,
- "Inode %lu has empty extent list at depth %u\n",
+ "Inode %llu has empty extent list at depth %u\n",
inode->i_ino,
le16_to_cpu(el->l_tree_depth));
goto out;
@@ -839,7 +839,7 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode,

if (!found) {
ret = ocfs2_error(inode->i_sb,
- "Inode %lu has bad extent record (%u, %u, 0) in btree\n",
+ "Inode %llu has bad extent record (%u, %u, 0) in btree\n",
inode->i_ino,
le32_to_cpu(rec->e_cpos),
ocfs2_rec_clusters(el, rec));