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>

This commit is contained in:

Jakub Kicinski

2021-08-13 06:41:22 -07:00

parent b769cf44ed f8e6dfc64f

commit f4083a752a

362 changed files with 2986 additions and 1480 deletions

									
										include/linux/netfilter/ipset/ip_set.h
									
		+3
		
												View File
												
				@@ -196,6 +196,9 @@ struct ip_set_region {

					u32 elements;		/* Number of elements vs timeout */

				};

				/* Max range where every element is added/deleted in one step */

				#define IPSET_MAX_RANGE		(1<<20)

				/* The max revision number supported by any set type + 1 */

				#define IPSET_REVISION_MAX	9