Ongoing failure for "dim rebuild-tip"

[Thomas Zimmermann]

Hi

Am 18.01.23 um 10:13 schrieb Christian König:
> 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?

Just blindly guessing:

Are you sure you don't have any old fix-up patches somewhere?

I've not seen this problem. But I've found a fix-up patch in my tree. 
Maybe the attachment fixes the problem for you? (goes into 
drm-rerere/fixups/).

Best regards
Thomas

> 
> Thanks,
> Christian.

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: drm-intel-gt-next.patch
Type: text/x-patch
Size: 1112 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20230118/7fd0f70b/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20230118/7fd0f70b/attachment.sig>