From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Somalapuram Amaranath" <amaranath.somalapuram@amd.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for Change the meaning of the fields in the ttm_place structure from pfn to bytes
Date: Fri, 03 Mar 2023 07:41:01 -0000 [thread overview]
Message-ID: <167782926137.9996.11634529781557754241@emeril.freedesktop.org> (raw)
In-Reply-To: <20230303071659.1213074-1-Amaranath.Somalapuram@amd.com>
== Series Details ==
Series: Change the meaning of the fields in the ttm_place structure from pfn to bytes
URL : https://patchwork.freedesktop.org/series/114603/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/114603/revisions/1/mbox/ not applied
Applying: Change the meaning of the fields in the ttm_place structure from pfn to bytes
Using index info to reconstruct a base tree...
M drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
M drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
M drivers/gpu/drm/i915/i915_ttm_buddy_manager.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_ttm_buddy_manager.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_ttm_buddy_manager.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_object.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 Change the meaning of the fields in the ttm_place structure from pfn to bytes
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:[~2023-03-03 7:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 7:16 [PATCH] Change the meaning of the fields in the ttm_place structure from pfn to bytes Somalapuram Amaranath
2023-03-03 7:16 ` [Nouveau] " Somalapuram Amaranath
2023-03-03 7:16 ` [Intel-gfx] " Somalapuram Amaranath
2023-03-03 7:41 ` Patchwork [this message]
2023-03-03 14:55 ` Michel Dänzer
2023-03-03 14:55 ` [Intel-gfx] " Michel Dänzer
2023-03-03 14:55 ` [Nouveau] " Michel Dänzer
2023-03-03 15:39 ` Stanislaw Gruszka
2023-03-03 15:39 ` [Nouveau] " Stanislaw Gruszka
2023-03-03 15:39 ` [Intel-gfx] " Stanislaw Gruszka
2023-03-06 8:03 ` kernel test robot
2023-03-06 8:03 ` kernel test robot
2023-03-06 8:03 ` [Intel-gfx] " kernel test robot
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=167782926137.9996.11634529781557754241@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=amaranath.somalapuram@amd.com \
--cc=intel-gfx@lists.freedesktop.org \
/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.