From: broonie@kernel.org
To: Theodore Ts'o <tytso@mit.edu>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Christoph Hellwig <hch@lst.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Matthew Wilcox <willy@infradead.org>
Subject: linux-next: manual merge of the ext4 tree with the mm-stable tree
Date: Thu, 13 Apr 2023 15:52:39 +0100 [thread overview]
Message-ID: <20230413145239.3529907-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the ext4 tree got a conflict in:
include/linux/pagemap.h
between commit:
263e721e3ba1f ("mm: make mapping_get_entry available outside of filemap.c")
from the mm-stable tree and commit:
e999a5c5a19cf ("fs: Add FGP_WRITEBEGIN")
from the ext4 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.
diff --cc include/linux/pagemap.h
index fdcd595d22944,51b75b89730ed..0000000000000
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@@ -504,9 -504,11 +504,11 @@@ pgoff_t page_cache_prev_miss(struct add
#define FGP_NOFS 0x00000010
#define FGP_NOWAIT 0x00000020
#define FGP_FOR_MMAP 0x00000040
-#define FGP_ENTRY 0x00000080
-#define FGP_STABLE 0x00000100
+#define FGP_STABLE 0x00000080
+ #define FGP_WRITEBEGIN (FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE)
+
+void *filemap_get_entry(struct address_space *mapping, pgoff_t index);
struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index,
int fgp_flags, gfp_t gfp);
struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index,
next reply other threads:[~2023-04-13 14:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-13 14:52 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-13 14:55 linux-next: manual merge of the ext4 tree with the mm-stable tree broonie
2023-04-13 14:50 broonie
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=20230413145239.3529907-1-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tytso@mit.edu \
--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).