[linux] 09/13: [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 sid
in repository linux.

commit fe21430e13fcea09dc1867d89f40ba879612af9f
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Nov 12 16:43:48 2015 +0000

    [x86] psmouse: Enable MOUSE_PS2_VMMOUSE (Closes: #802929)
    
    linux-image: Add versioned Breaks on xserver-xorg-input-vmmouse to avoid
    driver conflicts
    
    (cherry picked from commit cdec8195c20d29429922fbb873009be932dea874)
---
 debian/changelog                    | 3 +++
 debian/config/amd64/defines         | 1 +
 debian/config/i386/defines          | 1 +
 debian/config/kernelarch-x86/config | 3 +--
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b15620f..e41845c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,9 @@ linux (4.2.6-2) UNRELEASED; urgency=medium
     MOUSE_ELAN_I2C_SMBUS (Closes: #791631)
   * [armhf] hsi: Enable CMT_SPEECH as module (Closes: #791819)
   * [armhf] power: Enable BATTERY_RX51 as module (Closes: #791820)
+  * [x86] psmouse: Enable MOUSE_PS2_VMMOUSE (Closes: #802929)
+    - linux-image: Add versioned Breaks on xserver-xorg-input-vmmouse to
+      avoid driver conflicts
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Tue, 10 Nov 2015 22:05:58 +0100
 
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index ea197ee..933bed4 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -12,6 +12,7 @@ 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 20dc644..ed1b05f 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -17,6 +17,7 @@ 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 4cf2963..31a4163 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -727,8 +727,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 ##
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
-#. Must not enable this until xserver-xorg-input-vmmouse is upgraded
-# CONFIG_MOUSE_PS2_VMMOUSE is not set
+CONFIG_MOUSE_PS2_VMMOUSE=y
 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