From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Christoph Hellwig" <hch@lst.de>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [01/10] mm: update the documentation for vfree
Date: Wed, 30 Sep 2020 20:10:31 -0000 [thread overview]
Message-ID: <160149663166.17418.9840901943895753062@emeril.freedesktop.org> (raw)
In-Reply-To: <20200930175133.1252382-1-hch@lst.de>
== Series Details ==
Series: series starting with [01/10] mm: update the documentation for vfree
URL : https://patchwork.freedesktop.org/series/82271/
State : failure
== Summary ==
Applying: mm: update the documentation for vfree
Applying: mm: add a VM_MAP_PUT_PAGES flag for vmap
Applying: mm: add a vmap_pfn function
Applying: mm: allow a NULL fn callback in apply_to_page_range
Applying: zsmalloc: switch from alloc_vm_area to get_vm_area
Applying: drm/i915: use vmap in shmem_pin_map
Applying: drm/i915: use vmap in i915_gem_object_map
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gem/i915_gem_pages.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pages.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_pages.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0007 drm/i915: use vmap in i915_gem_object_map
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".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2020-09-30 20:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-30 17:51 [Intel-gfx] remove alloc_vm_area v3 Christoph Hellwig
2020-09-30 17:51 ` [Intel-gfx] [PATCH 01/10] mm: update the documentation for vfree Christoph Hellwig
2020-09-30 17:51 ` [Intel-gfx] [PATCH 02/10] mm: add a VM_MAP_PUT_PAGES flag for vmap Christoph Hellwig
2020-09-30 17:51 ` [Intel-gfx] [PATCH 03/10] mm: add a vmap_pfn function Christoph Hellwig
2020-09-30 17:51 ` [Intel-gfx] [PATCH 04/10] mm: allow a NULL fn callback in apply_to_page_range Christoph Hellwig
2020-09-30 17:51 ` [Intel-gfx] [PATCH 05/10] zsmalloc: switch from alloc_vm_area to get_vm_area Christoph Hellwig
2020-09-30 17:51 ` [Intel-gfx] [PATCH 06/10] drm/i915: use vmap in shmem_pin_map Christoph Hellwig
2020-09-30 17:51 ` [Intel-gfx] [PATCH 07/10] drm/i915: use vmap in i915_gem_object_map Christoph Hellwig
2020-09-30 17:51 ` [Intel-gfx] [PATCH 08/10] xen/xenbus: use apply_to_page_range directly in xenbus_map_ring_pv Christoph Hellwig
2020-09-30 17:51 ` [Intel-gfx] [PATCH 09/10] x86/xen: open code alloc_vm_area in arch_gnttab_valloc Christoph Hellwig
2020-09-30 17:51 ` [Intel-gfx] [PATCH 10/10] mm: remove alloc_vm_area Christoph Hellwig
2020-09-30 20:10 ` 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=160149663166.17418.9840901943895753062@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=hch@lst.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).