• L
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 47ebed96
    Linus Torvalds 提交于
    Pull networking fixes from David Miller:
    
     1) mlx4 driver bug fixes (TX queue wakeups, csum complete indications)
        from Ido Shamay, Eran Ben Elisha, and Or Gerlitz.
    
     2) Missing unlock in error path of PTP support in renesas driver, from
        Dan Carpenter.
    
     3) Add Vitesse 8641 phy IDs to vitesse PHY driver, from Shaohui Xie.
    
     4) Bnx2x driver bug fixes (linearization of encap packets, scratchpad
        parity error notifications, flow-control and speed settings) from
        Yuval Mintz, Manish Chopra, Shahed Shaikh, and Ariel Elior.
    
     5) ipv6 extension header parsing in the igb chip has a HW errata,
        disable it.  Frm Todd Fujinaka.
    
     6) Fix PCI link state locking issue in e1000e driver, from Yanir
        Lubetkin.
    
     7) Cure panics during MTU change in i40e, from Mitch Williams.
    
     8) Don't leak promisc refs in DSA slave driver, from Gilad Ben-Yossef.
    
     9) Add missing HAS_DMA dep to VIA Rhine driver, from Geery
        Uytterhoeven.
    
    10) Make sure DMA map/unmap calls are symmetric in bnx2x driver, from
        Michal Schmidt.
    
    11) Workaround for MDIO access problems in bcm7xxx devices, from FLorian
        Fainelli.
    
    12) Fix races in SCTP protocol between OTTB responses and route
        removals, from Alexander Sverdlin.
    
    13) Fix jumbo frame checksum issue with some mvneta devices, from Simon
        Guinot.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (58 commits)
      sock_diag: don't broadcast kernel sockets
      net: mvneta: disable IP checksum with jumbo frames for Armada 370
      ARM: mvebu: update Ethernet compatible string for Armada XP
      net: mvneta: introduce compatible string "marvell, armada-xp-neta"
      api: fix compatibility of linux/in.h with netinet/in.h
      net: icplus: fix typo in constant name
      sis900: Trivial: Fix typos in enums
      stmmac: Trivial: fix typo in constant name
      sctp: Fix race between OOTB responce and route removal
      net-Liquidio: Delete unnecessary checks before the function call "vfree"
      vmxnet3: Bump up driver version number
      amd-xgbe: Add the __GFP_NOWARN flag to Rx buffer allocation
      net: phy: mdio-bcm-unimac: workaround initial read failures for integrated PHYs
      net: bcmgenet: workaround initial read failures for integrated PHYs
      net: phy: bcm7xxx: workaround MDIO management controller initial read
      bnx2x: fix DMA API usage
      net: via: VIA_RHINE and VIA_VELOCITY should depend on HAS_DMA
      net/phy: tune get_phy_c45_ids to support more c45 phy
      bnx2x: fix lockdep splat
      net: fec: don't access RACC register when not available
      ...
    47ebed96
armada-370.dtsi 10.1 KB