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
..
Kconfig	…
Makefile	net/smc: Add SMC statistics support	2021-06-16 12:54:02 -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
smc.h	…
smc_cdc.c	…
smc_cdc.h	…
smc_clc.c	…
smc_clc.h	…
smc_close.c	…
smc_close.h	…
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	…
smc_ib.c	net: Remove redundant if statements	2021-08-05 13:27:50 +01:00
smc_ib.h	…
smc_ism.c	…
smc_ism.h	…
smc_llc.c	net/smc: fix wait on already cleared link	2021-08-09 10:46:59 +01:00
smc_llc.h	…
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	…
smc_pnet.c	net: Remove redundant if statements	2021-08-05 13:27:50 +01:00
smc_pnet.h	…
smc_rx.c	net/smc: Make SMC statistics network namespace aware	2021-06-16 12:54:02 -07:00
smc_rx.h	…
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	…
smc_wr.c	net/smc: fix wait on already cleared link	2021-08-09 10:46:59 +01:00
smc_wr.h	…