linux/arch
David S. Miller a2d6d7ae59 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The ungrafting from PRIO bug fixes in net, when merged into net-next,
merge cleanly but create a build failure.  The resolution used here is
from Petr Machata.

Signed-off-by: David S. Miller <davem@davemloft.net>
2020-01-09 12:13:43 -08:00
..
alpha alpha: use pgtable-nopud instead of 4level-fixup 2019-12-04 19:44:14 -08:00
arc ARC fixes for v5.5-rc6 2020-01-06 10:16:48 -08:00
arm Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next 2019-12-27 14:20:10 -08:00
arm64 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-01-09 12:13:43 -08:00
c6x c6x: use pgtable-nopud instead of 4level-fixup 2019-12-04 19:44:15 -08:00
csky dma-mapping updates for 5.5-rc1 2019-11-28 11:16:43 -08:00
h8300 h8300: Move EXCEPTION_TABLE to RO_DATA segment 2019-11-04 18:12:55 +01:00
hexagon hexagon: define ioremap_uc 2020-01-04 13:55:09 -08:00
ia64 mm/memory_hotplug: shrink zones when offlining memory 2020-01-04 13:55:08 -08:00
m68k netdev: pass the stuck queue to the timeout handler 2019-12-12 21:38:57 -08:00
microblaze microblaze: use pgtable-nopmd instead of 4level-fixup 2019-12-04 19:44:15 -08:00
mips Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-01-09 12:13:43 -08:00
nds32 nds32: use pgtable-nopmd instead of 4level-fixup 2019-12-04 19:44:15 -08:00
nios2 nios2: Fix ioremap 2019-12-12 16:34:33 +08:00
openrisc OpenRISC updates for 5.5 2019-12-02 17:18:43 -08:00
parisc parisc: Fix compiler warnings in debug_core.c 2019-12-20 21:01:42 +01:00
powerpc mm/memory_hotplug: shrink zones when offlining memory 2020-01-04 13:55:08 -08:00
riscv Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-01-09 12:13:43 -08:00
s390 mm/memory_hotplug: shrink zones when offlining memory 2020-01-04 13:55:08 -08:00
sh mm/memory_hotplug: shrink zones when offlining memory 2020-01-04 13:55:08 -08:00
sparc treewide: Use sizeof_field() macro 2019-12-09 10:36:44 -08:00
um netdev: pass the stuck queue to the timeout handler 2019-12-12 21:38:57 -08:00
unicore32 generic ioremap support 2019-11-28 10:57:12 -08:00
x86 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-01-09 12:13:43 -08:00
xtensa netdev: pass the stuck queue to the timeout handler 2019-12-12 21:38:57 -08:00
.gitignore
Kconfig arch/Kconfig: fix indentation 2019-12-04 19:44:12 -08:00