diff --git a/debian/changelog b/debian/changelog index ebbf8c72b..7ebb0715f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,24 @@ -linux (3.11.2-1~exp1) UNRELEASED; urgency=low +linux (3.11.5-1) UNRELEASED; urgency=low * New upstream stable update: http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.11.1 http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.11.2 - media: siano: fix divide error on 0 counters (Closes: #719623) + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.11.3 + - HID: multitouch: validate indexes details (CVE-2013-2897) + - HID: LG: validate HID output report details (CVE-2013-2893) + - HID: zeroplus: validate output report details (CVE-2013-2889) + - HID: lenovo-tpkbd: fix leak if tpkbd_probe_tp fails (CVE-2013-2894) + - HID: steelseries: validate output report details (CVE-2013-2891) + - HID: logitech-dj: validate output report details (CVE-2013-2895) + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.11.4 + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.11.5 + - cpqarray: fix info leak in ida_locked_ioctl() (CVE-2013-2147) + - cciss: fix info leak in cciss_ioctl32_passthru() (CVE-2013-2147) + - tuntap: correctly handle error in tun_set_iff() (CVE-2013-4343) + - net: sctp: fix ipv6 ipsec encryption bug in sctp_v6_xmit (CVE-2013-4350) + - ipv6: udp packets following an UFO enqueued packet need also be handled + by UFO (CVE-2013-4387) [ Ben Hutchings ] * udeb: Update config to match previous kernel config changes: diff --git a/debian/patches/bugfix/all/irq-Always-define-devm_-request_threaded-free-_irq.patch b/debian/patches/bugfix/all/irq-Always-define-devm_-request_threaded-free-_irq.patch deleted file mode 100644 index 2e6caf8bc..000000000 --- a/debian/patches/bugfix/all/irq-Always-define-devm_-request_threaded-free-_irq.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Ben Hutchings -Date: Mon, 30 Sep 2013 00:53:31 +0100 -Subject: irq: Always define devm_{request_threaded,free}_irq() -Forwarded: http://mid.gmane.org/1380498811.14493.7.camel@deadeye.wl.decadent.org.uk - -This is only needed for 3.11, as s390 has now been changed to use the -generic IRQ code upstream. - -These functions are currently defined only if CONFIG_GENERIC_HARDIRQS -is enabled. But they are still needed on s390 which has its own IRQ -management. - -References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=s390&ver=3.11%7Erc4-1%7Eexp1&stamp=1376009959 -Signed-off-by: Ben Hutchings ---- - kernel/Makefile | 2 +- - kernel/irq/Makefile | 6 ++++-- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/kernel/Makefile b/kernel/Makefile -index 35ef118..ed2c9a9 100644 ---- a/kernel/Makefile -+++ b/kernel/Makefile -@@ -79,7 +79,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o - obj-$(CONFIG_KGDB) += debug/ - obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o - obj-$(CONFIG_LOCKUP_DETECTOR) += watchdog.o --obj-$(CONFIG_GENERIC_HARDIRQS) += irq/ -+obj-y += irq/ - obj-$(CONFIG_SECCOMP) += seccomp.o - obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o - obj-$(CONFIG_TREE_RCU) += rcutree.o -diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile -index fff1738..639b2e1 100644 ---- a/kernel/irq/Makefile -+++ b/kernel/irq/Makefile -@@ -1,8 +1,10 @@ -- --obj-y := irqdesc.o handle.o manage.o spurious.o resend.o chip.o dummychip.o devres.o -+obj-y += devres.o -+ifdef CONFIG_GENERIC_HARDIRQS -+obj-y += irqdesc.o handle.o manage.o spurious.o resend.o chip.o dummychip.o - obj-$(CONFIG_GENERIC_IRQ_CHIP) += generic-chip.o - obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o - obj-$(CONFIG_IRQ_DOMAIN) += irqdomain.o - obj-$(CONFIG_PROC_FS) += proc.o - obj-$(CONFIG_GENERIC_PENDING_IRQ) += migration.o - obj-$(CONFIG_PM_SLEEP) += pm.o -+endif diff --git a/debian/patches/series b/debian/patches/series index 404de0678..716196e41 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -73,8 +73,6 @@ features/all/efi-autoload-efivars.patch # m68k Kconfig bugfix bugfix/m68k/ethernat-kconfig.patch -bugfix/all/irq-Always-define-devm_-request_threaded-free-_irq.patch - # m68k IRQ bugfix bugfix/m68k/atari-irqs.patch