From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dmitry Baryshkov <dmitry.baryshkov@linaro•org>,
Rob Clark <robdclark@gmail•com>,
Sean Paul <seanpaul@chromium•org>
Cc: Jilin Yuan <yuanjilin@cdjrlc•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Rob Clark <robdclark@chromium•org>
Subject: linux-next: manual merge of the drm-msm-lumag tree with the drm-msm tree
Date: Tue, 6 Sep 2022 11:38:19 +1000 [thread overview]
Message-ID: <20220906113819.1abecef0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 785 bytes --]
Hi all,
Today's linux-next merge of the drm-msm-lumag tree got a conflict in:
drivers/gpu/drm/msm/msm_gem.h
between commit:
b352ba54a820 ("drm/msm/gem: Convert to using drm_gem_lru")
from the drm-msm tree and commit:
aabc003330ed ("drm/msm: fix repeated words in comments")
from the drm-msm-lumag tree.
I fixed it up (the former removed the comment updated by the latter) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-09-06 1:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-06 1:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-03-31 0:25 linux-next: manual merge of the drm-msm-lumag tree with the drm-msm tree 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=20220906113819.1abecef0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dmitry.baryshkov@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robdclark@chromium$(echo .)org \
--cc=robdclark@gmail$(echo .)com \
--cc=seanpaul@chromium$(echo .)org \
--cc=yuanjilin@cdjrlc$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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