From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Alexey Lukyanchuk" <skif@skif-web.ru>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: dell wyse 3040 shutdown fix
Date: Sun, 25 Dec 2022 19:05:45 -0000 [thread overview]
Message-ID: <167199514531.27992.11752157787803759586@emeril.freedesktop.org> (raw)
In-Reply-To: <20221225184413.146916-1-skif@skif-web.ru>
== Series Details ==
Series: drm/i915: dell wyse 3040 shutdown fix
URL : https://patchwork.freedesktop.org/series/112224/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/112224/revisions/1/mbox/ not applied
Applying: drm/i915: dell wyse 3040 shutdown fix
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_audio.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_audio.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_audio.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 drm/i915: dell wyse 3040 shutdown fix
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".
prev parent reply other threads:[~2022-12-25 19:05 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-25 18:44 [PATCH] drm/i915/: dell wyse 3040 shutdown fix Alexey Lukyanchuk
2022-12-25 18:55 ` [PATCH v2] drm/i915: " Alexey Lukyanchuk
2022-12-25 18:55 ` Alexey Lukyanchuk
2022-12-25 18:55 ` [Intel-gfx] " Alexey Lukyanchuk
2022-12-27 16:39 ` Rodrigo Vivi
2022-12-27 16:39 ` Rodrigo Vivi
2022-12-27 16:39 ` Rodrigo Vivi
2022-12-27 17:40 ` Alexey Lukyachuk
2022-12-27 17:40 ` Alexey Lukyachuk
2022-12-27 17:40 ` Alexey Lukyachuk
2022-12-28 8:50 ` Jani Nikula
2022-12-28 8:50 ` Jani Nikula
2022-12-28 8:50 ` Jani Nikula
2023-01-02 13:56 ` Alexey Lukyachuk
2023-01-02 13:56 ` Alexey Lukyachuk
2023-01-02 13:56 ` Alexey Lukyachuk
2023-01-03 10:14 ` Jani Nikula
2023-01-03 10:14 ` Jani Nikula
2023-01-03 10:14 ` Jani Nikula
2023-01-03 10:24 ` Alexey Lukyachuk
2023-01-03 10:24 ` Alexey Lukyachuk
2023-01-03 10:24 ` Alexey Lukyachuk
2023-01-04 14:08 ` Jani Nikula
2023-01-04 14:08 ` Jani Nikula
2023-01-04 14:08 ` Jani Nikula
2023-01-03 12:46 ` Rodrigo Vivi
2023-01-03 12:46 ` Rodrigo Vivi
2023-01-03 12:46 ` Rodrigo Vivi
2023-01-03 13:43 ` Jani Nikula
2023-01-03 13:43 ` Jani Nikula
2023-01-03 13:43 ` Jani Nikula
2023-01-03 16:09 ` Alexey Lukyachuk
2023-01-03 16:09 ` Alexey Lukyachuk
2023-01-03 16:09 ` Alexey Lukyachuk
2023-01-03 16:18 ` Rodrigo Vivi
2023-01-03 16:18 ` Rodrigo Vivi
2023-01-03 16:18 ` Rodrigo Vivi
2022-12-25 19:05 ` 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=167199514531.27992.11752157787803759586@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=skif@skif-web.ru \
/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.