diff --git a/debian/changelog b/debian/changelog index 8c7d1c73d..4f3415f80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ linux (4.2.6-2) UNRELEASED; urgency=medium * Btrfs: fix truncation of compressed and inlined extents (CVE-2015-8374) * netfilter: Enable NFT_DUP_IPV4, NFT_DUP_IPV6 as modules (Closes: #803370) * [x86] Enable PINCTRL_BAYTRAIL (Closes: #797949) + * qxl: Enable by default (Closes: #779515) -- Salvatore Bonaccorso Tue, 10 Nov 2015 22:05:58 +0100 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 b809e34c2..000000000 --- a/debian/patches/debian/qxl-disable-modeset-by-default.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Ben Hutchings -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 bf8e78717..4aa544cbe 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