summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bpf-prog-build'Alexei Starovoitov2019-02-1251-34/+12
|\
| * selftests: bpf: relax sub-register mode compilation criteriaJiong Wang2019-02-121-4/+3
| * selftests: bpf: centre kernel bpf objects under new subdir "progs"Jiong Wang2019-02-1250-21/+5
| * selftests: bpf: extend sub-register mode compilation to all bpf object filesJiong Wang2019-02-121-13/+7
| * selftests: bpf: add "alu32" to .gitignoreJiong Wang2019-02-121-0/+1
|/
* Merge branch 'skb_sk-sk_fullsock-tcp_sock'Alexei Starovoitov2019-02-1113-235/+1493
|\
| * bpf: Add test_sock_fields for skb->sk and bpf_tcp_sockMartin KaFai Lau2019-02-114-2/+487
| * bpf: Add skb->sk, bpf_sk_fullsock and bpf_tcp_sock tests to test_veriferMartin KaFai Lau2019-02-114-3/+396
| * bpf: Sync bpf.h to tools/Martin KaFai Lau2019-02-111-7/+65
| * bpf: Add struct bpf_tcp_sock and BPF_FUNC_tcp_sockMartin KaFai Lau2019-02-114-3/+188
| * bpf: Refactor sock_ops_convert_ctx_accessMartin KaFai Lau2019-02-111-160/+127
| * bpf: Add state, dst_ip4, dst_ip6 and dst_port to bpf_sockMartin KaFai Lau2019-02-112-31/+85
| * bpf: Add a bpf_sock pointer to __sk_buff and a bpf_sk_fullsock helperMartin KaFai Lau2019-02-114-41/+157
|/
* bpf: Fix narrow load on a bpf_sock returned from sk_lookup()Martin KaFai Lau2019-02-111-4/+7
* Merge branch 'btf-api-extensions'Alexei Starovoitov2019-02-085-93/+121
|\
| * tools/bpf: remove btf__get_strings() superseded by raw data APIAndrii Nakryiko2019-02-084-23/+26
| * btf: expose API to work with raw btf_ext dataAndrii Nakryiko2019-02-083-48/+57
| * btf: expose API to work with raw btf dataAndrii Nakryiko2019-02-083-0/+8
| * btf: separate btf creation and loadingAndrii Nakryiko2019-02-084-25/+33
|/
* tools/bpf: add log_level to bpf_load_program_attrYonghong Song2019-02-083-6/+26
* tools/bpf: add missing strings.h includeAndrii Nakryiko2019-02-083-0/+3
* net: fixed-phy: Add fixed_phy_register_with_gpiod() APIMoritz Fischer2019-02-082-7/+40
* Merge branch 'Add-comphy-support-for-Armada-38x'David S. Miller2019-02-088-5/+369
|\
| * ARM: dts: clearfog: add comphy settings for Ethernet interfacesRussell King2019-02-081-0/+2
| * net: marvell: neta: add comphy supportRussell King2019-02-081-4/+41
| * dt-bindings: net: mvneta: add phys propertyRussell King2019-02-081-1/+1
| * ARM: dts: add description for Armada 38x common phyRussell King2019-02-081-0/+37
| * phy: armada38x: add common phy supportRussell King2019-02-083-0/+248
| * dt-bindings: phy: Armada 38x common phy bindingsRussell King2019-02-081-0/+40
|/
* Merge branch 'smc-next'David S. Miller2019-02-087-51/+74
|\
| * net/smc: original socket family in inet_sock_diagKarsten Graul2019-02-081-2/+1
| * net/smc: move code to clear the conn->lgr fieldKarsten Graul2019-02-081-2/+3
| * net/smc: use client and server LGR pending locks for SMC-RHans Wippel2019-02-081-16/+28
| * net/smc: unlock LGR pending lock earlier for SMC-DHans Wippel2019-02-081-5/+9
| * net/smc: use smc_curs_copy() for SMC-DUrsula Braun2019-02-081-4/+5
| * net/smc: postpone release of clcsockUrsula Braun2019-02-082-17/+23
| * s390/net: move pnet constantsUrsula Braun2019-02-082-8/+8
|/
* net: vxlan: Free a leaked vetoed multicast rdstPetr Machata2019-02-071-9/+11
* Merge branch 'devlink-health'David S. Miller2019-02-0711-165/+1755
|\
| * devlink: Add Documentation/networking/devlink-health.txtAya Levin2019-02-071-0/+86
| * net/mlx5e: Add tx timeout support for mlx5e tx reporterEran Ben Elisha2019-02-073-37/+55
| * net/mlx5e: Add tx reporter supportEran Ben Elisha2019-02-076-128/+306
| * devlink: Add health dump {get,clear} commandsEran Ben Elisha2019-02-072-0/+65
| * devlink: Add health diagnose commandEran Ben Elisha2019-02-072-0/+47
| * devlink: Add health recover commandEran Ben Elisha2019-02-072-0/+21
| * devlink: Add health set commandEran Ben Elisha2019-02-072-0/+37
| * devlink: Add health get commandEran Ben Elisha2019-02-072-0/+160
| * devlink: Add health report functionalityEran Ben Elisha2019-02-073-0/+193
| * devlink: Add health reporter create/destroy functionalityEran Ben Elisha2019-02-072-0/+145
| * devlink: Add devlink formatted message (fmsg) APIEran Ben Elisha2019-02-073-0/+640
|/