Jakub Kicinski 0fe2f273ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: drivers/net/can/dev.c commit 03f16c5075 ("can: dev: can_restart: fix use after free bug") commit 3e77f70e73 ("can: dev: move driver related infrastructure into separate subdir") Code move. drivers/net/dsa/b53/b53_common.c commit 8e4052c32d ("net: dsa: b53: fix an off by one in checking "vlan->vid"") commit b7a9e0da2d ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects") Field rename. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-01-20 12:16:11 -08:00
..
boot	dts: phy: add GPIO number and active state used for phy reset	2021-01-13 20:59:16 -08:00
configs	riscv: defconfig: enable gpio support for HiFive Unleashed	2021-01-13 20:59:46 -08:00
include	riscv: Fixup CONFIG_GENERIC_TIME_VSYSCALL	2021-01-12 20:34:44 -08:00
kernel	RISC-V: Do not allocate memblock while iterating reserved memblocks	2021-01-15 21:35:46 -08:00
lib	riscv: provide memmove implementation	2020-12-10 17:27:54 -08:00
mm	RISC-V: Set current memblock limit	2021-01-15 21:35:47 -08:00
net	bpf: Rename BPF_XADD and prepare to encode other atomics in .imm	2021-01-14 18:34:29 -08:00
Kbuild	riscv: Allow device trees to be built into the kernel	2020-05-18 11:38:05 -07:00
Kconfig	RISC-V: Fix maximum allowed phsyical memory for RV32	2021-01-15 21:35:48 -08:00
Kconfig.debug	RISC-V: Remove EARLY_PRINTK support	2018-12-17 10:23:46 -08:00
Kconfig.socs	clk: sifive: Use common name for prci configuration	2020-12-16 12:22:59 -08:00
Makefile	riscv: Clean up boot dir	2020-11-09 11:54:45 -08:00