Received-SPF: pass (google.com: domain of linux-kernel+bounces-169691-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Precedence: bulk
MIME-Version: 1.0
References: <20240506121308.09de6f33@canb.auug.org.au> <20240506122914.2f08c2cc@canb.auug.org.au>
In-Reply-To: <20240506122914.2f08c2cc@canb.auug.org.au>
From: Masahiro Yamada <masahiroy@kernel.org>
Date: Mon, 6 May 2024 19:44:22 +0900
Message-ID: <CAK7LNATNY9eYD3U6TJfoqbfn07diULRxyy07isCndSppCt1t4g@mail.gmail.com>
Subject: Re: linux-next: manual merge of the drm-msm tree with the kbuild tree
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rob Clark <robdclark@gmail.com>, Sean Paul <seanpaul@chromium.org>, 
	Dmitry Baryshkov <dmitry.baryshkov@linaro.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

On Mon, May 6, 2024 at 11:29=E2=80=AFAM Stephen Rothwell <sfr@canb.auug.org=
au> wrote:
>
> Hi all,
>
> On Mon, 6 May 2024 12:13:08 +1000 Stephen Rothwell <sfr@canb.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 so=
urce 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 tre=
e
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularl=
y
> > 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). )


--=20
Best Regards
Masahiro Yamada