From: Jani Nikula <jani.nikula@linux.intel.com>
To: "Christian König" <christian.koenig@amd.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
dri-devel <dri-devel@lists.freedesktop.org>
Subject: Re: Not 100% sure if I correctly fixed drm-tip
Date: Thu, 11 Feb 2021 17:02:27 +0200 [thread overview]
Message-ID: <87o8gqd4vw.fsf@intel.com> (raw)
In-Reply-To: <b313d0b2-9589-8209-54a3-f44dc137164e@amd.com>
On Thu, 11 Feb 2021, Christian König <christian.koenig@amd.com> wrote:
> Hi guys,
>
> I had a conflict this morning in the ttm pool while pushing an important
> fix to drm-misc-fixes.
>
> I'm not 100% sure if I correctly fixed up drm-tip. How can this be
> double checked? And how can it be fixed if the merge has gone bad?
I'm afraid there's a problem; bb52cb0dec8d ("drm/ttm: make the pool
shrinker lock a mutex") in upstream and drm-misc-fixes creates a silent
conflict with ba051901d10f ("drm/ttm: add a debugfs file for the global
page pools") in drm-misc-next, causing the latter to use
spin_lock/unlock on a mutex.
But while you hit a conflict, it does look like the conflict breaking
the build is silent, AFAICT the spinlock part does not conflict. So a
fixup patch in drm-rerere is probably needed until there are some
backmerges.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-02-11 15:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-11 10:01 Not 100% sure if I correctly fixed drm-tip Christian König
2021-02-11 14:37 ` Thomas Zimmermann
2021-02-11 15:02 ` Jani Nikula [this message]
2021-02-11 15:27 ` Christian König
2021-02-11 17:22 ` Daniel Vetter
2021-02-12 7:51 ` Christian König
2021-02-12 8:27 ` Daniel Vetter
2021-02-12 8:32 ` Christian König
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=87o8gqd4vw.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.