[linux] 01/01: Update patch for 2.6.32.69-rc2 to final 2.6.32.69 (no real change)

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch squeeze-security
in repository linux.

commit c871ccec233d1eddf91e5817eb3b5a7b96555f41
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Dec 6 13:48:12 2015 +0000

    Update patch for 2.6.32.69-rc2 to final 2.6.32.69 (no real change)
---
 debian/changelog                                                      | 2 +-
 .../bugfix/all/stable/{2.6.32.69-rc2.patch => 2.6.32.69.patch}        | 4 +---
 debian/patches/series/48squeeze17                                     | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c40e96..1c2d8fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ linux-2.6 (2.6.32-48squeeze17) UNRELEASED; urgency=medium
   * media: usbvision: fix overflow of interfaces array (CVE-2015-7833)
   * media: usbvision: fix crash on detecting device with invalid
     configuration (CVE-2015-7833)
-  * Add stable release 2.6.32.69-rc2:
+  * Add stable release 2.6.32.69:
     - xhci: fix off by one error in TRB DMA address boundary check
     - rds: fix an integer overflow test in rds_info_getsockopt()
     - net: Clone skb before setting peeked flag
diff --git a/debian/patches/bugfix/all/stable/2.6.32.69-rc2.patch b/debian/patches/bugfix/all/stable/2.6.32.69.patch
similarity index 99%
rename from debian/patches/bugfix/all/stable/2.6.32.69-rc2.patch
rename to debian/patches/bugfix/all/stable/2.6.32.69.patch
index 73418e3..8698a62 100644
--- a/debian/patches/bugfix/all/stable/2.6.32.69-rc2.patch
+++ b/debian/patches/bugfix/all/stable/2.6.32.69.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index e28e263..6f9ac206 100644
 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
 index 303eaeb8..b289d66 100644
 --- a/arch/x86/kernel/entry_64.S
@@ -1004,7 +1002,7 @@ index b435d1f..d81312f 100644
  		 * They get marked to be SIGKILLed if they fault in these
  		 * areas. This is because a future no-page fault on this VMA
 diff --git a/net/core/datagram.c b/net/core/datagram.c
-index 4ade301..767c17a 100644
+index 4ade301..767c17aa 100644
 --- a/net/core/datagram.c
 +++ b/net/core/datagram.c
 @@ -127,6 +127,35 @@ out_noerr:
diff --git a/debian/patches/series/48squeeze17 b/debian/patches/series/48squeeze17
index 1f70412..5825691 100644
--- a/debian/patches/series/48squeeze17
+++ b/debian/patches/series/48squeeze17
@@ -24,7 +24,7 @@
 # End of patches to drop for 2.6.32.69
 
 # Add upstream patches
-+ bugfix/all/stable/2.6.32.69-rc2.patch
++ bugfix/all/stable/2.6.32.69.patch
 
 # Restore conflicting patches
 + bugfix/all/rds-fix-race-condition-when-sending-a-message-on-unbound-socket.patch

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