Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 18673533
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     1) Fix regression in /proc/net/if_inet6, sometimes devices do not get
        listed.  From Eric Dumazet.
    
     2) Add IPSEC networking sub-section to MAINTAINERS.
    
     3) S390 networking fixes from Hendrik Brueckner and Stefan Raspl.
    
     4) Fix enslavement of devices that can't do VLAN properly, from Jiri
        Pirko.
    
     5) SCTP sack handling fix from Zijie Pan.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
      ipv6: addrconf: fix /proc/net/if_inet6
      bnx2x: fix handling mf storage modes
      qeth: fix deadlock between recovery and bonding driver
      smsgiucv: reestablish IUCV path after resume
      sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()
      vlan: fix bond/team enslave of vlan challenged slave/port
      MAINTAINERS: Add explicit section for IPSEC networking.
    18673533