* Re: linux-next: manual merge of the tip tree with the amdgpu tree
[not found] <20200923151336.1664ad72@canb.auug.org.au>
@ 2020-10-12 4:15 ` Stephen Rothwell
2020-10-13 3:42 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-10-12 4:15 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Dave Airlie, DRI
Cc: Mukul Joshi, Fenghua Yu, Linux Kernel Mailing List,
Linux Next Mailing List, Borislav Petkov
[-- Attachment #1.1: Type: text/plain, Size: 1454 bytes --]
Hi all,
On Wed, 23 Sep 2020 15:13:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.
>
>
> 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,
This is now a conflict between the tip tree and the drm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the tip tree with the amdgpu tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2020-10-13 3:42 UTC (permalink / raw)
To: Dave Airlie, DRI
Cc: Mukul Joshi, Fenghua Yu, Peter Zijlstra,
Linux Kernel Mailing List, Linux Next Mailing List,
H. Peter Anvin, Thomas Gleixner, Borislav Petkov, Ingo Molnar
[-- Attachment #1.1: Type: text/plain, Size: 1689 bytes --]
Hi all,
On Mon, 12 Oct 2020 15:15:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Wed, 23 Sep 2020 15:13:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > 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.
> >
> >
> > 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,
>
> This is now a conflict between the tip tree and the drm tree.
This is now a conflict between the drm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-13 3:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20200923151336.1664ad72@canb.auug.org.au>
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).