Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210729111027.33028-1-broonie@kernel.org> <2306c0c4-1312-fcc7-1ed3-406fbd72cf63@amd.com>
 <20210729122521.GM4670@sirena.org.uk>
In-Reply-To: <20210729122521.GM4670@sirena.org.uk>
From:   Rob Clark <robdclark@chromium.org>
Date:   Thu, 29 Jul 2021 07:47:31 -0700
Message-ID: <CAJs_Fx7osL1PAANAVGnbkyk+K1LvB9O-dWxsz1b=cCJMCixUfQ@mail.gmail.com>
Subject: Re: linux-next: manual merge of the drm-msm tree with the drm-next tree
To:     Mark Brown <broonie@kernel.org>
Cc:     =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>,
        Rob Clark <robdclark@gmail.com>,
        Sean Paul <seanpaul@chromium.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Thu, Jul 29, 2021 at 5:25 AM Mark Brown <broonie@kernel.org> wrote:
>
> On Thu, Jul 29, 2021 at 01:44:42PM +0200, Christian K=C3=B6nig wrote:
> > Am 29.07.21 um 13:10 schrieb Mark Brown:
> > > Hi all,
> > >
> > > Today's linux-next merge of the drm-msm tree got a conflict in:
> > >
> > >    drivers/gpu/drm/msm/msm_gem.c
> > >
> > > between commit:
> > >
> > >    60f800b2bdfa ("drm/msm: always wait for the exclusive fence")
> > >
> > > from the drm-next tree and commit:
> > >
> > >    1d8a5ca436ee ("drm/msm: Conversion to drm scheduler")
> > >
> > > from the drm-msm 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 t=
ree
> > > is submitted for merging.  You may also want to consider cooperating
> > > with the maintainer of the conflicting tree to minimise any particula=
rly
> > > complex conflicts.
> > >
> > > diff --cc drivers/gpu/drm/msm/msm_gem.c
> > > index 39c35414d7b5,5db07fc287ad..000000000000
> > > --- a/drivers/gpu/drm/msm/msm_gem.c
> > > +++ b/drivers/gpu/drm/msm/msm_gem.c
> >
> > thanks for the fixup, but something went wrong here. The diff is just e=
mpty.
> >
> > Any idea what's going on?
>
> The change modified a function that is simply deleted so the resulting
> diff was empty.

That is the correct resolution, that commit switched to
drm_gem_fence_array_add_implicit() as part of the conversion

BR,
-R