From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Radhakrishna Sripada" <radhakrishna.sripada@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for i915: Introduce Meteorlake
Date: Thu, 07 Jul 2022 00:47:44 -0000 [thread overview]
Message-ID: <165715486498.2212.16727322646070060676@emeril.freedesktop.org> (raw)
In-Reply-To: <20220707003107.2533184-1-radhakrishna.sripada@intel.com>
== Series Details ==
Series: i915: Introduce Meteorlake
URL : https://patchwork.freedesktop.org/series/106000/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/106000/revisions/1/mbox/ not applied
Applying: drm/i915/mtl: Add MeteorLake platform info
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_drv.h
M drivers/gpu/drm/i915/i915_pci.c
M drivers/gpu/drm/i915/intel_device_info.c
M drivers/gpu/drm/i915/intel_device_info.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_device_info.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.h
Auto-merging drivers/gpu/drm/i915/intel_device_info.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.c
Auto-merging drivers/gpu/drm/i915/i915_pci.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
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/mtl: Add MeteorLake platform info
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-07-07 0:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-07 0:31 [Intel-gfx] [PATCH 0/2] i915: Introduce Meteorlake Radhakrishna Sripada
2022-07-07 0:31 ` [Intel-gfx] [PATCH 1/2] drm/i915/mtl: Add MeteorLake platform info Radhakrishna Sripada
2022-07-07 3:55 ` Murthy, Arun R
2022-07-07 0:31 ` [Intel-gfx] [PATCH 2/2] drm/i915/mtl: Add MeteorLake PCI IDs Radhakrishna Sripada
2022-07-07 3:58 ` Murthy, Arun R
2022-07-07 0:47 ` Patchwork [this message]
2022-07-07 4:11 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for i915: Introduce Meteorlake (rev2) Patchwork
2022-07-07 18:19 ` [Intel-gfx] [PATCH 0/2] i915: Introduce Meteorlake Radhakrishna Sripada
2022-07-07 18:19 ` [Intel-gfx] [PATCH 1/2] drm/i915/mtl: Add MeteorLake platform info Radhakrishna Sripada
2022-07-07 18:20 ` [Intel-gfx] [PATCH 2/2] drm/i915/mtl: Add MeteorLake PCI IDs Radhakrishna Sripada
2022-07-07 20:26 ` [Intel-gfx] [PATCH v2 0/2] i915: Introduce Meteorlake Radhakrishna Sripada
2022-07-07 20:26 ` [Intel-gfx] [PATCH v2 1/2] drm/i915/mtl: Add MeteorLake platform info Radhakrishna Sripada
2022-07-07 20:59 ` Matt Roper
2022-07-07 20:26 ` [Intel-gfx] [PATCH v2 2/2] drm/i915/mtl: Add MeteorLake PCI IDs Radhakrishna Sripada
2022-07-07 20:48 ` Matt Roper
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=165715486498.2212.16727322646070060676@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=radhakrishna.sripada@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 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.