From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jaegeuk Kim <jaegeuk@kernel•org>
Cc: Christian Brauner <brauner@kernel•org>, 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, 5 Mar 2024 11:35:02 +1100 [thread overview]
Message-ID: <20240305113502.50980f88@canb.auug.org.au> (raw)
In-Reply-To: <ZeC7OEA4Onoi-mED@google.com>
[-- Attachment #1: Type: text/plain, Size: 1883 bytes --]
Hi Jaegeuk,
On Thu, 29 Feb 2024 09:13:28 -0800 Jaegeuk Kim <jaegeuk@kernel•org> wrote:
>
> On 02/29, Stephen Rothwell 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")
>
> fyi; I dropped the above commit in -dev.
And it seems to have come back as commit
45809cd3bdac ("f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup")
(which is fine, but the conflict has returned).
> > 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.
> >
> > --
> > Cheers,
> > Stephen Rothwell
> >
> > 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);
> > }
> > }
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-03-05 0:35 UTC|newest]
Thread overview: 12+ 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 [this message]
2024-03-05 0:40 ` Jaegeuk Kim
2024-03-12 4:02 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-07-13 22:25 Stephen Rothwell
2024-09-01 23:24 Stephen Rothwell
2024-09-05 0:18 ` Stephen Rothwell
2024-09-05 4:00 ` Chao Yu
2024-09-16 22:24 ` Stephen Rothwell
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=20240305113502.50980f88@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=chao@kernel$(echo .)org \
--cc=jaegeuk@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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