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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date: Mon, 6 May 2024 19:44:22 +0900
From: Masahiro Yamada <masahiroy@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Rob Clark <robdclark@...il.com>, Sean Paul <seanpaul@...omium.org>, 
	Dmitry Baryshkov <dmitry.baryshkov@...aro.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the drm-msm tree with the kbuild tree

On Mon, May 6, 2024 at 11:29 AM Stephen Rothwell <sfr@...b.auug.orgau> wrote:
>
> Hi all,
>
> On Mon, 6 May 2024 12:13:08 +1000 Stephen Rothwell <sfr@...b.auug.org.au> 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