David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

All of the conflicts were cases of overlapping changes.

In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.

Signed-off-by: David S. Miller <davem@davemloft.net>

2018-03-06 01:20:46 -05: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-03-06 01:20:46 -05:00

arm64

ARM: SoC fixes for 4.16

2018-02-28 16:11:04 -08:00

blackfin

…

c6x

…

cris

bug.h: work around GCC PR82365 in BUG()

2018-02-21 15:35:43 -08:00

frv

…

h8300

…

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

…

mips

MIPS fixes for 4.16-rc3

2018-02-23 14:59:29 -08:00

mn10300

…

nios2

…

openrisc

…

parisc

Merge branch 'parisc-4.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

2018-03-02 13:05:20 -08:00

powerpc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-03-05 11:29:24 -08:00

riscv

riscv/barrier: Define __smp_{mb,rmb,wmb}

2018-02-26 08:44:50 -08:00

s390

KVM: s390: provide only a single function for setting the tod (fix SCK)

2018-02-20 20:51:28 +00:00

score

…

sh

sh: fix build error for empty CONFIG_BUILTIN_DTB_SOURCE

2018-03-02 09:20:55 +09:00

sparc

bug.h: work around GCC PR82365 in BUG()

2018-02-21 15:35:43 -08:00

tile

…

um

…

unicore32

…

x86

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-03-06 01:20:46 -05:00

xtensa

…

.gitignore

…

Kconfig

…