Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: fib_rules: fix unresolved_rules counting r8169: fix wrong eee setting for rlt8111evl r8169: fix driver shutdown WoL regression. ehea: Change maintainer to me pptp: pptp_rcv_core() misses pskb_may_pull() call tproxy: copy transparent flag when creating a time wait pptp: fix skb leak in pptp_xmit() bonding: use local function pointer of bond->recv_probe in bond_handle_frame smsc911x: Add support for SMSC LAN89218 tg3: negate USE_PHYLIB flag check netconsole: enable netconsole can make net_device refcnt incorrent bluetooth: Properly clone LSM attributes to newly created child connections l2tp: fix a potential skb leak in l2tp_xmit_skb() bridge: fix hang on removal of bridge via netlink x25: Prevent skb overreads when checking call user data x25: Handle undersized/fragmented skbs x25: Validate incoming call user data lengths udplite: fast-path computation of checksum coverage IPVS netns shutdown/startup dead-lock netfilter: nf_conntrack: fix event flooding in GRE protocol tracker
Showing
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- drivers/net/bonding/bond_main.c 5 additions, 2 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/netconsole.c 5 additions, 0 deletionsdrivers/net/netconsole.c
- drivers/net/pptp.c 14 additions, 8 deletionsdrivers/net/pptp.c
- drivers/net/r8169.c 57 additions, 33 deletionsdrivers/net/r8169.c
- drivers/net/smsc911x.c 2 additions, 0 deletionsdrivers/net/smsc911x.c
- drivers/net/tg3.c 1 addition, 1 deletiondrivers/net/tg3.c
- include/net/ip_vs.h 1 addition, 0 deletionsinclude/net/ip_vs.h
- include/net/udplite.h 31 additions, 32 deletionsinclude/net/udplite.h
- net/bluetooth/l2cap_sock.c 4 additions, 0 deletionsnet/bluetooth/l2cap_sock.c
- net/bluetooth/rfcomm/sock.c 3 additions, 0 deletionsnet/bluetooth/rfcomm/sock.c
- net/bluetooth/sco.c 4 additions, 1 deletionnet/bluetooth/sco.c
- net/bridge/br_if.c 5 additions, 4 deletionsnet/bridge/br_if.c
- net/bridge/br_netlink.c 1 addition, 0 deletionsnet/bridge/br_netlink.c
- net/bridge/br_private.h 1 addition, 0 deletionsnet/bridge/br_private.h
- net/core/fib_rules.c 4 additions, 1 deletionnet/core/fib_rules.c
- net/ipv4/tcp_minisocks.c 1 addition, 0 deletionsnet/ipv4/tcp_minisocks.c
- net/l2tp/l2tp_core.c 3 additions, 1 deletionnet/l2tp/l2tp_core.c
- net/netfilter/ipvs/ip_vs_ctl.c 80 additions, 51 deletionsnet/netfilter/ipvs/ip_vs_ctl.c
- net/netfilter/ipvs/ip_vs_sync.c 6 additions, 0 deletionsnet/netfilter/ipvs/ip_vs_sync.c
Loading
Please register or sign in to comment