summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2018-06-061744-42060/+113851
|\
| * strparser: Add __strp_unpause and use it in ktls.Doron Roberts-Kedes2018-06-063-1/+16
| * rxrpc: Fix terminal retransmission connection ID to include the channelDavid Howells2018-06-061-1/+1
| * Merge branch 'hns3-next'David S. Miller2018-06-063-3/+36
| |\
| | * net: hns3: Optimize PF CMDQ interrupt switching processXi Wang2018-06-061-0/+13
| | * net: hns3: Fix for VF mailbox receiving unknown messageXi Wang2018-06-061-3/+20
| | * net: hns3: Fix for VF mailbox cannot receiving PF responseXi Wang2018-06-061-0/+3
| |/
| * bnx2x: use the right constantJulia Lawall2018-06-061-1/+1
| * Revert "net: sched: cls: Fix offloading when ingress dev is vxlan"David S. Miller2018-06-061-16/+10
| * net: dsa: b53: Fix for brcm tag issue in Cygnus SoCArun Parameswaran2018-06-063-3/+18
| * enic: fix UDP rss bitsGovindarajulu Varadarajan2018-06-067-21/+67
| * netdev-FAQ: clarify DaveM's position for stable backportsCong Wang2018-06-051-0/+9
| * rtnetlink: validate attributes in do_setlink()Eric Dumazet2018-06-051-4/+4
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDavid S. Miller2018-06-0576-730/+3841
| |\
| | * Merge branch 'bpf-af-xdp-zc-api'Daniel Borkmann2018-06-0510-61/+384
| | |\
| | | * samples/bpf: xdpsock: use skb Tx path for XDP_SKBBjörn Töpel2018-06-051-0/+5
| | | * xsk: wire upp Tx zero-copy functionsMagnus Karlsson2018-06-055-11/+137
| | | * net: added netdevice operation for TxMagnus Karlsson2018-06-051-0/+2
| | | * xsk: add zero-copy support for RxBjörn Töpel2018-06-055-21/+165
| | | * xdp: add MEM_TYPE_ZERO_COPYBjörn Töpel2018-06-052-5/+24
| | | * net: xdp: added bpf_netdev_command XDP_{QUERY, SETUP}_XSK_UMEMBjörn Töpel2018-06-051-0/+8
| | | * xsk: introduce xdp_umem_pageBjörn Töpel2018-06-053-4/+21
| | | * xsk: moved struct xdp_umem definitionBjörn Töpel2018-06-054-24/+26
| | |/
| | * Merge branch 'bpf-xdp-remove-xdp-flush'Daniel Borkmann2018-06-057-81/+1
| | |\
| | | * net: remove net_device operation ndo_xdp_flushJesper Dangaard Brouer2018-06-051-4/+0
| | | * tun: remove ndo_xdp_flush call tun_xdp_flushJesper Dangaard Brouer2018-06-051-22/+1
| | | * virtio_net: remove ndo_xdp_flush call virtnet_xdp_flushJesper Dangaard Brouer2018-06-051-13/+0
| | | * ixgbe: remove ndo_xdp_flush call ixgbe_xdp_flushJesper Dangaard Brouer2018-06-051-21/+0
| | | * i40e: remove ndo_xdp_flush call i40e_xdp_flushJesper Dangaard Brouer2018-06-053-21/+0
| | |/
| | * bpf, arm32: fix inconsistent naming about emit_a32_lsr_{r64,i64}Wang YanQing2018-06-051-5/+5
| | * bpf, arm32: correct check_imm24Wang YanQing2018-06-051-3/+3
| | * bpf: guard bpf_get_current_cgroup_id() with CONFIG_CGROUPSYonghong Song2018-06-041-0/+2
| | * Merge branch 'bpf-af-xdp-fixes'Daniel Borkmann2018-06-049-203/+172
| | |\
| | | * samples/bpf: minor *_nb_free performance fixMagnus Karlsson2018-06-041-3/+5
| | | * samples/bpf: adapted to new uapiBjörn Töpel2018-06-041-48/+36
| | | * xsk: new descriptor addressing schemeBjörn Töpel2018-06-048-129/+123
| | | * xsk: proper Rx drop statistics updateBjörn Töpel2018-06-041-5/+5
| | | * xsk: proper fill queue descriptor validationBjörn Töpel2018-06-042-29/+14
| | |/
| | * bpf: flowlabel in bpf_fib_lookup should be flowinfoDavid Ahern2018-06-033-3/+3
| | * Merge branch 'bpf_get_current_cgroup_id'Alexei Starovoitov2018-06-0313-4/+267
| | |\
| | | * tools/bpf: add a selftest for bpf_get_current_cgroup_id() helperYonghong Song2018-06-036-2/+232
| | | * tools/bpf: sync uapi bpf.h for bpf_get_current_cgroup_id() helperYonghong Song2018-06-032-1/+9
| | | * bpf: implement bpf_get_current_cgroup_id() helperYonghong Song2018-06-035-1/+26
| | |/
| | * Merge branch 'ndo_xdp_xmit-cleanup'Alexei Starovoitov2018-06-039-35/+72
| | |\
| | | * bpf/xdp: devmap can avoid calling ndo_xdp_flushJesper Dangaard Brouer2018-06-031-13/+6
| | | * bpf/xdp: non-map redirect can avoid calling ndo_xdp_flushJesper Dangaard Brouer2018-06-031-2/+1
| | | * xdp: done implementing ndo_xdp_xmit flush flag for all driversJesper Dangaard Brouer2018-06-031-1/+0
| | | * virtio_net: implement flush flag for ndo_xdp_xmitJesper Dangaard Brouer2018-06-031-1/+5
| | | * tun: implement flush flag for ndo_xdp_xmitJesper Dangaard Brouer2018-06-031-6/+13
| | | * ixgbe: implement flush flag for ndo_xdp_xmitJesper Dangaard Brouer2018-06-031-6/+14