intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Patchwork <patchwork@emeril.freedesktop.org>
To: "zhouchuangao" <zhouchuangao@vivo.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for gpu/drm/i915: Remove duplicated include of intel_region_lmem.h
Date: Mon, 02 Aug 2021 13:56:40 -0000	[thread overview]
Message-ID: <162791260005.3899.1066033305878362502@emeril.freedesktop.org> (raw)
In-Reply-To: <1627888031-56048-1-git-send-email-zhouchuangao@vivo.com>

== Series Details ==

Series: gpu/drm/i915: Remove duplicated include of intel_region_lmem.h
URL   : https://patchwork.freedesktop.org/series/93305/
State : failure

== Summary ==

Applying: gpu/drm/i915: Remove duplicated include of intel_region_lmem.h
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_region_lmem.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_region_lmem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_region_lmem.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 gpu/drm/i915: Remove duplicated include of intel_region_lmem.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".



      reply	other threads:[~2021-08-02 13:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-02  7:07 [Intel-gfx] [PATCH] gpu/drm/i915: Remove duplicated include of intel_region_lmem.h zhouchuangao
2021-08-02 13:56 ` Patchwork [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=162791260005.3899.1066033305878362502@emeril.freedesktop.org \
    --to=patchwork@emeril.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=zhouchuangao@vivo.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;
as well as URLs for NNTP newsgroup(s).