Re: linux-next: manual merge of the drm-msm tree with the kbuild tree

From: Masahiro Yamada
Date: Mon May 06 2024 - 06:45:08 EST


On Mon, May 6, 2024 at 11:29 AM Stephen Rothwell <sfr@xxxxxxxxx.orgau> wrote:
>
> Hi all,
>
> On Mon, 6 May 2024 12:13:08 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > Today's linux-next merge of the drm-msm tree got a conflict in:
> >
> > drivers/gpu/drm/msm/Makefile
> >
> > between commit:
> >
> > 7c972986689b ("kbuild: use $(src) instead of $(srctree)/$(src) for source directory")
> >
> > from the kbuild tree and commit:
> >
> > 0fddd045f88e ("drm/msm: generate headers on the fly")
> >
> > 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 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.
>
> I actually needed the below instead.

Thanks.

I ran
$ git grep '$(srctree)/$(src)'

There is no $(srctree)/$(src) remaining in next-20240506,
so it should be OK.

(If $(srctree)/$(src) is remaining, please replace it with $(src). )



--
Best Regards
Masahiro Yamada