* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: ariadne: remove redundant NULL check ip6ip6: autoload ip6 tunnel net: bridge builtin vs. ipv6 modular ipv6: Don't create clones of host routes. pktgen: fix errata in show results ipv4: Fix erroneous uses of ifa_address. vxge: update MAINTAINERS r6040: bump to version 0.27 and date 23Feb2011 r6040: fix multicast operations rds: prevent BUG_ON triggering on congestion map updates bonding 802.3ad: Rename rx_machine_lock to state_machine_lock bonding 802.3ad: Fix the state machine locking v2 drivers/net/macvtap: fix error check net: fix multithreaded signal handling in unix recv routines net: Enter net/ipv6/ even if CONFIG_IPV6=n net/smsc911x.c: Set the VLAN1 register to fix VLAN MTU problem bnx2x: fix MaxBW configuration bnx2x: (NPAR) prevent HW access in D3 state bnx2x: fix link notification bnx2x: fix non-pmf device load flow Doing my first --no-ff merge here, to get the explicit merge commit. David did a back-merge in order to get commit 8909c9ad ("net: don't allow CAP_NET_ADMIN to load non-netdev kernel modules") so that we can add Stephen Hemminger's fix to handle ip6 tunnels as well, which uses the MODULE_ALIAS_NETDEV() macro created by that change.
Showing
- MAINTAINERS 1 addition, 4 deletionsMAINTAINERS
- drivers/net/ariadne.c 0 additions, 5 deletionsdrivers/net/ariadne.c
- drivers/net/bnx2x/bnx2x.h 3 additions, 2 deletionsdrivers/net/bnx2x/bnx2x.h
- drivers/net/bnx2x/bnx2x_cmn.c 22 additions, 0 deletionsdrivers/net/bnx2x/bnx2x_cmn.c
- drivers/net/bnx2x/bnx2x_cmn.h 9 additions, 0 deletionsdrivers/net/bnx2x/bnx2x_cmn.h
- drivers/net/bnx2x/bnx2x_ethtool.c 8 additions, 10 deletionsdrivers/net/bnx2x/bnx2x_ethtool.c
- drivers/net/bnx2x/bnx2x_main.c 10 additions, 9 deletionsdrivers/net/bnx2x/bnx2x_main.c
- drivers/net/bonding/bond_3ad.c 19 additions, 13 deletionsdrivers/net/bonding/bond_3ad.c
- drivers/net/bonding/bond_3ad.h 2 additions, 1 deletiondrivers/net/bonding/bond_3ad.h
- drivers/net/macvtap.c 2 additions, 1 deletiondrivers/net/macvtap.c
- drivers/net/r6040.c 66 additions, 49 deletionsdrivers/net/r6040.c
- drivers/net/smsc911x.c 5 additions, 0 deletionsdrivers/net/smsc911x.c
- net/Makefile 1 addition, 3 deletionsnet/Makefile
- net/bridge/Kconfig 1 addition, 0 deletionsnet/bridge/Kconfig
- net/core/pktgen.c 1 addition, 1 deletionnet/core/pktgen.c
- net/ipv4/devinet.c 3 additions, 3 deletionsnet/ipv4/devinet.c
- net/ipv6/ip6_tunnel.c 1 addition, 0 deletionsnet/ipv6/ip6_tunnel.c
- net/ipv6/route.c 3 additions, 1 deletionnet/ipv6/route.c
- net/rds/ib_send.c 4 additions, 1 deletionnet/rds/ib_send.c
- net/rds/loop.c 8 additions, 3 deletionsnet/rds/loop.c
Loading
Please register or sign in to comment