diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-06 14:22:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-06 14:22:58 -0700 |
| commit | a2de4bbddce3e98bd2444bb027dc84418a0066b1 (patch) | |
| tree | 4252b3c6f3efeaccc418a543dfa7e5be305c1b2d /fs/attr.c | |
| parent | 38182162b50aa4e970e5997df0a0c4288147a153 (diff) | |
| parent | cc35518d29bc8e38902866b74874b4a3f1ad3617 (diff) | |
| download | linux-a2de4bbddce3e98bd2444bb027dc84418a0066b1.tar.bz2 | |
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 'fs/attr.c')
0 files changed, 0 insertions, 0 deletions