1. 13 Feb, 2007 35 commits
  2. 12 Feb, 2007 5 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · ec2f9d13
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC]: Re-export saved_command_line to modules.
        [SPARC64]: Increase command line size to 2048 like other arches.
        [SPARC64]: We do not need ZONE_DMA.
      ec2f9d13
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 89697f1d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
        [XFRM]: Fix OOPSes in xfrm_audit_log().
        [TCP]: cleanup of htcp (resend)
        [TCP]: Use read mostly for CUBIC parameters.
        [NETFILTER]: nf_conntrack_tcp: make sysctl variables static
        [NETFILTER]: ip6t_mh: drop piggyback payload packet on MH packets
        [NETFILTER]: Fix whitespace errors
        [NETFILTER]: Kconfig: improve dependency handling
        [NETFILTER]: xt_mac/xt_CLASSIFY: use IPv6 hook names for IPv6 registration
        [NETFILTER]: nf_conntrack: change nf_conntrack_l[34]proto_unregister to void
        [NETFILTER]: nf_conntrack: properly use RCU for nf_conntrack_destroyed callback
        [NETFILTER]: ip_conntrack: properly use RCU for ip_conntrack_destroyed callback
        [NETFILTER]: nf_conntrack: fix invalid conntrack statistics RCU assumption
        [NETFILTER]: ip_conntrack: fix invalid conntrack statistics RCU assumption
        [NETFILTER]: nf_conntrack: properly use RCU API for nf_ct_protos/nf_ct_l3protos arrays
        [NETFILTER]: ip_conntrack: properly use RCU API for ip_ct_protos array
        [NETFILTER]: nf_nat: properly use RCU API for nf_nat_protos array
        [NETFILTER]: ip_nat: properly use RCU API for ip_nat_protos array
        [NETFILTER]: nf_log: minor cleanups
        [NETFILTER]: nf_log: switch logger registration/unregistration to mutex
        [NETFILTER]: nf_log: make nf_log_unregister_pf return void
        ...
      89697f1d
    • David S. Miller's avatar
      [SPARC]: Re-export saved_command_line to modules. · 34cc560e
      David S. Miller authored
      This reverts some bogosity from the dynamic command-line
      changes made on sparc32 and sparc64.
      
      Drivers such as drivers/sbus/char/openprom.c reference
      saved_command_line, and can be modular.
      
      The boot_command_line is __initdata, yet the dynamic command-line
      changes add modular exports of that symbol, obviously wrong.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      34cc560e
    • David S. Miller's avatar
    • David S. Miller's avatar
      [SPARC64]: We do not need ZONE_DMA. · 1b51d3a0
      David S. Miller authored
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1b51d3a0