1. 11 May, 2011 2 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 9f381a61
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
        slcan: fix ldisc->open retval
        net/usb: mark LG VL600 LTE modem ethernet interface as WWAN
        xfrm: Don't allow esn with disabled anti replay detection
        xfrm: Assign the inner mode output function to the dst entry
        net: dev_close() should check IFF_UP
        vlan: fix GVRP at dismantle time
        netfilter: revert a2361c87
        netfilter: IPv6: fix DSCP mangle code
        netfilter: IPv6: initialize TOS field in REJECT target module
        IPVS: init and cleanup restructuring
        IPVS: Change of socket usage to enable name space exit.
        netfilter: ebtables: only call xt_compat_add_offset once per rule
        netfilter: fix ebtables compat support
        netfilter: ctnetlink: fix timestamp support for new conntracks
        pch_gbe: support ML7223 IOH
        PCH_GbE : Fixed the issue of checksum judgment
        PCH_GbE : Fixed the issue of collision detection
        NET: slip, fix ldisc->open retval
        be2net: Fixed bugs related to PVID.
        ehea: fix wrongly reported speed and port
        ...
      9f381a61
    • David Rientjes's avatar
      slub: Revert "[PARISC] slub: fix panic with DISCONTIGMEM" · 21a43e39
      David Rientjes authored
      This reverts commit 4a5fa359, which did not allow SLUB to be used
      on architectures that use DISCONTIGMEM without compiling NUMA support
      without CONFIG_BROKEN also set.
      
      The slub panic that it was intended to prevent is addressed by
      d9b41e0b ("[PARISC] set memory ranges in N_NORMAL_MEMORY when
      onlined") on parisc so there is no further slub issues with such a
      configuration.
      
      The reverts allows SLUB now to be used on such architectures since
      there haven't been any reports of additional errors.
      
      Cc: James Bottomley <James.Bottomley@suse.de>
      Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      21a43e39
  2. 10 May, 2011 38 commits