Received-SPF: pass (google.com: domain of linux-kernel+bounces-87151-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Thu, 29 Feb 2024 09:13:28 -0800
From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
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
Message-ID: <ZeC7OEA4Onoi-mED@google.com>
References: <20240229104140.2927da29@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240229104140.2927da29@canb.auug.org.au>

On 02/29, Stephen Rothwell wrote:
> Hi all,
> 
> 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.

> 
> 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);
>   			}
>   		}