Hi all, The following commits are also in Linus Torvalds' tree as different commits (but the same patches): 42a794d6eaeb ("bcachefs: Don't filter partial list buckets in open_buckets_to_text()") 40add6123c8a ("bcachefs: Don't keep tons of cached pointers around") These are commits e0fafac5c4b6 ("bcachefs: Don't filter partial list buckets in open_buckets_to_text()") a34eef6dd179 ("bcachefs: Don't keep tons of cached pointers around") in Linus' tree. The latter is causing an unnecessary conflict due to later changes in the bcachefs tree. -- Cheers, Stephen Rothwell
Attachment:
pgpS4K4sfMwB5.pgp
Description: OpenPGP digital signature