linux-next: manual merge of the pagemap-headers tree with the ceph tree

linux-next: manual merge of the pagemap-headers tree with the ceph tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1100 bytes --]

Hi all,

Today's linux-next merge of the pagemap-headers tree got a conflict in:

  net/ceph/osd_client.c

between commit:

  9ec08b7499a62 ("libceph: validate OSD extent maps before cursor advance")

from the ceph tree and commit:

  aedeab60c2cc3 ("net: Remove includes of 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/ceph/osd_client.c
index f36ce5ae75680,86b681a56e206..0000000000000
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@@ -6,8 -6,6 +6,7 @@@
  #include <linux/err.h>
  #include <linux/highmem.h>
  #include <linux/mm.h>
 +#include <linux/overflow.h>
- #include <linux/pagemap.h>
  #include <linux/slab.h>
  #include <linux/uaccess.h>
  #ifdef CONFIG_BLOCK

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]