diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 11:26:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 11:26:09 -0800 |
| commit | f14cc3b13d8f3ceee862f8365d37ba214630126a (patch) | |
| tree | 7529d76872014adb93ef06be9cf0fba1c83d9784 /drivers/net/slip/slip.c | |
| parent | 5bcbe22ca47da04cda3a858cef67f55b550c1d13 (diff) | |
| parent | d9d84780f17cd9e25ddde10eb40357b96b7d6874 (diff) | |
| download | linux-f14cc3b13d8f3ceee862f8365d37ba214630126a.tar.bz2 | |
Merge tag 'vfio-v4.11-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Kconfig fixes for SPAPR_TCE_IOMMU=n (Michael Ellerman)
- Module softdep rather than request_module to simplify usage from
initrd (Alex Williamson)
- Comment typo fix (Changbin Du)
* tag 'vfio-v4.11-rc1' of git://github.com/awilliam/linux-vfio:
vfio: fix a typo in comment of function vfio_pin_pages
vfio: Replace module request with softdep
vfio/mdev: Use a module softdep for vfio_mdev
vfio: Fix build break when SPAPR_TCE_IOMMU=n
Diffstat (limited to 'drivers/net/slip/slip.c')
0 files changed, 0 insertions, 0 deletions