summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-08-18116-1109/+1486
|\
| * Merge branch 'tc_action-fixes'David S. Miller2016-08-188-119/+112
| |\
| | * net_sched: allow flushing tc police actionsRoman Mashak2016-08-181-42/+1
| | * net_sched: unify the init logic for act_policeWANG Cong2016-08-181-9/+10
| | * net_sched: convert tcf_exts from list to pointer arrayWANG Cong2016-08-187-41/+85
| | * net_sched: move tc offload macros to pkt_cls.hWANG Cong2016-08-182-16/+22
| | * net_sched: fix a typo in tc_for_each_action()WANG Cong2016-08-181-1/+1
| | * net_sched: remove an unnecessary list_del()WANG Cong2016-08-181-1/+0
| | * net_sched: remove the leftover cleanup_a()WANG Cong2016-08-181-19/+3
| |/
| * Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher...David S. Miller2016-08-187-49/+107
| |\
| | * i40e: check for and deal with non-contiguous TCsDave Ertman2016-08-161-10/+25
| | * ixgbe: Re-enable ability to toggle VLAN filteringAlexander Duyck2016-08-161-0/+1
| | * ixgbe: Force VLNCTRL.VFE to be set in all VMDq pathsAlexander Duyck2016-08-161-6/+12
| | * e1000e: fix PTP on e1000_pch_lpt variantsJarod Wilson2016-08-161-1/+2
| | * e1000e: factor out systim sanitizationJarod Wilson2016-08-163-29/+44
| | * igb: fix adjusting PTP timestamps for Tx/Rx latencyKshitiz Gupta2016-08-161-3/+23
| * | Merge branch 'mlxsw-fixes'David S. Miller2016-08-186-88/+83
| |\ \ | | |/ | |/|
| | * mlxsw: spectrum: Allow packets to be trapped from any PGIdo Schimmel2016-08-181-1/+1
| | * mlxsw: spectrum: Unmap 802.1Q FID before destroying itIdo Schimmel2016-08-181-0/+2
| | * mlxsw: spectrum: Add missing rollbacks in error pathIdo Schimmel2016-08-181-1/+3
| | * mlxsw: reg: Fix missing op field fill-upJiri Pirko2016-08-181-0/+1
| | * mlxsw: spectrum: Trap loop-backed packetsIdo Schimmel2016-08-183-0/+16
| | * mlxsw: spectrum: Add missing packet trapsElad Raz2016-08-182-0/+18
| | * mlxsw: spectrum: Mark port as active before registering itIdo Schimmel2016-08-181-2/+3
| | * mlxsw: spectrum: Create PVID vPort before registering netdeviceIdo Schimmel2016-08-183-46/+29
| | * mlxsw: spectrum: Remove redundant errors from the codeIdo Schimmel2016-08-181-16/+5
| | * mlxsw: spectrum: Don't return upon error in removal pathIdo Schimmel2016-08-181-22/+5
| |/
| * Merge branch 'mediatek-fixes'David S. Miller2016-08-161-16/+30
| |\
| | * net: ethernet: mediatek: fix runtime warning raised by inconsistent struct de...sean.wang@mediatek.com2016-08-161-13/+13
| | * net: ethernet: mediatek: fix flow control settings on GMAC0 is not being enab...sean.wang@mediatek.com2016-08-161-0/+5
| | * net: ethernet: mediatek: fix RMII mode and add REVMII supported by GMACsean.wang@mediatek.com2016-08-161-3/+12
| |/
| * tipc: fix NULL pointer dereference in shutdown()Vegard Nossum2016-08-151-1/+2
| * Merge branch 'hv_netvsc-VF-removal-fixes'David S. Miller2016-08-153-82/+66
| |\
| | * hv_netvsc: fix bonding devices check in netvsc_netdev_event()Vitaly Kuznetsov2016-08-151-2/+7
| | * hv_netvsc: protect module refcount by checking net_device_ctx->vf_netdevVitaly Kuznetsov2016-08-151-2/+2
| | * hv_netvsc: reset vf_inject on VF removalVitaly Kuznetsov2016-08-151-10/+16
| | * hv_netvsc: avoid deadlocks between rtnl lock and vf_use_cnt waitVitaly Kuznetsov2016-08-152-35/+5
| | * hv_netvsc: don't lose VF informationVitaly Kuznetsov2016-08-153-42/+45
| |/
| * gre: set inner_protocol on xmitSimon Horman2016-08-153-3/+1
| * net: ipv6: Fix ping to link-local addresses.Lorenzo Colitti2016-08-151-16/+17
| * rhashtable: fix shift by 64 when shrinkingVegard Nossum2016-08-151-2/+4
| * mlxsw: spectrum_router: Fix use after freeVincent2016-08-151-1/+2
| * rhashtable: avoid large lock-array allocationsFlorian Westphal2016-08-151-2/+5
| * net: remove type_check from dev_get_nest_level()Sabrina Dubroca2016-08-145-12/+7
| * macsec: fix lockdep splats when nesting devicesSabrina Dubroca2016-08-141-2/+27
| * net: ipv6: Do not keep IPv6 addresses when IPv6 is disabledMike Manning2016-08-141-2/+2
| * net/sctp: always initialise sctp_ht_iter::start_failVegard Nossum2016-08-141-0/+1
| * net/irda: handle iriap_register_lsap() allocation failureVegard Nossum2016-08-141-2/+6
| * ipv6: suppress sparse warnings in IP6_ECN_set_ce()Johannes Berg2016-08-141-1/+2
| * bpf: fix write helpers with regards to non-linear partsDaniel Borkmann2016-08-141-52/+18