From: Stephen Rothwell <sfr@canb•auug.org.au>
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 tree with the btrfs-fixes tree
Date: Fri, 25 Mar 2022 10:48:25 +1100 [thread overview]
Message-ID: <20220325104825.72c2e97c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 975 bytes --]
Hi all,
Today's linux-next merge of the btrfs tree got a conflict in:
fs/btrfs/zoned.c
between commits:
0b9e66762aa0 ("btrfs: zoned: traverse devices under chunk_mutex in btrfs_can_activate_zone")
62ed0bf7315b ("btrfs: zoned: remove left over ASSERT checking for single profile")
from the btrfs-fixes tree and commits:
71f3883a5968 ("btrfs: zoned: use RCU list in btrfs_can_activate_zone")
7d5e73a6ef6c ("btrfs: zoned: remove left over ASSERT checking for single profile")
from the btrfs tree.
I fixed it up (I just (arbitrarily) chose the former version) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-03-24 23:50 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-24 23:48 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-06-02 12:41 linux-next: manual merge of the btrfs tree with the btrfs-fixes tree Mark Brown
2026-03-24 13:25 Mark Brown
2026-03-24 13:25 Mark Brown
2026-03-17 13:48 Mark Brown
2026-03-17 13:48 Mark Brown
2026-03-17 13:48 Mark Brown
2025-09-18 11:26 Mark Brown
2024-06-06 22:55 Stephen Rothwell
2024-06-06 23:12 ` Qu Wenruo
2023-10-04 23:09 Stephen Rothwell
2022-10-31 23:28 Stephen Rothwell
2022-09-05 23:50 Stephen Rothwell
2022-09-06 0:15 ` Stephen Rothwell
2022-09-06 19:41 ` David Sterba
2022-02-24 13:44 broonie
2022-02-25 11:59 ` David Sterba
2021-01-10 22:29 Stephen Rothwell
2020-05-01 0:28 Stephen Rothwell
2020-05-03 21:40 ` David Sterba
2020-05-01 0:24 Stephen Rothwell
2020-05-01 1:05 ` Stephen Rothwell
2020-05-01 2:06 ` Qu Wenruo
2020-01-08 22:14 Stephen Rothwell
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=20220325104825.72c2e97c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--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