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 #include #include - #include +#include #include #include #include