[linux] 01/01: Merge tag 'debian/3.16.7-ckt25-2' into jessie-security

[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-security
in repository linux.

commit eebdeaeba902cade15efb16db608595ceb437916
Merge: 111bfd0 13bc212
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Apr 8 14:15:25 2016 +0100

    Merge tag 'debian/3.16.7-ckt25-2' into jessie-security
    
    Bump the pending version number accordingly.

 debian/changelog      | 9 +++++++--
 debian/patches/series | 8 +++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index 49d191f,6701dce..1898b5c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,5 +1,14 @@@
- linux (3.16.7-ckt25-1+deb8u1) UNRELEASED; urgency=medium
++linux (3.16.7-ckt25-2+deb8u1) UNRELEASED; urgency=medium
 +
 +  * include/linux/poison.h: fix LIST_POISON{1,2} offset (CVE-2016-0821)
 +  * [s390*] mm: four page table levels vs. fork (CVE-2016-2143)
 +  * [amd64] iopl: Properly context-switch IOPL on Xen PV (CVE-2016-3157)
 +  * [amd64] entry/compat: Add missing CLAC to entry_INT80_32 (CVE-2016-XXXX)
++
++ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 30 Mar 2016 16:32:07 +0100
++
+ linux (3.16.7-ckt25-2) jessie; urgency=medium
+ 
    * Revert "drm/radeon: hold reference to fences in radeon_sa_bo_new"
      (Closes: #819881)
    * Revert "drm/radeon: call hpd_irq_event on resume", reported to cause
diff --cc debian/patches/series
index 5d919c3,ff31076..ad3b78c
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -656,12 -656,6 +656,10 @@@ debian/crypto-fix-abi-change-in-3.16.7-
  bugfix/all/ip_vti-ip6_vti-do-not-touch-skb-mark-on-xmit.patch
  bugfix/all/xfrm-override-skb-mark-with-tunnel-parm.i_key-in-xfr.patch
  bugfix/all/ip_vti-ip6_vti-preserve-skb-mark-after-rcv_cb-call.patch
+ bugfix/all/revert-drm-radeon-hold-reference-to-fences-in-radeon.patch
+ bugfix/all/revert-drm-radeon-call-hpd_irq_event-on-resume.patch
+ bugfix/all/revert-usb-hub-do-not-clear-bos-field-during-reset-d.patch
 +bugfix/all/include-linux-poison.h-fix-list_poison-1-2-offset.patch
 +bugfix/s390/s390-mm-four-page-table-levels-vs.-fork.patch
 +bugfix/x86/x86-iopl-64-properly-context-switch-iopl-on-xen-pv.patch
 +bugfix/x86/x86-entry-compat-add-missing-clac-to-entry_int80_32.patch
- 
- # radeon regression fixes
- bugfix/all/revert-drm-radeon-hold-reference-to-fences-in-radeon.patch
- bugfix/all/revert-drm-radeon-call-hpd_irq_event-on-resume.patch
- bugfix/all/revert-usb-hub-do-not-clear-bos-field-during-reset-d.patch

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