public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Alex Williamson <alex.williamson@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	"kvm@vger.kernel.org" <kvm@vger.kernel.org>,
	Arnd Bergmann <arnd@arndb.de>,
	Jani Nikula <jani.nikula@intel.com>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics <intel-gfx@lists.freedesktop.org>,
	linux-kernel@vger.kernel.org,
	Paul Gortmaker <paul.gortmaker@windriver.com>,
	Maling list - DRI developers <dri-devel@lists.freedesktop.org>,
	Arvind Yadav <arvind.yadav.cs@gmail.com>,
	Dan Carpenter <dan.carpenter@oracle.com>
Subject: [GIT PULL] VFIO fixes for v4.10-rc3
Date: Fri, 6 Jan 2017 09:16:42 -0700	[thread overview]
Message-ID: <20170106091642.12e0fdd4@t450s.home> (raw)

Hi Linus,

This pull request has a merge conflict and requires a build fix with
kvmgt (merged in ed40875), which is a consumer of the new vfio-mdev
work.  Stephen Rothwell has fixed both of these correctly for
linux-next as documented here:

merge conflict:
http://marc.info/?l=linux-next&m=148340046329214

build fix:
https://lkml.org/lkml/2017/1/2/521

Please make the corresponding changes in your merge.  Thanks!

Alex


The following changes since commit 98473f9f3f9bd404873cd1178c8be7d6d619f0d1:

  mm/filemap: fix parameters to test_bit() (2016-12-29 14:46:39 -0800)

are available in the git repository at:

  git://github.com/awilliam/linux-vfio.git tags/vfio-v4.10-rc3

for you to fetch changes up to c6ef7fd40eddad38a8825cbd6bb2ce8bdbba88f5:

  vfio-mdev: fix non-standard ioctl return val causing i386 build fail (2017-01-04 13:22:38 -0700)

----------------------------------------------------------------
VFIO fixes for v4.10-rc3

 - Add mtty sample driver properly into build system (Alex Williamson)
 - Restore type1 mapping performance after mdev (Alex Williamson)
 - Fix mdev device race (Alex Williamson)
 - Cleanups to the mdev ABI used by vendor drivers (Alex Williamson)
 - Build fix for old compilers (Arnd Bergmann)
 - Fix sample driver error path (Dan Carpenter)
 - Handle pci_iomap() error (Arvind Yadav)
 - Fix mdev ioctl return type (Paul Gortmaker)

----------------------------------------------------------------
Alex Williamson (6):
      vfio-mdev: Fix mtty sample driver building
      vfio/type1: Restore mapping performance with mdev support
      vfio-mdev: Fix remove race
      vfio-mdev: de-polute the namespace, rename parent_device & parent_ops
      vfio-mdev: Make mdev_parent private
      vfio-mdev: Make mdev_device private and abstract interfaces

Arnd Bergmann (1):
      vfio-pci: use 32-bit comparisons for register address for gcc-4.5

Arvind Yadav (1):
      vfio-pci: Handle error from pci_iomap

Dan Carpenter (1):
      vfio-mdev: fix some error codes in the sample code

Paul Gortmaker (1):
      vfio-mdev: fix non-standard ioctl return val causing i386 build fail

 Documentation/vfio-mediated-device.txt |  27 +++++----
 drivers/gpu/drm/i915/gvt/kvmgt.c       |  22 ++++----
 drivers/vfio/mdev/mdev_core.c          | 100 +++++++++++++++++++++++++++------
 drivers/vfio/mdev/mdev_private.h       |  29 +++++++++-
 drivers/vfio/mdev/mdev_sysfs.c         |   8 +--
 drivers/vfio/mdev/vfio_mdev.c          |  12 ++--
 drivers/vfio/pci/vfio_pci.c            |   4 ++
 drivers/vfio/pci/vfio_pci_rdwr.c       |   5 +-
 drivers/vfio/vfio_iommu_type1.c        |  98 ++++++++++++++++----------------
 include/linux/mdev.h                   |  56 +++++-------------
 samples/Kconfig                        |   7 +++
 samples/Makefile                       |   3 +-
 samples/vfio-mdev/Makefile             |  14 +----
 samples/vfio-mdev/mtty.c               |  32 ++++++-----
 14 files changed, 246 insertions(+), 171 deletions(-)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

                 reply	other threads:[~2017-01-06 16:16 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20170106091642.12e0fdd4@t450s.home \
    --to=alex.williamson@redhat.com \
    --cc=arnd@arndb.de \
    --cc=arvind.yadav.cs@gmail.com \
    --cc=dan.carpenter@oracle.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=paul.gortmaker@windriver.com \
    --cc=sfr@canb.auug.org.au \
    --cc=torvalds@linux-foundation.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