Jakub Kicinski f4083a752a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h
  9e26680733 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp")
  9e518f2580 ("bnxt_en: 1PPS functions to configure TSIO pins")
  099fdeda65 ("bnxt_en: Event handler for PPS events")

kernel/bpf/helpers.c
include/linux/bpf-cgroup.h
  a2baf4e8bb ("bpf: Fix potentially incorrect results with bpf_get_local_storage()")
  c7603cfa04 ("bpf: Add ambient BPF runtime context stored in current")

drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
  5957cc557d ("net/mlx5: Set all field of mlx5_irq before inserting it to the xarray")
  2d0b41a376 ("net/mlx5: Refcount mlx5_irq with integer")

MAINTAINERS
  7b637cd52f ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo")
  7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2021-08-13 06:41:22 -07:00

..

bpf.h

bpf, netns: Keep a list of attached bpf_link's

2020-06-30 10:45:08 -07:00

can.h

can: remove obsolete version strings

2020-10-12 10:06:39 +02:00

conntrack.h

netfilter: conntrack: remove offload_pickup sysctl again

2021-08-06 17:07:41 +02:00

core.h

sock: Hide unused variable when !CONFIG_PROC_FS.

2017-12-19 09:58:14 -05:00

generic.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

hash.h

netns: provide pure entropy for net_hash_mix()

2019-03-28 17:00:45 -07:00

ieee802154_6lowpan.h

net: dynamically allocate fqdir structures

2019-05-26 14:08:05 -07:00

ipv4.h

net/tcp_fastopen: remove tcp_fastopen_ctx_lock

2021-07-20 12:07:07 +02:00

ipv6.h

ipv6: ioam: Data plane support for Pre-allocated Trace

2021-07-21 08:14:33 -07:00

mctp.h

mctp: Allow per-netns default networks

2021-07-29 15:06:50 +01:00

mib.h

net: reorganize fields in netns_mib

2021-04-02 14:31:44 -07:00

mpls.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

netfilter.h

netfilter: nf_queue: move hookfn registration out of struct net

2021-08-10 17:32:00 +02:00

nexthop.h

nexthop: Convert to blocking notification chain

2020-09-15 16:31:17 -07:00

nftables.h

net: remove obsolete members from struct net

2021-04-06 00:34:53 +02:00

packet.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

sctp.h

sctp: add probe_interval in sysctl and sock/asoc/transport

2021-06-22 11:28:51 -07:00

smc.h

net/smc: Make SMC statistics network namespace aware

2021-06-16 12:54:02 -07:00

unix.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

xdp.h

net: xsk: track AF_XDP sockets on a per-netns list

2019-01-25 01:50:03 +01:00

xfrm.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

2021-08-04 10:45:41 +01:00