* linux-next: manual merge of the pagemap-headers tree with the vfs-brauner tree
@ 2026-11-17 23:26 Mark Brown
0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2026-11-17 23:26 UTC (permalink / raw)
To: Matthew Wilcox
Cc: Christian Brauner, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1084 bytes --]
Hi all,
Today's linux-next merge of the pagemap-headers tree got a conflict in:
net/sunrpc/cache.c
between commit:
64e4b2814cdc7 ("SUNRPC: let procfs copy out reads")
from the vfs-brauner tree and commit:
487f6c57f2afc ("sunrpc: Remove pagemap.h")
from the pagemap-headers 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 net/sunrpc/cache.c
index c6b6701ddf7f6,825e47833e095..0000000000000
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@@ -27,8 -27,6 +27,7 @@@
#include <linux/net.h>
#include <linux/workqueue.h>
#include <linux/mutex.h>
- #include <linux/pagemap.h>
+#include <linux/uio.h>
#include <asm/ioctls.h>
#include <linux/sunrpc/types.h>
#include <linux/sunrpc/cache.h>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-11-17 23:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-17 23:26 linux-next: manual merge of the pagemap-headers tree with the vfs-brauner tree Mark Brown
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).