Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (92 commits)
  gianfar: Revive VLAN support
  vlan: Export symbols as non GPL symbols.
  bnx2x: tx_has_work should not wait for FW
  netxen: reduce memory footprint
  netxen: fix vlan tso/checksum offload
  net: Fix linux/if_frad.h's suitability for userspace.
  net: Move config NET_NS to from net/Kconfig to init/Kconfig
  isdn: Fix missing ifdef in isdn_ppp
  networking: document "nc" in addition to "netcat" in netconsole.txt
  e1000e: workaround hw errata
  af_key: initialize xfrm encap_oa
  virtio_net: Fix MAX_PACKET_LEN to support 802.1Q VLANs
  lcs: fix compilation for !CONFIG_IP_MULTICAST
  rtl8187: Add termination packet to prevent stall
  iwlwifi: fix rs_get_rate WARN_ON()
  p54usb: fix packet loss with first generation devices
  sctp: Fix another socket race during accept/peeloff
  sctp: Properly timestamp outgoing data chunks for rtx purposes
  sctp: Correctly start rtx timer on new packet transmissions.
  sctp: Fix crc32c calculations on big-endian arhes.
  ...

diff --combined init/Kconfig
index 3be35f3,1e94882..b9d1dd2
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -238,98 -238,6 +238,98 @@@ config AUDIT_TRE
        def_bool y
        depends on AUDITSYSCALL && INOTIFY
  
 +menu "RCU Subsystem"
 +
 +choice
 +      prompt "RCU Implementation"
 +      default CLASSIC_RCU
 +
 +config CLASSIC_RCU
 +      bool "Classic RCU"
 +      help
 +        This option selects the classic RCU implementation that is
 +        designed for best read-side performance on non-realtime
 +        systems.
 +
 +        Select this option if you are unsure.
 +
 +config TREE_RCU
 +      bool "Tree-based hierarchical RCU"
 +      help
 +        This option selects the RCU implementation that is
 +        designed for very large SMP system with hundreds or
 +        thousands of CPUs.
 +
 +config PREEMPT_RCU
 +      bool "Preemptible RCU"
 +      depends on PREEMPT
 +      help
 +        This option reduces the latency of the kernel by making certain
 +        RCU sections preemptible. Normally RCU code is non-preemptible, if
 +        this option is selected then read-only RCU sections become
 +        preemptible. This helps latency, but may expose bugs due to
 +        now-naive assumptions about each RCU read-side critical section
 +        remaining on a given CPU through its execution.
 +
 +endchoice
 +
 +config RCU_TRACE
 +      bool "Enable tracing for RCU"
 +      depends on TREE_RCU || PREEMPT_RCU
 +      help
 +        This option provides tracing in RCU which presents stats
 +        in debugfs for debugging RCU implementation.
 +
 +        Say Y here if you want to enable RCU tracing
 +        Say N if you are unsure.
 +
 +config RCU_FANOUT
 +      int "Tree-based hierarchical RCU fanout value"
 +      range 2 64 if 64BIT
 +      range 2 32 if !64BIT
 +      depends on TREE_RCU
 +      default 64 if 64BIT
 +      default 32 if !64BIT
 +      help
 +        This option controls the fanout of hierarchical implementations
 +        of RCU, allowing RCU to work efficiently on machines with
 +        large numbers of CPUs.  This value must be at least the cube
 +        root of NR_CPUS, which allows NR_CPUS up to 32,768 for 32-bit
 +        systems and up to 262,144 for 64-bit systems.
 +
 +        Select a specific number if testing RCU itself.
 +        Take the default if unsure.
 +
 +config RCU_FANOUT_EXACT
 +      bool "Disable tree-based hierarchical RCU auto-balancing"
 +      depends on TREE_RCU
 +      default n
 +      help
 +        This option forces use of the exact RCU_FANOUT value specified,
 +        regardless of imbalances in the hierarchy.  This is useful for
 +        testing RCU itself, and might one day be useful on systems with
 +        strong NUMA behavior.
 +
 +        Without RCU_FANOUT_EXACT, the code will balance the hierarchy.
 +
 +        Say N if unsure.
 +
 +config TREE_RCU_TRACE
 +      def_bool RCU_TRACE && TREE_RCU
 +      select DEBUG_FS
 +      help
 +        This option provides tracing for the TREE_RCU implementation,
 +        permitting Makefile to trivially select kernel/rcutree_trace.c.
 +
 +config PREEMPT_RCU_TRACE
 +      def_bool RCU_TRACE && PREEMPT_RCU
 +      select DEBUG_FS
 +      help
 +        This option provides tracing for the PREEMPT_RCU implementation,
 +        permitting Makefile to trivially select kernel/rcupreempt_trace.c.
 +
 +endmenu # "RCU Subsystem"
 +
  config IKCONFIG
        tristate "Kernel .config support"
        ---help---
