summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* isdn: hfc_{pci,sx}: Avoid empty body if statementsNathan Chancellor2018-10-234-12/+11
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDavid S. Miller2018-10-2262-394/+2315
|\
| * tools: bpftool: fix completion for "bpftool map update"Quentin Monnet2018-10-211-1/+1
| * tools: bpftool: print nb of cmds to stdout (not stderr) for batch modeQuentin Monnet2018-10-211-1/+2
| * tools: bpftool: document restriction on '.' in names to pin in bpffsQuentin Monnet2018-10-212-3/+9
| * selftests/bpf: fix return value comparison for tests in test_libbpf.shQuentin Monnet2018-10-211-1/+1
| * Merge branch 'misc-improvements'Alexei Starovoitov2018-10-218-76/+99
| |\
| | * bpf, libbpf: simplify and cleanup perf ring buffer walkDaniel Borkmann2018-10-214-52/+47
| | * bpf, verifier: avoid retpoline for map push/pop/peek operationDaniel Borkmann2018-10-211-1/+24
| | * bpf, verifier: remove unneeded flow key in check_helper_mem_accessDaniel Borkmann2018-10-211-2/+0
| | * bpf, verifier: reject xadd on flow key memoryDaniel Borkmann2018-10-211-1/+10
| | * bpf, verifier: fix register type dump in xadd and stDaniel Borkmann2018-10-212-11/+18
| | * ulp: remove uid and user_visible membersDaniel Borkmann2018-10-212-9/+0
| |/
| * Merge branch 'bpf-msg-push-data'Daniel Borkmann2018-10-207-28/+308
| |\
| | * bpf: test_sockmap add options to use msg_push_dataJohn Fastabend2018-10-202-26/+129
| | * bpf: libbpf support for msg_push_dataJohn Fastabend2018-10-202-1/+21
| | * bpf: sk_msg program helper bpf_msg_push_dataJohn Fastabend2018-10-203-1/+158
| |/
| * bpf: skmsg, fix psock create on existing kcm/tls portJohn Fastabend2018-10-202-10/+26
| * bpf: remove unused variableAlexei Starovoitov2018-10-191-1/+1
| * Merge branch 'cg_skb_direct_pkt_access'Alexei Starovoitov2018-10-195-1/+248
| |\
| | * bpf: add tests for direct packet access from CGROUP_SKBSong Liu2018-10-192-0/+186
| | * bpf: add cg_skb_is_valid_access for BPF_PROG_TYPE_CGROUP_SKBSong Liu2018-10-193-1/+62
| |/
| * Merge branch 'improve_perf_barriers'Alexei Starovoitov2018-10-1910-18/+254
| |\
| | * bpf, libbpf: use correct barriers in perf ring buffer walkDaniel Borkmann2018-10-191-6/+4
| | * tools, perf: add and use optimized ring_buffer_{read_head, write_tail} helpersDaniel Borkmann2018-10-199-12/+250
| |/
| * selftests/bpf: add missing executables to .gitignoreAnders Roxell2018-10-191-0/+2
| * Merge branch 'queue_stack_maps'Alexei Starovoitov2018-10-1921-14/+834
| |\
| | * selftests/bpf: add test cases for queue and stack mapsMauricio Vasquez B2018-10-199-1/+313
| | * Sync uapi/bpf.h to tools/includeMauricio Vasquez B2018-10-191-1/+29
| | * bpf: add MAP_LOOKUP_AND_DELETE_ELEM syscallMauricio Vasquez B2018-10-192-0/+67
| | * bpf: add queue and stack mapsMauricio Vasquez B2018-10-1910-3/+401
| | * bpf/verifier: add ARG_PTR_TO_UNINIT_MAP_VALUEMauricio Vasquez B2018-10-192-3/+7
| | * bpf/syscall: allow key to be null in map functionsMauricio Vasquez B2018-10-191-4/+15
| | * bpf: rename stack trace map operationsMauricio Vasquez B2018-10-192-2/+2
| |/
| * tools: bpftool: use 4 context mode for the NFP disasmJakub Kicinski2018-10-184-9/+20
| * selftests/bpf: fix file resource leak in load_kallsymsPeng Hao2018-10-181-0/+1
| * bpf: fix doc of bpf_skb_adjust_room() in uapiNicolas Dichtel2018-10-182-2/+2
| * Merge branch 'bpf-sk-msg-peek'Daniel Borkmann2018-10-175-74/+153
| |\
| | * bpf: sockmap, add msg_peek tests to test_sockmapJohn Fastabend2018-10-171-52/+115
| | * bpf: sockmap, support for msg_peek in sk_msg with redirect ingressJohn Fastabend2018-10-173-17/+30
| | * bpf: skmsg, improve sk_msg_used_element to work in cork contextJohn Fastabend2018-10-171-5/+8
| |/
| * bpf: sockmap, fix skmsg recvmsg handler to track size correctlyJohn Fastabend2018-10-172-0/+2
| * Merge branch 'nfp-improve-bpf-offload'Alexei Starovoitov2018-10-173-13/+98
| |\
| | * nfp: bpf: double check vNIC capabilities after object sharingJakub Kicinski2018-10-173-6/+22
| | * nfp: bpf: protect against mis-initializing atomic countersJakub Kicinski2018-10-173-7/+76
| |/
| * libbpf: Per-symbol visibility for DSOAndrey Ignatov2018-10-174-148/+179
| * bpf, tls: add tls header to tools infrastructureDaniel Borkmann2018-10-162-5/+86
* | Merge branch 'net-simplify-getting-driver_data'David S. Miller2018-10-229-34/+17
|\ \
| * | net: phy: mdio-mux-bcm-iproc: simplify getting .driver_dataWolfram Sang2018-10-221-4/+2
| * | net: ethernet: wiznet: w5300: simplify getting .driver_dataWolfram Sang2018-10-221-4/+2