linux/arch
David S. Miller c0b458a946 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:

1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
   MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE

2) In 'net-next' params->log_rq_size is renamed to be
   params->log_rq_mtu_frames.

3) In 'net-next' params->hard_mtu is added.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-04-01 19:49:34 -04:00
..
alpha locking/xchg/alpha: Fix xchg() and cmpxchg() memory ordering bugs 2018-02-23 08:38:16 +01:00
arc ARC fixes for 4.16-rc4 2018-03-01 14:32:23 -08:00
arm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-04-01 19:49:34 -04:00
arm64 ARM: SoC fixes for 4.16 2018-03-28 13:52:13 -10:00
blackfin
c6x
cris
frv
h8300 h8300: remove extraneous __BIG_ENDIAN definition 2018-03-22 17:07:01 -07:00
hexagon
ia64 ia64/err-inject: fix spelling mistake: "capapbilities" -> "capabilities" 2018-03-05 14:44:53 -08:00
m32r
m68k net/mac89x0: Convert to platform_driver 2018-03-01 21:21:36 -05:00
metag
microblaze microblaze: switch to NO_BOOTMEM 2018-03-16 12:51:27 +01:00
mips MIPS: ralink: Fix booting on MT7621 2018-03-22 00:06:30 +00:00
mn10300
nios2
openrisc
parisc parisc: Handle case where flush_cache_range is called with no context 2018-03-17 11:49:39 +01:00
powerpc KVM fixes for v4.16-rc8 2018-03-30 07:24:14 -10:00
riscv riscv/barrier: Define __smp_{mb,rmb,wmb} 2018-02-26 08:44:50 -08:00
s390 KVM fixes for v4.16-rc5 2018-03-09 16:59:19 -08:00
score
sh sh: fix build error for empty CONFIG_BUILTIN_DTB_SOURCE 2018-03-02 09:20:55 +09:00
sparc sparc64: Fix regression in pmdp_invalidate(). 2018-03-15 14:18:00 -07:00
tile
um
unicore32
x86 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-04-01 19:49:34 -04:00
xtensa
.gitignore
Kconfig