@@@ -633,6 -541,14 +633,14 @@@ config PID_N
          Unless you want to work with an experimental feature
          say N here.
  
+ config NET_NS
+       bool "Network namespace"
+       default n
+       depends on NAMESPACES && EXPERIMENTAL && NET
+       help
+         Allow user space to create what appear to be multiple instances
+         of the network stack.
+ 
  config BLK_DEV_INITRD
        bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
        depends on BROKEN || !FRV
@@@ -1064,3 -980,90 +1072,3 @@@ source "block/Kconfig
  config PREEMPT_NOTIFIERS
        bool
  
 -choice
 -      prompt "RCU Implementation"
 -      default CLASSIC_RCU
 -
 -config CLASSIC_RCU
 -      bool "Classic RCU"
 -      help
 -        This option selects the classic RCU implementation that is
 -        designed for best read-side performance on non-realtime
 -        systems.
 -
 -        Select this option if you are unsure.
 -
 -config TREE_RCU
 -      bool "Tree-based hierarchical RCU"
 -      help
 -        This option selects the RCU implementation that is
 -        designed for very large SMP system with hundreds or
 -        thousands of CPUs.
 -
 -config PREEMPT_RCU
 -      bool "Preemptible RCU"
 -      depends on PREEMPT
 -      help
 -        This option reduces the latency of the kernel by making certain
 -        RCU sections preemptible. Normally RCU code is non-preemptible, if
 -        this option is selected then read-only RCU sections become
 -        preemptible. This helps latency, but may expose bugs due to
 -        now-naive assumptions about each RCU read-side critical section
 -        remaining on a given CPU through its execution.
 -
 -endchoice
 -
 -config RCU_TRACE
 -      bool "Enable tracing for RCU"
 -      depends on TREE_RCU || PREEMPT_RCU
 -      help
 -        This option provides tracing in RCU which presents stats
 -        in debugfs for debugging RCU implementation.
 -
 -        Say Y here if you want to enable RCU tracing
 -        Say N if you are unsure.
 -
 -config RCU_FANOUT
 -      int "Tree-based hierarchical RCU fanout value"
 -      range 2 64 if 64BIT
 -      range 2 32 if !64BIT
 -      depends on TREE_RCU
 -      default 64 if 64BIT
 -      default 32 if !64BIT
 -      help
 -        This option controls the fanout of hierarchical implementations
 -        of RCU, allowing RCU to work efficiently on machines with
 -        large numbers of CPUs.  This value must be at least the cube
 -        root of NR_CPUS, which allows NR_CPUS up to 32,768 for 32-bit
 -        systems and up to 262,144 for 64-bit systems.
 -
 -        Select a specific number if testing RCU itself.
 -        Take the default if unsure.
 -
 -config RCU_FANOUT_EXACT
 -      bool "Disable tree-based hierarchical RCU auto-balancing"
 -      depends on TREE_RCU
 -      default n
 -      help
 -        This option forces use of the exact RCU_FANOUT value specified,
 -        regardless of imbalances in the hierarchy.  This is useful for
 -        testing RCU itself, and might one day be useful on systems with
 -        strong NUMA behavior.
 -
 -        Without RCU_FANOUT_EXACT, the code will balance the hierarchy.
 -
 -        Say N if unsure.
 -
 -config TREE_RCU_TRACE
 -      def_bool RCU_TRACE && TREE_RCU
 -      select DEBUG_FS
 -      help
 -        This option provides tracing for the TREE_RCU implementation,
 -        permitting Makefile to trivially select kernel/rcutree_trace.c.
 -
 -config PREEMPT_RCU_TRACE
 -      def_bool RCU_TRACE && PREEMPT_RCU
 -      select DEBUG_FS
 -      help
 -        This option provides tracing for the PREEMPT_RCU implementation,
 -        permitting Makefile to trivially select kernel/rcupreempt_trace.c.