From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Christian Brauner <brauner@kernel.org>,
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 mm tree
Date: Tue, 9 Jan 2024 08:00:23 +1100 [thread overview]
Message-ID: <20240109080023.7d345d2f@canb.auug.org.au> (raw)
In-Reply-To: <20231122103119.34d23955@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1932 bytes --]
Hi all,
On Wed, 22 Nov 2023 10:31:19 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
> fs/buffer.c
>
> between commits:
>
> 2c68861ed127 ("buffer: return bool from grow_dev_folio()")
> 5334c6480adb ("buffer: calculate block number inside folio_init_buffers()")
>
> from the mm tree and commit:
>
> 488e2eea5100 ("fs: Rename mapping private members")
>
> 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/buffer.c
> index 4eb44ccdc6be,5ffc44ab4854..000000000000
> --- a/fs/buffer.c
> +++ b/fs/buffer.c
> @@@ -1067,14 -1064,17 +1067,14 @@@ static bool grow_dev_folio(struct block
> * lock to be atomic wrt __find_get_block(), which does not
> * run under the folio lock.
> */
> - spin_lock(&inode->i_mapping->private_lock);
> + spin_lock(&inode->i_mapping->i_private_lock);
> link_dev_buffers(folio, bh);
> - end_block = folio_init_buffers(folio, bdev,
> - (sector_t)index << sizebits, size);
> + end_block = folio_init_buffers(folio, bdev, size);
> - spin_unlock(&inode->i_mapping->private_lock);
> + spin_unlock(&inode->i_mapping->i_private_lock);
> -done:
> - ret = (block < end_block) ? 1 : -ENXIO;
> -failed:
> +unlock:
> folio_unlock(folio);
> folio_put(folio);
> - return ret;
> + return block < end_block;
> }
>
> /*
This is now a conflict between the mm 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:[~2024-01-08 21:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-21 23:31 linux-next: manual merge of the vfs-brauner tree with the mm tree Stephen Rothwell
2024-01-08 21:00 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-20 23:32 Stephen Rothwell
2024-03-11 21:56 ` Stephen Rothwell
2023-09-28 0:25 Stephen Rothwell
2023-10-30 22:30 ` Stephen Rothwell
2023-09-20 23:13 Stephen Rothwell
2023-07-14 0:24 Stephen Rothwell
2023-07-14 0:02 Stephen Rothwell
2023-05-24 0:06 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=20240109080023.7d345d2f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).