From: Mark Brown <broonie@kernel•org>
To: David Sterba <dsterba@suse•cz>
Cc: David Sterba <dsterba@suse•com>,
Johannes Thumshirn <johannes.thumshirn@wdc•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the btrfs-fixes tree with the origin tree
Date: Fri, 26 Sep 2025 12:20:27 +0100 [thread overview]
Message-ID: <aNZ2-6TZzpXbS50a@sirena.org.uk> (raw)
[-- 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 --]
reply other threads:[~2025-09-26 11:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aNZ2-6TZzpXbS50a@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=dsterba@suse$(echo .)com \
--cc=dsterba@suse$(echo .)cz \
--cc=johannes.thumshirn@wdc$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox