- update

Changed files:
    kernel-alpha-smp.config -> 1.78
    kernel-alpha.config -> 1.78
    kernel-i386-smp.config -> 1.65
    kernel-i386.config -> 1.87
    kernel-ia64-smp.config -> 1.5
    kernel-ia64.config -> 1.4
    kernel-ppc-smp.config -> 1.84
    kernel-ppc.config -> 1.82
    kernel-sparc-smp.config -> 1.55
    kernel-sparc.config -> 1.53
    kernel-sparc64-smp.config -> 1.76
    kernel-sparc64.config -> 1.77
    kernel-x86_64-smp.config -> 1.5
    kernel-x86_64.config -> 1.5

diff --git a/kernel-alpha-smp.config b/kernel-alpha-smp.config
index e74dfca7350c89fc821a4c1e5c136caaf175755a..4d75d61eaacd94fdaac9f4f94126197dfebca44e 100644 (file)
--- a/kernel-alpha-smp.config
+++ b/kernel-alpha-smp.config
@@ -509,6 +509,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration
@@ -601,13 +602,16 @@ CONFIG_WAN_ROUTER=m
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CLK_CPU=y
 CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_WRR=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_ESFQ=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_GRED=m
@@ -758,6 +762,7 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
+# CONFIG_R8169_NAPI is not set
 CONFIG_SIS190=m
 CONFIG_SK98LIN=m
 CONFIG_TIGON3=m

diff --git a/kernel-alpha.config b/kernel-alpha.config
index c7659fa1cee7f7724d6759aee7243eb680bc6cff..bf8c01dd6641235cd3eab5743294e6a760fbc703 100644 (file)
--- a/kernel-alpha.config
+++ b/kernel-alpha.config
@@ -510,6 +510,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration
@@ -602,13 +603,16 @@ CONFIG_WAN_ROUTER=m
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CLK_CPU=y
 CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_WRR=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_ESFQ=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_GRED=m
@@ -761,6 +765,7 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
+# CONFIG_R8169_NAPI is not set
 CONFIG_SIS190=m
 CONFIG_SK98LIN=m
 CONFIG_TIGON3=m

diff --git a/kernel-i386-smp.config b/kernel-i386-smp.config
index b632e2f9fbd32017a968e0efbfc1ee207a4aaf3b..dea17062a0637a7a168e3c6faa0396afbba45d91 100644 (file)
--- a/kernel-i386-smp.config
+++ b/kernel-i386-smp.config
@@ -1199,7 +1199,7 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
+# CONFIG_R8169_NAPI is not set
 CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 

diff --git a/kernel-i386.config b/kernel-i386.config
index 31ce29d5f2daceeb532fd24f7b8fca2204555085..cf6eb33a354cf8338e9383797ec7c623c7f43c48 100644 (file)
--- a/kernel-i386.config
+++ b/kernel-i386.config
@@ -1217,7 +1217,7 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
+# CONFIG_R8169_NAPI is not set
 CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 

diff --git a/kernel-ia64-smp.config b/kernel-ia64-smp.config
index 09472102afd141476a090b56d529f3beeb3c57c0..226cf41a3654043870f013e01dd216f4734a395e 100644 (file)
--- a/kernel-ia64-smp.config
+++ b/kernel-ia64-smp.config
@@ -911,7 +911,7 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
+# CONFIG_R8169_NAPI is not set
 CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 

diff --git a/kernel-ia64.config b/kernel-ia64.config
index 7e82d7d6e0d633e2f9301dd8a2c8b799d301f27f..c341b8afbe66e8d9362fb5c5f627c391b9d61f63 100644 (file)
--- a/kernel-ia64.config
+++ b/kernel-ia64.config
@@ -926,7 +926,7 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
+# CONFIG_R8169_NAPI is not set
 CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 

diff --git a/kernel-ppc-smp.config b/kernel-ppc-smp.config
index 90afd3d9d8b468e88efe3d1b8f6e816e4f7ca8db..ee6a8b70ba445f7f2f3a482de14a286c6712f8bb 100644 (file)
--- a/kernel-ppc-smp.config
+++ b/kernel-ppc-smp.config
@@ -93,7 +93,8 @@ CONFIG_CPU_FREQ_PMAC=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 
 #
 # General setup
