Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts ...

Conflicts:
	include/linux/compiler-clang.h
	include/linux/compiler-gcc.h
	include/linux/compiler-intel.h
	include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2017-11-07 10:32:44 +01:00

..

mdev

vfio/mdev: Use a module softdep for vfio_mdev

2017-02-08 13:13:25 -07:00

pci

vfio/pci: Fix handling of RC integrated endpoint PCIe capability size

2017-07-27 10:39:33 -06:00

platform

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

Kconfig

vfio: Fix build break when SPAPR_TCE_IOMMU=n

2017-02-08 13:13:25 -07:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

vfio_iommu_spapr_tce.c

Merge tag 'powerpc-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2017-05-05 11:36:44 -07:00

vfio_iommu_type1.c

vfio/type1: Give hardware MSI regions precedence

2017-08-10 13:11:50 -06:00

vfio_spapr_eeh.c

drivers/vfio: Support EEH error injection

2015-05-12 20:33:35 +10:00

vfio.c

locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()

2017-10-25 11:01:08 +02:00

virqfd.c

sched/wait: Rename wait_queue_t => wait_queue_entry_t

2017-06-20 12:18:27 +02:00