From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alex Deucher <alexdeucher@gmail•com>,
Dave Airlie <airlied@linux•ie>,
DRI <dri-devel@lists•freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Joseph Greathouse <Joseph.Greathouse@amd•com>
Subject: linux-next: manual merge of the amdgpu-fixes tree with the drm-fixes tree
Date: Fri, 9 Aug 2019 07:55:47 +1000 [thread overview]
Message-ID: <20190809075547.679c0713@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2019-08-08 21:55 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190809075547.679c0713@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Joseph.Greathouse@amd$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=alexdeucher@gmail$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox