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
..
af_smc.c	net/smc: Correct smc link connection counter in case of smc client	2021-08-09 10:46:59 +01:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	net/smc: Add SMC statistics support	2021-06-16 12:54:02 -07:00
smc_cdc.c	net: smc: convert tasklets to use new tasklet_setup() API	2020-11-07 10:41:15 -08:00
smc_cdc.h	net/smc: pre-fetch send buffer outside of send_lock	2020-05-30 18:12:25 -07:00
smc_clc.c	net/smc: Add support for obtaining system information	2020-12-01 17:56:13 -08:00
smc_clc.h	net/smc: Add support for obtaining system information	2020-12-01 17:56:13 -08:00
smc_close.c	net/smc: check variable before dereferencing in smc_close.c	2020-09-16 17:30:16 -07:00
smc_close.h	net/smc: remove close abort worker	2019-10-22 11:23:44 -07:00
smc_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
smc_core.h	net/smc: Correct smc link connection counter in case of smc client	2021-08-09 10:46:59 +01:00
smc_diag.c	net/smc: Introduce SMCR get link command	2020-12-01 17:56:13 -08:00
smc_ib.c	net: Remove redundant if statements	2021-08-05 13:27:50 +01:00
smc_ib.h	net/smc: Add support for obtaining SMCR device list	2020-12-01 17:56:13 -08:00
smc_ism.c	net/smc: no need to flush smcd_dev's event_wq before destroying it	2021-06-03 13:54:49 -07:00
smc_ism.h	net/smc: Add support for obtaining SMCD device list	2020-12-01 17:56:13 -08:00
smc_llc.c	net/smc: fix wait on already cleared link	2021-08-09 10:46:59 +01:00
smc_llc.h	net/smc: move add link processing for new device into llc layer	2020-07-19 15:30:22 -07:00
smc_netlink.c	net/smc: Add netlink support for SMC fallback statistics	2021-06-16 12:54:02 -07:00
smc_netlink.h	net/smc: Add netlink support for SMC fallback statistics	2021-06-16 12:54:02 -07:00
smc_netns.h	net/smc: introduce list of pnetids for Ethernet devices	2020-09-28 15:19:03 -07:00
smc_pnet.c	net: Remove redundant if statements	2021-08-05 13:27:50 +01:00
smc_pnet.h	net/smc: determine proposed ISM devices	2020-09-28 15:19:03 -07:00
smc_rx.c	net/smc: Make SMC statistics network namespace aware	2021-06-16 12:54:02 -07:00
smc_rx.h	smc: add support for splice()	2018-05-04 11:45:06 -04:00
smc_stats.c	net/smc: Fix ENODATA tests in smc_nl_get_fback_stats()	2021-06-21 12:16:58 -07:00
smc_stats.h	net/smc: Make SMC statistics network namespace aware	2021-06-16 12:54:02 -07:00
smc_tx.c	net/smc: fix wait on already cleared link	2021-08-09 10:46:59 +01:00
smc_tx.h	net/smc: eliminate cursor read and write calls	2018-07-23 10:57:14 -07:00
smc_wr.c	net/smc: fix wait on already cleared link	2021-08-09 10:46:59 +01:00
smc_wr.h	net/smc: wait for departure of an IB message	2020-05-04 10:54:39 -07:00
smc.h	net/smc: introduce CLC first contact extension	2020-09-28 15:19:03 -07:00