> -----Original Message----- > From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Felix > Kuehling > Sent: Friday, August 24, 2018 5:58 PM > To: Deucher, Alexander <Alexander.Deucher at amd.com>; Koenig, Christian > <Christian.Koenig at amd.com>; Oded Gabbay <oded.gabbay at gmail.com>; > Dave Airlie <airlied at redhat.com> > Cc: amd-gfx list <amd-gfx at lists.freedesktop.org> > Subject: Re: KFD co-maintainership and branch model > > On 2018-08-23 08:38 AM, Deucher, Alexander wrote: > >> -----Original Message----- > >> From: Christian König <ckoenig.leichtzumerken at gmail.com> > >> Sent: Thursday, August 23, 2018 3:01 AM > >> To: Oded Gabbay <oded.gabbay at gmail.com>; Dave Airlie > >> <airlied at redhat.com> > >> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; Kuehling, Felix > >> <Felix.Kuehling at amd.com>; amd-gfx list > >> <amd-gfx at lists.freedesktop.org> > >> Subject: Re: KFD co-maintainership and branch model > >> > >> Am 23.08.2018 um 08:54 schrieb Oded Gabbay: > >>> On Thu, Aug 23, 2018 at 4:34 AM David Airlie <airlied at redhat.com> > wrote: > >>>> On Thu, Aug 23, 2018 at 8:25 AM, Felix Kuehling > >> <felix.kuehling at amd.com> wrote: > >>>>> Hi all, > >>>>> > >>>>> Oded has offered to make me co-maintainer of KFD, as he's super > >>>>> busy at work and less responsive than he used to be. > >>>>> > >>>>> At the same time we're about to send out the first patches to > >>>>> merge KFD and AMDGPU into a single kernel module. > >>>>> > >>>>> With that in mind I'd like to propose to upstream KFD through > >>>>> Alex's branch in the future. It would avoid conflicts in shared > >>>>> code (amdgpu_vm.c is most active at the moment) when merging > >>>>> branches, and make the code flow and testing easier. > >>>>> > >>>>> Please let me know what you think? > >>>>> > >>>> Works for me. > >>>> > >>>> Thanks, > >>>> Dave. > >>> Works for me as well. > >> Sounds good to me as well. > > Works for me as well. > > Thank you. We have agreement. > > Right now KFD in amd-staging-drm-next is a bit behind what's drm-next. > Alex, are you planning to rebase amd-staging-drm-next soon? If not, I'd like > to cherry-pick the missing commits before applying anything new. > Yes. I can update it this week. Alex > Regards, >  Felix > > > > > Alex > > > >> Christian. > >> > >>> Oded > >>> _______________________________________________ > >>> amd-gfx mailing list > >>> amd-gfx at lists.freedesktop.org > >>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx