[kernel] r6288 - in people/waldi/linux-2.6: . debian debian/arch
debian/arch/amd64 debian/arch/arm debian/arch/armeb
debian/arch/hppa debian/arch/i386
debian/arch/i386/xen-vserver debian/arch/ia64
debian/arch/mips debian/arch/mipsel debian/lib/kernel-package
debian/lib/python/debian_linux debian/patches
debian/patches/series debian/templates
Bastian Blank
waldi at costa.debian.org
Sun Mar 26 18:38:33 UTC 2006
Author: waldi
Date: Sun Mar 26 18:38:29 2006
New Revision: 6288
Added:
people/waldi/linux-2.6/debian/arch/i386/xen-vserver/
people/waldi/linux-2.6/debian/arch/i386/xen-vserver/config
people/waldi/linux-2.6/debian/arch/i386/xen-vserver/config.686
people/waldi/linux-2.6/debian/arch/i386/xen-vserver/defines
people/waldi/linux-2.6/debian/lib/kernel-package/
people/waldi/linux-2.6/debian/patches/series/3-extra
people/waldi/linux-2.6/debian/patches/series/99experimental.1-extra
people/waldi/linux-2.6/debian/patches/vserver-vs2.0.2-rc14-update.patch
people/waldi/linux-2.6/debian/patches/xen-tls.patch (contents, props changed)
Modified:
people/waldi/linux-2.6/ (props changed)
people/waldi/linux-2.6/debian/README.build
people/waldi/linux-2.6/debian/arch/amd64/defines
people/waldi/linux-2.6/debian/arch/arm/config
people/waldi/linux-2.6/debian/arch/arm/config.footbridge
people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx
people/waldi/linux-2.6/debian/arch/arm/config.nslu2
people/waldi/linux-2.6/debian/arch/armeb/config
people/waldi/linux-2.6/debian/arch/armeb/config.nslu2
people/waldi/linux-2.6/debian/arch/defines
people/waldi/linux-2.6/debian/arch/hppa/config
people/waldi/linux-2.6/debian/arch/i386/defines
people/waldi/linux-2.6/debian/arch/ia64/config
people/waldi/linux-2.6/debian/arch/mips/config
people/waldi/linux-2.6/debian/arch/mips/config.r4k-ip22
people/waldi/linux-2.6/debian/arch/mips/config.r5k-ip32
people/waldi/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
people/waldi/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
people/waldi/linux-2.6/debian/arch/mipsel/config
people/waldi/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
people/waldi/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
people/waldi/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
people/waldi/linux-2.6/debian/changelog
people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
people/waldi/linux-2.6/debian/rules.real
people/waldi/linux-2.6/debian/templates/control.main.in
Log:
Merge /dists/trunk/linux-2.6.
Modified: people/waldi/linux-2.6/debian/README.build
==============================================================================
--- people/waldi/linux-2.6/debian/README.build (original)
+++ people/waldi/linux-2.6/debian/README.build Sun Mar 26 18:38:29 2006
@@ -2,7 +2,7 @@
1) Start by downloading a kernel tarball from kernel.org (ie,
linux-2.6.12.tar.bz2).
-2) Run trunk/scripts/prune-non-free <tarball>. This will produce two
+2) Run trunk/scripts/prune-non-free <tarball> <version>. This will produce two
additional tarballs; linux-kernel-<version>.orig.tar.gz and
linux-kernel-nonfree-<version>.orig.tar.gz. Ignore the nonfree tarball
for now.
Modified: people/waldi/linux-2.6/debian/arch/amd64/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/defines (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/defines Sun Mar 26 18:38:29 2006
@@ -6,7 +6,7 @@
em64t-p4
em64t-p4-smp
kernel-arch: x86_64
-kernel-header-dirs: x86_64
+kernel-header-dirs: x86_64 i386
subarches:
vserver
xen
Modified: people/waldi/linux-2.6/debian/arch/arm/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config Sun Mar 26 18:38:29 2006
@@ -2,7 +2,6 @@
# CONFIG_CIFS_EXPERIMENTAL is not set
CONFIG_SLIP_SMART=y
CONFIG_SUNRPC_GSS=m
-# CONFIG_NFSD_V4 is not set
# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_CODA_FS_OLD_API is not set
CONFIG_CIFS_STATS=y
Modified: people/waldi/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.footbridge (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.footbridge Sun Mar 26 18:38:29 2006
@@ -663,7 +663,7 @@
# CONFIG_E100 is not set
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
-CONFIG_NE2K_PCI=y
+CONFIG_NE2K_PCI=m
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set
Modified: people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx Sun Mar 26 18:38:29 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: people/waldi/linux-2.6/debian/arch/arm/config.nslu2
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.nslu2 (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.nslu2 Sun Mar 26 18:38:29 2006
@@ -1369,15 +1369,26 @@
#
# Network File Systems
#
+CONFIG_NFS_V4=y
+CONFIG_NFS_DIRECTIO=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=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_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
Modified: people/waldi/linux-2.6/debian/arch/armeb/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/armeb/config (original)
+++ people/waldi/linux-2.6/debian/arch/armeb/config Sun Mar 26 18:38:29 2006
@@ -2,7 +2,6 @@
# CONFIG_CIFS_EXPERIMENTAL is not set
CONFIG_SLIP_SMART=y
CONFIG_SUNRPC_GSS=m
-# CONFIG_NFSD_V4 is not set
# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_CODA_FS_OLD_API is not set
CONFIG_CIFS_STATS=y
Modified: people/waldi/linux-2.6/debian/arch/armeb/config.nslu2
==============================================================================
--- people/waldi/linux-2.6/debian/arch/armeb/config.nslu2 (original)
+++ people/waldi/linux-2.6/debian/arch/armeb/config.nslu2 Sun Mar 26 18:38:29 2006
@@ -142,7 +142,7 @@
# Processor Features
#
# CONFIG_ARM_THUMB is not set
-# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_CPU_BIG_ENDIAN=y
CONFIG_XSCALE_PMU=y
CONFIG_DMABOUNCE=y
@@ -1369,15 +1369,26 @@
#
# Network File Systems
#
+CONFIG_NFS_V4=y
+CONFIG_NFS_DIRECTIO=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=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_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
Modified: people/waldi/linux-2.6/debian/arch/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/defines (original)
+++ people/waldi/linux-2.6/debian/arch/defines Sun Mar 26 18:38:29 2006
@@ -30,5 +30,5 @@
gcc-3.3: gcc-3.3
initramfs-fallback: linux-initramfs-tool
initramfs-tools: initramfs-tools (>= 0.53)
-yaird: yaird
+yaird: yaird (>= 0.0.12-8)
Modified: people/waldi/linux-2.6/debian/arch/hppa/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/hppa/config (original)
+++ people/waldi/linux-2.6/debian/arch/hppa/config Sun Mar 26 18:38:29 2006
@@ -502,6 +502,7 @@
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
@@ -801,6 +802,7 @@
CONFIG_SND_HWDEP=m
CONFIG_NFS_ACL_SUPPORT=y
# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_F71805F is not set
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_1000 is not set
Modified: people/waldi/linux-2.6/debian/arch/i386/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/defines (original)
+++ people/waldi/linux-2.6/debian/arch/i386/defines Sun Mar 26 18:38:29 2006
@@ -10,6 +10,7 @@
subarches:
vserver
xen
+ xen-vserver
[image]
suggests: grub | lilo (>= 19.1)
Added: people/waldi/linux-2.6/debian/arch/i386/xen-vserver/config
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/arch/i386/xen-vserver/config Sun Mar 26 18:38:29 2006
@@ -0,0 +1,48 @@
+# CONFIG_X86_PC is not set
+CONFIG_X86_XEN=y
+CONFIG_XEN_PCIDEV_FRONTEND=y
+# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
+CONFIG_XEN_PRIVILEGED_GUEST=y
+CONFIG_XEN_PCIDEV_BACKEND=y
+CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
+# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
+# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
+CONFIG_XEN_BLKDEV_BACKEND=y
+# CONFIG_XEN_BLKDEV_TAP_BE is not set
+CONFIG_XEN_NETDEV_BACKEND=y
+# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
+CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_FRONTEND=y
+# CONFIG_XEN_BLKDEV_TAP is not set
+CONFIG_XEN_NETDEV_LOOPBACK=y
+# CONFIG_XEN_TPMDEV_FRONTEND is not set
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_DISABLE_SERIAL=y
+# CONFIG_SMP_ALTERNATIVES is not set
+# CONFIG_PCI_GOXEN_FE is not set
+CONFIG_VSERVER=y
+CONFIG_VSERVER_SECURITY=y
+CONFIG_VSERVER_LEGACYNET=y
+CONFIG_VSERVER_LEGACY=y
+# CONFIG_VSERVER_LEGACY_VERSION is not set
+CONFIG_VSERVER_DYNAMIC_IDS=y
+# CONFIG_VSERVER_NGNET is not set
+CONFIG_VSERVER_COWBL=y
+CONFIG_VSERVER_PROC_SECURE=y
+# CONFIG_VSERVER_HARDCPU is not set
+# CONFIG_INOXID_NONE is not set
+# CONFIG_INOXID_UID16 is not set
+# CONFIG_INOXID_GID16 is not set
+CONFIG_INOXID_UGID24=y
+# CONFIG_INOXID_INTERN is not set
+# CONFIG_INOXID_RUNTIME is not set
+# CONFIG_XID_TAG_NFSD is not set
+# CONFIG_XID_PROPAGATE is not set
+# CONFIG_VSERVER_DEBUG is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_25G is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_15G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_BLK_DEV_VROOT=y
Added: people/waldi/linux-2.6/debian/arch/i386/xen-vserver/config.686
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/arch/i386/xen-vserver/config.686 Sun Mar 26 18:38:29 2006
@@ -0,0 +1,71 @@
+CONFIG_LOCK_KERNEL=y
+# CONFIG_CPUSETS is not set
+CONFIG_STOP_MACHINE=y
+# CONFIG_M386 is not set
+CONFIG_M686=y
+# CONFIG_MK7 is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_XADD=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_X86_PPRO_FENCE=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_GOOD_APIC=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=8
+CONFIG_SCHED_SMT=y
+CONFIG_X86_TSC=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_NONFATAL=m
+CONFIG_X86_MCE_P4THERMAL=y
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_IRQBALANCE is not set
+CONFIG_HAVE_DEC_LOCK=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+# CONFIG_EISA is not set
+# CONFIG_MCA is not set
+# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
+# CONFIG_SBPCD is not set
+# CONFIG_CM206 is not set
+# CONFIG_CDU31A is not set
+# CONFIG_DMASCC is not set
+# CONFIG_IRPORT_SIR is not set
+# CONFIG_NI5010 is not set
+# CONFIG_PCMCIA_XIRTULIP is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_HYSDN is not set
+# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
+# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
+# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
+# CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
+# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
+# CONFIG_ISDN_DRV_AVMB1_C4 is not set
+# CONFIG_COMPUTONE is not set
+# CONFIG_DIGIEPCA is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_SX is not set
+# CONFIG_RIO is not set
+# CONFIG_STALLION is not set
+# CONFIG_ISTALLION is not set
+# CONFIG_FTAPE is not set
+# CONFIG_I2C_ELEKTOR is not set
+CONFIG_I2C_STUB=m
+# CONFIG_USB_W9968CF is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_LOG_BUF_SHIFT=15
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_X86_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_X86_CMPXCHG64=y
+# CONFIG_M486 is not set
Added: people/waldi/linux-2.6/debian/arch/i386/xen-vserver/defines
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/arch/i386/xen-vserver/defines Sun Mar 26 18:38:29 2006
@@ -0,0 +1,12 @@
+[base]
+flavours:
+ 686
+
+[image]
+type: plain-xen
+
+[686]
+class: PPro/Celeron/PII/PIII/P4
+longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
+recommends: libc6-i686
+
Modified: people/waldi/linux-2.6/debian/arch/ia64/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/ia64/config (original)
+++ people/waldi/linux-2.6/debian/arch/ia64/config Sun Mar 26 18:38:29 2006
@@ -171,7 +171,9 @@
CONFIG_PARPORT_NOT_PC=y
# CONFIG_PARPORT_GSC is not set
CONFIG_PARPORT_1284=y
-# CONFIG_PNP is not set
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG is not set
+CONFIG_PNPACPI=y
CONFIG_PARIDE=m
CONFIG_PARIDE_PARPORT=m
CONFIG_PARIDE_PD=m
@@ -211,6 +213,7 @@
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
CONFIG_ATA_OVER_ETH=m
CONFIG_IDE=m
+CONFIG_IDE_MAX_HWIFS=4
CONFIG_BLK_DEV_IDE=m
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_BLK_DEV_IDEDISK=m
@@ -451,6 +454,7 @@
CONFIG_BT_HCIBTUART=m
CONFIG_BT_HCIVHCI=m
CONFIG_DUMMY=m
+CONFIG_NET_SB1000=m
CONFIG_ARCNET=m
CONFIG_ARCNET_1201=m
CONFIG_ARCNET_1051=m
@@ -657,8 +661,10 @@
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_COMPUTONE=m
CONFIG_ROCKETPORT=m
# CONFIG_CYCLADES is not set
+CONFIG_MOXA_INTELLIO=m
# CONFIG_MOXA_SMARTIO is not set
# CONFIG_ISI is not set
CONFIG_SYNCLINKMP=m
@@ -675,6 +681,7 @@
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_ACPI=y
CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SERIAL_8250_DETECT_IRQ is not set
@@ -684,6 +691,7 @@
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_SGI_L1_CONSOLE=y
CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SGI_IOC3=m
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
CONFIG_PRINTER=m
@@ -754,6 +762,7 @@
CONFIG_SENSORS_ADM1031=m
CONFIG_SENSORS_ASB100=m
CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_F71805F=m
CONFIG_SENSORS_FSCHER=m
CONFIG_SENSORS_FSCPOS=m
CONFIG_SENSORS_GL518SM=m
@@ -1113,6 +1122,7 @@
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_AIRPRIME=m
CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
@@ -1158,6 +1168,7 @@
# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
CONFIG_INFINIBAND_IPOIB=m
# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_SGI_IOC3=m
CONFIG_JBD=m
CONFIG_FS_MBCACHE=m
CONFIG_TMPFS_XATTR=y
Modified: people/waldi/linux-2.6/debian/arch/mips/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mips/config (original)
+++ people/waldi/linux-2.6/debian/arch/mips/config Sun Mar 26 18:38:29 2006
@@ -0,0 +1 @@
+CONFIG_MIPS=y
Modified: people/waldi/linux-2.6/debian/arch/mips/config.r4k-ip22
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mips/config.r4k-ip22 (original)
+++ people/waldi/linux-2.6/debian/arch/mips/config.r4k-ip22 Sun Mar 26 18:38:29 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: people/waldi/linux-2.6/debian/arch/mips/config.r5k-ip32
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mips/config.r5k-ip32 (original)
+++ people/waldi/linux-2.6/debian/arch/mips/config.r5k-ip32 Sun Mar 26 18:38:29 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: people/waldi/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mips/config.sb1-bcm91250a (original)
+++ people/waldi/linux-2.6/debian/arch/mips/config.sb1-bcm91250a Sun Mar 26 18:38:29 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: people/waldi/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b (original)
+++ people/waldi/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b Sun Mar 26 18:38:29 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: people/waldi/linux-2.6/debian/arch/mipsel/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mipsel/config (original)
+++ people/waldi/linux-2.6/debian/arch/mipsel/config Sun Mar 26 18:38:29 2006
@@ -0,0 +1 @@
+CONFIG_MIPS=y
Modified: people/waldi/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mipsel/config.r5k-cobalt (original)
+++ people/waldi/linux-2.6/debian/arch/mipsel/config.r5k-cobalt Sun Mar 26 18:38:29 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
@@ -479,7 +472,13 @@
#
# Parallel port support
#
-# CONFIG_PARPORT is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_PC_SUPERIO=y
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_1284=y
#
# Plug and Play support
@@ -488,6 +487,7 @@
#
# Block devices
#
+# CONFIG_PARIDE is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
@@ -645,6 +645,8 @@
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
CONFIG_SCSI_INIA100=m
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
CONFIG_SCSI_SYM53C8XX_2=m
CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
@@ -775,6 +777,7 @@
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
# CONFIG_LAN_SAA9730 is not set
+# CONFIG_NET_POCKET is not set
#
# Ethernet (1000 Mbit)
@@ -848,6 +851,7 @@
# CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
+CONFIG_PLIP=m
CONFIG_PPP=m
CONFIG_PPP_MULTILINK=y
CONFIG_PPP_FILTER=y
@@ -921,6 +925,7 @@
CONFIG_SERIO=m
CONFIG_SERIO_I8042=m
CONFIG_SERIO_SERPORT=m
+# CONFIG_SERIO_PARKBD is not set
# CONFIG_SERIO_PCIPS2 is not set
CONFIG_SERIO_LIBPS2=m
# CONFIG_SERIO_RAW is not set
@@ -949,6 +954,9 @@
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
+# CONFIG_PRINTER is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
#
# IPMI
@@ -992,6 +1000,7 @@
# SPI Master Controller Drivers
#
CONFIG_SPI_BITBANG=m
+# CONFIG_SPI_BUTTERFLY is not set
#
# SPI Protocol Masters
@@ -1029,6 +1038,9 @@
# Video Adapters
#
# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_BWQCAM is not set
+# CONFIG_VIDEO_CQCAM is not set
+# CONFIG_VIDEO_W9966 is not set
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_STRADIS is not set
# CONFIG_VIDEO_MXB is not set
@@ -1284,6 +1296,7 @@
#
# USB port drivers
#
+# CONFIG_USB_USS720 is not set
#
# USB Serial Converter support
@@ -1383,7 +1396,11 @@
CONFIG_REISERFS_FS_XATTR=y
# CONFIG_REISERFS_FS_POSIX_ACL is not set
# CONFIG_REISERFS_FS_SECURITY is not set
-# CONFIG_JFS_FS is not set
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
CONFIG_FS_POSIX_ACL=y
CONFIG_XFS_FS=m
CONFIG_XFS_EXPORT=y
Modified: people/waldi/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a (original)
+++ people/waldi/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a Sun Mar 26 18:38:29 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
@@ -737,12 +730,12 @@
# Multi-device support (RAID and LVM)
#
CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
+CONFIG_BLK_DEV_MD=m
CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
CONFIG_MD_RAID10=m
-CONFIG_MD_RAID5=y
+CONFIG_MD_RAID5=m
CONFIG_MD_RAID6=m
CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
@@ -751,7 +744,8 @@
CONFIG_DM_SNAPSHOT=m
CONFIG_DM_MIRROR=m
CONFIG_DM_ZERO=m
-# CONFIG_DM_MULTIPATH is not set
+CONFIG_DM_MULTIPATH=m
+# CONFIG_DM_MULTIPATH_EMC is not set
#
# Fusion MPT device support
Modified: people/waldi/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
==============================================================================
--- people/waldi/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b (original)
+++ people/waldi/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b Sun Mar 26 18:38:29 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
@@ -738,12 +731,12 @@
# Multi-device support (RAID and LVM)
#
CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
+CONFIG_BLK_DEV_MD=m
CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
CONFIG_MD_RAID10=m
-CONFIG_MD_RAID5=y
+CONFIG_MD_RAID5=m
CONFIG_MD_RAID6=m
CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
@@ -752,7 +745,8 @@
CONFIG_DM_SNAPSHOT=m
CONFIG_DM_MIRROR=m
CONFIG_DM_ZERO=m
-# CONFIG_DM_MULTIPATH is not set
+CONFIG_DM_MULTIPATH=m
+# CONFIG_DM_MULTIPATH_EMC is not set
#
# Fusion MPT device support
Modified: people/waldi/linux-2.6/debian/changelog
==============================================================================
--- people/waldi/linux-2.6/debian/changelog (original)
+++ people/waldi/linux-2.6/debian/changelog Sun Mar 26 18:38:29 2006
@@ -2,9 +2,47 @@
*
- -- Bastian Blank <waldi at debian.org> Mon, 20 Mar 2006 12:33:49 +0100
+ -- Bastian Blank <waldi at debian.org> Thu, 23 Mar 2006 21:40:17 +0100
-linux-2.6 (2.6.16-1) UNRELEASED; urgency=low
+linux-2.6 (2.6.16-3) UNRELEASED; urgency=low
+
+ [ Frederik Schüler ]
+ * [amd64] Add asm-i386 to the linux-headers packages.
+
+ [ Jonas Smedegaard ]
+ * Tighten yaird dependency to at least 0.0.12-8 (supporting Linux
+ 2.6.16 uppercase hex in Kconfig and new IDE sysfs naming, and VIA
+ IDE on powerpc).
+
+ [ Martin Michlmayr ]
+ * [arm/armeb] Enable CONFIG_NFSD on NSLU2 again. Closes: #358709.
+ * [arm/footbridge] CONFIG_NE2K_PCI should be a module, not built-in.
+
+ [ Bastian Blank ]
+ * Update vserver patch to 2.0.2-rc14.
+ - Fix sendfile. (closes: #358391, #358752)
+
+ -- Bastian Blank <waldi at debian.org> Fri, 24 Mar 2006 12:49:46 +0100
+
+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
+
+ [ 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
[ Bastian Blank ]
* New upstream release.
@@ -26,11 +64,16 @@
* [mips] Fix VINO drivers when using a 64-bit kernel (Mikael Nousiainen).
* [arm/armeb] Update configs for 2.6.16.
* [mips/mipsel] Update configs for 2.6.16.
+ * [arm/armeb] Enable the SMB module on NSLU2.
+ * [mipsel] Enable parallel port modules for Cobalt since there are PCI
+ cards that can be used in a Qube.
+ * [mipsel] Enable the JFS module on Cobalt.
[ dann frazier ]
- * [ia64] use yaird on ia64 until #341181 is fixed
+ * [ia64] use yaird on ia64 until #357414 is fixed
+ * [ia64] Update configs for 2.6.16
- -- Bastian Blank <waldi at debian.org> Thu, 16 Mar 2006 19:24:30 +0100
+ -- Bastian Blank <waldi at debian.org> Tue, 21 Mar 2006 16:12:16 +0100
linux-2.6 (2.6.15+2.6.16-rc5-0experimental.1) experimental; urgency=low
Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py (original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Sun Mar 26 18:38:29 2006
@@ -211,6 +211,7 @@
ret[1] = vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
vars['upstreamversion'] = version['upstream']
vars['version'] = version['version']
+ vars['source_upstream'] = version['source_upstream']
vars['major'] = version['major']
ret[2] = vars
return ret
Added: people/waldi/linux-2.6/debian/patches/series/3-extra
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/series/3-extra Sun Mar 26 18:38:29 2006
@@ -0,0 +1 @@
++ vserver-vs2.0.2-rc14-update.patch *_vserver
Added: people/waldi/linux-2.6/debian/patches/series/99experimental.1-extra
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/series/99experimental.1-extra Sun Mar 26 18:38:29 2006
@@ -0,0 +1 @@
++ xen-tls.patch *_xen *_xen-vserver
Added: people/waldi/linux-2.6/debian/patches/vserver-vs2.0.2-rc14-update.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/vserver-vs2.0.2-rc14-update.patch Sun Mar 26 18:38:29 2006
@@ -0,0 +1,44 @@
+--- linux-2.6.16-vs2.0.2-rc13/fs/ioprio.c 2006-03-20 17:34:49 +0100
++++ linux-2.6.16-vs2.0.2-rc14/fs/ioprio.c 2006-03-23 19:35:17 +0100
+@@ -96,7 +96,7 @@
+ if (!who)
+ user = current->user;
+ else
+- user = find_user(who, vx_current_xid());
++ user = find_user(vx_current_xid(), who);
+
+ if (!user)
+ break;
+@@ -150,7 +150,7 @@
+ if (!who)
+ user = current->user;
+ else
+- user = find_user(who, vx_current_xid());
++ user = find_user(vx_current_xid(), who);
+
+ if (!user)
+ break;
+--- linux-2.6.16-vs2.0.2-rc13/fs/read_write.c 2006-03-20 17:34:49 +0100
++++ linux-2.6.16/fs/read_write.c 2006-03-20 17:33:14 +0100
+@@ -667,8 +667,9 @@
+ if (!(in_file->f_mode & FMODE_PREAD))
+ goto fput_in;
+ retval = rw_verify_area(READ, in_file, ppos, count);
++ if (retval < 0)
+- if (retval)
+ goto fput_in;
++ count = retval;
+
+ retval = security_file_permission (in_file, MAY_READ);
+ if (retval)
+@@ -688,8 +689,9 @@
+ goto fput_out;
+ out_inode = out_file->f_dentry->d_inode;
+ retval = rw_verify_area(WRITE, out_file, &out_file->f_pos, count);
++ if (retval < 0)
+- if (retval)
+ goto fput_out;
++ count = retval;
+
+ retval = security_file_permission (out_file, MAY_WRITE);
+ if (retval)
Added: people/waldi/linux-2.6/debian/patches/xen-tls.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/xen-tls.patch Sun Mar 26 18:38:29 2006
@@ -0,0 +1,24 @@
+diff --git a/arch/i386/kernel/fixup.c b/arch/i386/kernel/fixup.c
+index 5188b23..d506a65 100644
+--- a/arch/i386/kernel/fixup.c
++++ b/arch/i386/kernel/fixup.c
+@@ -39,7 +39,7 @@
+
+ fastcall void do_fixup_4gb_segment(struct pt_regs *regs, long error_code)
+ {
+- static unsigned long printed = 0;
++ static unsigned long printed = 1;
+ char info[100];
+ int i;
+
+diff --git a/arch/i386/kernel/vsyscall-note-xen.S b/arch/i386/kernel/vsyscall-note-xen.S
+index c2d6dbf..019d9af 100644
+--- a/arch/i386/kernel/vsyscall-note-xen.S
++++ b/arch/i386/kernel/vsyscall-note-xen.S
+@@ -28,5 +28,5 @@
+ #define NOTE_KERNELCAP_END ASM_ELF_NOTE_END
+
+ NOTE_KERNELCAP_BEGIN(1, 1)
+-NOTE_KERNELCAP(1, "nosegneg") /* Change 1 back to 0 when glibc is fixed! */
++NOTE_KERNELCAP(0, "nosegneg")
+ NOTE_KERNELCAP_END
Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real (original)
+++ people/waldi/linux-2.6/debian/rules.real Sun Mar 26 18:38:29 2006
@@ -137,6 +137,7 @@
cd '$(DIR)'; $(setup_env) $(setup_env_kpkg_jobs) PATH='$(CURDIR)/build:$(CURDIR)/bin:$(PATH)' $(kpkg_image) build
touch '$@'
+$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package-internal \
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
cd '$(DIR)'; $(setup_env) make ARCH=$(KERNEL_ARCH) $(JOBS_ARG)
touch '$@'
@@ -155,7 +156,7 @@
rm -rf '$(DIR)'
cp -al '$(SOURCE_DIR)' '$(DIR)'
cp '$<' '$(DIR)/.config'
- echo '$(KPKG_ABINAME)$(LOCALVERSION)' > '$(DIR)/localversion'
+ echo '$(ABINAME)$(LOCALVERSION)' > '$(DIR)/localversion'
cd '$(DIR)'; $(setup_env) make prepare ARCH=$(KERNEL_ARCH) $(JOBS_ARG)
touch '$@'
Modified: people/waldi/linux-2.6/debian/templates/control.main.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.main.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.main.in Sun Mar 26 18:38:29 2006
@@ -64,7 +64,4 @@
linux-source- at version@ package, as well as architecture-specific
patches. Note that these patches do NOT apply against a pristine
Linux @version@ kernel but only against the kernel tarball
- linux-source- at version@_ at version@.orig.tar.gz from the Debian archive.
- .
- This packages is produced using an updated kernel packaging system
- and replaces older kernel-patch-debian packages
+ linux- at major@_ at source_upstream@.orig.tar.gz from the Debian archive.
More information about the Kernel-svn-changes
mailing list