From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Alex Deucher <alexdeucher@gmail•com>
Cc: Mukul Joshi <mukul.joshi@amd•com>, Borislav Petkov <bp@suse•de>,
Fenghua Yu <fenghua.yu@intel•com>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the tip tree with the amdgpu tree
Date: Wed, 23 Sep 2020 15:13:36 +1000 [thread overview]
Message-ID: <20200923151336.1664ad72@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1229 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/amd/amdkfd/kfd_priv.h
between commit:
59d7115dae02 ("drm/amdkfd: Move process doorbell allocation into kfd device")
from the amdgpu tree and commit:
c7b6bac9c72c ("drm, iommu: Change type of pasid to u32")
from the tip 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 739db04080d0,922ae138ab85..000000000000
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@@ -739,7 -723,8 +739,7 @@@ struct kfd_process
/* We want to receive a notification when the mm_struct is destroyed */
struct mmu_notifier mmu_notifier;
- uint16_t pasid;
+ u32 pasid;
- unsigned int doorbell_index;
/*
* List of kfd_process_device structures,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-09-23 5:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 5:13 Stephen Rothwell [this message]
2020-10-12 4:15 ` linux-next: manual merge of the tip tree with the amdgpu tree Stephen Rothwell
2020-10-13 3:42 ` Stephen Rothwell
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=20200923151336.1664ad72@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alexdeucher@gmail$(echo .)com \
--cc=bp@suse$(echo .)de \
--cc=fenghua.yu@intel$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=mukul.joshi@amd$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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