summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bpf: Introduce bpf_map IDMartin KaFai Lau2017-06-062-1/+34
* bpf: Introduce bpf_prog IDMartin KaFai Lau2017-06-062-1/+40
* cxgb4: implement ndo_set_vf_rate()Ganesh Goudar2017-06-062-0/+107
* ppp: mppe: Use vsnprintf extension %phNJoe Perches2017-06-061-11/+4
* net: phy: Delete unused function phy_ethtool_gsetyuval.shaia@oracle.com2017-06-063-26/+0
* Merge branch 's390-next-updates'David S. Miller2017-06-069-99/+105
|\
| * s390/qeth: do early device setup for z/VM IQD NICsJulian Wiedmann2017-06-063-11/+37
| * s390/qeth: add support for early L3 device setupUrsula Braun2017-06-063-5/+25
| * s390/qeth: silence qeth_fix_features()Julian Wiedmann2017-06-061-4/+1
| * s390/qeth: consolidate pack buffer flushingJulian Wiedmann2017-06-061-40/+25
| * s390/qeth: add missing strings for IPA return codesJulian Wiedmann2017-06-061-0/+2
| * s390/qeth: log bridgeport capabilitiesJulian Wiedmann2017-06-061-0/+8
| * s390/qeth: query IPv6 IPA support on HiperSocketsJulian Wiedmann2017-06-061-3/+4
| * s390/qeth: remove skb_is_nonlinear() check on IQDJulian Wiedmann2017-06-061-7/+1
| * s390/qeth: remove support for IPA_IP_FRAGMENTATIONJulian Wiedmann2017-06-063-29/+2
|/
* Merge branch 'net-trap-control-action'David S. Miller2017-06-0624-6/+89
|\
| * spectrum_flower: Implement gact trap TC action offloadJiri Pirko2017-06-061-0/+4
| * acl: Introduce ACL trap actionJiri Pirko2017-06-064-2/+45
| * mlxsw: spectrum: Introduce ACL trapJiri Pirko2017-06-062-1/+4
| * mlxsw: pci: Fix size of trap_id field in CQEJiri Pirko2017-06-061-1/+1
| * net: sched: introduce helper to identify gact trap actionJiri Pirko2017-06-061-2/+13
| * net: sched: introduce a TRAP control actionJiri Pirko2017-06-0615-0/+22
|/
* net/mlxfw: remove redundant goto on error checkColin Ian King2017-06-061-2/+0
* Merge tag 'rxrpc-rewrite-20170606' of git://git.kernel.org/pub/scm/linux/kern...David S. Miller2017-06-0619-59/+245
|\
| * rxrpc: Add service upgrade support for client connectionsDavid Howells2017-06-058-12/+106
| * rxrpc: Implement service upgradeDavid Howells2017-06-057-12/+71
| * rxrpc: Permit multiple service bindingDavid Howells2017-06-056-24/+51
| * rxrpc: Separate the connection's protocol service ID from the lookup IDDavid Howells2017-06-0510-13/+19
* | Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher...David S. Miller2017-06-068-43/+103
|\ \
| * | e1000e: use disable_hardirq() also for MSIX vectors in e1000_netpoll()Konstantin Khlebnikov2017-06-061-6/+6
| * | e1000e: Don't return uninitialized statsBenjamin Poirier2017-06-061-1/+1
| * | igb: Remove useless argumentBenjamin Poirier2017-06-063-7/+7
| * | igb: check for Tx timestamp timeouts during watchdogJacob Keller2017-06-063-0/+31
| * | igb: add statistic indicating number of skipped Tx timestampsJacob Keller2017-06-063-0/+4
| * | e1000e: add statistic indicating number of skipped Tx timestampsJacob Keller2017-06-063-7/+12
| * | igb: avoid permanent lock of *_PTP_TX_IN_PROGRESSJacob Keller2017-06-061-5/+18
| * | igb: fix race condition with PTP_TX_IN_PROGRESS bitsJacob Keller2017-06-061-2/+10
| * | e1000e: fix race condition around skb_tstamp_tx()Jacob Keller2017-06-061-2/+8
| * | igb: mark PM functions as __maybe_unusedArnd Bergmann2017-06-061-13/+5
| * | igb: Explicitly select page 0 at initializationMatwey V Kornilov2017-06-061-0/+1
|/ /
* | mdio: mux: fix an incorrect less than zero error check using a u32Colin Ian King2017-06-051-1/+1
* | net-next: stmmac: dwmac-sun8i: ensure the EPHY is properly resetedIcenowy Zheng2017-06-051-0/+5
* | net/3com: Make el3_netdev_get_ecmd return voidyuval.shaia@oracle.com2017-06-051-5/+3
* | net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd ...yuval.shaia@oracle.com2017-06-0529-73/+78
* | net/dec: Make __de_get_link_ksettings return voidyuval.shaia@oracle.com2017-06-051-7/+4
* | net: sched: select cls when cls_act is enabledJiri Pirko2017-06-051-0/+1
* | genetlink: remove ops_list from genetlink header.Rosen, Rami2017-06-051-1/+0
|/
* Merge branch 'mlxsw-Minor-cleanup'David S. Miller2017-06-054-38/+41
|\
| * mlxsw: spectrum_router: Align RIF index allocation with existing codeIdo Schimmel2017-06-051-12/+12
| * mlxsw: Fix typo inside enumerationIdo Schimmel2017-06-052-4/+4