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
..
ccids	dccp: tfrc: fix doc warnings in tfrc_equation.c	2021-06-10 14:08:49 -07:00
ackvec.c	net: dccp: Fix most of the kerneldoc warnings	2020-10-30 12:08:54 -07:00
ackvec.h
ccid.c	net: dccp: Add __printf() markup to fix -Wsuggest-attribute=format	2020-10-30 11:31:46 -07:00
ccid.h	net: dccp: Replace zero-length array with flexible-array member	2020-02-28 12:08:37 -08:00
dccp.h	dccp: add do-while-0 stubs for dccp_pr_debug macros	2021-08-09 10:00:02 +01:00
diag.c	inet_diag: Move the INET_DIAG_REQ_BYTECODE nlattr to cb->data	2020-02-27 18:50:19 -08:00
feat.c	dccp: Return the correct errno code	2021-02-06 11:15:28 -08:00
feat.h
input.c	net: dccp: Convert to use the preferred fallthrough macro	2020-08-22 12:38:34 -07:00
ipv4.c	net: sock: introduce sk_error_report	2021-06-29 11:28:21 -07:00
ipv6.c	net: sock: introduce sk_error_report	2021-06-29 11:28:21 -07:00
ipv6.h
Kconfig	dccp: Replace HTTP links with HTTPS ones	2020-07-13 11:54:07 -07:00
Makefile
minisocks.c	dccp: Add missing annotation for dccp_child_process()	2020-02-24 13:26:49 -08:00
options.c	net: dccp: Convert to use the preferred fallthrough macro	2020-08-22 12:38:34 -07:00
output.c	net: dccp: Fix most of the kerneldoc warnings	2020-10-30 12:08:54 -07:00
proto.c	memcg: enable accounting for inet_bin_bucket cache	2021-07-20 06:00:38 -07:00
qpolicy.c	net: dccp: Fix most of the kerneldoc warnings	2020-10-30 12:08:54 -07:00
sysctl.c
timer.c	net: sock: introduce sk_error_report	2021-06-29 11:28:21 -07:00
trace.h