From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Sterba <dsterba@suse•cz>
Cc: Christian Brauner <brauner@kernel•org>,
David Sterba <dsterba@suse•com>,
Filipe Manana <fdmanana@suse•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Matthew Wilcox (Oracle)" <willy@infradead•org>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the btrfs tree
Date: Tue, 2 Dec 2025 11:58:34 +1100 [thread overview]
Message-ID: <20251202115834.19758b9f@canb.auug.org.au> (raw)
In-Reply-To: <20251103085832.5d7ff280@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1775 bytes --]
Hi all,
On Mon, 3 Nov 2025 08:58:32 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
> fs/btrfs/file.c
>
> between commit:
>
> ede21a086a16 ("btrfs: use end_pos variable where needed in btrfs_dirty_folio()")
>
> from the btrfs tree and commit:
>
> 48f3784b17d9 ("btrfs: Use folio_next_pos()")
>
> from the vfs-brauner 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc fs/btrfs/file.c
> index 1e0ff3d7210d,977931cfa71e..000000000000
> --- a/fs/btrfs/file.c
> +++ b/fs/btrfs/file.c
> @@@ -86,9 -86,11 +86,9 @@@ int btrfs_dirty_folio(struct btrfs_inod
> extra_bits |= EXTENT_NORESERVE;
>
> start_pos = round_down(pos, fs_info->sectorsize);
> - num_bytes = round_up(write_bytes + pos - start_pos,
> - fs_info->sectorsize);
> + num_bytes = round_up(end_pos - start_pos, fs_info->sectorsize);
> ASSERT(num_bytes <= U32_MAX);
> - ASSERT(folio_pos(folio) <= pos && folio_end(folio) >= end_pos);
> - ASSERT(folio_pos(folio) <= pos &&
> - folio_next_pos(folio) >= pos + write_bytes);
> ++ ASSERT(folio_pos(folio) <= pos && folio_next_pos(folio) >= end_pos);
>
> end_of_last_block = start_pos + num_bytes - 1;
>
This is now a conflict between the btrfs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-12-02 0:58 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-02 21:58 linux-next: manual merge of the vfs-brauner tree with the btrfs tree Stephen Rothwell
2025-12-02 0:58 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-31 22:22 Stephen Rothwell
2024-10-15 21:51 Stephen Rothwell
2024-11-18 22:16 ` Stephen Rothwell
2024-06-18 11:41 Mark Brown
2024-07-16 0:58 ` Stephen Rothwell
2024-05-03 1:00 Stephen Rothwell
2024-05-14 1:38 ` Stephen Rothwell
2024-04-30 23:42 Stephen Rothwell
2023-12-06 23:32 Stephen Rothwell
2024-01-08 20:56 ` Stephen Rothwell
2023-11-26 22:20 Stephen Rothwell
2023-11-28 21:33 ` Nathan Chancellor
2023-11-29 11:09 ` Jan Kara
2023-11-29 20:50 ` Stephen Rothwell
2024-01-08 20:53 ` Stephen Rothwell
2023-11-26 22:14 Stephen Rothwell
2023-10-08 23:48 Stephen Rothwell
2023-10-09 16:15 ` Christian Brauner
2023-10-10 21:37 ` Stephen Rothwell
2023-10-11 0:24 ` Stephen Rothwell
2023-10-11 9:20 ` David Sterba
2023-10-12 15:42 ` David Sterba
2023-10-23 17:55 ` David Sterba
2023-10-23 21:25 ` Stephen Rothwell
2023-10-24 15:32 ` David Sterba
2023-10-25 0:09 ` Stephen Rothwell
2023-08-15 1:20 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=20251202115834.19758b9f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=dsterba@suse$(echo .)com \
--cc=dsterba@suse$(echo .)cz \
--cc=fdmanana@suse$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=willy@infradead$(echo .)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