linux-next: manual merge of the amdgpu tree with Linus' tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Jason Gunthorpe <jgg@mellanox.com>, Yong Zhao <Yong.Zhao@amd.com>
Subject: linux-next: manual merge of the amdgpu tree with Linus' tree
Date: Thu, 3 Oct 2019 10:19:01 +1000	[thread overview]
Message-ID: <20191003101901.67efa929@canb.auug.org.au> (raw)

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

Hi all,

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

  drivers/gpu/drm/amd/amdkfd/kfd_priv.h

between commit:

  471f39020569 ("drm/amdkfd: use mmu_notifier_put")

from Linus' tree and commit:

  4b3cece1863c ("drm/amdkfd: Use hex print format for pasid")

from the amdgpu 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index c89326125d71,fc8b81208368..000000000000

--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@@ -687,7 -688,10 +688,7 @@@ struct kfd_process 
  	/* We want to receive a notification when the mm_struct is destroyed */
  	struct mmu_notifier mmu_notifier;
  
- 	unsigned int pasid;
 -	/* Use for delayed freeing of kfd_process structure */
 -	struct rcu_head	rcu;
 -
+ 	uint16_t pasid;
  	unsigned int doorbell_index;
  
  	/*

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