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 Provide core infrastructure for managing open/release (rev6)
Date: Fri, 23 Jul 2021 09:41:12 -0000 [thread overview]
Message-ID: <162703327202.3044.16659074123640207084@emeril.freedesktop.org> (raw)
In-Reply-To: <0-v2-b6a5582525c9+ff96-vfio_reflck_jgg@nvidia.com>
== Series Details ==
Series: Provide core infrastructure for managing open/release (rev6)
URL : https://patchwork.freedesktop.org/series/92556/
State : failure
== Summary ==
Applying: vfio/samples: Remove module get/put
Applying: vfio/mbochs: Fix missing error unwind in mbochs_probe()
Applying: vfio: Introduce a vfio_uninit_group_dev() API call
Using index info to reconstruct a base tree...
M drivers/vfio/pci/vfio_pci.c
M samples/vfio-mdev/mbochs.c
Falling back to patching base and 3-way merge...
Auto-merging samples/vfio-mdev/mbochs.c
CONFLICT (content): Merge conflict in samples/vfio-mdev/mbochs.c
Auto-merging drivers/vfio/pci/vfio_pci.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 vfio: Introduce a vfio_uninit_group_dev() API call
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:[~2021-07-23 9:41 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 17:42 [Intel-gfx] [PATCH v2 00/14] Provide core infrastructure for managing open/release Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 01/14] vfio/samples: Remove module get/put Jason Gunthorpe
2021-07-23 7:18 ` Christoph Hellwig
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 02/14] vfio/mbochs: Fix missing error unwind in mbochs_probe() Jason Gunthorpe
2021-07-20 22:01 ` Alex Williamson
2021-07-20 22:49 ` Jason Gunthorpe
2021-07-20 22:54 ` Alex Williamson
2021-07-21 9:18 ` Cornelia Huck
2021-07-21 9:16 ` Cornelia Huck
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 03/14] vfio: Introduce a vfio_uninit_group_dev() API call Jason Gunthorpe
2021-07-21 11:33 ` Cornelia Huck
2021-07-23 7:18 ` Christoph Hellwig
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 04/14] vfio: Provide better generic support for open/release vfio_device_ops Jason Gunthorpe
2021-07-22 14:42 ` Cornelia Huck
2021-07-23 7:39 ` Christoph Hellwig
2021-07-23 14:38 ` Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 05/14] vfio/samples: Delete useless open/close Jason Gunthorpe
2021-07-23 7:39 ` Christoph Hellwig
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 06/14] vfio/fsl: Move to the device set infrastructure Jason Gunthorpe
2021-07-23 7:44 ` Christoph Hellwig
2021-07-23 12:22 ` Jason Gunthorpe
2021-07-23 12:29 ` Christoph Hellwig
2021-07-23 13:11 ` Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 07/14] vfio/platform: Use open_device() instead of open coding a refcnt scheme Jason Gunthorpe
2021-07-22 14:48 ` Cornelia Huck
2021-07-23 7:45 ` Christoph Hellwig
2021-07-23 12:23 ` Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 08/14] vfio/pci: Move to the device set infrastructure Jason Gunthorpe
2021-07-23 7:47 ` Christoph Hellwig
2021-07-23 12:59 ` Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 09/14] vfio/pci: Change vfio_pci_try_bus_reset() to use the dev_set Jason Gunthorpe
2021-07-23 8:05 ` Christoph Hellwig
2021-07-23 13:30 ` Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 10/14] vfio/pci: Reorganize VFIO_DEVICE_PCI_HOT_RESET to use the device set Jason Gunthorpe
2021-07-23 8:12 ` Christoph Hellwig
2021-07-23 13:31 ` Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 11/14] vfio/mbochs: Fix close when multiple device FDs are open Jason Gunthorpe
2021-07-23 8:13 ` Christoph Hellwig
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 12/14] vfio/ap, ccw: Fix open/close " Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 13/14] vfio/gvt: " Jason Gunthorpe
2021-07-23 8:14 ` Christoph Hellwig
2021-07-20 17:43 ` [Intel-gfx] [PATCH v2 14/14] vfio: Remove struct vfio_device_ops open/release Jason Gunthorpe
2021-07-23 8:14 ` Christoph Hellwig
2021-07-20 17:55 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Provide core infrastructure for managing open/release (rev4) Patchwork
2021-07-20 17:59 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-07-20 18:25 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-07-20 19:53 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-07-20 22:22 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Provide core infrastructure for managing open/release (rev5) Patchwork
2021-07-23 9:41 ` 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=162703327202.3044.16659074123640207084@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).