summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'afs-next-20200604' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2020-06-052-3/+6
|\
| * rxrpc: Adjust /proc/net/rxrpc/calls to display call->debug_id not user_IDDavid Howells2020-05-311-3/+3
| * rxrpc: Map the EACCES error produced by some ICMP6 to EHOSTUNREACHDavid Howells2020-05-311-0/+3
* | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdmaLinus Torvalds2020-06-059-340/+43
|\ \
| * | RDMA: Remove 'max_fmr'Jason Gunthorpe2020-06-021-1/+1
| * | RDMA/rds: Remove FMR support for memory registrationMax Gurtovoy2020-06-028-322/+21
| * | RDMA/cma: Provide ECE reject reasonLeon Romanovsky2020-05-271-1/+3
| * | Merge tag 'v5.7-rc6' into rdma.git for-nextJason Gunthorpe2020-05-21112-571/+983
| |\ \
| * | | RDMA: Allow ib_client's to fail when add() is calledJason Gunthorpe2020-05-062-14/+17
| * | | Merge branch 'mellanox/mlx5-next' into rdma.git for-nextJason Gunthorpe2020-05-021-0/+22
| |\ \ \
| * | | | RDMA: Remove a few extra calls to ib_get_client_data()Jason Gunthorpe2020-04-141-2/+1
* | | | | Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eb...Linus Torvalds2020-06-041-1/+1
|\ \ \ \ \
| * | | | | proc: proc_pid_ns takes super_block as an argumentAlexey Gladkov2020-05-191-1/+1
| |/ / / /
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-nextLinus Torvalds2020-06-03341-6812/+17456
|\ \ \ \ \
| * | | | | Revert "tipc: Fix potential tipc_aead refcnt leak in tipc_crypto_rcv"Tuong Lien2020-06-021-1/+0
| * | | | | Revert "tipc: Fix potential tipc_node refcnt leak in tipc_rcv"Tuong Lien2020-06-021-1/+0
| * | | | | bpf: Add csum_level helper for fixing up csum levelsDaniel Borkmann2020-06-021-0/+38
| * | | | | bpf: Fix up bpf_skb_adjust_room helper's skb csum settingDaniel Borkmann2020-06-021-2/+6
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDavid S. Miller2020-06-018-137/+231
| |\ \ \ \ \
| | * | | | | flow_dissector: Move out netns_bpf prog callbacksJakub Sitnicki2020-06-011-121/+4
| | * | | | | net: Introduce netns_bpf for BPF programs attached to netnsJakub Sitnicki2020-06-011-36/+69
| | * | | | | flow_dissector: Pull locking up from prog attach callbackJakub Sitnicki2020-06-011-20/+20
| | * | | | | bpf: Allow SO_BINDTODEVICE opt in bpf_setsockoptFerenc Fejes2020-06-011-1/+27
| | * | | | | net: Make locking in sock_bindtoindex optionalFerenc Fejes2020-06-013-6/+8
| | * | | | | bpf: Fix running sk_skb program types with ktlsJohn Fastabend2020-06-012-5/+58
| | * | | | | bpf: Refactor sockmap redirect code so its easy to reuseJohn Fastabend2020-06-011-21/+34
| | * | | | | xdp: Add xdp_txq_info to xdp_buffDavid Ahern2020-06-011-0/+17
| | * | | | | bpf: Add support to attach bpf program to a devmap entryDavid Ahern2020-06-011-0/+18
| | * | | | | bpf: Add rx_queue_mapping to bpf_sockAmritha Nambiar2020-06-011-0/+18
| | * | | | | bpf, sk_msg: Add get socket storage helpersJohn Fastabend2020-06-011-0/+15
| | * | | | | bpf, sk_msg: Add some generic helpers that may be useful from sk_msgJohn Fastabend2020-06-011-0/+16
| * | | | | | crypto/chtls: IPv6 support for inline TLSVinay Kumar Yadav2020-06-011-0/+1
| * | | | | | ipv6: fix IPV6_ADDRFORM operation logicHangbin Liu2020-06-011-6/+7
| * | | | | | tipc: Fix NULL pointer dereference in __tipc_sendstream()YueHaibing2020-06-011-2/+6
| |/ / / / /
| * | | | | switch cmsghdr_from_user_compat_to_kern() to copy_from_user()Al Viro2020-06-011-7/+8
| * | | | | cls_flower: remove mpls_opts_policyGuillaume Nault2020-06-011-5/+0
| * | | | | bridge: mrp: Add support for role MRAHoratiu Vultur2020-06-014-21/+118
| * | | | | bridge: mrp: Set the priority of MRP instanceHoratiu Vultur2020-06-014-1/+9
| * | | | | flow_dissector: work around stack frame size warningArnd Bergmann2020-06-011-9/+8
| * | | | | devlink: Add ACL control packet trapsIdo Schimmel2020-06-011-0/+4
| * | | | | devlink: Add layer 3 control packet trapsIdo Schimmel2020-06-011-0/+42
| * | | | | devlink: Add layer 2 control packet trapsIdo Schimmel2020-06-011-0/+16
| * | | | | devlink: Add 'control' trap typeIdo Schimmel2020-06-011-0/+7
| * | | | | devlink: Add 'mirror' trap actionIdo Schimmel2020-06-011-1/+2
| * | | | | devlink: Create dedicated trap group for layer 3 exceptionsIdo Schimmel2020-06-011-0/+1
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2020-06-016-135/+650
| |\ \ \ \ \
| | * | | | | netfilter: nf_tables: skip flowtable hooknum and priority on device updatesPablo Neira Ayuso2020-05-271-18/+35
| | * | | | | netfilter: nf_tables: allow to register flowtable with no devicesPablo Neira Ayuso2020-05-271-9/+11
| | * | | | | netfilter: nf_tables: delete devices from flowtablePablo Neira Ayuso2020-05-271-16/+97
| | * | | | | netfilter: nf_tables: add devices to existing flowtablePablo Neira Ayuso2020-05-271-11/+86