From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 09315C433EF for ; Tue, 7 Jun 2022 01:06:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 67BD110ECF1; Tue, 7 Jun 2022 01:06:54 +0000 (UTC) Received: from emeril.freedesktop.org (emeril.freedesktop.org [131.252.210.167]) by gabe.freedesktop.org (Postfix) with ESMTP id D880A10ECF1; Tue, 7 Jun 2022 01:06:52 +0000 (UTC) Received: from emeril.freedesktop.org (localhost [127.0.0.1]) by emeril.freedesktop.org (Postfix) with ESMTP id CDB94A66C9; Tue, 7 Jun 2022 01:06:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Patchwork To: "Jason Gunthorpe" Date: Tue, 07 Jun 2022 01:06:52 -0000 Message-ID: <165456401281.8647.7152977154668482978@emeril.freedesktop.org> X-Patchwork-Hint: ignore References: <0-v1-896844109f36+a-vfio_unmap_notif_jgg@nvidia.com> In-Reply-To: <0-v1-896844109f36+a-vfio_unmap_notif_jgg@nvidia.com> Subject: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBS?= =?utf-8?q?emove_the_VFIO=5FIOMMU=5FNOTIFY=5FDMA=5FUNMAP_notifier?= X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: intel-gfx@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" == 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".