Skip to content
  • Linus Torvalds's avatar
    a6391a92
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · a6391a92
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     1) Don't use uninitialized data in IPVS, from Dan Carpenter.
    
     2) conntrack race fixes from Pablo Neira Ayuso.
    
     3) Fix TX hangs with i40e, from Jesse Brandeburg.
    
     4) Fix budget return from poll calls in dnet and alx, from Eric
        Dumazet.
    
     5) Fix bugus "if (unlikely(x) < 0)" test in AF_PACKET, from Christoph
        Jaeger.
    
     6) Fix bug introduced by conversion to list_head in TIPC retransmit
        code, from Jon Paul Maloy.
    
     7) Don't use GFP_NOIO under spinlock in USB kaweth driver, from Alexey
        Khoroshilov.
    
     8) Fix bridge build with INET disabled, from Arnd Bergmann.
    
     9) Fix netlink array overrun for PROBE attributes in openvswitch, from
        Thomas Graf.
    
    10) Don't hold spinlock across synchronize_irq() in tg3 driver, from
        Prashant Sreedharan.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
      tg3: Release tp->lock before invoking synchronize_irq()
      tg3: tg3_reset_task() needs to use rtnl_lock to synchronize
      tg3: tg3_timer() should grab tp->lock before checking for tp->irq_sync
      team: avoid possible underflow of count_pending value for notify_peers and mcast_rejoin
      openvswitch: packet messages need their own probe attribtue
      i40e: adds FCoE configure option
      cxgb4vf: Fix queue allocation for 40G adapter
      netdevice: Add missing parentheses in macro
      bridge: only provide proxy ARP when CONFIG_INET is enabled
      neighbour: fix base_reachable_time(_ms) not effective immediatly when changed
      net: fec: fix MDIO bus assignement for dual fec SoC's
      xen-netfront: use different locks for Rx and Tx stats
      drivers: net: cpsw: fix multicast flush in dual emac mode
      cxgb4vf: Initialize mdio_addr before using it
      net: Corrected the comment describing the ndo operations to reflect the actual prototype for couple of operations
      usb/kaweth: use GFP_ATOMIC under spin_lock in usb_start_wait_urb()
      MAINTAINERS: add me as ibmveth maintainer
      tipc: fix bug in broadcast retransmit code
      update ip-sysctl.txt documentation (v2)
      net/at91_ether: prepare and unprepare clock
      ...
    a6391a92
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     1) Don't use uninitialized data in IPVS, from Dan Carpenter.
    
     2) conntrack race fixes from Pablo Neira Ayuso.
    
     3) Fix TX hangs with i40e, from Jesse Brandeburg.
    
     4) Fix budget return from poll calls in dnet and alx, from Eric
        Dumazet.
    
     5) Fix bugus "if (unlikely(x) < 0)" test in AF_PACKET, from Christoph
        Jaeger.
    
     6) Fix bug introduced by conversion to list_head in TIPC retransmit
        code, from Jon Paul Maloy.
    
     7) Don't use GFP_NOIO under spinlock in USB kaweth driver, from Alexey
        Khoroshilov.
    
     8) Fix bridge build with INET disabled, from Arnd Bergmann.
    
     9) Fix netlink array overrun for PROBE attributes in openvswitch, from
        Thomas Graf.
    
    10) Don't hold spinlock across synchronize_irq() in tg3 driver, from
        Prashant Sreedharan.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
      tg3: Release tp->lock before invoking synchronize_irq()
      tg3: tg3_reset_task() needs to use rtnl_lock to synchronize
      tg3: tg3_timer() should grab tp->lock before checking for tp->irq_sync
      team: avoid possible underflow of count_pending value for notify_peers and mcast_rejoin
      openvswitch: packet messages need their own probe attribtue
      i40e: adds FCoE configure option
      cxgb4vf: Fix queue allocation for 40G adapter
      netdevice: Add missing parentheses in macro
      bridge: only provide proxy ARP when CONFIG_INET is enabled
      neighbour: fix base_reachable_time(_ms) not effective immediatly when changed
      net: fec: fix MDIO bus assignement for dual fec SoC's
      xen-netfront: use different locks for Rx and Tx stats
      drivers: net: cpsw: fix multicast flush in dual emac mode
      cxgb4vf: Initialize mdio_addr before using it
      net: Corrected the comment describing the ndo operations to reflect the actual prototype for couple of operations
      usb/kaweth: use GFP_ATOMIC under spin_lock in usb_start_wait_urb()
      MAINTAINERS: add me as ibmveth maintainer
      tipc: fix bug in broadcast retransmit code
      update ip-sysctl.txt documentation (v2)
      net/at91_ether: prepare and unprepare clock
      ...
Loading