summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDavid S. Miller2018-02-2613-100/+779
|\
| * samples/bpf: Add program for CPU state statisticsLeo Yan2018-02-263-0/+504
| * Merge branch 'x86-jit'Alexei Starovoitov2018-02-242-87/+221
| |\
| | * bpf: add various jit test casesDaniel Borkmann2018-02-241-0/+89
| | * bpf, x64: save 5 bytes in prologue when ebpf insns came from cbpfDaniel Borkmann2018-02-241-12/+16
| | * bpf, x64: save few bytes when mul is in alu32Daniel Borkmann2018-02-241-15/+28
| | * bpf, x64: save several bytes when mul dest is r0/r3 anywayDaniel Borkmann2018-02-241-10/+11
| | * bpf, x64: save several bytes by using mov over movabsq when possibleDaniel Borkmann2018-02-241-51/+74
| | * bpf, x64: save one byte per shl/shr/sar when imm is 1Daniel Borkmann2018-02-241-1/+5
| |/
| * bpf: NULL pointer check is not needed in BPF_CGROUP_RUN_PROG_INET_SOCKYafang Shao2018-02-231-1/+1
| * Merge branch 'bpf-misc-selftest-improvements'Daniel Borkmann2018-02-152-9/+34
| |\
| | * bpf: Remove unused callee_saved arrayJoe Stringer2018-02-151-4/+0
| | * selftests/bpf: Only run tests if !bpf_disabledJoe Stringer2018-02-151-1/+25
| | * selftests/bpf: Count tests skipped by unprivJoe Stringer2018-02-151-3/+7
| | * selftests/bpf: Print unexpected output on failJoe Stringer2018-02-151-1/+2
| |/
| * tools/bpf: adjust rlimit RLIMIT_MEMLOCK for test_tcpbpf_userYonghong Song2018-02-141-0/+6
| * selftests/bpf: fix Makefile for cgroup_helpers.cJesper Dangaard Brouer2018-02-141-1/+3
| * net: avoid including xdp.h in filter.hJesper Dangaard Brouer2018-02-141-1/+1
| * bpf: samples/sockmap detach sock ops programPrashant Bhole2018-02-141-0/+1
| * bpf: samples/sockmap fix Makefile for build errorPrashant Bhole2018-02-141-1/+1
| * samples/bpf: adjust rlimit RLIMIT_MEMLOCK for xdp_redirectTushar Dave2018-02-141-0/+7
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-02-24320-1384/+2314
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2018-02-24108-455/+625
| |\ \
| | * | net_sched: gen_estimator: fix broken estimators based on percpu statsEric Dumazet2018-02-231-0/+1
| | * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpfDavid S. Miller2018-02-2310-15/+80
| | |\ \
| | | * | bpf, arm64: fix out of bounds access in tail callDaniel Borkmann2018-02-232-2/+29
| | | * | bpf, x64: implement retpoline for tail callDaniel Borkmann2018-02-232-4/+42
| | | * | bpf: fix rcu lockdep warning for lpm_trie map_free callbackYonghong Song2018-02-221-2/+1
| | | * | bpf: add schedule points in percpu arrays managementEric Dumazet2018-02-221-1/+4
| | | * | selftests/bpf/test_maps: exit child process without error in ENOMEM caseLi Zhijian2018-02-221-0/+2
| | | * | selftests/bpf: update gitignore with test_libbpf_openAnders Roxell2018-02-221-0/+1
| | | * | selftests/bpf: tcpbpf_kern: use in6_* macros from glibcAnders Roxell2018-02-221-1/+0
| | | * | bpf: clean up unused-variable warningArnd Bergmann2018-02-221-5/+1
| | * | | gianfar: simplify FCS handling and fix memory leakAndy Spencer2018-02-231-16/+7
| | * | | ipv6 sit: work around bogus gcc-8 -Wrestrict warningArnd Bergmann2018-02-231-1/+1
| | * | | macvlan: fix use-after-free in macvlan_common_newlink()Alexey Kodanev2018-02-231-1/+1
| | * | | rxrpc: Fix send in rxrpc_send_data_packet()David Howells2018-02-221-1/+1
| | * | | net: aquantia: Fix error handling in aq_pci_probe()Dan Carpenter2018-02-221-4/+10
| | * | | Merge tag 'mac80211-for-davem-2018-02-22' of git://git.kernel.org/pub/scm/lin...David S. Miller2018-02-2211-27/+41
| | |\ \ \
| | | * | | regulatory: add NUL to request alpha2Johannes Berg2018-02-221-1/+1
| | | * | | mac80211: Fix sending ADDBA response for an ongoing sessionIlan Peer2018-02-191-3/+1
| | | * | | mac80211: Do not disconnect on invalid operating classIlan Peer2018-02-191-4/+3
| | | * | | cfg80211: clear wep keys after disconnectionAvraham Stern2018-02-191-0/+2
| | | * | | mac80211: fix calling sleeping function in atomic contextSara Sharon2018-02-191-1/+1
| | | * | | mac80211: fix a possible leak of station statsSara Sharon2018-02-191-0/+1
| | | * | | mac80211: round IEEE80211_TX_STATUS_HEADROOM up to multiple of 4Felix Fietkau2018-02-191-1/+1
| | | * | | mac80211_hwsim: don't use WQ_MEM_RECLAIMJohannes Berg2018-02-191-1/+1
| | | * | | cfg80211: fix cfg80211_beacon_dupArnd Bergmann2018-02-191-1/+1
| | | * | | mac80211: mesh: fix wrong mesh TTL offset calculationPeter Oh2018-01-312-12/+7
| | | * | | cfg80211: use only 1Mbps for basic rates in meshJohannes Berg2018-01-311-3/+22