Linux v4.1-rc3-346-gc0655fe9b090

- Enable in-kernel vmmouse driver (rhbz 1214474)
This commit is contained in:
Josh Boyer 2015-05-18 10:03:18 -04:00
parent ea896256a4
commit cf59280c31
4 changed files with 9 additions and 3 deletions

View File

@ -527,6 +527,7 @@ CONFIG_INTEL_RAPL=m
CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI=m
CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMWARE_VMCI_VSOCKETS=m
CONFIG_MOUSE_PS2_VMMOUSE=y
CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC_X86=y

View File

@ -90,7 +90,7 @@ index 2a8ddfd12a5b..452ca53561fe 100644
cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $< cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile 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 --- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile +++ b/arch/x86/vdso/Makefile
@@ -172,8 +172,9 @@ $(vdso32-images:%=$(obj)/%.dbg): $(obj)/vdso32-%.so.dbg: FORCE \ @@ -172,8 +172,9 @@ $(vdso32-images:%=$(obj)/%.dbg): $(obj)/vdso32-%.so.dbg: FORCE \

View File

@ -67,7 +67,7 @@ Summary: The Linux kernel
# The rc snapshot level # The rc snapshot level
%define rcrev 3 %define rcrev 3
# The git snapshot level # The git snapshot level
%define gitrev 3 %define gitrev 4
# Set rpm version accordingly # Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0 %define rpmversion 4.%{upstream_sublevel}.0
%endif %endif
@ -640,6 +640,7 @@ Requires(pre): %{kernel_prereq}\
Requires(pre): %{initrd_prereq}\ Requires(pre): %{initrd_prereq}\
Requires(pre): linux-firmware >= 20130724-29.git31f6b30\ Requires(pre): linux-firmware >= 20130724-29.git31f6b30\
Requires(preun): systemd >= 200\ 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}}_conflicts:Conflicts: %%{kernel%{?1:_%{1}}_conflicts}}}\
%{expand:%%{?kernel%{?1:_%{1}}_obsoletes:Obsoletes: %%{kernel%{?1:_%{1}}_obsoletes}}}\ %{expand:%%{?kernel%{?1:_%{1}}_obsoletes:Obsoletes: %%{kernel%{?1:_%{1}}_obsoletes}}}\
%{expand:%%{?kernel%{?1:_%{1}}_provides:Provides: %%{kernel%{?1:_%{1}}_provides}}}\ %{expand:%%{?kernel%{?1:_%{1}}_provides:Provides: %%{kernel%{?1:_%{1}}_provides}}}\
@ -2212,6 +2213,10 @@ fi
# #
# #
%changelog %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 * Fri May 15 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc3.git3.1
- Linux v4.1-rc3-177-gf0897f4cc0fc - Linux v4.1-rc3-177-gf0897f4cc0fc

View File

@ -1,4 +1,4 @@
a86916bd12798220da9eb4a1eec3616d linux-4.0.tar.xz a86916bd12798220da9eb4a1eec3616d linux-4.0.tar.xz
d125eecce68ab6fb5f1f23523c2c04b8 perf-man-4.0.tar.gz d125eecce68ab6fb5f1f23523c2c04b8 perf-man-4.0.tar.gz
a858fe84bfa6428ff24852221613131f patch-4.1-rc3.xz a858fe84bfa6428ff24852221613131f patch-4.1-rc3.xz
9dff2b4094cd06ccd7fa2f0a003f5e4b patch-4.1-rc3-git3.xz 8e06c270c849e88d13278570b15aa6c8 patch-4.1-rc3-git4.xz