Merge tag 'gvt-fixes-2017-04-01' of https://github.com/01org/gvt-linux into drm-intel...

gvt-fixes-2017-04-01

- Fix cfg space in failsafe (Changbin)
- Fix a race for irq inject with vgpu release (Zhi)
- Fix golden state firmware load (Zhi)

Link: http://patchwork.freedesktop.org/patch/msgid/20170401080650.6cvqon7nsbziwnyc@zhen-hp.sh.intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --cc drivers/gpu/drm/i915/gvt/gvt.h
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/kvmgt.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/vgpu.c
Simple merge