From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Jan 2019 23:27:04 +0000 (-0800)
Subject: Merge tag 'vfio-v5.0-rc4' of git://github.com/awilliam/linux-vfio
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2580acb2a1b12f93f8259ff2053cec455d1d22a7;p=linux.git

Merge tag 'vfio-v5.0-rc4' of git://github.com/awilliam/linux-vfio

Pull VFIO fixes from Alex Williamson:

 - cleanup licenses in new files (Thomas Gleixner)

 - cleanup new compiler warnings (Alexey Kardashevskiy)

* tag 'vfio-v5.0-rc4' of git://github.com/awilliam/linux-vfio:
  vfio-pci/nvlink2: Fix ancient gcc warnings
  vfio/pci: Cleanup license mess
---

2580acb2a1b12f93f8259ff2053cec455d1d22a7