From: Stephen Rothwell <sfr@canb.auug.org.au>
To: 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: linux-next: manual merge of the folio tree with the btrfs tree
Date: Tue, 14 Jun 2022 13:34:19 +1000 [thread overview]
Message-ID: <20220614133419.5e10ba00@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
Hi all,
Today's linux-next merge of the folio tree got a conflict in:
fs/btrfs/disk-io.c
between commit:
fe9b88cb7288 ("btrfs: use preallocated page for super block write")
from the btrfs tree and commit:
020ae1ea6060 ("btrfs: Use a folio in wait_dev_supers()")
from the folio tree.
I fixed it up (I did not know how to fix this up, so I used the former -
effectively reverting the latter) 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-06-14 3:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 3:34 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
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
2022-05-10 15:04 ` Matthew Wilcox
2022-05-10 15:06 ` Filipe Manana
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=20220614133419.5e10ba00@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dsterba@suse.com \
--cc=dsterba@suse.cz \
--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).