From cf59280c31ac276fd2ca78cabb48acf0b56b4446 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Mon, 18 May 2015 10:03:18 -0400
Subject: Linux v4.1-rc3-346-gc0655fe9b090

- Enable in-kernel vmmouse driver (rhbz 1214474)
---
 config-x86-generic      | 1 +
 kbuild-AFTER_LINK.patch | 2 +-
 kernel.spec             | 7 ++++++-
 sources                 | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/config-x86-generic b/config-x86-generic
index 0a100a837..5305651b2 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -527,6 +527,7 @@ CONFIG_INTEL_RAPL=m
 
 CONFIG_VMWARE_VMCI=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_MOUSE_PS2_VMMOUSE=y
 
 CONFIG_XZ_DEC_X86=y
 
diff --git a/kbuild-AFTER_LINK.patch b/kbuild-AFTER_LINK.patch
index 2ff2d2626..582616bc6 100644
--- a/kbuild-AFTER_LINK.patch
+++ b/kbuild-AFTER_LINK.patch
@@ -90,7 +90,7 @@ index 2a8ddfd12a5b..452ca53561fe 100644
        cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
  
 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
-index 275a3a8b78af..a4430446630c 100644
+index e97032069f88..9ea82f444dea 100644
 --- a/arch/x86/vdso/Makefile
 +++ b/arch/x86/vdso/Makefile
 @@ -172,8 +172,9 @@ $(vdso32-images:%=$(obj)/%.dbg): $(obj)/vdso32-%.so.dbg: FORCE \
diff --git a/kernel.spec b/kernel.spec
index c2cbbb955..61f66d11b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -640,6 +640,7 @@ Requires(pre): %{kernel_prereq}\
 Requires(pre): %{initrd_prereq}\
 Requires(pre): linux-firmware >= 20130724-29.git31f6b30\
 Requires(preun): systemd >= 200\
+Conflicts: xorg-x11-drv-vmmouse < 3.0.99\
 %{expand:%%{?kernel%{?1:_%{1}}_conflicts:Conflicts: %%{kernel%{?1:_%{1}}_conflicts}}}\
 %{expand:%%{?kernel%{?1:_%{1}}_obsoletes:Obsoletes: %%{kernel%{?1:_%{1}}_obsoletes}}}\
 %{expand:%%{?kernel%{?1:_%{1}}_provides:Provides: %%{kernel%{?1:_%{1}}_provides}}}\
@@ -2212,6 +2213,10 @@ fi
 #
 # 
 %changelog
+* Mon May 18 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc3.git4.1
+- Linux v4.1-rc3-346-gc0655fe9b090
+- Enable in-kernel vmmouse driver (rhbz 1214474)
+
 * Fri May 15 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc3.git3.1
 - Linux v4.1-rc3-177-gf0897f4cc0fc
 
diff --git a/sources b/sources
index 02267e55a..4b409865a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 a86916bd12798220da9eb4a1eec3616d  linux-4.0.tar.xz
 d125eecce68ab6fb5f1f23523c2c04b8  perf-man-4.0.tar.gz
 a858fe84bfa6428ff24852221613131f  patch-4.1-rc3.xz
-9dff2b4094cd06ccd7fa2f0a003f5e4b  patch-4.1-rc3-git3.xz
+8e06c270c849e88d13278570b15aa6c8  patch-4.1-rc3-git4.xz
-- 
cgit