[pve-devel] r5278 - pve-kernel-2.6.32/trunk

svn-commits at proxmox.com svn-commits at proxmox.com
Thu Oct 21 09:19:37 CEST 2010


Author: dietmar
Date: 2010-10-21 07:19:36 +0000 (Thu, 21 Oct 2010)
New Revision: 5278

Added:
   pve-kernel-2.6.32/trunk/linux-2.6_2.6.32-26.diff.gz
Removed:
   pve-kernel-2.6.32/trunk/linux-2.6_2.6.32-24.diff.gz
Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/README
   pve-kernel-2.6.32/trunk/changelog.Debian
   pve-kernel-2.6.32/trunk/config-2.6.32.diff
   pve-kernel-2.6.32/trunk/config-2.6.32.org
Log:


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2010-10-20 09:30:30 UTC (rev 5277)
+++ pve-kernel-2.6.32/trunk/Makefile	2010-10-21 07:19:36 UTC (rev 5278)
@@ -1,10 +1,10 @@
 RELEASE=1.6
 
 KERNEL_VER=2.6.32
-PKGREL=24
+PKGREL=25
 KREL=4
 
-KERNEL_DEB_REL=24
+KERNEL_DEB_REL=26
 
 EXTRAVERSION=-${KREL}-pve
 KVNAME=${KERNEL_VER}${EXTRAVERSION}

Modified: pve-kernel-2.6.32/trunk/README
===================================================================
--- pve-kernel-2.6.32/trunk/README	2010-10-20 09:30:30 UTC (rev 5277)
+++ pve-kernel-2.6.32/trunk/README	2010-10-21 07:19:36 UTC (rev 5278)
@@ -106,14 +106,9 @@
 - enable loopback, because it is commonly used for disk manipulations.
 
   	 CONFIG_BLK_DEV_LOOP=y
- 
-- enable old isdn4linux drivers
 
-  CONFIG_ISDN_I4L=m
-  CONFIG_ISDN_CAPI_CAPIDRV=m
-  and many related ISDN settings
+- enable CONFIG_NF_CONNTRACK_IPV=m
 
-
 Testing final kernel with kvm
 -----------------------------
 

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2010-10-20 09:30:30 UTC (rev 5277)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2010-10-21 07:19:36 UTC (rev 5278)
@@ -1,3 +1,13 @@
+pve-kernel-2.6.32 (2.6.32-25) unstable; urgency=low
+
+  * upgarde to debian squeeze kernel 2.6.32-26
+  
+  * update config (original debian config now includes ISDN4LINUX)
+
+  * enable CONFIG_NF_CONNTRACK_IPV6
+
+  -- Proxmox Support Team <support at proxmox.com>  Thu, 21 Oct 2010 08:51:01 +0200
+
 pve-kernel-2.6.32 (2.6.32-24) unstable; urgency=low
 
   * include fix for OpenVZ bug #1603

Modified: pve-kernel-2.6.32/trunk/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-10-20 09:30:30 UTC (rev 5277)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-10-21 07:19:36 UTC (rev 5278)
@@ -1,6 +1,6 @@
---- config-2.6.32.org	2010-09-15 12:04:33.000000000 +0200
-+++ config-2.6.32	2010-10-07 10:46:15.000000000 +0200
-@@ -500,7 +500,7 @@
+--- config-2.6.32.org	2010-10-21 09:00:42.000000000 +0200
++++ config-2.6.32	2010-10-21 09:15:03.000000000 +0200
+@@ -502,7 +502,7 @@
  CONFIG_PCI_MSI=y
  CONFIG_PCI_LEGACY=y
  # CONFIG_PCI_DEBUG is not set
@@ -9,7 +9,7 @@
  CONFIG_HT_IRQ=y
  CONFIG_PCI_IOV=y
  CONFIG_ISA_DMA_API=y
-@@ -578,6 +578,7 @@
+@@ -580,6 +580,7 @@
  CONFIG_NET_KEY=m
  CONFIG_NET_KEY_MIGRATE=y
  CONFIG_INET=y
@@ -17,7 +17,16 @@
  CONFIG_IP_MULTICAST=y
  CONFIG_IP_ADVANCED_ROUTER=y
  CONFIG_ASK_IP_FIB_HASH=y
-@@ -1364,7 +1365,7 @@
+@@ -814,7 +815,7 @@
+ #
+ # IPv6: Netfilter Configuration
+ #
+-# CONFIG_NF_CONNTRACK_IPV6 is not set
++CONFIG_NF_CONNTRACK_IPV6=m
+ CONFIG_IP6_NF_QUEUE=m
+ CONFIG_IP6_NF_IPTABLES=m
+ CONFIG_IP6_NF_MATCH_AH=m
+@@ -1366,7 +1367,7 @@
  CONFIG_BLK_DEV_DAC960=m
  CONFIG_BLK_DEV_UMEM=m
  # CONFIG_BLK_DEV_COW_COMMON is not set
