Jakub Kicinski adc2e56ebe Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Trivial conflicts in net/can/isotp.c and tools/testing/selftests/net/mptcp/mptcp_connect.sh scaled_ppm_to_ppb() was moved from drivers/ptp/ptp_clock.c to include/linux/ptp_clock_kernel.h in -next so re-apply the fix there. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-06-18 19:47:02 -07:00
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-06-18 19:47:02 -07:00
configs	ARM: platform support for Apple M1	2021-04-26 12:30:36 -07:00
crypto	arm64 updates for 5.13:	2021-04-26 10:25:03 -07:00
include	ARM fixes:	2021-05-29 06:02:25 -10:00
kernel	Assorted arm64 fixes and clean-ups, the most important:	2021-05-07 12:11:05 -07:00
kvm	KVM: arm64: Prevent mixed-width VM creation	2021-05-27 10:34:33 +01:00
lib	arm64: lib: Annotate {clear, copy}_page() as position-independent	2021-03-19 12:01:19 +00:00
mm	arm64: mm: don't use CON and BLK mapping if KFENCE is enabled	2021-05-25 14:04:38 +01:00
net	bpf, arm64: Remove redundant switch case about BPF_DIV and BPF_MOD	2021-05-18 16:41:49 +02:00
tools	arm64: tools: Add __ASM_CPUCAPS_H to the endif in cpucaps.h	2021-05-13 17:57:43 +01:00
xen	arm64: xen: Use modern annotations for assembly functions	2020-01-09 16:09:42 +00:00
Kbuild	bpf: Fix BPF_JIT kconfig symbol dependency	2021-05-20 23:48:37 +02:00
Kconfig	Assorted arm64 fixes and clean-ups, the most important:	2021-05-07 12:11:05 -07:00
Kconfig.debug	arm64: remove TEXT_OFFSET randomization	2020-06-15 13:10:59 +01:00
Kconfig.platforms	arm64: meson: select COMMON_CLK	2021-05-31 09:27:08 +02:00
Makefile	arm64: Generate cpucaps.h	2021-05-10 10:16:37 +01:00