Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the amdgpu-fixes tree with the drm-fixes tree
@ 2019-08-08 21:55 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-08-08 21:55 UTC (permalink / raw)
  To: Alex Deucher, Dave Airlie, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Joseph Greathouse

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

Hi all,

Today's linux-next merge of the amdgpu-fixes tree got conflicts in:

  drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
  include/uapi/linux/kfd_ioctl.h

between commit:

  4b3e30ed3ec7 ("Revert "drm/amdkfd: New IOCTL to allocate queue GWS"")

from the drm-fixes tree and commit:

  7e51b56cd5b8 ("drm/amdkfd: Remove GPU ID in GWS queue creation")

from the amdgpu-fixes tree.

I fixed it up (I just used the former) 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

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-08 21:55 linux-next: manual merge of the amdgpu-fixes tree with the drm-fixes tree Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org linux-next@archiver.kernel.org
	public-inbox-index linux-next


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/ public-inbox