@@ -26,7 +35,7 @@
  # CONFIG_BLK_DEV_CRYPTOLOOP is not set
  CONFIG_BLK_DEV_DRBD=m
  # CONFIG_DRBD_FAULT_INJECTION is not set
-@@ -1478,7 +1479,7 @@
+@@ -1480,7 +1481,7 @@
  # SCSI device support
  #
  CONFIG_RAID_ATTRS=m
@@ -35,7 +44,7 @@
  CONFIG_SCSI_DMA=y
  CONFIG_SCSI_TGT=m
  CONFIG_SCSI_NETLINK=y
-@@ -1487,12 +1488,12 @@
+@@ -1489,12 +1490,12 @@
  #
  # SCSI support type (disk, tape, CD-ROM)
  #
@@ -51,7 +60,7 @@
  CONFIG_CHR_DEV_SCH=m
  CONFIG_SCSI_ENCLOSURE=m
  CONFIG_SCSI_MULTI_LUN=y
-@@ -1684,7 +1685,7 @@
+@@ -1686,7 +1687,7 @@
  # CONFIG_ASYNC_RAID6_TEST is not set
  CONFIG_MD_MULTIPATH=m
  CONFIG_MD_FAULTY=m
@@ -60,123 +69,7 @@
  # CONFIG_DM_DEBUG is not set
  CONFIG_DM_CRYPT=m
  CONFIG_DM_SNAPSHOT=m
-@@ -2161,7 +2162,7 @@
- CONFIG_VIRTIO_NET=m
- CONFIG_VMXNET3=m
- CONFIG_ISDN=y
--# CONFIG_ISDN_I4L is not set
-+CONFIG_ISDN_I4L=m
- CONFIG_MISDN=m
- CONFIG_MISDN_DSP=m
- CONFIG_MISDN_L1OIP=m
-@@ -2179,6 +2180,86 @@
- # CONFIG_MISDN_NETJET is not set
- CONFIG_MISDN_IPAC=m
- CONFIG_MISDN_ISAR=m
-+CONFIG_ISDN_PPP=y
-+CONFIG_ISDN_PPP_VJ=y
-+CONFIG_ISDN_MPP=y
-+CONFIG_IPPP_FILTER=y
-+CONFIG_ISDN_PPP_BSDCOMP=m
-+CONFIG_ISDN_AUDIO=y
-+CONFIG_ISDN_TTY_FAX=y
-+CONFIG_ISDN_X25=y
-+
-+#
-+# ISDN feature submodules
-+#
-+CONFIG_ISDN_DIVERSION=m
-+
-+#
-+# ISDN4Linux hardware drivers
-+#
-+
-+#
-+# Passive cards
-+#
-+CONFIG_ISDN_DRV_HISAX=m
-+
-+#
-+# D-channel protocol features
-+#
-+CONFIG_HISAX_EURO=y
-+CONFIG_DE_AOC=y
-+CONFIG_HISAX_NO_SENDCOMPLETE=y
-+CONFIG_HISAX_NO_LLC=y
-+CONFIG_HISAX_NO_KEYPAD=y
-+CONFIG_HISAX_1TR6=y
-+CONFIG_HISAX_NI1=y
-+CONFIG_HISAX_MAX_CARDS=8
-+
-+#
-+# HiSax supported cards
-+#
-+CONFIG_HISAX_16_3=y
-+CONFIG_HISAX_TELESPCI=y
-+CONFIG_HISAX_S0BOX=y
-+CONFIG_HISAX_FRITZPCI=y
-+CONFIG_HISAX_AVM_A1_PCMCIA=y
-+CONFIG_HISAX_ELSA=y
-+CONFIG_HISAX_DIEHLDIVA=y
-+CONFIG_HISAX_SEDLBAUER=y
-+CONFIG_HISAX_NETJET=y
-+CONFIG_HISAX_NETJET_U=y
-+CONFIG_HISAX_NICCY=y
-+CONFIG_HISAX_BKM_A4T=y
-+CONFIG_HISAX_SCT_QUADRO=y
-+CONFIG_HISAX_GAZEL=y
-+CONFIG_HISAX_HFC_PCI=y
-+CONFIG_HISAX_W6692=y
-+CONFIG_HISAX_HFC_SX=y
-+CONFIG_HISAX_ENTERNOW_PCI=y
-+# CONFIG_HISAX_DEBUG is not set
-+
-+#
-+# HiSax PCMCIA card service modules
-+#
-+CONFIG_HISAX_SEDLBAUER_CS=m
-+CONFIG_HISAX_ELSA_CS=m
-+CONFIG_HISAX_AVM_A1_CS=m
-+CONFIG_HISAX_TELES_CS=m
-+
-+#
-+# HiSax sub driver modules
-+#
-+CONFIG_HISAX_ST5481=m
-+CONFIG_HISAX_HFCUSB=m
-+CONFIG_HISAX_HFC4S8S=m
-+CONFIG_HISAX_FRITZ_PCIPNP=m
-+
-+#
-+# Active cards
-+#
-+CONFIG_HYSDN=m
-+CONFIG_HYSDN_CAPI=y
-+CONFIG_ISDN_HDLC=m
- CONFIG_ISDN_CAPI=m
- CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
- CONFIG_CAPI_TRACE=y
-@@ -2186,6 +2267,7 @@
- CONFIG_ISDN_CAPI_CAPI20=m
- CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
- CONFIG_ISDN_CAPI_CAPIFS=m
-+CONFIG_ISDN_CAPI_CAPIDRV=m
- 
- #
- # CAPI hardware drivers
-@@ -2204,6 +2286,11 @@
- CONFIG_ISDN_DIVAS_DIVACAPI=m
- CONFIG_ISDN_DIVAS_USERIDI=m
- CONFIG_ISDN_DIVAS_MAINT=m
-+CONFIG_ISDN_DRV_GIGASET=m
-+CONFIG_GIGASET_BASE=m
-+CONFIG_GIGASET_M105=m
-+CONFIG_GIGASET_M101=m
-+# CONFIG_GIGASET_DEBUG is not set
- CONFIG_PHONE=m
- CONFIG_PHONE_IXJ=m
- CONFIG_PHONE_IXJ_PCMCIA=m
-@@ -3304,6 +3391,11 @@
+@@ -3392,6 +3393,11 @@
  CONFIG_FONT_8x8=y
  CONFIG_FONT_8x16=y
  # CONFIG_LOGO is not set
