1. 11 4月, 2006 36 次提交
  2. 10 4月, 2006 4 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 460fbf82
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (35 commits)
        [IPV6]: Deinline few large functions in inet6 code
        [IPV4] ip_fragment: Always compute hash with ipfrag_lock held.
        [NETFILTER]: Fix DNAT in LOCAL_OUT
        [X25]: Restore skb->dev setting in x25_type_trans().
        [NET]: Fix hotplug race during device registration.
        [IPV6]: Unexport secure_ipv6_port_ephemeral
        [NETFILTER]: Fix build with CONFIG_NETFILTER=y/m on IA64
        [NET]: More kzalloc conversions.
        [NET] kzalloc: use in alloc_netdev
        [PKT_SCHED] act_police: Rename methods.
        [TG3]: Speed up SRAM access (2nd version)
        [TG3]: Kill some less useful flags
        [NETFILTER]: H.323 helper: remove changelog
        [NETFILTER]: Convert conntrack/ipt_REJECT to new checksumming functions
        [NETFILTER]: Add address family specific checksum helpers
        [NETFILTER]: Introduce infrastructure for address family specific operations
        [NETFILTER]: Fix IP_NF_CONNTRACK_NETLINK dependency
        [NETFILTER]: H.323 helper: add parameter 'default_rrq_ttl'
        [NETFILTER]: H.323 helper: make get_h245_addr() static
        [NETFILTER]: H.323 helper: change EXPORT_SYMBOL to EXPORT_SYMBOL_GPL
        ...
      460fbf82
    • D
      [SPARC64]: Set ARCH_SELECT_MEMORY_MODEL · 68491d58
      David S. Miller 提交于
      Otherwise the build breaks with EXPERIMENTAL disabled
      because SPARSEMEM will not get selected properly.  See
      mm/Kconfig for how that works.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      68491d58
    • D
      [SPARC64]: smp_call_function() fixups... · aa1d1a0a
      David S. Miller 提交于
      1) Take doc-book function comment from i386 implementation.
      2) cacheline align call_lock, taken from powerpc
      3) Need memory barrier after setting call_data
      4) Remove timeout
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      aa1d1a0a
    • D