From: Linus Torvalds Date: Sat, 14 Mar 2015 16:36:10 +0000 (-0700) Subject: Merge tag 'vfio-v4.0-rc4' of git://github.com/awilliam/linux-vfio X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0be952c13be80ccdd3cb0d1ba25099de9468ac1b;p=linux-beck.git Merge tag 'vfio-v4.0-rc4' of git://github.com/awilliam/linux-vfio Pull VFIO fix from Alex Williamson: "Add missing break to avoid clobbering ioctl (Alexey Kardashevskiy)" * tag 'vfio-v4.0-rc4' of git://github.com/awilliam/linux-vfio: vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEX --- 0be952c13be80ccdd3cb0d1ba25099de9468ac1b