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
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
configs	Additional Qualcomm ARM64 defconfig udpate for v5.14	2021-06-23 19:01:58 -07:00
crypto	crypto: arm64 - use a pattern rule for generating *.S files	2021-05-14 19:07:54 +08:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
kernel	arm64: stacktrace: avoid tracing arch_stack_walk()	2021-08-03 10:39:35 +01:00
kvm	KVM: arm64: Fix detection of shared VMAs on guest fault	2021-07-14 09:49:10 +01:00
lib	arm64: Avoid premature usercopy failure	2021-07-15 17:29:14 +01:00
mm	Revert "mm/pgtable: add stubs for {pmd/pub}_{set/clear}_huge"	2021-07-21 11:28:09 +01:00
net	bpf: Introduce BPF nospec instruction for mitigating Spectre v4	2021-07-29 00:20:56 +02:00
tools	arm64: Allow mismatched 32-bit EL0 support	2021-06-11 13:25:40 +01:00
xen	…
Kbuild	bpf: Fix BPF_JIT kconfig symbol dependency	2021-05-20 23:48:37 +02:00
Kconfig	arm64: fix the doc of RANDOMIZE_MODULE_REGION_FULL	2021-08-03 10:36:42 +01:00
Kconfig.debug	arm64: remove TEXT_OFFSET randomization	2020-06-15 13:10:59 +01:00
Kconfig.platforms	Merge branch 'arm/fixes' into arm/soc	2021-07-09 10:46:02 -07:00
Makefile	arm64: move warning about toolchains to archprepare	2021-08-03 10:35:58 +01:00