[kernel] r6883 - in dists/trunk/linux-2.6/debian: . arch arch/sparc patches/series

[Bastian Blank]

Author: waldi
Date: Sat Jun 24 15:45:32 2006
New Revision: 6883

Removed:
   dists/trunk/linux-2.6/debian/patches/sparc32-iotlb.patch
Modified:
   dists/trunk/linux-2.6/debian/arch/defines
   dists/trunk/linux-2.6/debian/arch/sparc/defines
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1

Log:
Revert r6880, r6881 and r6882. Can't accept an ABI bump yet.


Modified: dists/trunk/linux-2.6/debian/arch/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/defines	Sat Jun 24 15:45:32 2006
@@ -1,5 +1,5 @@
 [abi]
-abiname: 2
+abiname: 1
 
 [base]
 arches:

Modified: dists/trunk/linux-2.6/debian/arch/sparc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/defines	Sat Jun 24 15:45:32 2006
@@ -1,5 +1,4 @@
 [base]
-compiler: gcc-4.1
 flavours:
  sparc32
  sparc64

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Jun 24 15:45:32 2006
@@ -1,12 +1,3 @@
-linux-2.6 (2.6.17-2) UNRELEASED; urgency=low
-
-  [ Jurij Smakov ]
-  * [sparc] Switch to gcc-4.1, as it produces the working kernel, while
-    gcc-4.0 does not. Bump ABI to 2 as a result.
-  * [sparc32] Add sparc32-iotlb.patch to fix DMA errors on sparc32.
-
- -- Jurij Smakov <jurij at debian.org>  Sat, 24 Jun 2006 08:42:46 -0700
-
 linux-2.6 (2.6.17-1) unstable; urgency=low
 
   [ Frederik Schüler ]

Modified: dists/trunk/linux-2.6/debian/patches/series/1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1	Sat Jun 24 15:45:32 2006
@@ -22,4 +22,3 @@
 + s390-drivers-ccw-uevent-cleanup.patch
 + mips-sb1-duart-tts.patch
 + 2.6.17.1
-+ sparc32-iotlb.patch