[linux] 01/01: Revert "[x86] psmouse: Enable MOUSE_PS2_VMMOUSE (Closes: #802929)"

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch jessie-backports
in repository linux.

commit 5bf052d564aea546961328fcdfb783fdb37cda65
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Dec 14 23:58:41 2015 +0000

    Revert "[x86] psmouse: Enable MOUSE_PS2_VMMOUSE (Closes: #802929)"
    
    This reverts commit fe21430e13fcea09dc1867d89f40ba879612af9f.  It is
    incompatible with jessie's version of xserver-xorg-input-vmmouse, and
    several important metapackages depend on that.
---
 debian/changelog                    | 7 +++++++
 debian/config/amd64/defines         | 1 -
 debian/config/i386/defines          | 1 -
 debian/config/kernelarch-x86/config | 3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e73192c..38e90bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (4.2.6-3~bpo8+2) jessie-backports; urgency=medium
+
+  * Revert "[x86] psmouse: Enable MOUSE_PS2_VMMOUSE", which breaks
+    xserver-xorg-input-vmmouse and several metapackages in jessie
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 14 Dec 2015 23:57:20 +0000
+
 linux (4.2.6-3~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 933bed4..ea197ee 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -12,7 +12,6 @@ image-file: arch/x86/boot/bzImage
 bootloaders: grub-pc grub-efi extlinux
 configs:
 install-stem: vmlinuz
-breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
 
 [relations]
 headers%gcc-4.9: linux-compiler-gcc-4.9-x86
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index ed1b05f..20dc644 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -17,7 +17,6 @@ part-long-pae: This kernel requires PAE (Physical Address Extension).
 bootloaders: grub-pc extlinux
 configs:
 install-stem: vmlinuz
-breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
 
 [relations]
 headers%gcc-4.9: linux-compiler-gcc-4.9-x86
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 31a4163..4cf2963 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -727,7 +727,8 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 ##
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_VMMOUSE=y
+#. Must not enable this until xserver-xorg-input-vmmouse is upgraded
+# CONFIG_MOUSE_PS2_VMMOUSE is not set
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git