Hi all,
Today's linux-next merge of the bcachefs tree got a conflict in:
fs/bcachefs/btree_types.h
between commit:
ecae0bd5173b ("Merge tag 'mm-stable-2023-11-01-14-33' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm")
from the origin tree and commit:
ba1676c7af0c ("bcachefs: Split out btree_key_cache_types.h")
from the bcachefs tree.
I fixed it up (I kept the latter version of this file and applied the
following merge resolution patch) 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.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 13 Nov 2023 09:18:22 +1100
Subject: [PATCH] fix up for "bcachefs: Split out btree_key_cache_types.h"
interacting with "Merge tag 'mm-stable-2023-11-01-14-33' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
fs/bcachefs/btree_key_cache_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/bcachefs/btree_key_cache_types.h b/fs/bcachefs/btree_key_cache_types.h
index cfd09f519965..290e4e57df5b 100644
--- a/fs/bcachefs/btree_key_cache_types.h
+++ b/fs/bcachefs/btree_key_cache_types.h
@@ -17,7 +17,7 @@ struct btree_key_cache {
struct list_head freed_nonpcpu;
size_t nr_freed_nonpcpu;
- struct shrinker shrink;
+ struct shrinker *shrink;
unsigned shrink_iter;
struct btree_key_cache_freelist __percpu *pcpu_freed;
--
2.40.1
--
Cheers,
Stephen Rothwell
Attachment:
pgpuHtxtF0cgL.pgp
Description: OpenPGP digital signature
