From: Jani Nikula <jani.nikula@intel.com>
To: Patchwork <patchwork@emeril.freedesktop.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: clean up i915_drv.h
Date: Wed, 05 Jan 2022 22:28:54 +0200 [thread overview]
Message-ID: <875yqyj5a1.fsf@intel.com> (raw)
In-Reply-To: <164141342082.25402.15604951649221430139@emeril.freedesktop.org>
On Wed, 05 Jan 2022, Patchwork <patchwork@emeril.freedesktop.org> wrote:
> == Series Details ==
>
> Series: drm/i915: clean up i915_drv.h
> URL : https://patchwork.freedesktop.org/series/98515/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915: split out i915_getparam.h from i915_drv.h
> Applying: drm/i915: split out i915_cmd_parser.h from i915_drv.h
> Applying: drm/i915: split out i915_gem_evict.h from i915_drv.h
> Applying: drm/i915: split out gem/i915_gem_userptr.h from i915_drv.h
> Applying: drm/i915: split out gem/i915_gem_tiling.h from i915_drv.h
> Applying: drm/i915: split out i915_gem.h declarations from i915_drv.h
> Applying: drm/i915: split out i915_gem_internal.h from i915_drv.h
> error: sha1 information is lacking or useless (drivers/gpu/drm/i915/i915_drv.h).
> error: could not build fake ancestor
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> Patch failed at 0007 drm/i915: split out i915_gem_internal.h from i915_drv.h
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
Don't know what gives, the series rebases just fine without conflicts.
I guess let's review first, and I'll split smaller series for CI because
this is going to be painful.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
prev parent reply other threads:[~2022-01-05 20:29 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-05 19:56 [Intel-gfx] [PATCH 00/21] drm/i915: clean up i915_drv.h Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 01/21] drm/i915: split out i915_getparam.h from i915_drv.h Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 02/21] drm/i915: split out i915_cmd_parser.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 03/21] drm/i915: split out i915_gem_evict.h " Jani Nikula
2022-01-06 8:55 ` Tvrtko Ursulin
2022-01-07 13:22 ` Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 04/21] drm/i915: split out gem/i915_gem_userptr.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 05/21] drm/i915: split out gem/i915_gem_tiling.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 06/21] drm/i915: split out i915_gem.h declarations " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 07/21] drm/i915: split out i915_gem_internal.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 08/21] drm/i915: remove leftover i915_gem_pm.h declarations " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 09/21] drm/i915: split out gem/i915_gem_dmabuf.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 10/21] drm/i915: split out gem/i915_gem_create.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 11/21] drm/i915: split out gem/i915_gem_domain.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 12/21] drm/i915: move i915_cache_level_str() static in i915_debugfs.c Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 13/21] drm/i915: move i915_gem_vm_lookup() where it's used Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 14/21] drm/i915: move i915_reset_count()/i915_reset_engine_count() out of i915_drv.h Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 15/21] drm/i915: split out i915_file_private.h from i915_drv.h Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 16/21] drm/i915: don't include drm_cache.h in i915_drv.h Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 17/21] drm/i915: include shmem_fs.h only where needed Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 18/21] drm/i915: include some drm headers " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 19/21] drm/i915: axe lots of unnecessary includes from i915_drv.h Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 20/21] drm/i915: fix drm_i915.h include grouping and sorting Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 21/21] drm/i915: group drm_i915.h forward declarations together Jani Nikula
2022-01-05 20:10 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: clean up i915_drv.h Patchwork
2022-01-05 20:28 ` Jani Nikula [this message]
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=875yqyj5a1.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=patchwork@emeril.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox