From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>, Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Chao Yu <chao@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the f2fs tree
Date: Tue, 12 Mar 2024 15:02:28 +1100 [thread overview]
Message-ID: <20240312150228.31190b3c@canb.auug.org.au> (raw)
In-Reply-To: <20240229104140.2927da29@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1564 bytes --]
Hi all,
On Thu, 29 Feb 2024 10:41:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
> fs/f2fs/super.c
>
> between commit:
>
> 5fa6a97d2784 ("f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup")
>
> from the f2fs tree and commit:
>
> 512383ae4910 ("f2fs: port block device access to files")
>
> 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/f2fs/super.c
> index 09ffdd554f9c,09e82624eff5..000000000000
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@@ -4206,9 -4265,9 +4206,9 @@@ static int f2fs_scan_devices(struct f2f
> } else {
> FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
> FDEV(i).end_blk = FDEV(i).start_blk +
> - (FDEV(i).total_segments <<
> - sbi->log_blocks_per_seg) - 1;
> + SEGS_TO_BLKS(sbi,
> + FDEV(i).total_segments) - 1;
> - FDEV(i).bdev_handle = bdev_open_by_path(
> + FDEV(i).bdev_file = bdev_file_open_by_path(
> FDEV(i).path, mode, sbi->sb, NULL);
> }
> }
This is now a conflict between the f2fs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-03-12 4:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-28 23:41 linux-next: manual merge of the vfs-brauner tree with the f2fs tree Stephen Rothwell
2024-02-29 17:13 ` Jaegeuk Kim
2024-03-05 0:35 ` Stephen Rothwell
2024-03-05 0:40 ` Jaegeuk Kim
2024-03-12 4:02 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-15 1:33 Stephen Rothwell
2023-08-15 1:30 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=20240312150228.31190b3c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=brauner@kernel.org \
--cc=chao@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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).