Hi all,
On Wed, 05 Aug 2020 15:19:38 -0700 Joe Perches <joe@xxxxxxxxxxx> wrote:
>
> On Wed, 2020-08-05 at 17:27 -0400, Alex Deucher wrote:
> > On Wed, Aug 5, 2020 at 4:53 PM Joe Perches <joe@xxxxxxxxxxx> wrote:
> > > On Wed, 2020-08-05 at 16:01 -0400, Alex Deucher wrote:
> > > > On Wed, Aug 5, 2020 at 7:35 AM Colin King <colin.king@xxxxxxxxxxxxx> wrote:
> > > > > From: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> > > > >
> > > > > There is a spelling mistake in a DRM_ERROR message. Fix it.
> > > > >
> > > > > Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> > > >
> > > > This is already fixed.
> > >
> > > This fix is not in today's -next.
> > >
> > > Perhaps whatever tree it's fixed in should be in -next.
> > >
> >
> > Weird. It's in the drm-next tree as:
> >
> > commit 4afaa61db9cf5250b5734c2531b226e7b3a3d691
> > Author: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> > Date: Fri Jul 10 09:37:58 2020 +0100
> >
> > drm/amdgpu: fix spelling mistake "Falied" -> "Failed"
> >
> > There is a spelling mistake in a DRM_ERROR error message. Fix it.
> >
> > Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
> >
> > Alex
> >
> > > $ git show --oneline -s
> > > d15fe4ec0435 (HEAD, tag: next-20200805, origin/master, origin/HEAD) Add linux-next specific files for 20200805
> > >
> > > $ git grep -i falied drivers
> > > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c: DRM_ERROR("Falied to terminate tmr\n");
> > >
> > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > > []
> > > > > @@ -2010,7 +2010,7 @@ static int psp_suspend(void *handle)
> > > > >
> > > > > ret = psp_tmr_terminate(psp);
> > > > > if (ret) {
> > > > > - DRM_ERROR("Falied to terminate tmr\n");
> > > > > + DRM_ERROR("Failed to terminate tmr\n");
> > > > > return ret;
> > > > > }
>
> Dunno.
>
> Maybe it's due to some ordering of trees in
> how -next accumulates patches?
The spelling error is introduced in two commits:
c564b8601ae9 ("drm/amdgpu: add TMR destory function for psp")
in Linus' tree between v5.8-rc4 and rc5
90937420c44f ("drm/amdgpu: add TMR destory function for psp")
in the amdgpu tree between two merges by the drm tree. In this same
interval, the error is corrected by commit
4afaa61db9cf ("drm/amdgpu: fix spelling mistake "Falied" -> "Failed"")
so when David comes to merge the amdgpu tree in commit
206739119508 ("Merge tag 'amd-drm-next-5.9-2020-07-17' of git://people.freedesktop.org/~agd5f/linux into drm-next")
the spelling error has been introduced on one side of the merge and
introduced and corrected on the other. This would have produced a
conflict which David presumably resolved in haste by picking the HEAD
side of the merge instead of the MERGE_HEAD side (it happens).
This could have been avoided by not cherry-picking fix commits around
in the amdgpu process - instead having a fixes branch that is merged
into the next branch after the fixes branch has been accepted upstream
(that way there is only one commit for each fix and less conflicts).
I have to deal with these sort of conflicts (sometimes daily) due to
the drm processes. Its a pain as I have to track down each conflict to
see if the same patches appear on both sides of merges and then try to
figure out what other changes occur. (This is only slightly helped by
have the "cherry-picked from" tags in the fix commits.)
--
Cheers,
Stephen Rothwell
Attachment:
pgpTbWr4UPz4B.pgp
Description: OpenPGP digital signature
