From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: David Sterba <dsterba@suse•cz>, Christoph Hellwig <hch@lst•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the btrfs tree with the mm tree
Date: Tue, 27 Jun 2023 10:45:20 +1000 [thread overview]
Message-ID: <20230627104520.25411bc6@canb.auug.org.au> (raw)
In-Reply-To: <20230605090803.43597523@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1370 bytes --]
Hi all,
On Mon, 5 Jun 2023 09:08:03 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the btrfs tree got a conflict in:
>
> fs/btrfs/file.c
>
> between commit:
>
> 39bf7bdb48fe ("backing_dev: remove current->backing_dev_info")
>
> from the mm tree and commit:
>
> 3564004ccddf ("btrfs: determine synchronous writers from bio or writeback control")
>
> from the btrfs 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 ecd43ab66fa6,f53b7b75092d..000000000000
> --- a/fs/btrfs/file.c
> +++ b/fs/btrfs/file.c
> @@@ -1683,9 -1682,7 +1679,6 @@@ ssize_t btrfs_do_write_iter(struct kioc
> num_written = num_sync;
> }
>
> - if (sync)
> - atomic_dec(&inode->sync_writers);
> -
> - current->backing_dev_info = NULL;
> return num_written;
> }
>
This is now a conflict between the mm-stable 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:[~2023-06-27 0:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-04 23:08 linux-next: manual merge of the btrfs tree with the mm tree Stephen Rothwell
2023-06-27 0:45 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-09-14 23:14 Stephen Rothwell
2023-09-14 23:47 ` Stephen Rothwell
2023-09-15 2:17 ` Qi Zheng
2023-09-26 0:17 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=20230627104520.25411bc6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dsterba@suse$(echo .)cz \
--cc=hch@lst$(echo .)de \
--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