From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Dave Airlie <airlied@redhat•com>,
DRI <dri-devel@lists•freedesktop.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>,
Qi Zheng <zhengqi.arch@bytedance•com>,
Rob Clark <robdclark@chromium•org>
Subject: Re: linux-next: manual merge of the drm tree with the mm-stable tree
Date: Thu, 2 Nov 2023 08:36:00 +1100 [thread overview]
Message-ID: <20231102083600.09d99853@canb.auug.org.au> (raw)
In-Reply-To: <20231024115206.4ce24d96@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1947 bytes --]
Hi all,
On Tue, 24 Oct 2023 11:52:06 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/msm/msm_drv.c
>
> between commit:
>
> cd61a76c210a ("drm/msm: dynamically allocate the drm-msm_gem shrinker")
>
> from the mm-stable tree and commit:
>
> 506efcba3129 ("drm/msm: carve out KMS code from msm_drv.c")
>
> from the drm 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/msm/msm_drv.c
> index 7f20249d6071,443bbc3ed750..000000000000
> --- a/drivers/gpu/drm/msm/msm_drv.c
> +++ b/drivers/gpu/drm/msm/msm_drv.c
> @@@ -457,23 -265,12 +265,14 @@@ static int msm_drm_init(struct device *
> if (ret)
> goto err_deinit_vram;
>
> - /* the fw fb could be anywhere in memory */
> - ret = drm_aperture_remove_framebuffers(drv);
> - if (ret)
> - goto err_msm_uninit;
> -
> - msm_gem_shrinker_init(ddev);
> + ret = msm_gem_shrinker_init(ddev);
> + if (ret)
> + goto err_msm_uninit;
>
> if (priv->kms_init) {
> - ret = priv->kms_init(ddev);
> - if (ret) {
> - DRM_DEV_ERROR(dev, "failed to load kms\n");
> - priv->kms = NULL;
> + ret = msm_drm_kms_init(dev, drv);
> + if (ret)
> goto err_msm_uninit;
> - }
> - kms = priv->kms;
> } else {
> /* valid only for the dummy headless case, where of_node=NULL */
> WARN_ON(dev->of_node);
This is now a conflict between the mm-stable tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-11-01 21:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-24 0:52 linux-next: manual merge of the drm tree with the mm-stable tree Stephen Rothwell
2023-11-01 21:36 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-11 2:24 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=20231102083600.09d99853@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@redhat$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dmitry.baryshkov@linaro$(echo .)org \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robdclark@chromium$(echo .)org \
--cc=zhengqi.arch@bytedance$(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