Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · f5af19d1
    Linus Torvalds authored
    Pull networking updates from David Miller:
    
     1) Missing netlink attribute validation in nft_lookup, from Patrick
        McHardy.
    
     2) Restrict ipv6 partial checksum handling to UDP, since that's the
        only case it works for.  From Vlad Yasevich.
    
     3) Clear out silly device table sentinal macros used by SSB and BCMA
        drivers.  From Joe Perches.
    
     4) Make sure the remote checksum code never creates a situation where
        the remote checksum is applied yet the tunneling metadata describing
        the remote checksum transformation is still present.  Otherwise an
        external entity might see this and apply the checksum again.  From
        Tom Herbert.
    
     5) Use msecs_to_jiffies() where applicable, from Nicholas Mc Guire.
    
     6) Don't explicitly initialize timer struct fields, use setup_timer()
        and mod_timer() instead.  From Vaishali Thakkar.
    
     7) Don't invoke tg3_halt() without the tp->lock held, from Jun'ichi
        Nomura.
    
     8) Missing __percpu annotation in ipvlan driver, from Eric Dumazet.
    
     9) Don't potentially perform skb_get() on shared skbs, also from Eric
        Dumazet.
    
    10) Fix COW'ing of metrics for non-DST_HOST routes in ipv6, from Martin
        KaFai Lau.
    
    11) Fix merge resolution error between the iov_iter changes in vhost and
        some bug fixes that occurred at the same time.  From Jason Wang.
    
    12) If rtnl_configure_link() fails we have to perform a call to
        ->dellink() before unregistering the device.  From WANG Cong.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (39 commits)
      net: dsa: Set valid phy interface type
      rtnetlink: call ->dellink on failure when ->newlink exists
      com20020-pci: add support for eae single card
      vhost_net: fix wrong iter offset when setting number of buffers
      net: spelling fixes
      net/core: Fix warning while make xmldocs caused by dev.c
      net: phy: micrel: disable NAND-tree for KSZ8021, KSZ8031, KSZ8051, KSZ8081
      ipv6: fix ipv6_cow_metrics for non DST_HOST case
      openvswitch: Fix key serialization.
      r8152: restore hw settings
      hso: fix rx parsing logic when skb allocation fails
      tcp: make sure skb is not shared before using skb_get()
      bridge: netfilter: Move sysctl-specific error code inside #ifdef
      ipv6: fix possible deadlock in ip6_fl_purge / ip6_fl_gc
      ipvlan: add a missing __percpu pcpu_stats
      tg3: Hold tp->lock before calling tg3_halt() from tg3_init_one()
      bgmac: fix device initialization on Northstar SoCs (condition typo)
      qlcnic: Delete existing multicast MAC list before adding new
      net/mlx5_core: Fix configuration of log_uar_page_sz
      sunvnet: don't change gso data on clones
      ...
    f5af19d1