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

[Mark Brown]

Hi all,

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

  drivers/gpu/drm/amd/amdkfd/kfd_migrate.c

between commit:

  ce23f00eb12b0 ("drm/amdgpu: Add amdgpu_sdma_types.h header")

from the amdgpu tree and commit:

  54db4e00bf624 ("drm/amd: Remove pagemap.h includes")

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 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
index 8b96e1fe741a1,460b289ddd4ef..0000000000000
--- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
@@@ -24,8 -24,7 +24,9 @@@
  #include <linux/dma-direction.h>
  #include <linux/dma-mapping.h>
  #include <linux/migrate.h>
+ #include <linux/pagemap.h>
 +#include "amdgpu.h"
 +#include "amdgpu_sdma.h"
  #include "amdgpu_sync.h"
  #include "amdgpu_object.h"
  #include "amdgpu_vm.h"

Attachment: signature.asc
Description: PGP signature