r2302 - in trunk/kernel/s390: . kernel-image-2.6.10-s390-2.6.10/config kernel-image-2.6.10-s390-2.6.10/debian kernel-image-2.6.10-s390-2.6.10/diffs
Bastian Blank
waldi@costa.debian.org
Sat, 15 Jan 2005 18:35:56 +0100
Author: waldi
Date: 2005-01-15 18:35:56 +0100 (Sat, 15 Jan 2005)
New Revision: 2302
Added:
trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/
Modified:
trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/config/s390
trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/config/s390x
trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/debian/changelog
trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/debian/control
trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/debian/kpatches
trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/debian/rules
trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/diffs/ibm.diff
Log:
Add kernel-image-2.6.10-s390.
Copied: trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10 (from rev 2301, trunk/kernel/s390/kernel-image-2.6.8-s390-2.6.8)
Modified: trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/config/s390
===================================================================
--- trunk/kernel/s390/kernel-image-2.6.8-s390-2.6.8/config/s390 2005-01-15 12:02:57 UTC (rev 2301)
+++ trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/config/s390 2005-01-15 17:35:56 UTC (rev 2302)
@@ -1,5 +1,7 @@
#
# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.10-1-s390
+# Sat Jan 15 14:10:02 2005
#
CONFIG_MMU=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -11,10 +13,12 @@
#
CONFIG_EXPERIMENTAL=y
CONFIG_CLEAN_COMPILE=y
+CONFIG_LOCK_KERNEL=y
#
# General setup
#
+CONFIG_LOCALVERSION=""
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
@@ -24,17 +28,20 @@
# CONFIG_AUDIT is not set
CONFIG_LOG_BUF_SHIFT=17
CONFIG_HOTPLUG=y
+CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_FUTEX=y
CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_TINY_SHMEM is not set
#
# Loadable module support
@@ -44,6 +51,7 @@
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y
@@ -57,15 +65,22 @@
# CONFIG_ARCH_S390X is not set
# CONFIG_64BIT is not set
CONFIG_ARCH_S390_31=y
-CONFIG_MARCH_G5=y
-# CONFIG_MARCH_Z900 is not set
-# CONFIG_MARCH_Z990 is not set
CONFIG_SMP=y
CONFIG_NR_CPUS=32
# CONFIG_HOTPLUG_CPU is not set
CONFIG_MATHEMU=y
#
+# Code generation options
+#
+CONFIG_MARCH_G5=y
+# CONFIG_MARCH_Z900 is not set
+# CONFIG_MARCH_Z990 is not set
+# CONFIG_PACK_STACK is not set
+# CONFIG_CHECK_STACK is not set
+# CONFIG_WARN_STACK is not set
+
+#
# I/O subsystem configuration
#
CONFIG_MACHCHK_WARNING=y
@@ -136,9 +151,7 @@
#
# SCSI low-level drivers
#
-# CONFIG_SCSI_AIC7XXX_OLD is not set
# CONFIG_SCSI_SATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
# CONFIG_SCSI_DEBUG is not set
CONFIG_ZFCP=m
CONFIG_CCW=y
@@ -150,9 +163,12 @@
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=24576
CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
# CONFIG_LBD is not set
+# CONFIG_CDROM_PKTCDVD is not set
#
# S/390 block device drivers
@@ -167,6 +183,14 @@
# CONFIG_DASD_CMB is not set
#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+
+#
# Multi-device support (RAID and LVM)
#
CONFIG_MD=y
@@ -174,9 +198,11 @@
CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_MD_RAID1=m
+# CONFIG_MD_RAID10 is not set
CONFIG_MD_RAID5=m
# CONFIG_MD_RAID6 is not set
CONFIG_MD_MULTIPATH=m
+# CONFIG_MD_FAULTY is not set
CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
@@ -190,6 +216,11 @@
CONFIG_UNIX98_PTY_COUNT=256
#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+
+#
# S/390 character device drivers
#
CONFIG_TN3270=y
@@ -215,6 +246,8 @@
# S/390 tape hardware support
#
CONFIG_S390_TAPE_34XX=m
+CONFIG_VMLOGRDR=m
+CONFIG_MONREADER=m
#
# Cryptographic devices
@@ -247,6 +280,9 @@
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
+CONFIG_IP_TCPDIAG=y
+CONFIG_IP_TCPDIAG_IPV6=y
#
# IP: Virtual Server Configuration
@@ -286,6 +322,7 @@
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m
+CONFIG_INET6_TUNNEL=m
CONFIG_IPV6_TUNNEL=m
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
@@ -294,6 +331,9 @@
# IP: Netfilter Configuration
#
CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
CONFIG_IP_NF_FTP=m
# CONFIG_IP_NF_IRC is not set
# CONFIG_IP_NF_TFTP is not set
@@ -318,8 +358,16 @@
CONFIG_IP_NF_MATCH_STATE=m
# CONFIG_IP_NF_MATCH_CONNTRACK is not set
CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_REALM=m
+# CONFIG_IP_NF_MATCH_SCTP is not set
+# CONFIG_IP_NF_MATCH_COMMENT is not set
+# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+# CONFIG_IP_NF_TARGET_ULOG is not set
+CONFIG_IP_NF_TARGET_TCPMSS=m
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -335,15 +383,10 @@
# CONFIG_IP_NF_TARGET_DSCP is not set
CONFIG_IP_NF_TARGET_MARK=m
# CONFIG_IP_NF_TARGET_CLASSIFY is not set
-CONFIG_IP_NF_TARGET_LOG=m
-# CONFIG_IP_NF_TARGET_ULOG is not set
-CONFIG_IP_NF_TARGET_TCPMSS=m
+# CONFIG_IP_NF_RAW is not set
# CONFIG_IP_NF_ARPTABLES is not set
# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-# CONFIG_IP_NF_RAW is not set
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_REALM=m
#
# IPv6: Netfilter Configuration
@@ -393,7 +436,6 @@
# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
#
# QoS and/or fair queueing
@@ -407,6 +449,7 @@
# CONFIG_NET_PKTGEN is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_X_NET_DEVICE_SPECIFIC_EUI64=y
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
@@ -459,7 +502,7 @@
# Gigabit Ethernet default settings
#
CONFIG_QETH_IPV6=y
-CONFIG_QETH_VLAN=y
+# CONFIG_QETH_VLAN is not set
# CONFIG_QETH_PERF_STATS is not set
CONFIG_CCWGROUP=m
# CONFIG_PPP is not set
@@ -493,6 +536,7 @@
# CONFIG_QFMT_V1 is not set
CONFIG_QFMT_V2=y
CONFIG_QUOTACTL=y
+CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=m
@@ -522,6 +566,7 @@
# CONFIG_DEVFS_DEBUG is not set
# CONFIG_DEVPTS_FS_XATTR is not set
CONFIG_TMPFS=y
+# CONFIG_TMPFS_XATTR is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
@@ -559,6 +604,7 @@
CONFIG_EXPORTFS=m
CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
@@ -639,14 +685,15 @@
# Kernel hacking
#
# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
#
# Security options
#
+# CONFIG_KEYS is not set
CONFIG_SECURITY=y
# CONFIG_SECURITY_NETWORK is not set
CONFIG_SECURITY_CAPABILITIES=y
+# CONFIG_SECURITY_SECLVL is not set
# CONFIG_SECURITY_SELINUX is not set
#
@@ -661,6 +708,7 @@
CONFIG_CRYPTO_SHA1_Z990=m
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_WP512 is not set
CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_DES_Z990=m
CONFIG_CRYPTO_BLOWFISH=m
@@ -672,6 +720,7 @@
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_ARC4=m
# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
CONFIG_CRYPTO_DEFLATE=m
# CONFIG_CRYPTO_MICHAEL_MIC is not set
CONFIG_CRYPTO_CRC32C=m
Modified: trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/config/s390x
===================================================================
--- trunk/kernel/s390/kernel-image-2.6.8-s390-2.6.8/config/s390x 2005-01-15 12:02:57 UTC (rev 2301)
+++ trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/config/s390x 2005-01-15 17:35:56 UTC (rev 2302)
@@ -1,5 +1,7 @@
#
# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.10-1-s390x
+# Sat Jan 15 14:13:58 2005
#
CONFIG_MMU=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -10,10 +12,12 @@
#
CONFIG_EXPERIMENTAL=y
CONFIG_CLEAN_COMPILE=y
+CONFIG_LOCK_KERNEL=y
#
# General setup
#
+CONFIG_LOCALVERSION=""
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
@@ -23,17 +27,20 @@
# CONFIG_AUDIT is not set
CONFIG_LOG_BUF_SHIFT=17
CONFIG_HOTPLUG=y
+CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_FUTEX=y
CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_TINY_SHMEM is not set
#
# Loadable module support
@@ -43,6 +50,7 @@
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y
@@ -55,9 +63,6 @@
#
CONFIG_ARCH_S390X=y
CONFIG_64BIT=y
-# CONFIG_MARCH_G5 is not set
-CONFIG_MARCH_Z900=y
-# CONFIG_MARCH_Z990 is not set
CONFIG_SMP=y
CONFIG_NR_CPUS=32
# CONFIG_HOTPLUG_CPU is not set
@@ -67,6 +72,16 @@
CONFIG_BINFMT_ELF32=y
#
+# Code generation options
+#
+# CONFIG_MARCH_G5 is not set
+CONFIG_MARCH_Z900=y
+# CONFIG_MARCH_Z990 is not set
+# CONFIG_PACK_STACK is not set
+# CONFIG_CHECK_STACK is not set
+# CONFIG_WARN_STACK is not set
+
+#
# I/O subsystem configuration
#
CONFIG_MACHCHK_WARNING=y
@@ -137,9 +152,7 @@
#
# SCSI low-level drivers
#
-# CONFIG_SCSI_AIC7XXX_OLD is not set
# CONFIG_SCSI_SATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
# CONFIG_SCSI_DEBUG is not set
CONFIG_ZFCP=m
CONFIG_CCW=y
@@ -151,8 +164,11 @@
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=24576
CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CDROM_PKTCDVD is not set
#
# S/390 block device drivers
@@ -166,6 +182,14 @@
# CONFIG_DASD_CMB is not set
#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+
+#
# Multi-device support (RAID and LVM)
#
CONFIG_MD=y
@@ -173,9 +197,11 @@
CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_MD_RAID1=m
+# CONFIG_MD_RAID10 is not set
CONFIG_MD_RAID5=m
# CONFIG_MD_RAID6 is not set
CONFIG_MD_MULTIPATH=m
+# CONFIG_MD_FAULTY is not set
CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
@@ -189,6 +215,11 @@
CONFIG_UNIX98_PTY_COUNT=256
#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+
+#
# S/390 character device drivers
#
CONFIG_TN3270=y
@@ -214,6 +245,8 @@
# S/390 tape hardware support
#
CONFIG_S390_TAPE_34XX=m
+CONFIG_VMLOGRDR=m
+CONFIG_MONREADER=m
#
# Cryptographic devices
@@ -246,6 +279,9 @@
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
+CONFIG_IP_TCPDIAG=y
+CONFIG_IP_TCPDIAG_IPV6=y
#
# IP: Virtual Server Configuration
@@ -285,6 +321,7 @@
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m
+CONFIG_INET6_TUNNEL=m
CONFIG_IPV6_TUNNEL=m
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
@@ -293,6 +330,9 @@
# IP: Netfilter Configuration
#
CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
CONFIG_IP_NF_FTP=m
# CONFIG_IP_NF_IRC is not set
# CONFIG_IP_NF_TFTP is not set
@@ -317,8 +357,16 @@
CONFIG_IP_NF_MATCH_STATE=m
# CONFIG_IP_NF_MATCH_CONNTRACK is not set
CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_REALM=m
+# CONFIG_IP_NF_MATCH_SCTP is not set
+# CONFIG_IP_NF_MATCH_COMMENT is not set
+# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+# CONFIG_IP_NF_TARGET_ULOG is not set
+CONFIG_IP_NF_TARGET_TCPMSS=m
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -334,15 +382,10 @@
# CONFIG_IP_NF_TARGET_DSCP is not set
CONFIG_IP_NF_TARGET_MARK=m
# CONFIG_IP_NF_TARGET_CLASSIFY is not set
-CONFIG_IP_NF_TARGET_LOG=m
-# CONFIG_IP_NF_TARGET_ULOG is not set
-CONFIG_IP_NF_TARGET_TCPMSS=m
+# CONFIG_IP_NF_RAW is not set
# CONFIG_IP_NF_ARPTABLES is not set
# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-# CONFIG_IP_NF_RAW is not set
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_REALM=m
#
# IPv6: Netfilter Configuration
@@ -392,7 +435,6 @@
# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
#
# QoS and/or fair queueing
@@ -406,6 +448,7 @@
# CONFIG_NET_PKTGEN is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_X_NET_DEVICE_SPECIFIC_EUI64=y
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
@@ -458,7 +501,7 @@
# Gigabit Ethernet default settings
#
CONFIG_QETH_IPV6=y
-CONFIG_QETH_VLAN=y
+# CONFIG_QETH_VLAN is not set
# CONFIG_QETH_PERF_STATS is not set
CONFIG_CCWGROUP=m
# CONFIG_PPP is not set
@@ -492,6 +535,7 @@
# CONFIG_QFMT_V1 is not set
CONFIG_QFMT_V2=y
CONFIG_QUOTACTL=y
+CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=m
@@ -521,6 +565,7 @@
# CONFIG_DEVFS_DEBUG is not set
# CONFIG_DEVPTS_FS_XATTR is not set
CONFIG_TMPFS=y
+# CONFIG_TMPFS_XATTR is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
@@ -558,6 +603,7 @@
CONFIG_EXPORTFS=m
CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
@@ -638,14 +684,15 @@
# Kernel hacking
#
# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
#
# Security options
#
+# CONFIG_KEYS is not set
CONFIG_SECURITY=y
# CONFIG_SECURITY_NETWORK is not set
CONFIG_SECURITY_CAPABILITIES=y
+# CONFIG_SECURITY_SECLVL is not set
# CONFIG_SECURITY_SELINUX is not set
#
@@ -660,6 +707,7 @@
CONFIG_CRYPTO_SHA1_Z990=m
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_WP512 is not set
CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_DES_Z990=m
CONFIG_CRYPTO_BLOWFISH=m
@@ -671,6 +719,7 @@
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_ARC4=m
# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
CONFIG_CRYPTO_DEFLATE=m
# CONFIG_CRYPTO_MICHAEL_MIC is not set
CONFIG_CRYPTO_CRC32C=m
Modified: trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/s390/kernel-image-2.6.8-s390-2.6.8/debian/changelog 2005-01-15 12:02:57 UTC (rev 2301)
+++ trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/debian/changelog 2005-01-15 17:35:56 UTC (rev 2302)
@@ -1,3 +1,10 @@
+kernel-image-2.6.10-s390 (2.6.10-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - Use kernel-tree-2.6.10-3.
+
+ -- Bastian Blank <waldi@debian.org> Sat, 15 Jan 2005 13:12:12 +0100
+
kernel-image-2.6.8-s390 (2.6.8-4) unstable; urgency=high
* config
Modified: trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/debian/control
===================================================================
--- trunk/kernel/s390/kernel-image-2.6.8-s390-2.6.8/debian/control 2005-01-15 12:02:57 UTC (rev 2301)
+++ trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/debian/control 2005-01-15 17:35:56 UTC (rev 2302)
@@ -1,38 +1,44 @@
-Source: kernel-image-2.6.8-s390
+Source: kernel-image-2.6.10-s390
Section: devel
Priority: optional
Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
Uploaders: Bastian Blank <waldi@debian.org>, Jochen Röhrig <jr@debian.org>
Standards-Version: 3.5.6
-Build-Depends: debhelper (>> 4.0.0), module-init-tools, kernel-tree-2.6.8-10, kernel-package (>= 8.084)
+Build-Depends: debhelper (>> 4.0.0), module-init-tools, kernel-tree-2.6.10-3, kernel-package (>= 8.084)
-Package: kernel-patch-2.6.8-s390
+Package: kernel-patch-2.6.10-s390
Architecture: all
Depends: ${kpatch:Depends}
-Recommends: kernel-source-2.6.8, kernel-package
-Description: Diffs to the Linux kernel source 2.6.8 for IBM S/390 and zSeries
+Recommends: kernel-source-2.6.10, kernel-package
+Description: Diffs to the Linux kernel source 2.6.10 for IBM S/390 and zSeries
Patches for the Linux kernel for the S/390 and zSeries architecture.
- This package includes the patch for the Linux kernel version 2.6.8.
+ This package includes the patch for the Linux kernel version 2.6.10.
-Package: kernel-headers-2.6.8-1
+Package: kernel-headers-2.6.10-1-s390
Architecture: s390
Section: devel
Priority: optional
-Provides: kernel-headers, kernel-headers-2.6
-Description: Header files related to Linux kernel version 2.6.8 on IBM S/390
- This package provides kernel header files for version 2.6.8 on IBM S/390,
- for sites that want the latest kernel headers. Please read
- /usr/share/doc/kernel-headers-2.6.8/debian.README.gz for details.
+Provides: kernel-headers, kernel-headers-2.6, kernel-headers-2.6.10, kernel-headers-2.6.10-1
+Description: Header files related to Linux kernel version 2.6.10 on IBM S/390
+ This package provides kernel header files for version 2.6.10 on IBM S/390.
-Package: kernel-image-2.6.8-1-s390
+Package: kernel-headers-2.6.10-1-s390x
Architecture: s390
+Section: devel
+Priority: optional
+Provides: kernel-headers, kernel-headers-2.6, kernel-headers-2.6.10, kernel-headers-2.6.10-1
+Description: Header files related to Linux kernel version 2.6.10 on IBM zSeries
+ This package provides kernel header files for version 2.6.10 on IBM zSeries.
+
+Package: kernel-image-2.6.10-1-s390
+Architecture: s390
Section: base
Priority: optional
Provides: kernel-image, kernel-image-2.6
Depends: module-init-tools, initrd-tools (>= 0.1.73)
-Suggests: s390-tools (>= 1.3.0), kernel-doc-2.6.8
-Description: Linux kernel image for kernel version 2.6.8 on IBM S/390
- This package contains the Linux kernel image for kernel version 2.6.8
+Suggests: s390-tools (>= 1.3.0), kernel-doc-2.6.10
+Description: Linux kernel image for kernel version 2.6.10 on IBM S/390
+ This package contains the Linux kernel image for kernel version 2.6.10
on IBM S/390 and zSeries, the corresponding System.map file, and the
modules built by the packager. It also contains scripts that try to
ensure that the system is not left in an unbootable state after an
@@ -44,26 +50,26 @@
and it is suggested that you install that package if you wish to
create a custom kernel from the sources.
-Package: kernel-image-2.6.8-1-s390-tape
+Package: kernel-image-2.6.10-1-s390-tape
Architecture: s390
Section: base
Priority: extra
-Depends: kernel-image-2.6.8-1-s390 (= ${Source-Version})
-Description: Linux kernel image for kernel version 2.6.8 on IBM S/390
- This package contains the Linux kernel image for kernel version 2.6.8
+Depends: kernel-image-2.6.10-1-s390 (= ${Source-Version})
+Description: Linux kernel image for kernel version 2.6.10 on IBM S/390
+ This package contains the Linux kernel image for kernel version 2.6.10
on IBM S/390 and zSeries.
.
This kernel has support to IPL (boot) from a tape.
-Package: kernel-image-2.6.8-1-s390x
+Package: kernel-image-2.6.10-1-s390x
Architecture: s390
Section: base
Priority: optional
Provides: kernel-image, kernel-image-2.6
Depends: module-init-tools, initrd-tools (>= 0.1.73)
-Suggests: s390-tools (>= 1.3.0), kernel-doc-2.6.8
-Description: Linux kernel image for kernel version 2.6.8 on IBM zSeries.
- This package contains the Linux kernel image for kernel version 2.6.8
+Suggests: s390-tools (>= 1.3.0), kernel-doc-2.6.10
+Description: Linux kernel image for kernel version 2.6.10 on IBM zSeries.
+ This package contains the Linux kernel image for kernel version 2.6.10
on IBM zSeries, the corresponding System.map file, and the modules
built by the packager. It also contains scripts that try to ensure that
the system is not left in a unbootable state after an update.
Modified: trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/debian/kpatches
===================================================================
--- trunk/kernel/s390/kernel-image-2.6.8-s390-2.6.8/debian/kpatches 2005-01-15 12:02:57 UTC (rev 2301)
+++ trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/debian/kpatches 2005-01-15 17:35:56 UTC (rev 2302)
@@ -1,7 +1,7 @@
-Patch-name: IBM s390 and zSeries support for Linux 2.6.8
-Patch-id: s390-2_6_8
+Patch-name: IBM s390 and zSeries support for Linux 2.6.10
+Patch-id: s390-2_6_10
Architecture: s390
Path-strip-level: 1
-Patch-file: linux-2.6.8-s390.debian.diff
-Kernel-version: 2.6.8
+Patch-file: linux-2.6.10-s390.debian.diff
+Kernel-version: 2.6.10
Modified: trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/debian/rules
===================================================================
--- trunk/kernel/s390/kernel-image-2.6.8-s390-2.6.8/debian/rules 2005-01-15 12:02:57 UTC (rev 2301)
+++ trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/debian/rules 2005-01-15 17:35:56 UTC (rev 2302)
@@ -81,9 +81,6 @@
echo "cd build-$$i; $$make_kpkg"; \
( cd build-$$i; $$make_kpkg ); \
done
- cp -al build build-default
- cp config/s390 build-default/.config
- cd build-default; make-kpkg configure
touch $@
@@ -135,15 +132,11 @@
@-rm -rf install*
- cp -al build-default install
- cd install; make-kpkg kernel-headers --append-to-version $(debian_version_number)
- cat install/debian/files >> debian/files
-
@for i in $(flavours); do \
arch=`echo $$i | sed -e 's,^\([^-]*\)-.*,\1,'`; \
echo "cp -al build-$$i install-$$i"; \
cp -al build-$$i install-$$i; \
- make_kpkg="make-kpkg --append-to-version $(debian_version_number)-$$arch --initrd kernel-image"; \
+ make_kpkg="make-kpkg --append-to-version $(debian_version_number)-$$arch --initrd kernel-image kernel-headers"; \
echo "cd install-$$i; $$make_kpkg"; \
( cd install-$$i; $$make_kpkg ); \
echo "cat install-$$i/debian/files >> debian/files"; \
Modified: trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/diffs/ibm.diff
===================================================================
--- trunk/kernel/s390/kernel-image-2.6.8-s390-2.6.8/diffs/ibm.diff 2005-01-15 12:02:57 UTC (rev 2301)
+++ trunk/kernel/s390/kernel-image-2.6.10-s390-2.6.10/diffs/ibm.diff 2005-01-15 17:35:56 UTC (rev 2302)
@@ -1,107 +1,5 @@
-Index: include/net/addrconf.h
-===================================================================
---- include/net/addrconf.h (.../upstream/vanilla/2.6.7) (revision 34)
-+++ include/net/addrconf.h (.../trunk/2.6.7) (revision 34)
-@@ -70,6 +70,7 @@
- struct in6_addr *saddr,
- int onlink);
- extern int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *);
-+extern int ipv6_generate_eui64(u8 *eui, struct net_device *dev);
- extern int ipv6_rcv_saddr_equal(const struct sock *sk,
- const struct sock *sk2);
- extern void addrconf_join_solict(struct net_device *dev,
-Index: include/linux/netdevice.h
-===================================================================
---- include/linux/netdevice.h (.../upstream/vanilla/2.6.7) (revision 34)
-+++ include/linux/netdevice.h (.../trunk/2.6.7) (revision 34)
-@@ -459,6 +459,7 @@
- unsigned char *haddr);
- int (*neigh_setup)(struct net_device *dev, struct neigh_parms *);
- int (*accept_fastpath)(struct net_device *, struct dst_entry*);
-+ int (*generate_eui64)(u8 *eui, struct net_device *dev);
- #ifdef CONFIG_NETPOLL_RX
- int netpoll_rx;
- #endif
-@@ -483,6 +484,10 @@
- /* class/net/name entry */
- struct class_device class_dev;
- struct net_device_stats* (*last_stats)(struct net_device *);
-+
-+ /* use dev_id in conjunction with shared network cards*/
-+ unsigned short dev_id;
-+
- /* how much padding had been added by alloc_netdev() */
- int padded;
- };
-Index: net/8021q/vlan.c
-===================================================================
---- net/8021q/vlan.c (.../upstream/vanilla/2.6.7) (revision 34)
-+++ net/8021q/vlan.c (.../trunk/2.6.7) (revision 34)
-@@ -471,6 +471,10 @@
- new_dev->flags = real_dev->flags;
- new_dev->flags &= ~IFF_UP;
-
-+ /* ipv6 shared card related stuff */
-+ new_dev->dev_id = real_dev->dev_id;
-+ new_dev->generate_eui64 = real_dev->generate_eui64;
-+
- /* need 4 bytes for extra VLAN header info,
- * hope the underlying device can handle it.
- */
-Index: net/ipv6/addrconf.c
-===================================================================
---- net/ipv6/addrconf.c (.../upstream/vanilla/2.6.7) (revision 34)
-+++ net/ipv6/addrconf.c (.../trunk/2.6.7) (revision 34)
-@@ -1057,7 +1057,7 @@
- }
-
-
--static int ipv6_generate_eui64(u8 *eui, struct net_device *dev)
-+int ipv6_generate_eui64(u8 *eui, struct net_device *dev)
- {
- switch (dev->type) {
- case ARPHRD_ETHER:
-@@ -1115,7 +1115,7 @@
-
- dev = idev->dev;
-
-- if (ipv6_generate_eui64(idev->work_eui64, dev)) {
-+ if (dev->generate_eui64(idev->work_eui64, dev)) {
- printk(KERN_INFO
- "__ipv6_regen_rndid(idev=%p): cannot get EUI64 identifier; use random bytes.\n",
- idev);
-@@ -1379,7 +1379,7 @@
-
- if (pinfo->prefix_len == 64) {
- memcpy(&addr, &pinfo->prefix, 8);
-- if (ipv6_generate_eui64(addr.s6_addr + 8, dev) &&
-+ if (dev->generate_eui64(addr.s6_addr + 8, dev) &&
- ipv6_inherit_eui64(addr.s6_addr + 8, in6_dev)) {
- in6_dev_put(in6_dev);
- return;
-@@ -1783,6 +1783,9 @@
- return;
- }
-
-+ if (!dev->generate_eui64)
-+ dev->generate_eui64 = ipv6_generate_eui64;
-+
- idev = addrconf_add_dev(dev);
- if (idev == NULL)
- return;
-@@ -1790,7 +1793,7 @@
- memset(&addr, 0, sizeof(struct in6_addr));
- addr.s6_addr32[0] = htonl(0xFE800000);
-
-- if (ipv6_generate_eui64(addr.s6_addr + 8, dev) == 0)
-+ if (dev->generate_eui64(addr.s6_addr + 8, dev) == 0)
- addrconf_add_linklocal(idev, &addr);
- }
-
-Index: arch/s390/boot/kerntypes.c
-===================================================================
---- arch/s390/boot/kerntypes.c (revision 0)
-+++ arch/s390/boot/kerntypes.c (revision 34)
+--- arch/s390/boot/kerntypes.c
++++ arch/s390/boot/kerntypes.c
@@ -0,0 +1,58 @@
+/*
+ * kerntypes.c
@@ -161,37 +59,131 @@
+ * - struct runqueue
+ */
+#include "kernel/sched.c"
-Index: drivers/net/net_init.c
-===================================================================
---- drivers/net/net_init.c (.../upstream/vanilla/2.6.7) (revision 34)
-+++ drivers/net/net_init.c (.../trunk/2.6.7) (revision 34)
-@@ -280,6 +280,9 @@
- dev->header_cache_update= eth_header_cache_update;
- dev->hard_header_parse = eth_header_parse;
+--- include/linux/netdevice.h
++++ include/linux/netdevice.h
+@@ -475,6 +475,9 @@
+ #ifdef CONFIG_NET_POLL_CONTROLLER
+ void (*poll_controller)(struct net_device *dev);
+ #endif
++#ifdef CONFIG_X_NET_DEVICE_SPECIFIC_EUI64
++ int (*generate_eui64)(u8 *eui, struct net_device *dev);
++#endif
-+ dev->generate_eui64 = NULL;
-+ dev->dev_id = 0;
+ /* bridge stuff */
+ struct net_bridge_port *br_port;
+@@ -486,6 +489,12 @@
+
+ /* class/net/name entry */
+ struct class_device class_dev;
+
- dev->type = ARPHRD_ETHER;
- dev->hard_header_len = ETH_HLEN;
- dev->mtu = 1500; /* eth_mtu */
-@@ -306,6 +309,9 @@
- dev->hard_header = fddi_header;
- dev->rebuild_header = fddi_rebuild_header;
++#ifdef CONFIG_X_NET_DEVICE_SPECIFIC_EUI64
++ /* use dev_id in conjunction with shared network cards*/
++ unsigned short dev_id;
++#endif
++
+ /* how much padding had been added by alloc_netdev() */
+ int padded;
+ };
+--- include/net/addrconf.h
++++ include/net/addrconf.h
+@@ -69,6 +69,9 @@
+ struct in6_addr *daddr,
+ struct in6_addr *saddr);
+ extern int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *);
++#ifdef CONFIG_X_NET_DEVICE_SPECIFIC_EUI64
++extern int ipv6_generate_eui64(u8 *eui, struct net_device *dev);
++#endif
+ extern int ipv6_rcv_saddr_equal(const struct sock *sk,
+ const struct sock *sk2);
+ extern void addrconf_join_solict(struct net_device *dev,
+--- net/8021q/vlan.c
++++ net/8021q/vlan.c
+@@ -454,6 +454,12 @@
-+ dev->generate_eui64 = NULL;
-+ dev->dev_id = 0;
+ new_dev->state = real_dev->state & VLAN_LINK_STATE_MASK;
+
++#ifdef CONFIG_X_NET_DEVICE_SPECIFIC_EUI64
++ /* ipv6 shared card related stuff */
++ new_dev->dev_id = real_dev->dev_id;
++ new_dev->generate_eui64 = real_dev->generate_eui64;
++#endif
+
- dev->type = ARPHRD_FDDI;
- dev->hard_header_len = FDDI_K_SNAP_HLEN+3; /* Assume 802.2 SNAP hdr len + 3 pad bytes */
- dev->mtu = FDDI_K_SNAP_DLEN; /* Assume max payload of 802.2 SNAP frame */
-@@ -416,6 +422,9 @@
- dev->hard_header = tr_header;
- dev->rebuild_header = tr_rebuild_header;
+ /* need 4 bytes for extra VLAN header info,
+ * hope the underlying device can handle it.
+ */
+--- net/ipv6/addrconf.c
++++ net/ipv6/addrconf.c
+@@ -1074,7 +1074,10 @@
+ __ipv6_dev_ac_dec(ifp->idev, &addr);
+ }
-+ dev->generate_eui64 = NULL;
-+ dev->dev_id = 0;
+-static int ipv6_generate_eui64(u8 *eui, struct net_device *dev)
++#ifndef CONFIG_X_NET_DEVICE_SPECIFIC_EUI64
++static
++#endif
++int ipv6_generate_eui64(u8 *eui, struct net_device *dev)
+ {
+ switch (dev->type) {
+ case ARPHRD_ETHER:
+@@ -1132,7 +1135,11 @@
+
+ dev = idev->dev;
+
++#ifdef CONFIG_X_NET_DEVICE_SPECIFIC_EUI64
++ if (dev->generate_eui64(idev->work_eui64, dev)) {
++#else
+ if (ipv6_generate_eui64(idev->work_eui64, dev)) {
++#endif
+ printk(KERN_INFO
+ "__ipv6_regen_rndid(idev=%p): cannot get EUI64 identifier; use random bytes.\n",
+ idev);
+@@ -1396,7 +1403,11 @@
+
+ if (pinfo->prefix_len == 64) {
+ memcpy(&addr, &pinfo->prefix, 8);
++#ifdef CONFIG_X_NET_DEVICE_SPECIFIC_EUI64
++ if (dev->generate_eui64(addr.s6_addr + 8, dev) &&
++#else
+ if (ipv6_generate_eui64(addr.s6_addr + 8, dev) &&
++#endif
+ ipv6_inherit_eui64(addr.s6_addr + 8, in6_dev)) {
+ in6_dev_put(in6_dev);
+ return;
+@@ -1799,6 +1810,11 @@
+ return;
+ }
+
++#ifdef CONFIG_X_NET_DEVICE_SPECIFIC_EUI64
++ if (!dev->generate_eui64)
++ dev->generate_eui64 = ipv6_generate_eui64;
++#endif
+
- dev->type = ARPHRD_IEEE802_TR;
- dev->hard_header_len = TR_HLEN;
- dev->mtu = 2000;
+ idev = addrconf_add_dev(dev);
+ if (idev == NULL)
+ return;
+@@ -1806,7 +1822,11 @@
+ memset(&addr, 0, sizeof(struct in6_addr));
+ addr.s6_addr32[0] = htonl(0xFE800000);
+
++#ifdef CONFIG_X_NET_DEVICE_SPECIFIC_EUI64
++ if (dev->generate_eui64(addr.s6_addr + 8, dev) == 0)
++#else
+ if (ipv6_generate_eui64(addr.s6_addr + 8, dev) == 0)
++#endif
+ addrconf_add_linklocal(idev, &addr);
+ }
+
+--- net/Kconfig
++++ net/Kconfig
+@@ -647,6 +647,11 @@
+ config NET_POLL_CONTROLLER
+ def_bool NETPOLL
+
++config X_NET_DEVICE_SPECIFIC_EUI64
++ bool
++ default y
++ depends on ARCH_S390
++
+ source "net/ax25/Kconfig"
+
+ source "net/irda/Kconfig"