linux-kernel - linux-next: manual merge of the bcachefs tree with Linus tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250228092826.255fec8a@canb.auug.org.au>
Date: Fri, 28 Feb 2025 09:28:26 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Kent Overstreet <kent.overstreet@...ux.dev>
Cc: Joshua Ashton <joshua@...ggi.es>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the bcachefs tree with Linus tree

Hi all,

Today's linux-next merge of the bcachefs tree got conflicts in:

  fs/bcachefs/dirent.h
  fs/bcachefs/fs-common.c
  fs/bcachefs/sb-downgrade.c

between commit:

  4804f3ac2649 ("bcachefs: Revert directory i_size")

from Linus tree and commits:

  1afdbf54cda5 ("bcachefs: bcachefs_metadata_version_cached_backpointers")
  713d0639b9f7 ("bcachefs: bcachefs_metadata_version_stripe_backpointers")
  3e97fc2b1bb1 ("bcachefs: Kill dirent_occupied_size()")
  bb13a9d96daa ("bcachefs: bcachefs_metadata_version_casefolding")

from the bcachefs 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/bcachefs/dirent.h
index 362b3b2f2f2e,a6e15a012936..000000000000
--- a/fs/bcachefs/dirent.h
+++ b/fs/bcachefs/dirent.h
diff --cc fs/bcachefs/fs-common.c
index 2c3d46ac70c6,ca70a3de805c..000000000000
--- a/fs/bcachefs/fs-common.c
+++ b/fs/bcachefs/fs-common.c
diff --cc fs/bcachefs/sb-downgrade.c
index 051214fdc735,21130eadaf32..000000000000
--- a/fs/bcachefs/sb-downgrade.c
+++ b/fs/bcachefs/sb-downgrade.c
@@@ -90,7 -90,16 +90,13 @@@
  	  BIT_ULL(BCH_RECOVERY_PASS_check_allocations),		\
  	  BCH_FSCK_ERR_accounting_mismatch,			\
  	  BCH_FSCK_ERR_accounting_key_replicas_nr_devs_0,	\
- 	  BCH_FSCK_ERR_accounting_key_junk_at_end)
+ 	  BCH_FSCK_ERR_accounting_key_junk_at_end)		\
 -	x(directory_size,					\
 -	  BIT_ULL(BCH_RECOVERY_PASS_check_dirents),		\
 -	  BCH_FSCK_ERR_directory_size_mismatch)			\
+ 	x(cached_backpointers,					\
+ 	  BIT_ULL(BCH_RECOVERY_PASS_check_extents_to_backpointers),\
+ 	  BCH_FSCK_ERR_ptr_to_missing_backpointer)		\
+ 	x(stripe_backpointers,					\
+ 	  BIT_ULL(BCH_RECOVERY_PASS_check_extents_to_backpointers),\
+ 	  BCH_FSCK_ERR_ptr_to_missing_backpointer)
  
  #define DOWNGRADE_TABLE()					\
  	x(bucket_stripe_sectors,				\

Content of type "application/pgp-signature" skipped