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 Enhance vfio PCI hot reset for vfio cdev device (rev7)
Date: Wed, 14 Jun 2023 15:47:00 -0000 [thread overview]
Message-ID: <168675762054.17428.7935292626241050492@emeril.freedesktop.org> (raw)
In-Reply-To: <20230602121515.79374-1-yi.l.liu@intel.com>
== Series Details ==
Series: Enhance vfio PCI hot reset for vfio cdev device (rev7)
URL : https://patchwork.freedesktop.org/series/116991/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/116991/revisions/7/mbox/ not applied
Applying: vfio/pci: Update comment around group_fd get in vfio_pci_ioctl_pci_hot_reset()
Applying: vfio/pci: Move the existing hot reset logic to be a helper
Applying: iommufd: Reserve all negative IDs in the iommufd xarray
Applying: iommufd: Add iommufd_ctx_has_group()
Applying: iommufd: Add helper to retrieve iommufd_ctx and devid
Applying: vfio: Mark cdev usage in vfio_device
Applying: vfio: Add helper to search vfio_device in a dev_set
Applying: vfio/pci: Extend VFIO_DEVICE_GET_PCI_HOT_RESET_INFO for vfio device cdev
Using index info to reconstruct a base tree...
M drivers/vfio/pci/vfio_pci_core.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/vfio/pci/vfio_pci_core.c
CONFLICT (content): Merge conflict in drivers/vfio/pci/vfio_pci_core.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0008 vfio/pci: Extend VFIO_DEVICE_GET_PCI_HOT_RESET_INFO for vfio device cdev
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".
Build failed, no error log produced
prev parent reply other threads:[~2023-06-14 15:47 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-02 12:15 [PATCH v7 0/9] Enhance vfio PCI hot reset for vfio cdev device Yi Liu
2023-06-02 12:15 ` [Intel-gfx] " Yi Liu
2023-06-02 12:15 ` [PATCH v7 1/9] vfio/pci: Update comment around group_fd get in vfio_pci_ioctl_pci_hot_reset() Yi Liu
2023-06-02 12:15 ` [Intel-gfx] " Yi Liu
2023-06-02 12:15 ` [PATCH v7 2/9] vfio/pci: Move the existing hot reset logic to be a helper Yi Liu
2023-06-02 12:15 ` [Intel-gfx] " Yi Liu
2023-06-02 12:15 ` [PATCH v7 3/9] iommufd: Reserve all negative IDs in the iommufd xarray Yi Liu
2023-06-02 12:15 ` [Intel-gfx] " Yi Liu
2023-06-13 11:46 ` Jason Gunthorpe
2023-06-13 11:46 ` [Intel-gfx] " Jason Gunthorpe
2023-06-02 12:15 ` [PATCH v7 4/9] iommufd: Add iommufd_ctx_has_group() Yi Liu
2023-06-02 12:15 ` [Intel-gfx] " Yi Liu
2023-06-08 21:40 ` Alex Williamson
2023-06-08 21:40 ` Alex Williamson
2023-06-08 23:44 ` Liu, Yi L
2023-06-08 23:44 ` [Intel-gfx] " Liu, Yi L
2023-06-13 11:46 ` Jason Gunthorpe
2023-06-13 11:46 ` [Intel-gfx] " Jason Gunthorpe
2023-06-02 12:15 ` [PATCH v7 5/9] iommufd: Add helper to retrieve iommufd_ctx and devid Yi Liu
2023-06-02 12:15 ` [Intel-gfx] " Yi Liu
2023-06-13 11:47 ` Jason Gunthorpe
2023-06-13 11:47 ` [Intel-gfx] " Jason Gunthorpe
2023-06-02 12:15 ` [PATCH v7 6/9] vfio: Mark cdev usage in vfio_device Yi Liu
2023-06-02 12:15 ` [Intel-gfx] " Yi Liu
2023-06-13 17:56 ` Jason Gunthorpe
2023-06-13 17:56 ` [Intel-gfx] " Jason Gunthorpe
2023-06-14 5:56 ` Liu, Yi L
2023-06-14 5:56 ` [Intel-gfx] " Liu, Yi L
2023-06-14 12:11 ` Jason Gunthorpe
2023-06-14 12:11 ` [Intel-gfx] " Jason Gunthorpe
2023-06-02 12:15 ` [PATCH v7 7/9] vfio: Add helper to search vfio_device in a dev_set Yi Liu
2023-06-02 12:15 ` [Intel-gfx] " Yi Liu
2023-06-13 11:47 ` Jason Gunthorpe
2023-06-13 11:47 ` Jason Gunthorpe
2023-06-02 12:15 ` [PATCH v7 8/9] vfio/pci: Extend VFIO_DEVICE_GET_PCI_HOT_RESET_INFO for vfio device cdev Yi Liu
2023-06-02 12:15 ` [Intel-gfx] " Yi Liu
2023-06-08 22:26 ` Alex Williamson
2023-06-08 22:26 ` Alex Williamson
2023-06-09 0:04 ` Liu, Yi L
2023-06-09 0:04 ` [Intel-gfx] " Liu, Yi L
2023-06-13 11:46 ` Jason Gunthorpe
2023-06-13 11:46 ` [Intel-gfx] " Jason Gunthorpe
2023-06-13 12:50 ` Liu, Yi L
2023-06-13 12:50 ` [Intel-gfx] " Liu, Yi L
2023-06-13 14:32 ` Alex Williamson
2023-06-13 14:32 ` Alex Williamson
2023-06-13 17:40 ` Jason Gunthorpe
2023-06-13 17:40 ` [Intel-gfx] " Jason Gunthorpe
2023-06-13 18:23 ` Jason Gunthorpe
2023-06-13 18:23 ` [Intel-gfx] " Jason Gunthorpe
2023-06-14 10:35 ` Liu, Yi L
2023-06-14 10:35 ` [Intel-gfx] " Liu, Yi L
2023-06-14 12:17 ` Jason Gunthorpe
2023-06-14 12:17 ` [Intel-gfx] " Jason Gunthorpe
2023-06-14 13:05 ` Liu, Yi L
2023-06-14 13:05 ` [Intel-gfx] " Liu, Yi L
2023-06-14 13:37 ` Jason Gunthorpe
2023-06-14 13:37 ` [Intel-gfx] " Jason Gunthorpe
2023-06-15 3:31 ` Liu, Yi L
2023-06-15 3:31 ` Liu, Yi L
2023-06-02 12:15 ` [PATCH v7 9/9] vfio/pci: Allow passing zero-length fd array in VFIO_DEVICE_PCI_HOT_RESET Yi Liu
2023-06-02 12:15 ` [Intel-gfx] " Yi Liu
2023-06-08 22:30 ` Alex Williamson
2023-06-08 22:30 ` Alex Williamson
2023-06-09 0:13 ` Liu, Yi L
2023-06-09 0:13 ` [Intel-gfx] " Liu, Yi L
2023-06-09 14:38 ` Jason Gunthorpe
2023-06-09 14:38 ` [Intel-gfx] " Jason Gunthorpe
2023-06-13 18:09 ` Jason Gunthorpe
2023-06-13 18:09 ` [Intel-gfx] " Jason Gunthorpe
2023-06-02 15:14 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Enhance vfio PCI hot reset for vfio cdev device (rev5) Patchwork
2023-06-02 15:29 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-06-04 20:05 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-06-08 6:59 ` [PATCH v7 0/9] Enhance vfio PCI hot reset for vfio cdev device Jiang, Yanting
2023-06-08 6:59 ` [Intel-gfx] " Jiang, Yanting
2023-06-13 20:47 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Enhance vfio PCI hot reset for vfio cdev device (rev6) Patchwork
2023-06-14 15:47 ` 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=168675762054.17428.7935292626241050492@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.