* linux-next: manual merge of the btrfs-fixes tree with the origin tree
@ 2025-09-26 11:20 Mark Brown
0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2025-09-26 11:20 UTC (permalink / raw)
To: David Sterba
Cc: David Sterba, Johannes Thumshirn, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 868 bytes --]
Hi all,
Today's linux-next merge of the btrfs-fixes tree got a conflict in:
fs/btrfs/zoned.c
between commit:
53de7ee4e28f6 ("btrfs: zoned: don't fail mount needlessly due to too many active zones")
from the origin tree and commit:
cc53bd2085c8f ("btrfs: add unlikely annotations to branches leading to EIO")
from the btrfs-fixes 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.
diff --cc fs/btrfs/zoned.c
index f426276e2b6bf,e3341a84f4ab3..0000000000000
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-09-26 11:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-26 11:20 linux-next: manual merge of the btrfs-fixes tree with the origin tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox