Ingo Molnar 28cff52eae Merge branch 'linus' into locking/core, to resolve conflict ... Conflicts: arch/arm/include/asm/percpu.h As Stephen Rothwell noted, there's a conflict between this commit in locking/core: a21ee6055c ("lockdep: Change hardirq{s_enabled,_context} to per-cpu variables") and this fresh upstream commit: aa54ea903a ("ARM: percpu.h: fix build error") a21ee6055c is a simpler solution to the dependency problem and doesn't further increase header hell - so this conflict resolution effectively reverts aa54ea903a and uses the a21ee6055c solution. Signed-off-by: Ingo Molnar <mingo@kernel.org>		2020-07-31 12:16:09 +02:00
..
boot	riscv: K210: Add a built-in device tree	2020-05-18 11:38:06 -07:00
configs	riscv: K210: Update defconfig	2020-05-18 11:38:07 -07:00
include	Merge branch 'locking/header'	2020-07-29 16:14:21 +02:00
kernel	riscv: Fix "no previous prototype" compile warning in kgdb.c file	2020-07-09 20:09:30 -07:00
lib	RISC-V Patches for the 5.7 Merge Window, Part 1	2020-04-09 10:51:30 -07:00
mm	riscv: Parse all memory blocks to remove unusable memory	2020-07-24 22:08:25 -07:00
net	bpf, riscv: Optimize BPF_JSET BPF_K using andi on RV64	2020-05-06 09:48:15 +02:00
Kbuild	riscv: Allow device trees to be built into the kernel	2020-05-18 11:38:05 -07:00
Kconfig	riscv: enable the Kconfig prompt of STRICT_KERNEL_RWX	2020-07-09 20:09:29 -07:00
Kconfig.debug	RISC-V: Remove EARLY_PRINTK support	2018-12-17 10:23:46 -08:00
Kconfig.socs	riscv: K210: Add a built-in device tree	2020-05-18 11:38:06 -07:00
Makefile	RISC-V Patches for the 5.7 Merge Window, Part 1	2020-04-09 10:51:30 -07:00