summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bpf: sockmap test remove shutdown() callsJohn Fastabend2018-08-291-3/+0
* bpf: remove duplicated include from syscall.cYueHaibing2018-08-291-1/+0
* Merge branch 'nfp-add-NFP5000-support'David S. Miller2018-08-2815-236/+682
|\
| * nfp: make RTsym users handle absolute symbols correctlyJakub Kicinski2018-08-283-32/+21
| * nfp: support access to absolute RTsymsJakub Kicinski2018-08-282-9/+46
| * nfp: convert all RTsym users to use new read/write helpersJakub Kicinski2018-08-283-46/+23
| * nfp: convert existing RTsym helpers to full target decodingJakub Kicinski2018-08-281-14/+14
| * nfp: pass cpp_id to nfp_cpp_map_area()Jakub Kicinski2018-08-284-16/+16
| * nfp: add RTsym access helpersJakub Kicinski2018-08-282-0/+171
| * nfp: add basic errors messages to target logicJakub Kicinski2018-08-281-2/+10
| * nfp: save the MU locality field offsetJakub Kicinski2018-08-283-31/+38
| * nfp: refactor the per-chip PCIe configJakub Kicinski2018-08-282-13/+41
| * nfp: add support for NFP5000Jakub Kicinski2018-08-282-1/+7
| * nfp: abm: look up MAC addresses via management FWJakub Kicinski2018-08-281-9/+25
| * nfp: add support for indirect HWinfo lookupJakub Kicinski2018-08-282-0/+44
| * nfp: interpret extended FW load result codesJakub Kicinski2018-08-282-3/+85
| * nfp: attempt FW load from flashJakub Kicinski2018-08-283-2/+16
| * nfp: encapsulate NSP command arguments into structsJakub Kicinski2018-08-281-69/+136
|/
* Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2018-08-2817-1199/+3326
|\
| * ice: Fix and update driver version stringAnirudh Venkataramanan2018-08-281-1/+1
| * ice: Introduce SERVICE_DIS flag and service routine functionsAkeem G Abodunrin2018-08-282-7/+28
| * ice: Enable VSI Rx/Tx pruning only when VLAN 0 is activeBrett Creeley2018-08-281-9/+85
| * ice: Enable firmware logging during device initialization.Hieu Tran2018-08-285-2/+286
| * ice: Implement ice_bridge_getlink and ice_bridge_setlinkMd Fahad Iqbal Polash2018-08-283-1/+181
| * ice: Add support for Tx hang, Tx timeout and malicious driver detectionSudheer Mogilappagari2018-08-285-0/+331
| * ice: Clean up register fileAnirudh Venkataramanan2018-08-281-229/+188
| * ice: Implement handlers for ethtool PHY/link operationsChinh Cao2018-08-284-53/+891
| * ice: Refactor VSI allocation, deletion and rebuild flowAnirudh Venkataramanan2018-08-287-171/+580
| * ice: Refactor switch rule management structures and functionsAnirudh Venkataramanan2018-08-285-553/+500
| * ice: Code optimization for ice_fill_sw_rule()Zhenning Xiao2018-08-281-8/+10
| * ice: Prevent control queue operations during resetAnirudh Venkataramanan2018-08-284-5/+34
| * ice: Update request resource command to latest specificationDan Nowlin2018-08-284-21/+67
| * ice: Updates to Tx scheduler codeAnirudh Venkataramanan2018-08-284-114/+61
| * ice: Rework flex descriptor programmingAnirudh Venkataramanan2018-08-282-34/+92
* | Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe...David S. Miller2018-08-2819-48/+1241
|\ \ | |/ |/|
| * ixgbe: fix the return value for unsupported VF offloadShannon Nelson2018-08-281-1/+1
| * ixgbe: disallow IPsec Tx offload when in SR-IOV modeShannon Nelson2018-08-281-0/+3
| * ixgbevf: enable VF IPsec offload operationsShannon Nelson2018-08-285-21/+86
| * ixgbevf: add VF IPsec offload codeShannon Nelson2018-08-284-0/+748
| * ixgbevf: add defines for IPsec offload requestShannon Nelson2018-08-282-0/+13
| * ixgbe: add VF IPsec offload request message handlingShannon Nelson2018-08-283-6/+35
| * ixgbe: add VF IPsec offload enable flagShannon Nelson2018-08-283-1/+12
| * ixgbe: add VF IPsec managementShannon Nelson2018-08-282-9/+260
| * ixgbe: prep IPsec constants for later useShannon Nelson2018-08-281-3/+5
| * ixgbe: reload IPsec IP table after sa tablesShannon Nelson2018-08-281-8/+8
| * ixgbe: don't clear IPsec sa counters on HW clearingShannon Nelson2018-08-281-4/+0
| * ixgbevf: VF2VF TCP RSSSebastian Basierski2018-08-281-0/+4
| * ixgbe: firmware recovery modeSebastian Basierski2018-08-284-0/+71
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2018-08-2792-711/+754
|\
| * net: sched: Fix memory exposure from short TCA_U32_SELKees Cook2018-08-261-2/+8