streamline upstream commits

git-svn-id: svn+ssh://svn.debian.org/svn/kernel-sec@2214 e094ebfe-e918-0410-adfb-c712417f3574

6 files changed, 5 insertions, 11 deletions

diff --git a/retired/CVE-2009-4272 b/retired/CVE-2009-4272
index c1fe2368..e8c183ee 100644
--- a/retired/CVE-2009-4272
+++ b/retired/CVE-2009-4272
@@ -8,9 +8,8 @@ Notes:
  Introduced via:
  c6153b5b77650879d78dec76414213c76dd8d574 v2.6.27-rc4~39^2~41
  1080d709fb9d8cd4392f93476ee46a9d6ea05a5b v2.6.29-rc1~581^2~973
- Fixed in: 73e42897 and b6280b47
 Bugs:
-upstream: released (2.6.31)
+upstream: released (2.6.31) [73e42897, b6280b47]
 linux-2.6: released (2.6.31-1)
 2.6.18-etch-security: N/A
 2.6.24-etch-security: N/A
diff --git a/retired/CVE-2010-0006 b/retired/CVE-2010-0006
index baab029d..bfca97a9 100644
--- a/retired/CVE-2010-0006
+++ b/retired/CVE-2010-0006
@@ -8,7 +8,7 @@ Notes:
  on in most cases in oss-sec posting, so likely not a
  very high urgency issue
 Bugs:
-upstream: released (2.6.33) (2570a4f5428bcdb1077622342181755741e7fa60)
+upstream: released (2.6.33) [2570a4f5428bcdb1077622342181755741e7fa60]
 2.6.32-upstream-stable: released (2.6.32.4)
 linux-2.6: released (2.6.32-6)
 2.6.18-etch-security: N/A "introduced in 2.6.28 commit 483a47d2"
diff --git a/retired/CVE-2010-1148 b/retired/CVE-2010-1148
index b427ac29..41c6b1e8 100644
--- a/retired/CVE-2010-1148
+++ b/retired/CVE-2010-1148
@@ -4,10 +4,9 @@ Description:
 References:
  http://www.openwall.com/lists/oss-security/2010/04/06/2
 Notes:
- jmm> fa588e0c57048b3d4bfcd772d80dc0615f83fd35
  jmm> Submitted for 2.6.32.x stable
 Bugs:
-upstream: released (2.6.34)
+upstream: released (2.6.34) [fa588e0c57048b3d4bfcd772d80dc0615f83fd35]
 2.6.32-upstream-stable: released (2.6.32.16)
 linux-2.6: released (2.6.32-12) [bugfix/all/cifs-allow-null-nd-on-create.patch]
 2.6.26-lenny-security: N/A "introduced in 2.6.29 commit c3b2a0c6"
diff --git a/retired/CVE-2010-2071 b/retired/CVE-2010-2071
index ffca9e1b..c81df629 100644
--- a/retired/CVE-2010-2071
+++ b/retired/CVE-2010-2071
@@ -3,7 +3,6 @@ Description:
 References:
  http://www.openwall.com/lists/oss-security/2010/06/11/3
  http://lkml.org/lkml/2010/5/17/544 
- http://git.kernel.org/linus/2f26afba
 Notes:
 Bugs:
 upstream: released (2.6.35-rc3) [2f26afba]
diff --git a/retired/CVE-2010-2226 b/retired/CVE-2010-2226
index a755cd02..15be4c16 100644
--- a/retired/CVE-2010-2226
+++ b/retired/CVE-2010-2226
@@ -6,9 +6,8 @@ References:
  http://archives.free.net.ph/message/20100616.130710.301704aa.en.html
  http://archives.free.net.ph/message/20100616.135735.40f53a32.en.html
 Notes:
- jmm> 1817176a86352f65210139d4c794ad2d19fc6b63
 Bugs:
-upstream: released (2.6.35-rc4)
+upstream: released (2.6.35-rc4) [1817176a86352f65210139d4c794ad2d19fc6b63]
 2.6.32-upstream-stable: released (2.6.32.18)
 linux-2.6: released (2.6.32-20)
 2.6.26-lenny-security: released (2.6.26-24lenny1) [bugfix/all/xfs-prevent-swapext-from-operating-on-write-only-files.patch]
diff --git a/retired/CVE-2010-3298 b/retired/CVE-2010-3298
index 05f704cd..b51196ca 100644
--- a/retired/CVE-2010-3298
+++ b/retired/CVE-2010-3298
@@ -3,10 +3,8 @@ Description: drivers/net/usb/hso.c: reading uninitialized memory
 References:
  https://bugzilla.redhat.com/633140
 Notes:
- jmm> 7011e660938fc44ed86319c18a5954e95a82ab3e
- jmm> 
 Bugs:
-upstream: released (2.6.36-rc5)
+upstream: released (2.6.36-rc5) [7011e660938fc44ed86319c18a5954e95a82ab3e]
 2.6.32-upstream-stable: released (2.6.32.23)
 linux-2.6: released (2.6.32-24)
 2.6.26-lenny-security: N/A (Driver introduced in 2.6.27)