All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Jason Gunthorpe" <jgg@nvidia.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for Remove the VFIO_IOMMU_NOTIFY_DMA_UNMAP notifier
Date: Tue, 07 Jun 2022 01:06:52 -0000	[thread overview]
Message-ID: <165456401281.8647.7152977154668482978@emeril.freedesktop.org> (raw)
In-Reply-To: <0-v1-896844109f36+a-vfio_unmap_notif_jgg@nvidia.com>

== Series Details ==

Series: Remove the VFIO_IOMMU_NOTIFY_DMA_UNMAP notifier
URL   : https://patchwork.freedesktop.org/series/104793/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/104793/revisions/1/mbox/ not applied
Applying: vfio: Replace the DMA unmapping notifier with a callback
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gvt/gvt.h
M	drivers/gpu/drm/i915/gvt/kvmgt.c
M	drivers/s390/cio/vfio_ccw_ops.c
M	drivers/s390/crypto/vfio_ap_ops.c
M	drivers/s390/crypto/vfio_ap_private.h
M	drivers/vfio/vfio.c
M	include/linux/vfio.h
Falling back to patching base and 3-way merge...
Auto-merging include/linux/vfio.h
CONFLICT (content): Merge conflict in include/linux/vfio.h
Auto-merging drivers/vfio/vfio.c
CONFLICT (content): Merge conflict in drivers/vfio/vfio.c
Auto-merging drivers/s390/crypto/vfio_ap_private.h
CONFLICT (content): Merge conflict in drivers/s390/crypto/vfio_ap_private.h
Auto-merging drivers/s390/crypto/vfio_ap_ops.c
CONFLICT (content): Merge conflict in drivers/s390/crypto/vfio_ap_ops.c
Auto-merging drivers/s390/cio/vfio_ccw_ops.c
CONFLICT (content): Merge conflict in drivers/s390/cio/vfio_ccw_ops.c
Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/kvmgt.c
Auto-merging drivers/gpu/drm/i915/gvt/gvt.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/gvt.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 vfio: Replace the DMA unmapping notifier with a callback
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".



  parent reply	other threads:[~2022-06-07  1:06 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-07  0:34 [PATCH 0/2] Remove the VFIO_IOMMU_NOTIFY_DMA_UNMAP notifier Jason Gunthorpe
2022-06-07  0:34 ` [Intel-gfx] " Jason Gunthorpe
2022-06-07  0:34 ` [PATCH 1/2] vfio: Replace the DMA unmapping notifier with a callback Jason Gunthorpe
2022-06-07  0:34   ` [Intel-gfx] " Jason Gunthorpe
2022-06-07  5:39   ` Christoph Hellwig
2022-06-07  5:39     ` [Intel-gfx] " Christoph Hellwig
2022-06-07 11:57     ` Jason Gunthorpe
2022-06-07 11:57       ` Jason Gunthorpe
2022-06-07 11:57       ` [Intel-gfx] " Jason Gunthorpe
2022-06-07 22:40       ` Jason Gunthorpe
2022-06-07 22:40         ` Jason Gunthorpe
2022-06-07 22:40         ` [Intel-gfx] " Jason Gunthorpe
2022-06-07  0:34 ` [PATCH 2/2] vfio: Replace the iommu notifier with a device list Jason Gunthorpe
2022-06-07  0:34   ` [Intel-gfx] " Jason Gunthorpe
2022-06-07  5:44   ` Christoph Hellwig
2022-06-07  5:44     ` [Intel-gfx] " Christoph Hellwig
2022-06-07 11:57     ` Jason Gunthorpe
2022-06-07 11:57       ` [Intel-gfx] " Jason Gunthorpe
2022-06-07 11:57       ` Jason Gunthorpe
2022-06-07  1:06 ` Patchwork [this message]
2022-07-20  0:02 [PATCH v4 0/2] Remove the VFIO_IOMMU_NOTIFY_DMA_UNMAP notifier Jason Gunthorpe
2022-07-20  0:29 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork

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=165456401281.8647.7152977154668482978@emeril.freedesktop.org \
    --to=patchwork@emeril.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jgg@nvidia.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.