[kernel] r4915 - in dists/sid/linux-2.6/debian: . arch arch/alpha arch/amd64 arch/arm arch/hppa arch/i386 arch/ia64 arch/m68k arch/powerpc arch/sparc templates

Frederik Schüler fschueler-guest at costa.debian.org
Sat Nov 26 12:23:10 UTC 2005 

Author: fschueler-guest
Date: Sat Nov 26 12:23:08 2005
New Revision: 4915

Modified:
   dists/sid/linux-2.6/debian/arch/alpha/config
   dists/sid/linux-2.6/debian/arch/amd64/config
   dists/sid/linux-2.6/debian/arch/arm/config
   dists/sid/linux-2.6/debian/arch/arm/config.footbridge
   dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/sid/linux-2.6/debian/arch/arm/config.rpc
   dists/sid/linux-2.6/debian/arch/arm/config.s3c2410
   dists/sid/linux-2.6/debian/arch/config
   dists/sid/linux-2.6/debian/arch/hppa/config
   dists/sid/linux-2.6/debian/arch/i386/config
   dists/sid/linux-2.6/debian/arch/ia64/config
   dists/sid/linux-2.6/debian/arch/m68k/config
   dists/sid/linux-2.6/debian/arch/powerpc/config.apus
   dists/sid/linux-2.6/debian/arch/sparc/config
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/templates/control.source.in
Log:
Merge in trunk config changes for unix.ko and af_packet now built into the kernel.
Add myself to uploadders and prepare the release.


Modified: dists/sid/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/alpha/config	(original)
+++ dists/sid/linux-2.6/debian/arch/alpha/config	Sat Nov 26 12:23:08 2005
@@ -347,9 +347,6 @@
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
-CONFIG_PACKET=m
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=m
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_FWMARK=y

Modified: dists/sid/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/config	Sat Nov 26 12:23:08 2005
@@ -366,9 +366,6 @@
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
-CONFIG_PACKET=m
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=m
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_FWMARK=y

Modified: dists/sid/linux-2.6/debian/arch/arm/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config	Sat Nov 26 12:23:08 2005
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
-CONFIG_PACKET=y
 # CONFIG_CIFS_EXPERIMENTAL is not set
 CONFIG_SLIP_SMART=y
 CONFIG_SUNRPC_GSS=m
@@ -16,4 +15,3 @@
 CONFIG_ECONET_NATIVE=y
 CONFIG_EQUALIZER=m
 CONFIG_NET_CLS_ROUTE=y
-CONFIG_PACKET_MMAP=y

Modified: dists/sid/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.footbridge	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.footbridge	Sat Nov 26 12:23:08 2005
@@ -180,8 +180,6 @@
 #
 # Networking options
 #
-CONFIG_PACKET=y
-CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y

Modified: dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx	Sat Nov 26 12:23:08 2005
@@ -189,8 +189,6 @@
 #
 # Networking options
 #
-CONFIG_PACKET=m
-CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_NET_KEY is not set

Modified: dists/sid/linux-2.6/debian/arch/arm/config.rpc
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.rpc	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.rpc	Sat Nov 26 12:23:08 2005
@@ -170,8 +170,6 @@
 #
 # Networking options
 #
-# CONFIG_PACKET is not set
-CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y

Modified: dists/sid/linux-2.6/debian/arch/arm/config.s3c2410
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.s3c2410	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.s3c2410	Sat Nov 26 12:23:08 2005
@@ -200,7 +200,6 @@
 #
 # Networking options
 #
-CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 CONFIG_NET_KEY=m

Modified: dists/sid/linux-2.6/debian/arch/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/config	(original)
+++ dists/sid/linux-2.6/debian/arch/config	Sat Nov 26 12:23:08 2005
@@ -351,9 +351,6 @@
 #
 # Networking options
 #
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 CONFIG_NET_KEY=m
@@ -703,4 +700,7 @@
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_XFS_QUOTA=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_PACKET_MMAP=y
 CONFIG_MKISS=m

Modified: dists/sid/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/hppa/config	(original)
+++ dists/sid/linux-2.6/debian/arch/hppa/config	Sat Nov 26 12:23:08 2005
@@ -233,9 +233,6 @@
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
 CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
 CONFIG_NET_KEY=m
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y

