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
..
6lowpan	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
core.c	drivers: Introduce device lookup variants by name	2019-07-30 13:07:41 +02:00
core.h
header_ops.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174	2019-05-30 11:26:41 -07:00
ieee802154.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174	2019-05-30 11:26:41 -07:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile
netlink.c	genetlink: move to smaller ops wherever possible	2020-10-02 19:11:11 -07:00
nl802154.c	net: Remove redundant if statements	2021-08-05 13:27:50 +01:00
nl802154.h
nl_policy.c	nl802154: add missing attribute validation for dev_type	2020-03-03 13:28:48 -08:00
nl-mac.c	ieee802154: fix error return code in ieee802154_llsec_getparams()	2021-06-03 10:59:49 +02:00
nl-phy.c	net: Remove redundant if statements	2021-08-05 13:27:50 +01:00
rdev-ops.h
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
sysfs.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174	2019-05-30 11:26:41 -07:00
sysfs.h
trace.c
trace.h