Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 7a3c296a
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     1) Clamp timeouts to INT_MAX in conntrack, from Jay Elliot.
    
     2) Fix broken UAPI for BPF_PROG_TYPE_PERF_EVENT, from Hendrik
        Brueckner.
    
     3) Fix locking in ieee80211_sta_tear_down_BA_sessions, from Johannes
        Berg.
    
     4) Add missing barriers to ptr_ring, from Michael S. Tsirkin.
    
     5) Don't advertise gigabit in sh_eth when not available, from Thomas
        Petazzoni.
    
     6) Check network namespace when delivering to netlink taps, from Kevin
        Cernekee.
    
     7) Kill a race in raw_sendmsg(), from Mohamed Ghannam.
    
     8) Use correct address in TCP md5 lookups when replying to an incoming
        segment, from Christoph Paasch.
    
     9) Add schedule points to BPF map alloc/free, from Eric Dumazet.
    
    10) Don't allow silly mtu values to be used in ipv4/ipv6 multicast, also
        from Eric Dumazet.
    
    11) Fix SKB leak in tipc, from Jon Maloy.
    
    12) Disable MAC learning on OVS ports of mlxsw, from Yuval Mintz.
    
    13) SKB leak fix in skB_complete_tx_timestamp(), from Willem de Bruijn.
    
    14) Add some new qmi_wwan device IDs, from Daniele Palmas.
    
    15) Fix static key imbalance in ingress qdisc, from Jiri Pirko.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (76 commits)
      net: qcom/emac: Reduce timeout for mdio read/write
      net: sched: fix static key imbalance in case of ingress/clsact_init error
      net: sched: fix clsact init error path
      ip_gre: fix wrong return value of erspan_rcv
      net: usb: qmi_wwan: add Telit ME910 PID 0x1101 support
      pkt_sched: Remove TC_RED_OFFLOADED from uapi
      net: sched: Move to new offload indication in RED
      net: sched: Add TCA_HW_OFFLOAD
      net: aquantia: Increment driver version
      net: aquantia: Fix typo in ethtool statistics names
      net: aquantia: Update hw counters on hw init
      net: aquantia: Improve link state and statistics check interval callback
      net: aquantia: Fill in multicast counter in ndev stats from hardware
      net: aquantia: Fill ndev stat couters from hardware
      net: aquantia: Extend stat counters to 64bit values
      net: aquantia: Fix hardware DMA stream overload on large MRRS
      net: aquantia: Fix actual speed capabilities reporting
      sock: free skb in skb_complete_tx_timestamp on error
      s390/qeth: update takeover IPs after configuration change
      s390/qeth: lock IP table while applying takeover changes
      ...
    7a3c296a