@@ -573,6 +574,7 @@ CONFIG_IP_MROUTE=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration
@@ -647,6 +649,7 @@ CONFIG_WAN_ROUTER=m
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CLK_CPU=y
 NET_SCH_CLK_JIFFIES=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
@@ -773,6 +776,7 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
+# CONFIG_R8169_NAPI is not set
 CONFIG_SIS190=m
 CONFIG_SK98LIN=m
 CONFIG_CONFIG_SK98LIN_T1=y

diff --git a/kernel-ppc.config b/kernel-ppc.config
index 68acc2e52519dcd12dcd89a34d9a16abe0dadb92..9359ef5d0f9b15975f25ec29886bf20510c48735 100644 (file)
--- a/kernel-ppc.config
+++ b/kernel-ppc.config
@@ -93,7 +93,8 @@ CONFIG_CPU_FREQ_PMAC=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 
 #
 # General setup
@@ -573,6 +574,7 @@ CONFIG_IP_MROUTE=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration
@@ -647,6 +649,7 @@ CONFIG_WAN_ROUTER=m
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CLK_CPU=y
 NET_SCH_CLK_JIFFIES=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
@@ -773,6 +776,7 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
+# CONFIG_R8169_NAPI is not set
 CONFIG_SIS190=m
 CONFIG_SK98LIN=m
 CONFIG_CONFIG_SK98LIN_T1=y

diff --git a/kernel-sparc-smp.config b/kernel-sparc-smp.config
index 421ddfc9d1346b4f3a77b40f23c8a9026780bf8d..753f5297ffe9fa77eb6146c59f88266006ba2294 100644 (file)
--- a/kernel-sparc-smp.config
+++ b/kernel-sparc-smp.config
@@ -337,6 +337,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration
@@ -425,13 +426,16 @@ CONFIG_WAN_ROUTER=m
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CLK_CPU=y
 CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_WRR=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_ESFQ=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_GRED=m

diff --git a/kernel-sparc.config b/kernel-sparc.config
index 2bfc7a7a9b0ae0ff67e77605849c8a544d67c7b6..0a3444de69b46491faaf6d03d93fe9483f128a3a 100644 (file)
--- a/kernel-sparc.config
+++ b/kernel-sparc.config
@@ -336,6 +336,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration

diff --git a/kernel-sparc64-smp.config b/kernel-sparc64-smp.config
index 886fefbd45a7cf9d209d9fb19a8b6156853d4f37..8fe4b34714eba04908c3d839f02a1108a99a968d 100644 (file)
--- a/kernel-sparc64-smp.config
+++ b/kernel-sparc64-smp.config
@@ -64,6 +64,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 # CONFIG_CPU_FREQ_24_API is not set
 CONFIG_SPARC64=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -460,6 +461,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration
@@ -752,6 +754,7 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
+# CONFIG_R8169_NAPI is not set
 CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 

diff --git a/kernel-sparc64.config b/kernel-sparc64.config
index 09f8f6d7db3d7dfd05c41f87eed546666cd704af..6f4370784717b25c3d1f1dd703d4532776aed059 100644 (file)
--- a/kernel-sparc64.config
+++ b/kernel-sparc64.config
@@ -63,6 +63,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 # CONFIG_CPU_FREQ_24_API is not set
 CONFIG_SPARC64=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -498,6 +499,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration
@@ -802,6 +804,7 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
+# CONFIG_R8169_NAPI is not set
 CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 

diff --git a/kernel-x86_64-smp.config b/kernel-x86_64-smp.config
index 77c585205f8e8814f252cebf745a2b4ef7ae6655..8556f225cdcabd4ab3caac0baf5d76ce0ba0cdda 100644 (file)
--- a/kernel-x86_64-smp.config
+++ b/kernel-x86_64-smp.config
@@ -969,7 +969,7 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
+# CONFIG_R8169_NAPI is not set
 CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
 

diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index c5ada78606dc4b59e07949848d6f53dc3674e1ed..7072e089bdb6b6b285046a3684e8daa57f51beec 100644 (file)
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -978,7 +978,7 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
+# CONFIG_R8169_NAPI is not set
 CONFIG_SK98LIN=m
 CONFIG_TIGON3=m