From: Filipe Manana <fdmanana@suse.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Matthew Wilcox <willy@infradead.org>,
David Sterba <dsterba@suse.cz>
Cc: David Sterba <dsterba@suse.com>,
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 folio tree with the btrfs tree
Date: Tue, 10 May 2022 10:43:07 +0100 [thread overview]
Message-ID: <55f4b515-1d1c-fd3e-0f93-4cda45261c91@suse.com> (raw)
In-Reply-To: <20220510183908.7571cb73@canb.auug.org.au>
On 10/05/22 09:39, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the folio tree got a conflict in:
>
> fs/btrfs/send.c
>
> between commit:
>
> d1a1a97304b4 ("btrfs: send: keep the current inode open while processing it")
>
> from the btrfs tree and commit:
>
> 2ebdd1df3166 ("mm/readahead: Convert page_cache_async_readahead to take a folio")
>
> from the folio tree.
>
> I fixed it up (I think - see below) and can carry the fix as
Looks correct to me.
Thanks.
> 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.
>
next prev parent reply other threads:[~2022-05-10 9:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-10 8:39 linux-next: manual merge of the folio tree with the btrfs tree Stephen Rothwell
2022-05-10 9:43 ` Filipe Manana [this message]
2022-05-10 15:04 ` Matthew Wilcox
2022-05-10 15:06 ` Filipe Manana
-- strict thread matches above, loose matches on Subject: below --
2022-06-14 3:34 Stephen Rothwell
2022-05-02 7:43 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=55f4b515-1d1c-fd3e-0f93-4cda45261c91@suse.com \
--to=fdmanana@suse.com \
--cc=dsterba@suse.com \
--cc=dsterba@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.