All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian König" <christian.koenig@amd.com>
To: dri-devel <dri-devel@lists.freedesktop.org>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	Dave Airlie <airlied@redhat.com>, Daniel Vetter <daniel@ffwll.ch>
Subject: [Intel-gfx] Ongoing failure for "dim rebuild-tip"
Date: Wed, 18 Jan 2023 10:13:57 +0100	[thread overview]
Message-ID: <b1605ab2-7f60-1e2d-de21-a6eb94afdbc7@amd.com> (raw)

Hi guys,

for a couple of weeks now the command "dim rebuild-tip" fails for me. 
The error message is:

Merging drm-intel/drm-intel-gt-next... Applying manual fixup patch for 
drm-tip merge... patching file drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
dim:
dim: FAILURE: Could not merge drm-intel/drm-intel-gt-next
dim: See the section "Resolving Conflicts when Rebuilding drm-tip"
dim: in the drm-tip.rst documentation for how to handle this situation.

This also happens on a fresh clean install of dim, so I'm pretty sure 
that this isn't a problem on my side.

What can we do?

Thanks,
Christian.

WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <christian.koenig@amd.com>
To: dri-devel <dri-devel@lists.freedesktop.org>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	Dave Airlie <airlied@redhat.com>, Daniel Vetter <daniel@ffwll.ch>
Subject: Ongoing failure for "dim rebuild-tip"
Date: Wed, 18 Jan 2023 10:13:57 +0100	[thread overview]
Message-ID: <b1605ab2-7f60-1e2d-de21-a6eb94afdbc7@amd.com> (raw)

Hi guys,

for a couple of weeks now the command "dim rebuild-tip" fails for me. 
The error message is:

Merging drm-intel/drm-intel-gt-next... Applying manual fixup patch for 
drm-tip merge... patching file drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
dim:
dim: FAILURE: Could not merge drm-intel/drm-intel-gt-next
dim: See the section "Resolving Conflicts when Rebuilding drm-tip"
dim: in the drm-tip.rst documentation for how to handle this situation.

This also happens on a fresh clean install of dim, so I'm pretty sure 
that this isn't a problem on my side.

What can we do?

Thanks,
Christian.

             reply	other threads:[~2023-01-18  9:14 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-18  9:13 Christian König [this message]
2023-01-18  9:13 ` Ongoing failure for "dim rebuild-tip" Christian König
2023-01-18  9:29 ` [Intel-gfx] " Thomas Zimmermann
2023-01-18  9:29   ` Thomas Zimmermann
2023-01-18  9:32   ` [Intel-gfx] " Christian König
2023-01-18  9:32     ` Christian König
2023-01-18 10:09     ` [Intel-gfx] " Christian König
2023-01-18 10:09       ` Christian König
2023-01-18 11:16 ` [Intel-gfx] " Jani Nikula
2023-01-18 11:16   ` Jani Nikula
2023-01-18 11:37   ` [Intel-gfx] " Christian König
2023-01-18 11:37     ` Christian König
2023-01-18 12:57 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork

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=b1605ab2-7f60-1e2d-de21-a6eb94afdbc7@amd.com \
    --to=christian.koenig@amd.com \
    --cc=airlied@redhat.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@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.