From: Masahiro Yamada <masahiroy@kernel.org>
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>
Subject: Re: linux-next: manual merge of the drm-msm tree with the kbuild tree
Date: Mon, 6 May 2024 19:44:22 +0900 [thread overview]
Message-ID: <CAK7LNATNY9eYD3U6TJfoqbfn07diULRxyy07isCndSppCt1t4g@mail.gmail.com> (raw)
In-Reply-To: <20240506122914.2f08c2cc@canb.auug.org.au>
On Mon, May 6, 2024 at 11:29 AM 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 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
next prev parent reply other threads:[~2024-05-06 10:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 2:13 linux-next: manual merge of the drm-msm tree with the kbuild tree Stephen Rothwell
2024-05-06 2:29 ` Stephen Rothwell
2024-05-06 10:44 ` Masahiro Yamada [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-07 2:51 Stephen Rothwell
2024-05-13 2:03 ` Stephen Rothwell
2024-05-15 23:20 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAK7LNATNY9eYD3U6TJfoqbfn07diULRxyy07isCndSppCt1t4g@mail.gmail.com \
--to=masahiroy@kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robdclark@gmail.com \
--cc=seanpaul@chromium.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).