summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* samples/bpf: add a test for bpf_override_returnJosef Bacik2017-12-126-2/+71
* bpf: add a bpf_override_function helperJosef Bacik2017-12-1215-9/+154
* btrfs: make open_ctree error injectableJosef Bacik2017-12-121-0/+2
* add infrastructure for tagging functions as error injectableJosef Bacik2017-12-126-1/+195
* Merge branch 'bpf-tracing-multiprog-tp-query'Alexei Starovoitov2017-12-129-1/+255
|\
| * bpf/tracing: add a bpf test for new ioctl query interfaceYonghong Song2017-12-124-1/+182
| * bpf/tracing: allow user space to query prog array on the same tpYonghong Song2017-12-125-0/+73
|/
* selftests: bpf: Adding config fragment CONFIG_CGROUP_BPF=yNaresh Kamboju2017-12-121-0/+1
* Merge branch 'bpf-bpftool-makefile-cleanups'Daniel Borkmann2017-12-083-40/+52
|\
| * tools: bpftool: create "uninstall", "doc-uninstall" make targetsQuentin Monnet2017-12-083-3/+18
| * tools: bpftool: harmonise Makefile and Documentation/MakefileQuentin Monnet2017-12-082-39/+36
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDavid S. Miller2017-12-086-5/+572
|\
| * Merge branch 'bpf-devel-doc'Alexei Starovoitov2017-12-062-0/+523
| |\
| | * bpf, doc: add faq about bpf development processDaniel Borkmann2017-12-061-0/+519
| | * bpf, doc: add bpf trees and tps to maintainers entryDaniel Borkmann2017-12-061-0/+4
| |/
| * bpf: Add access to snd_cwnd and others in sock_opsLawrence Brakmo2017-12-054-2/+47
| * bpf: move bpf csum flag checkWilliam Tu2017-12-041-3/+2
* | tuntap: fix possible deadlock when fail to register netdevJason Wang2017-12-081-3/+4
* | Merge branch 'smc-fixes-next'David S. Miller2017-12-078-55/+118
|\ \
| * | smc: support variable CLC proposal messagesUrsula Braun2017-12-073-24/+107
| * | smc: no consumer update in tasklet contextUrsula Braun2017-12-072-16/+5
| * | smc: cleanup close checking during data receivalUrsula Braun2017-12-071-4/+1
| * | smc: no update for unused sk_write_pendingUrsula Braun2017-12-071-2/+0
| * | smc: improve smc_clc_send_decline() error handlingUrsula Braun2017-12-072-7/+4
| * | smc: make smc_close_active_abort() staticUrsula Braun2017-12-072-2/+1
|/ /
* | net: dsa: Allow compiling out legacy supportFlorian Fainelli2017-12-078-22/+56
* | bnxt_en: Don't print "Link speed -1 no longer supported" messages.Michael Chan2017-12-071-3/+7
* | ipvlan: Eliminate duplicated codes with existing functionGao Feng2017-12-061-11/+2
* | mlxsw: spectrum: handle NETIF_F_HW_TC changes correctlyJiri Pirko2017-12-063-0/+52
* | tun: avoid unnecessary READ_ONCE in tun_net_xmitWillem de Bruijn2017-12-061-3/+1
* | rds: debug: fix null check on static arrayPrashant Bhole2017-12-061-2/+2
* | act_mirred: get rid of mirred_list_lock spinlockCong Wang2017-12-061-9/+1
* | act_mirred: get rid of tcfm_ifindex from struct tcf_mirredCong Wang2017-12-0611-41/+26
* | Merge branch 'ipv6-add-ip6erspan-collect_md-mode'David S. Miller2017-12-063-25/+180
|\ \
| * | samples/bpf: add ip6erspan sample codeWilliam Tu2017-12-062-0/+95
| * | ip6_gre: add ip6 erspan collect_md modeWilliam Tu2017-12-061-25/+85
|/ /
* | bnxt_en: Uninitialized variable in bnxt_tc_parse_actions()Dan Carpenter2017-12-061-4/+1
* | Merge branch 'macb-rx-filter-cleanups'David S. Miller2017-12-061-24/+23
|\ \
| * | net: macb: change GFP_ATOMIC to GFP_KERNELJulia Cartwright2017-12-061-1/+1
| * | net: macb: reduce scope of rx_fs_lock-protected regionsJulia Cartwright2017-12-061-5/+11
| * | net: macb: kill useless use of list_empty()Julia Cartwright2017-12-061-19/+12
|/ /
* | net_sched: remove unused parameter from act cleanup opsCong Wang2017-12-0612-16/+16
* | Merge branch 'dsa-use-per-port-upstream-port'David S. Miller2017-12-063-25/+46
|\ \
| * | net: dsa: return per-port upstream portVivien Didelot2017-12-062-4/+7
| * | net: dsa: assign a CPU port to DSA portVivien Didelot2017-12-061-1/+1
| * | net: dsa: mv88e6xxx: setup global upstream portVivien Didelot2017-12-061-13/+16
| * | net: dsa: mv88e6xxx: helper to setup upstream portVivien Didelot2017-12-061-7/+20
| * | net: dsa: mv88e6xxx: egress floods all DSA portsVivien Didelot2017-12-061-1/+3
|/ /
* | Merge branch 'sch_api-style'David S. Miller2017-12-052-49/+58
|\ \
| * | net: sched: sch_api: rearrange init handlingAlexander Aring2017-12-051-41/+47