From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Stephen Rothwell" <sfr@canb.auug.org.au>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-intel tree (rev4)
Date: Fri, 26 Aug 2022 02:37:45 -0000 [thread overview]
Message-ID: <166148146512.30039.1764825894267626891@emeril.freedesktop.org> (raw)
In-Reply-To: <20220826123636.72fbea19@canb.auug.org.au>
== Series Details ==
Series: linux-next: build failure after merge of the drm-intel tree (rev4)
URL : https://patchwork.freedesktop.org/series/42839/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/42839/revisions/4/mbox/ not applied
Applying: linux-next: build failure after merge of the drm-intel tree
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/uc/intel_guc.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_guc.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 linux-next: build failure after merge of the drm-intel tree
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".
next prev parent reply other threads:[~2022-08-26 2:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 2:36 linux-next: build failure after merge of the drm-intel tree Stephen Rothwell
2022-08-26 2:36 ` [Intel-gfx] " Stephen Rothwell
2022-08-26 2:36 ` Stephen Rothwell
2022-08-26 2:37 ` Patchwork [this message]
2022-08-26 7:50 ` Jani Nikula
2022-08-26 7:50 ` [Intel-gfx] " Jani Nikula
2022-08-26 7:50 ` 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=166148146512.30039.1764825894267626891@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=sfr@canb.auug.org.au \
/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.