summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe...David S. Miller2018-01-2917-106/+342
|\
| * i40e: Do not allow use more TC queue pairs than MSI-X vectors existPaweł Jabłoński2018-01-261-0/+4
| * i40e/i40evf: Record ITR register location in the q_vectorAlexander Duyck2018-01-265-18/+12
| * i40e: fix reported mask for ntuple filtersJacob Keller2018-01-261-4/+4
| * i40e: disallow programming multiple filters with same criteriaJacob Keller2018-01-261-0/+87
| * i40e: program fragmented IPv4 filter input setJacob Keller2018-01-262-0/+13
| * i40e: Fix kdump failureAvinash Dayanand2018-01-261-2/+2
| * i40e: cleanup unnecessary parensJeff Kirsher2018-01-262-2/+2
| * i40e: fix FW_LLDP flag on initAlan Brady2018-01-261-0/+3
| * i40e: Implement an ethtool private flag to stop LLDP in FWDave Ertman2018-01-262-3/+58
| * i40e: change flags to use 64 bitsAlice Michael2018-01-262-35/+36
| * i40e: Display LLDP information on vSphere Web ClientUpasana Menon2018-01-264-0/+55
| * i40e/i40evf: Use ring pointers to clean up _set_itr_per_queueAlexander Duyck2018-01-262-24/+26
| * i40evf: Allow turning off offloads when the VF has VLAN setPaweł Jabłoński2018-01-261-6/+12
| * i40e: Fix for adding multiple ethtool filters on the same locationPatryk Małek2018-01-261-6/+6
| * i40e: Add returning AQ critical error to SWMichal Kosiarz2018-01-266-8/+24
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDavid S. Miller2018-01-2937-378/+1969
|\ \
| * \ Merge branch 'fix-lpm-map'Alexei Starovoitov2018-01-273-16/+107
| |\ \
| | * | tools/bpf: add a multithreaded stress test in bpf selftests test_lpm_mapYonghong Song2018-01-272-1/+96
| | * | bpf: fix kernel page fault in lpm map trie_get_next_keyYonghong Song2018-01-271-15/+11
| |/ /
| * | Merge branch 'bpf-improvements-and-fixes'Alexei Starovoitov2018-01-2713-246/+546
| |\ \
| | * | bpf: add further test cases around div/mod and othersDaniel Borkmann2018-01-272-15/+336
| | * | bpf, arm: remove obsolete exception handling from div/modDaniel Borkmann2018-01-271-8/+0
| | * | bpf, mips64: remove unneeded zero check from div/mod with kDaniel Borkmann2018-01-271-15/+4
| | * | bpf, mips64: remove obsolete exception handling from div/modDaniel Borkmann2018-01-271-10/+0
| | * | bpf, sparc64: remove obsolete exception handling from div/modDaniel Borkmann2018-01-271-18/+0
| | * | bpf, ppc64: remove obsolete exception handling from div/modDaniel Borkmann2018-01-271-8/+0
| | * | bpf, s390x: remove obsolete exception handling from div/modDaniel Borkmann2018-01-271-10/+0
| | * | bpf, arm64: remove obsolete exception handling from div/modDaniel Borkmann2018-01-271-13/+0
| | * | bpf, x86_64: remove obsolete exception handling from div/modDaniel Borkmann2018-01-271-20/+0
| | * | bpf: fix subprog verifier bypass by div/mod by 0 exceptionDaniel Borkmann2018-01-273-17/+38
| | * | bpf: make unknown opcode handling more robustDaniel Borkmann2018-01-273-105/+154
| | * | bpf: improve dead code sanitizingDaniel Borkmann2018-01-271-5/+12
| | * | bpf: xor of a/x in cbpf can be done in 32 bit aluDaniel Borkmann2018-01-271-2/+2
| |/ /
| * | samples/bpf: Partially fixes the bpf.o buildMickaël Salaün2018-01-261-1/+4
| * | bpf: clean up from test_tcpbpf_kern.cLawrence Brakmo2018-01-261-3/+0
| * | bpf: Use the IS_FD_ARRAY() macro in map_update_elem()Mickaël Salaün2018-01-261-4/+1
| * | Merge branch 'bpf-more-sock_ops-callbacks'Alexei Starovoitov2018-01-2617-39/+925
| |\ \
| | * | bpf: add selftest for tcpbpfLawrence Brakmo2018-01-268-6/+480
| | * | bpf: Add BPF_SOCK_OPS_STATE_CBLawrence Brakmo2018-01-262-1/+52
| | * | bpf: Add BPF_SOCK_OPS_RETRANS_CBLawrence Brakmo2018-01-262-1/+12
| | * | bpf: Add sock_ops R/W access to tclassLawrence Brakmo2018-01-261-2/+45
| | * | bpf: Add support for reading sk_state and moreLawrence Brakmo2018-01-262-11/+154
| | * | bpf: Add sock_ops RTO callbackLawrence Brakmo2018-01-262-1/+14
| | * | bpf: Adds field bpf_sock_ops_cb_flags to tcp_sockLawrence Brakmo2018-01-263-1/+61
| | * | bpf: Support passing args to sock_ops bpf functionLawrence Brakmo2018-01-266-10/+42
| | * | bpf: Add write access to tcp_sock and sock fieldsLawrence Brakmo2018-01-263-1/+58
| | * | bpf: Make SOCK_OPS_GET_TCP struct independentLawrence Brakmo2018-01-261-10/+10
| | * | bpf: Make SOCK_OPS_GET_TCP size independentLawrence Brakmo2018-01-261-5/+8
| | * | bpf: Only reply field should be writeableLawrence Brakmo2018-01-261-2/+1
| |/ /