[linux] 01/02: qxl: Enable by default (Closes: #779515)

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux.

commit 7f648db4e236f9c6105e4160023e3a4659bf8988
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Nov 7 14:19:28 2015 +0000

    qxl: Enable by default (Closes: #779515)
---
 debian/changelog                                     |  6 ++++++
 .../debian/qxl-disable-modeset-by-default.patch      | 20 --------------------
 debian/patches/series                                |  1 -
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10dfe6a..826671a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux (4.3-1~exp2) UNRELEASED; urgency=medium
+
+  * qxl: Enable by default (Closes: #779515)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 07 Nov 2015 14:18:48 +0000
+
 linux (4.3-1~exp1) experimental; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/debian/qxl-disable-modeset-by-default.patch b/debian/patches/debian/qxl-disable-modeset-by-default.patch
deleted file mode 100644
index b809e34..0000000
--- a/debian/patches/debian/qxl-disable-modeset-by-default.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Ben Hutchings <ben at decadent.org.uk>
-Subject: qxl: Disable by default
-Forwarded: not-needed
-
-This kernel driver is incompatible with older versions of
-xserver-xorg-video-qxl, so do not enable it by default.  It should be
-enabled by a modprobe configuration file installed by
-xserver-xorg-video-qxl in jessie.
-
---- a/drivers/gpu/drm/qxl/qxl_drv.c
-+++ b/drivers/gpu/drm/qxl/qxl_drv.c
-@@ -47,7 +47,7 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist
- };
- MODULE_DEVICE_TABLE(pci, pciidlist);
- 
--static int qxl_modeset = -1;
-+static int qxl_modeset = 0;
- int qxl_num_crtc = 4;
- 
- MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
diff --git a/debian/patches/series b/debian/patches/series
index e2efa28..f3a6ae5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,7 +42,6 @@ debian/mgag200-disable-autoload.patch
 debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch
 debian/snd-pcsp-disable-autoload.patch
 bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
-debian/qxl-disable-modeset-by-default.patch
 
 # Arch bug fixes
 bugfix/mips/disable-advansys.patch

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