linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the vfs-brauner tree with the f2fs tree
@ 2024-02-28 23:41 Stephen Rothwell
  2024-02-29 17:13 ` Jaegeuk Kim
  2024-03-12  4:02 ` Stephen Rothwell
  0 siblings, 2 replies; 12+ messages in thread
From: Stephen Rothwell @ 2024-02-28 23:41 UTC (permalink / raw)
  To: Christian Brauner, Jaegeuk Kim
  Cc: Chao Yu, Linux Kernel Mailing List, Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]

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")

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: manual merge of the vfs-brauner tree with the f2fs tree
@ 2025-07-13 22:25 Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2025-07-13 22:25 UTC (permalink / raw)
  To: Christian Brauner, Jaegeuk Kim
  Cc: Eric Sandeen, Hongbo Li, Linux Kernel Mailing List,
	Linux Next Mailing List, Qu Wenruo

[-- Attachment #1: Type: text/plain, Size: 1161 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/f2fs/super.c

between commit:

  a0512c55d7f8 ("f2fs: switch to the new mount api")

from the f2fs tree and commit:

  165fa94de612 ("fs: enhance and rename shutdown() callback to remove_bdev()")

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 30c038413040,8667af9f76e4..000000000000
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@@ -3507,7 -3263,8 +3507,7 @@@ static const struct super_operations f2
  	.freeze_fs	= f2fs_freeze,
  	.unfreeze_fs	= f2fs_unfreeze,
  	.statfs		= f2fs_statfs,
- 	.shutdown	= f2fs_shutdown,
 -	.remount_fs	= f2fs_remount,
+ 	.remove_bdev	= f2fs_remove_bdev,
  };
  
  #ifdef CONFIG_FS_ENCRYPTION

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: manual merge of the vfs-brauner tree with the f2fs tree
@ 2024-09-01 23:24 Stephen Rothwell
  2024-09-05  0:18 ` Stephen Rothwell
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2024-09-01 23:24 UTC (permalink / raw)
  To: Christian Brauner, Jaegeuk Kim
  Cc: Chao Yu, Linux Kernel Mailing List, Linux Next Mailing List,
	Matthew Wilcox (Oracle)

[-- Attachment #1: Type: text/plain, Size: 776 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/f2fs/data.c

between commits:

  f13c7184e62e ("f2fs: convert f2fs_write_begin() to use folio")
  357dd8479f8b ("f2fs: convert f2fs_write_end() to use folio")
(and maybe others)

from the f2fs tree and commits:

  a0f858d450ce ("f2fs: Convert f2fs_write_end() to use a folio")
  dfd2e81d37e1 ("f2fs: Convert f2fs_write_begin() to use a folio")
  a225800f322a ("fs: Convert aops->write_end to take a folio")
  1da86618bdce ("fs: Convert aops->write_begin to take a folio")

from the vfs-brauner tree.

This was too much for me to fix up, so I just used the f2fs tree from
next-20240830 for today.  Please discuss this and fix things up.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: manual merge of the vfs-brauner tree with the f2fs tree
@ 2023-08-15  1:33 Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2023-08-15  1:33 UTC (permalink / raw)
  To: Christian Brauner, Jaegeuk Kim
  Cc: Chao Yu, Jeff Layton, Linux Kernel Mailing List,
	Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 1112 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/f2fs/xattr.c

between commit:

  8874ad7dae8d ("f2fs: fix to update i_ctime in __f2fs_setxattr()")

from the f2fs tree and commit:

  c62ebd3501cc ("f2fs: convert to ctime accessor functions")

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/xattr.c
index 9cc1ca75b2da,4ae93e1df421..000000000000
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@@ -766,8 -767,7 +766,8 @@@ same
  		clear_inode_flag(inode, FI_ACL_MODE);
  	}
  
- 	inode->i_ctime = current_time(inode);
++	inode_set_ctime_current(inode);
 +	f2fs_mark_inode_dirty_sync(inode, true);
  exit:
  	kfree(base_addr);
  	return error;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: manual merge of the vfs-brauner tree with the f2fs tree
@ 2023-08-15  1:30 Stephen Rothwell
  0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2023-08-15  1:30 UTC (permalink / raw)
  To: Christian Brauner, Jaegeuk Kim
  Cc: Christoph Hellwig, Linux Kernel Mailing List,
	Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 1715 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/f2fs/super.c

between commit:

  51bf8d3c8199 ("f2fs: don't reopen the main block device in f2fs_scan_devices")

from the f2fs tree and commit:

  2ea6f68932f7 ("fs: use the super_block as holder when mounting file systems")

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 a067466a694c,aa1f9a3a8037..000000000000
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@@ -1561,8 -1561,7 +1561,8 @@@ static void destroy_device_list(struct 
  	int i;
  
  	for (i = 0; i < sbi->s_ndevs; i++) {
 -		blkdev_put(FDEV(i).bdev, sbi->sb);
 +		if (i > 0)
- 			blkdev_put(FDEV(i).bdev, sbi->sb->s_type);
++			blkdev_put(FDEV(i).bdev, sbi->sb);
  #ifdef CONFIG_BLK_DEV_ZONED
  		kvfree(FDEV(i).blkz_seq);
  #endif
@@@ -4218,9 -4215,9 +4218,9 @@@ static int f2fs_scan_devices(struct f2f
  				FDEV(i).end_blk = FDEV(i).start_blk +
  					(FDEV(i).total_segments <<
  					sbi->log_blocks_per_seg) - 1;
 +				FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path,
- 					mode, sbi->sb->s_type, NULL);
++					mode, sbi->sb, NULL);
  			}
 -			FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path, mode,
 -							  sbi->sb, NULL);
  		}
  		if (IS_ERR(FDEV(i).bdev))
  			return PTR_ERR(FDEV(i).bdev);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2025-07-13 22:25 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
  -- 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

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).