@@ -188,7 +81,7 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-@@ -4354,7 +4446,7 @@
+@@ -4442,7 +4448,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -197,7 +90,7 @@
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4391,7 +4483,7 @@
+@@ -4479,7 +4485,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
@@ -206,7 +99,7 @@
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4490,7 +4582,7 @@
+@@ -4578,7 +4584,7 @@
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  CONFIG_SECURITYFS=y
  CONFIG_SECURITY_FILE_CAPABILITIES=y
@@ -215,7 +108,7 @@
  # CONFIG_IMA is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
-@@ -4634,7 +4726,7 @@
+@@ -4722,7 +4728,7 @@
  CONFIG_GENERIC_FIND_LAST_BIT=y
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m

Modified: pve-kernel-2.6.32/trunk/config-2.6.32.org
===================================================================
--- pve-kernel-2.6.32/trunk/config-2.6.32.org	2010-10-20 09:30:30 UTC (rev 5277)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.org	2010-10-21 07:19:36 UTC (rev 5278)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Mon Sep 13 18:54:35 2010
+# Tue Oct 19 23:25:36 2010
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -196,7 +196,8 @@
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_INTEGRITY=y
-# CONFIG_BLK_CGROUP is not set
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_BLOCK_COMPAT=y
 
 #
@@ -206,7 +207,8 @@
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
-# CONFIG_CFQ_GROUP_IOSCHED is not set
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEBUG_CFQ_IOSCHED is not set
 # CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_CFQ=y
@@ -2161,7 +2163,7 @@
 CONFIG_VIRTIO_NET=m
 CONFIG_VMXNET3=m
 CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
+CONFIG_ISDN_I4L=m
 CONFIG_MISDN=m
 CONFIG_MISDN_DSP=m
 CONFIG_MISDN_L1OIP=m
@@ -2179,6 +2181,86 @@
 # CONFIG_MISDN_NETJET is not set
 CONFIG_MISDN_IPAC=m
 CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+CONFIG_ISDN_X25=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+# CONFIG_HISAX_NO_SENDCOMPLETE is not set
+# CONFIG_HISAX_NO_LLC is not set
+# CONFIG_HISAX_NO_KEYPAD is not set
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_ISDN_HDLC=m
 CONFIG_ISDN_CAPI=m
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_CAPI_TRACE=y
@@ -2186,6 +2268,7 @@
 CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
 CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
 
 #
 # CAPI hardware drivers
@@ -2204,6 +2287,11 @@
 CONFIG_ISDN_DIVAS_DIVACAPI=m
 CONFIG_ISDN_DIVAS_USERIDI=m
 CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
 CONFIG_PHONE=m
 CONFIG_PHONE_IXJ=m
 CONFIG_PHONE_IXJ_PCMCIA=m

Deleted: pve-kernel-2.6.32/trunk/linux-2.6_2.6.32-24.diff.gz
===================================================================
(Binary files differ)

Added: pve-kernel-2.6.32/trunk/linux-2.6_2.6.32-26.diff.gz
===================================================================
(Binary files differ)


Property changes on: pve-kernel-2.6.32/trunk/linux-2.6_2.6.32-26.diff.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream



More information about the pve-devel mailing list