[kernel] r6265 - in dists/trunk/linux-2.6: . debian debian/arch/arm debian/arch/mips debian/arch/mipsel

Wed Mar 22 17:49:44 UTC 2006

Author: waldi
Date: Wed Mar 22 17:49:41 2006
New Revision: 6265

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/arch/mips/config
   dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22
   dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32
   dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/arch/mipsel/config
   dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
   dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/changelog
Log:
Merge /dists/sid/linux-2.6.


Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================

--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	Wed Mar 22 17:49:41 2006
@@ -652,6 +652,7 @@
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
+CONFIG_MACLIST=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set

Modified: dists/trunk/linux-2.6/debian/arch/mips/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config	Wed Mar 22 17:49:41 2006
@@ -0,0 +1 @@
+CONFIG_MIPS=y

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22	Wed Mar 22 17:49:41 2006
@@ -1,11 +1,4 @@
 #
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-rc5
-# Thu Mar  2 14:53:47 2006
-#
-CONFIG_MIPS=y
-
-#
 # Machine selection
 #
 # CONFIG_MIPS_MTX1 is not set

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32	Wed Mar 22 17:49:41 2006
@@ -1,11 +1,4 @@
 #
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-rc5
-# Thu Mar  2 14:54:35 2006
-#
-CONFIG_MIPS=y
-
-#
 # Machine selection
 #
 # CONFIG_MIPS_MTX1 is not set

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a	Wed Mar 22 17:49:41 2006
@@ -1,11 +1,4 @@
 #
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-rc5
-# Thu Mar  2 14:54:52 2006
-#
-CONFIG_MIPS=y
-
-#
 # Machine selection
 #
 # CONFIG_MIPS_MTX1 is not set

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b	Wed Mar 22 17:49:41 2006
@@ -1,11 +1,4 @@
 #
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-rc5
-# Thu Mar  2 14:54:52 2006
-#
-CONFIG_MIPS=y
-
-#
 # Machine selection
 #
 # CONFIG_MIPS_MTX1 is not set

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config	Wed Mar 22 17:49:41 2006
@@ -0,0 +1 @@
+CONFIG_MIPS=y

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt	Wed Mar 22 17:49:41 2006
@@ -1,11 +1,4 @@
 #
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-rc5
-# Thu Mar  2 14:58:35 2006
-#
-CONFIG_MIPS=y
-
-#
 # Machine selection
 #
 # CONFIG_MIPS_MTX1 is not set
@@ -236,7 +229,7 @@
 # Networking options
 #
 # CONFIG_NETDEBUG is not set
-CONFIG_PACKET=m
+CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a	Wed Mar 22 17:49:41 2006
@@ -1,11 +1,4 @@
 #
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-rc5
-# Thu Mar  2 14:55:46 2006
-#
-CONFIG_MIPS=y
-
-#
 # Machine selection
 #
 # CONFIG_MIPS_MTX1 is not set

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b	Wed Mar 22 17:49:41 2006
@@ -1,11 +1,4 @@
 #
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-rc5
-# Thu Mar  2 14:55:46 2006
-#
-CONFIG_MIPS=y
-
-#
 # Machine selection
 #
 # CONFIG_MIPS_MTX1 is not set

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Mar 22 17:49:41 2006
@@ -4,13 +4,23 @@
 
  -- Bastian Blank <waldi at debian.org>  Mon, 20 Mar 2006 12:33:49 +0100
 
-linux-2.6 (2.6.16-2) UNRELEASED; urgency=low
+linux-2.6 (2.6.16-2) unstable; urgency=low
 
+  [ dann frazier ]
   * [ia64] Set unconfigured options:
       CONFIG_PNP_DEBUG=n and CONFIG_NET_SB1000=m
   * [hppa] Update config for 2.6.16
 
- -- dann frazier <dannf at debian.org>  Tue, 21 Mar 2006 15:31:07 -0700
+  [ Martin Michlmayr ]
+  * [mips/mipsel] Put something in the generic config file because diff
+    will otherwise remove the empty file, causing the build to fail.
+  * [mipsel/r5k-cobalt] Set CONFIG_PACKET=y.
+  * [arm] Set CONFIG_MACLIST=y for ixp4xx because nas100d needs it.
+
+  [ Frederik Schüler ]
+  * Add Maximilian Attems to uploaders list.
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Wed, 22 Mar 2006 15:15:14 +0000
 
 linux-2.6 (2.6.16-1) unstable; urgency=low
 