Modified: dists/sid/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config	Sat Nov 26 12:23:08 2005
@@ -463,9 +463,6 @@
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
-CONFIG_PACKET=m
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=m
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_FWMARK=y

Modified: dists/sid/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/sid/linux-2.6/debian/arch/ia64/config	Sat Nov 26 12:23:08 2005
@@ -313,9 +313,6 @@
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_FWMARK=y

Modified: dists/sid/linux-2.6/debian/arch/m68k/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/m68k/config	(original)
+++ dists/sid/linux-2.6/debian/arch/m68k/config	Sat Nov 26 12:23:08 2005
@@ -78,9 +78,6 @@
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_NET=y
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
 CONFIG_NET_KEY=y
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set

Modified: dists/sid/linux-2.6/debian/arch/powerpc/config.apus
==============================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/config.apus	(original)
+++ dists/sid/linux-2.6/debian/arch/powerpc/config.apus	Sat Nov 26 12:23:08 2005
@@ -386,9 +386,6 @@
 #
 # Networking options
 #
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set

Modified: dists/sid/linux-2.6/debian/arch/sparc/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/sparc/config	(original)
+++ dists/sid/linux-2.6/debian/arch/sparc/config	Sat Nov 26 12:23:08 2005
@@ -92,9 +92,6 @@
 CONFIG_MD_RAID6=m
 CONFIG_MD_FAULTY=m
 CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
 CONFIG_IP_PNP=y
 # CONFIG_IP_PNP_DHCP is not set
 # CONFIG_IP_PNP_BOOTP is not set

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sat Nov 26 12:23:08 2005
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.14-4) UNRELEASED; urgency=low
+linux-2.6 (2.6.14-4) unstable; urgency=low
 
   [ dann frazier ]
   * setkeys-needs-root-1.patch, setkeys-needs-root-2.patch:
@@ -44,10 +44,15 @@
     - Fix memory management error during setting up new advapi sockopts.
     - Fix sending extension headers before and including routing header.
     - hwmon: Fix missing boundary check when setting W83627THF in0 limits
-  * Remove ctnetlink-check-if-protoinfo-is-present.patch, 
+  * Remove ctnetlink-check-if-protoinfo-is-present.patch,
     net-nf_queue-oops.patch - already included in 2.6.14.3.
 
- -- maximilian attems <maks at sternwelten.at>  Fri, 25 Nov 2005 23:44:20 +0100
+  [ Frederik Schüler ]
+  * Make CONFIG_PACKET, PACKET_MM and UNIX builtin on all architectures:
+    statically linked has better performance then modules due to TLB issue.
+  * Add myself to uploaders.
+
+ -- Frederik Schüler <fs at debian.org>  Sat, 26 Nov 2005 13:18:41 +0100
 
 linux-2.6 (2.6.14-3) unstable; urgency=low
 

Modified: dists/sid/linux-2.6/debian/templates/control.source.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.source.in	(original)
+++ dists/sid/linux-2.6/debian/templates/control.source.in	Sat Nov 26 12:23:08 2005
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
-Uploaders: Andres Salomon <dilinger at debian.org>, Bastian Blank <waldi at debian.org>, Simon Horman <horms at debian.org>, Sven Luther <luther at debian.org>, Jonas Smedegaard <dr at jones.dk>, Norbert Tretkowski <nobse at debian.org>
+Uploaders: Andres Salomon <dilinger at debian.org>, Bastian Blank <waldi at debian.org>, Simon Horman <horms at debian.org>, Sven Luther <luther at debian.org>, Jonas Smedegaard <dr at jones.dk>, Norbert Tretkowski <nobse at debian.org>, Frederik Schüler <fs at debian.org>
 Standards-Version: 3.6.1.0
 Build-Depends: gcc (>= 4:4.0) [!m68k], gcc-3.3 [m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 9.008.3)
 Build-Depends-Indep: docbook-utils, gs, transfig, xmlto, dh-kpatches (>= 0.99.3)

More information about the Kernel-svn-changes mailing list