summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpfDavid S. Miller2020-06-1714-59/+158
|\
| * bpf: Document optval > PAGE_SIZE behavior for sockopt hooksStanislav Fomichev2020-06-171-0/+14
| * selftests/bpf: Make sure optvals > PAGE_SIZE are bypassedStanislav Fomichev2020-06-172-9/+91
| * bpf: Don't return EINVAL from {get,set}sockopt when optlen > PAGE_SIZEStanislav Fomichev2020-06-171-20/+33
| * devmap: Use bpf_map_area_alloc() for allocating hash bucketsToke Høiland-Jørgensen2020-06-171-4/+6
| * xdp: Handle frame_sz in xdp_convert_zc_to_xdp_frame()Hangbin Liu2020-06-171-0/+1
| * tools, bpftool: Add ringbuf map type to map command docsTobias Klauser2020-06-172-2/+2
| * bpf: bpf_probe_read_kernel_str() has to return amount of data read on successAndrii Nakryiko2020-06-171-1/+1
| * bpf, xdp, samples: Fix null pointer dereference in *_user codeGaurav Singh2020-06-163-21/+7
| * tools/bpftool: Add ringbuf map to a list of known map typesAndrii Nakryiko2020-06-161-0/+1
| * bpf: Fix definition of bpf_ringbuf_output() helper in UAPI commentsAndrii Nakryiko2020-06-162-2/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netLinus Torvalds2020-06-1733-314/+309
|\ \
| * \ Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher...David S. Miller2020-06-172-51/+28
| |\ \
| | * | e1000e: fix unused-function warningArnd Bergmann2020-06-171-11/+5
| | * | e1000: use generic power managementVaibhav Gupta2020-06-171-36/+13
| | * | e1000e: Do not wake up the system via WOL if device wakeup is disabledChen Yu2020-06-171-4/+10
| * | | lan743x: add MODULE_DEVICE_TABLE for module loading aliasTim Harvey2020-06-161-0/+2
| * | | mlxsw: spectrum: Adjust headroom buffers for 8x portsIdo Schimmel2020-06-164-0/+17
| * | | bareudp: Fixed configuration to avoid having garbage valuesMartin2020-06-161-0/+2
| * | | mvpp2: remove module bugfixSven Auhagen2020-06-161-2/+5
| * | | tcp: grow window for OOO packets only for SACK flowsEric Dumazet2020-06-161-2/+10
| |/ /
| * | mptcp: fix memory leak in mptcp_subflow_create_socket()Wei Yongjun2020-06-161-1/+3
| * | Merge branch 'remove-dependency-between-mlx5-act_ct-nf_flow_table'David S. Miller2020-06-164-61/+55
| |\ \ | | |/ | |/|
| | * netfilter: flowtable: Make nf_flow_table_offload_add/del_cb inlineAlaa Hleihel2020-06-162-49/+45
| | * net/sched: act_ct: Make tcf_ct_flow_table_restore_skb inlineAlaa Hleihel2020-06-162-12/+10
| |/
| * net: dsa: sja1105: fix PTP timestamping with large tc-taprio cyclesVladimir Oltean2020-06-151-4/+4
| * mvpp2: ethtool rxtx stats fixSven Auhagen2020-06-151-2/+2
| * MAINTAINERS: switch to my private email for Renesas Ethernet driversSergei Shtylyov2020-06-151-1/+1
| * rocker: fix incorrect error handling in dma_rings_initAditya Pakki2020-06-151-2/+2
| * test_objagg: Fix potential memory leak in error handlingAditya Pakki2020-06-151-2/+2
| * net: ethernet: mtk-star-emac: simplify interrupt handlingBartosz Golaszewski2020-06-151-89/+29
| * mld: fix memory leak in ipv6_mc_destroy_dev()Wang Hai2020-06-151-0/+1
| * Merge branch 'bnxt_en-Bug-fixes'David S. Miller2020-06-151-18/+17
| |\
| | * bnxt_en: Return from timer if interface is not in open state.Vasundhara Volam2020-06-151-1/+1
| | * bnxt_en: Fix AER reset logic on 57500 chips.Michael Chan2020-06-151-5/+12
| | * bnxt_en: Re-enable SRIOV during resume.Michael Chan2020-06-151-0/+2
| | * bnxt_en: Simplify bnxt_resume().Michael Chan2020-06-151-12/+2
| |/
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2020-06-154-25/+65
| |\
| | * netfilter: nf_tables: hook list memleak in flowtable deletionPablo Neira Ayuso2020-06-121-7/+24
| | * netfilter: ctnetlink: memleak in filter initialization error pathPablo Neira Ayuso2020-06-101-10/+22
| | * netfilter: nft_set_pipapo: Disable preemption before getting per-CPU pointerStefano Brivio2020-06-081-1/+5
| | * netfilter: nft_set_rbtree: Don't account for expired elements on insertionStefano Brivio2020-06-081-7/+14
| * | MAINTAINERS: merge entries for felix and ocelot driversVladimir Oltean2020-06-151-16/+12
| * | net: alx: fix race condition in alx_removeZekun Shen2020-06-151-4/+5
| * | ibmvnic: Harden device login requestsThomas Falcon2020-06-151-4/+17
| * | net: macb: Only disable NAPI on the actual error pathCharles Keepax2020-06-151-5/+4
| * | qlcnic: Use kobj_to_dev() insteadWang Qing2020-06-151-17/+17
| * | mptcp: use list_first_entry_or_nullGeliang Tang2020-06-151-4/+1
| * | net: axienet: fix spelling mistake in comment "Exteneded" -> "extended"Colin Ian King2020-06-151-1/+1
| * | mptcp: drop MPTCP_PM_MAX_ADDRGeliang Tang2020-06-151-2/+0