public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix intel_dp_atomic_find_vcpi_slots function
Date: Tue, 6 Sep 2022 14:57:34 +0300	[thread overview]
Message-ID: <Yxc1rvmwMuN9RzTo@intel.com> (raw)
In-Reply-To: <20220906102329.7073-1-stanislav.lisovskiy@intel.com>

On Tue, Sep 06, 2022 at 01:23:29PM +0300, Stanislav Lisovskiy wrote:
> drm_dp_atomic_find_vcpi_slots no longer exists and needs
> to be used as drm_dp_atomic_find_time_slots.
> Also rename the function itself.
> 
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> Fixes: 7ae5ab441402 ("Extract drm_dp_atomic_find_vcpi_slots cycle to separate function")

The problem only exists in drm-tip. You need to revert the 
bad merge from rerere-cache and redo it.

And please always test build drm-tip after solving merge conflicts!

-- 
Ville Syrjälä
Intel

  parent reply	other threads:[~2022-09-06 11:57 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-06 10:23 [Intel-gfx] [PATCH] drm/i915: Fix intel_dp_atomic_find_vcpi_slots function Stanislav Lisovskiy
2022-09-06 10:25 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
2022-09-06 11:44 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Fix intel_dp_atomic_find_vcpi_slots function (rev2) Patchwork
2022-09-06 11:57 ` Ville Syrjälä [this message]
2022-09-06 12:27   ` [Intel-gfx] [PATCH] drm/i915: Fix intel_dp_atomic_find_vcpi_slots function Lisovskiy, Stanislav
2022-09-06 12:38     ` Ville Syrjälä
2022-09-06 14:30     ` Jani Nikula

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=Yxc1rvmwMuN9RzTo@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=stanislav.lisovskiy@intel.com \
    /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