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	netfilter: nf_log_bridge: merge with nf_log_syslog	2021-03-31 22:34:05 +02:00
Makefile	netfilter: nf_log_bridge: merge with nf_log_syslog	2021-03-31 22:34:05 +02:00
ebt_802_3.c	netfilter: inline xt_hashlimit, ebt_802_3 and xt_physdev headers	2019-09-13 12:32:48 +02:00
ebt_among.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_arp.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_arpreply.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_dnat.c	netfilter: ebtables: Fixes dropping of small packets in bridge nat	2020-10-20 13:54:53 +02:00
ebt_ip.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_ip6.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_limit.c	netfilter: allow to turn off xtables compat layer	2021-04-26 18:16:56 +02:00
ebt_log.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_mark.c	netfilter: allow to turn off xtables compat layer	2021-04-26 18:16:56 +02:00
ebt_mark_m.c	netfilter: allow to turn off xtables compat layer	2021-04-26 18:16:56 +02:00
ebt_nflog.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_pkttype.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
ebt_redirect.c	netfilter: ebtables: Fixes dropping of small packets in bridge nat	2020-10-20 13:54:53 +02:00
ebt_snat.c	netfilter: ebtables: Fixes dropping of small packets in bridge nat	2020-10-20 13:54:53 +02:00
ebt_stp.c	netfilter: ebt_stp: Remove unused macro BPDU_TYPE_TCN	2020-09-08 12:56:38 +02:00
ebt_vlan.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
ebtable_broute.c	netfilter: ebtables: do not hook tables by default	2021-08-02 11:40:45 +02:00
ebtable_filter.c	netfilter: ebtables: do not hook tables by default	2021-08-02 11:40:45 +02:00
ebtable_nat.c	netfilter: ebtables: do not hook tables by default	2021-08-02 11:40:45 +02:00
ebtables.c	netfilter: ebtables: do not hook tables by default	2021-08-02 11:40:45 +02:00
nf_conntrack_bridge.c	netfilter: nf_conntrack_bridge: Fix memory leak when error	2021-08-04 10:41:29 +02:00
nft_meta_bridge.c	netfilter: nftables: add nft_parse_register_store() and use it	2021-01-27 23:16:02 +01:00
nft_reject_bridge.c	netfilter: nft_reject: unify reject init and dump into nft_reject	2020-10-31 10:40:42 +01:00