From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jan Kara <jack@suse.cz>
Cc: Christian Brauner <brauner@kernel.org>,
Jeff Layton <jlayton@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the ext3 tree
Date: Tue, 31 Oct 2023 11:26:25 +1100 [thread overview]
Message-ID: <20231031112625.20c86e6f@canb.auug.org.au> (raw)
In-Reply-To: <20231027104356.3fda2bc9@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2677 bytes --]
Hi all,
On Fri, 27 Oct 2023 10:43:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
> fs/ext2/dir.c
>
> between commits:
>
> 1de0736c3af9 ("ext2: Convert ext2_add_link() to use a folio")
> 7e56bbf15d95 ("ext2: Convert ext2_delete_entry() to use folios")
> 82dd620653b3 ("ext2: Convert ext2_prepare_chunk and ext2_commit_chunk to folios")
>
> from the ext3 tree and commit:
>
> 5cdc59fce617 ("ext2: convert to new timestamp accessors")
>
> from the vfs-brauner tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc fs/ext2/dir.c
> index 6807df637112,c7900868171b..000000000000
> --- a/fs/ext2/dir.c
> +++ b/fs/ext2/dir.c
> @@@ -463,9 -466,9 +463,9 @@@ int ext2_set_link(struct inode *dir, st
> }
> de->inode = cpu_to_le32(inode->i_ino);
> ext2_set_de_type(de, inode);
> - ext2_commit_chunk(page, pos, len);
> + ext2_commit_chunk(folio, pos, len);
> if (update_times)
> - dir->i_mtime = inode_set_ctime_current(dir);
> + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
> EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
> mark_inode_dirty(dir);
> return ext2_handle_dirsync(dir);
> @@@ -551,8 -554,8 +551,8 @@@ got_it
> memcpy(de->name, name, namelen);
> de->inode = cpu_to_le32(inode->i_ino);
> ext2_set_de_type (de, inode);
> - ext2_commit_chunk(page, pos, rec_len);
> + ext2_commit_chunk(folio, pos, rec_len);
> - dir->i_mtime = inode_set_ctime_current(dir);
> + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
> EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
> mark_inode_dirty(dir);
> err = ext2_handle_dirsync(dir);
> @@@ -605,8 -605,8 +605,8 @@@ int ext2_delete_entry(struct ext2_dir_e
> if (pde)
> pde->rec_len = ext2_rec_len_to_disk(to - from);
> dir->inode = 0;
> - ext2_commit_chunk(page, pos, to - from);
> + ext2_commit_chunk(folio, pos, to - from);
> - inode->i_mtime = inode_set_ctime_current(inode);
> + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
> EXT2_I(inode)->i_flags &= ~EXT2_BTREE_FL;
> mark_inode_dirty(inode);
> return ext2_handle_dirsync(inode);
This is now a conflict between the ext3 tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2023-10-31 0:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-26 23:43 linux-next: manual merge of the vfs-brauner tree with the ext3 tree Stephen Rothwell
2023-10-31 0:26 ` Stephen Rothwell [this message]
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=20231031112625.20c86e6f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=brauner@kernel.org \
--cc=jack@suse.cz \
--cc=jlayton@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=willy@infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).