summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'vfio-v5.13-rc1' of git://github.com/awilliam/linux-vfioLinus Torvalds2021-04-2935-1361/+793
|\
| * vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEVArnd Bergmann2021-04-271-1/+1
| * vfio/iommu_type1: Remove unused pinned_page_dirty_scope in vfio_iommuKeqian Zhu2021-04-141-1/+0
| * vfio/mdev: Correct the function signatures for the mdev_type_attributesJason Gunthorpe2021-04-129-62/+90
| * vfio/mdev: Remove kobj from mdev_parent_ops->create()Jason Gunthorpe2021-04-128-9/+8
| * vfio/gvt: Use mdev_get_type_group_id()Jason Gunthorpe2021-04-123-22/+11
| * vfio/gvt: Make DRM_I915_GVT depend on VFIO_MDEVJason Gunthorpe2021-04-121-0/+1
| * vfio/mbochs: Use mdev_get_type_group_id()Jason Gunthorpe2021-04-071-14/+7
| * vfio/mdpy: Use mdev_get_type_group_id()Jason Gunthorpe2021-04-071-16/+6
| * vfio/mtty: Use mdev_get_type_group_id()Jason Gunthorpe2021-04-071-43/+7
| * vfio/mdev: Add mdev/mtype_get_type_group_id()Jason Gunthorpe2021-04-074-7/+33
| * vfio/mdev: Remove duplicate storage of parent in mdev_deviceJason Gunthorpe2021-04-073-16/+12
| * vfio/mdev: Add missing error handling to dev_set_name()Jason Gunthorpe2021-04-071-1/+3
| * vfio/mdev: Reorganize mdev_device_create()Jason Gunthorpe2021-04-071-33/+27
| * vfio/mdev: Add missing reference counting to mdev_typeJason Gunthorpe2021-04-071-0/+4
| * vfio/mdev: Expose mdev_get/put_parent to mdev_private.hJason Gunthorpe2021-04-072-20/+15
| * vfio/mdev: Use struct mdev_type in struct mdev_deviceJason Gunthorpe2021-04-074-20/+18
| * vfio/mdev: Simplify driver registrationJason Gunthorpe2021-04-074-19/+15
| * vfio/mdev: Add missing typesafety around mdev_deviceJason Gunthorpe2021-04-078-128/+83
| * vfio/mdev: Do not allow a mdev_type to have a NULL parent pointerJason Gunthorpe2021-04-071-1/+1
| * vfio/mdev: Fix missing static's on MDEV_TYPE_ATTR'sJason Gunthorpe2021-04-072-10/+10
| *-. Merge branches 'v5.13/vfio/embed-vfio_device', 'v5.13/vfio/misc' and 'v5.13/v...Alex Williamson2021-04-0611-575/+68
| |\ \
| | | * vfio/pci: remove vfio_pci_nvlink2Christoph Hellwig2021-04-066-563/+4
| | * | vfio/type1: Remove the almost unused check in vfio_iommu_type1_unpin_pagesShenming Lu2021-04-061-4/+4
| | * | vfio/platform: Fix spelling mistake "registe" -> "register"Zhen Lei2021-04-061-1/+1
| | * | vfio/pci: fix a couple of spelling mistakesZhen Lei2021-04-062-3/+3
| | * | vfio/mdev: Fix spelling mistake "interal" -> "internal"Zhen Lei2021-04-061-1/+1
| | * | vfio/type1: fix a couple of spelling mistakesZhen Lei2021-04-061-3/+3
| | * | vfio/pci: Add support for opregion v2.1+Fred Gao2021-04-061-0/+53
| | * | vfio/pci: Remove an unnecessary blank line in vfio_pci_enableZhou Wang2021-04-061-1/+0
| | * | vfio: pci: Spello fix in the file vfio_pci.cBhaskar Chowdhury2021-04-061-1/+1
| | |/
| * | vfio: Remove device_data from the vfio bus driver APIJason Gunthorpe2021-04-067-21/+9
| * | vfio/pci: Replace uses of vfio_device_data() with container_ofJason Gunthorpe2021-04-061-43/+24
| * | vfio: Make vfio_device_ops pass a 'struct vfio_device *' instead of 'void *'Jason Gunthorpe2021-04-067-86/+117
| * | vfio/mdev: Make to_mdev_device() into a static inlineJason Gunthorpe2021-04-061-1/+4
| * | vfio/mdev: Use vfio_init/register/unregister_group_devJason Gunthorpe2021-04-063-44/+20
| * | vfio/pci: Use vfio_init/register/unregister_group_devJason Gunthorpe2021-04-062-5/+6
| * | vfio/pci: Re-order vfio_pci_probe()Jason Gunthorpe2021-04-061-8/+9
| * | vfio/pci: Move VGA and VF initialization to functionsJason Gunthorpe2021-04-061-42/+74
| * | vfio/fsl-mc: Use vfio_init/register/unregister_group_devJason Gunthorpe2021-04-062-9/+12
| * | vfio/fsl-mc: Re-order vfio_fsl_mc_probe()Jason Gunthorpe2021-04-061-27/+47
| * | vfio/platform: Use vfio_init/register/unregister_group_devJason Gunthorpe2021-04-064-31/+25
| * | vfio: Split creation of a vfio_device into init and register opsJason Gunthorpe2021-04-063-73/+99
| * | vfio: Simplify the lifetime logic for vfio_deviceJason Gunthorpe2021-04-061-54/+25
| * | vfio: Remove extra put/gets around vfio_device->groupJason Gunthorpe2021-04-061-19/+2
| |/
* | Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cl...Linus Torvalds2021-04-29109-2034/+5279
|\ \
| * \ Merge branch 'clk-ralink' into clk-nextStephen Boyd2021-04-2811-59/+665
| |\ \
| | * | MAINTAINERS: add MT7621 CLOCK maintainerSergio Paracuellos2021-04-131-0/+6
| | * | staging: mt7621-dts: use valid vendor 'mediatek' instead of invalid 'mtk'Sergio Paracuellos2021-04-132-9/+9
| | * | staging: mt7621-dts: make use of new 'mt7621-clk'Sergio Paracuellos2021-04-132-52/+33