diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-06 23:22:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-06 23:22:58 +0200 |
| commit | a2de4bbddce3e98bd2444bb027dc84418a0066b1 (patch) | |
| tree | 4252b3c6f3efeaccc418a543dfa7e5be305c1b2d /mm/swap_cgroup.c | |
| parent | Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/b... (diff) | |
| parent | docs: vfio: fix typo (diff) | |
| download | linux-a2de4bbddce3e98bd2444bb027dc84418a0066b1.tar.xz linux-a2de4bbddce3e98bd2444bb027dc84418a0066b1.zip | |
Merge tag 'vfio-v5.13-rc1pt2' of git://github.com/awilliam/linux-vfio
Pull more VFIO updates from Alex Williamson:
"A second small set of commits for this merge window, primarily to
unbreak some deletions from our uAPI header.
- Additional mdev sample driver cleanup (Dan Carpenter)
- Doc fix (Alyssa Ross)
- Unbreak uAPI from NVLink2 support removal (Alex Williamson)"
* tag 'vfio-v5.13-rc1pt2' of git://github.com/awilliam/linux-vfio:
docs: vfio: fix typo
vfio/pci: Revert nvlink removal uAPI breakage
vfio/mdev: remove unnecessary NULL check in mbochs_create()
Diffstat (limited to 'mm/swap_cgroup.c')
0 files changed, 0 insertions, 0 deletions