summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDavid S. Miller2017-12-0431-443/+2362
|\
| * Merge branch 'bpf-xdp-stack-uninit-and-offload-tests'Daniel Borkmann2017-12-0320-258/+1715
| |\
| | * net: dummy: remove fake SR-IOV functionalityJakub Kicinski2017-12-031-214/+1
| | * netdevsim: add SR-IOV functionalityJakub Kicinski2017-12-032-2/+284
| | * selftests/bpf: add offload test based on netdevsimJakub Kicinski2017-12-033-2/+691
| | * netdevsim: add bpf offload supportJakub Kicinski2017-12-034-1/+529
| | * netdevsim: add software driver for testing offloadsJakub Kicinski2017-12-036-0/+167
| | * net: xdp: make the stack take care of the tear downJakub Kicinski2017-12-037-30/+22
| | * net: xdp: report flags program was installed with on queryJakub Kicinski2017-12-032-0/+3
| | * net: xdp: avoid output parameters when querying XDP progJakub Kicinski2017-12-033-12/+21
| |/
| * Merge branch 'bpf-nfp-jmp-memcpy-improvements'Daniel Borkmann2017-12-018-75/+503
| |\
| | * nfp: bpf: detect load/store sequences lowered from memory copyJiong Wang2017-12-011-0/+237
| | * nfp: bpf: implement memory bulk copy for length bigger than 32-bytesJiong Wang2017-12-011-7/+45
| | * nfp: bpf: implement memory bulk copy for length within 32-bytesJiong Wang2017-12-014-0/+122
| | * nfp: bpf: factor out is_mbpf_load & is_mbpf_storeJiong Wang2017-12-012-2/+12
| | * nfp: bpf: encode indirect commandsJakub Kicinski2017-12-012-5/+15
| | * nfp: bpf: correct the encoding for No-Dest immedJiong Wang2017-12-011-3/+5
| | * nfp: bpf: relax source operands checkJiong Wang2017-12-011-2/+4
| | * nfp: bpf: don't do ld/shifts combination if shifts are jump destinationJiong Wang2017-12-011-0/+4
| | * nfp: bpf: don't do ld/mask combination if mask is jump destinationJiong Wang2017-12-011-0/+3
| | * nfp: bpf: flag jump destination to guide insn combine optimizationsJiong Wang2017-12-012-0/+5
| | * nfp: bpf: record jump destination to simplify jump fixupJiong Wang2017-12-014-55/+41
| | * nfp: bpf: support backward jumpJiong Wang2017-12-012-30/+40
| | * nfp: fix old kdoc issuesJakub Kicinski2017-12-012-6/+5
| |/
| * Merge branch 'bpf-verifier-misc-improvements'Daniel Borkmann2017-12-012-98/+120
| |\
| | * selftests/bpf: adjust test_align expected outputAlexei Starovoitov2017-12-011-78/+78
| | * bpf: cleanup register_is_null()Alexei Starovoitov2017-12-011-10/+10
| | * bpf: improve JEQ/JNE path walkingAlexei Starovoitov2017-12-011-2/+3
| | * bpf: improve verifier liveness marksAlexei Starovoitov2017-12-011-0/+5
| | * bpf: don't mark FP reg as uninitAlexei Starovoitov2017-12-011-4/+4
| | * bpf: print liveness info to verifier logAlexei Starovoitov2017-12-011-4/+20
| | * bpf: fix stack state printing in verifier logAlexei Starovoitov2017-12-011-1/+1
| |/
| * samples/bpf: Convert magic numbers to names in multi-prog cgroup test caseDavid Ahern2017-11-301-12/+24
* | Merge branch 'rtnetlink-rework-handler-registration'David S. Miller2017-12-0414-160/+282
|\ \
| * | rtnetlink: remove __rtnl_registerFlorian Westphal2017-12-046-55/+61
| * | net: use rtnl_register_module where neededFlorian Westphal2017-12-048-32/+55
| * | rtnetlink: get reference on module before invoking handlersFlorian Westphal2017-12-042-35/+80
| * | net: rtnetlink: use rcu to free rtnl message handlersFlorian Westphal2017-12-041-53/+101
|/ /
* | net: phy: broadcom: re-add mistakenly removed config settingsHeiner Kallweit2017-12-041-0/+3
* | Merge branch 'ipv6-gre-collect_md'David S. Miller2017-12-045-13/+210
|\ \
| * | samples/bpf: extend test_tunnel_bpf.sh with ip6greWilliam Tu2017-12-042-0/+108
| * | bpf: allow disabling tunnel csum for ipv6William Tu2017-12-041-2/+3
| * | ip6_gre: add ip6 gre and gretap collect_md modeWilliam Tu2017-12-042-11/+99
|/ /
* | net: phy: core: don't disable device interrupts in phy_changeHeiner Kallweit2017-12-041-13/+6
* | net: phy: core: remove now uneeded disabling of interruptsHeiner Kallweit2017-12-042-25/+2
* | Merge branch 'tcp-2nd-listener-hash'David S. Miller2017-12-039-52/+301
|\ \
| * | tcp: Enable 2nd listener hashtable in TCPMartin KaFai Lau2017-12-031-0/+3
| * | inet: Add a 2nd listener hashtable (port+addr)Martin KaFai Lau2017-12-034-15/+249
| * | udp: Move udp[46]_portaddr_hash() to net/ip[v6].hMartin KaFai Lau2017-12-034-38/+42
| * | inet: Add a count to struct inet_listen_hashbucketMartin KaFai Lau2017-12-032-2/+10
|/ /