From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Jani Nikula" <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BUILD: failure for hdrtest: hide the disgusting turds
Date: Tue, 01 Apr 2025 12:59:32 -0000 [thread overview]
Message-ID: <174351237271.22413.2807281599249456080@e6b6f09ec485> (raw)
In-Reply-To: <20250401121830.21696-1-jani.nikula@intel.com>
== Series Details ==
Series: hdrtest: hide the disgusting turds
URL : https://patchwork.freedesktop.org/series/147058/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/147058/revisions/1/mbox/ not applied
Applying: drm: place header test files in .hdrtest subdirectories
Applying: drm/xe: place header test files in .hdrtest subdirectories
Applying: drm/i915: place header test files in .hdrtest subdirectories
Applying: kbuild: hdrtest: place header test files in .hdrtest subdirectories
Applying: drm: add config option for extra build-time checks
Using index info to reconstruct a base tree...
M drivers/gpu/drm/Kconfig
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/Kconfig
CONFLICT (content): Merge conflict in drivers/gpu/drm/Kconfig
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0005 drm: add config option for extra build-time checks
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".
Build failed, no error log produced
prev parent reply other threads:[~2025-04-01 12:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-01 12:18 [PATCH 0/5] hdrtest: hide the disgusting turds Jani Nikula
2025-04-01 12:18 ` [PATCH 1/5] drm: place header test files in .hdrtest subdirectories Jani Nikula
2025-04-01 12:18 ` [PATCH 2/5] drm/xe: " Jani Nikula
2025-04-01 12:18 ` [PATCH 3/5] drm/i915: " Jani Nikula
2025-04-01 12:18 ` [PATCH 4/5] kbuild: hdrtest: " Jani Nikula
2025-04-01 17:49 ` Masahiro Yamada
2025-04-01 12:18 ` [PATCH 5/5] drm: add config option for extra build-time checks Jani Nikula
2025-04-01 12:59 ` 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=174351237271.22413.2807281599249456080@e6b6f09ec485 \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.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