From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Matthew Wilcox <willy@infradead•org>,
David Howells <dhowells@redhat•com>
Cc: 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 fscache tree
Date: Tue, 21 Sep 2021 13:54:21 +1000 [thread overview]
Message-ID: <20210921135421.13eac778@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
Hi all,
Today's linux-next merge of the folio tree got a conflict in:
fs/cachefiles/rdwr.c
between commit:
405f4ff7f8a3 ("fscache: Remove the old I/O API")
from the fscache tree and commit:
2e96a1a81b3f ("mm/filemap: Convert page wait queues to be folios")
from the folio tree.
I fixed it up (the former removed the file, so I did that) 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:[~2021-09-21 3:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-21 3:54 Stephen Rothwell [this message]
2021-11-01 22:07 ` linux-next: manual merge of the folio tree with the fscache tree Stephen Rothwell
2021-11-02 7:04 ` David Howells
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 9:25 Stephen Rothwell
2022-03-23 23:53 ` Stephen Rothwell
2022-03-15 9:28 Stephen Rothwell
2022-03-23 23:54 ` 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=20210921135421.13eac778@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(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