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

..

auxdisplay

…

blackfin

…

bpf

samples/bpf: add gre sequence number test.

2018-03-04 18:35:02 -05:00

configfs

…

connector

…

hidraw

kbuild: remove all dummy assignments to obj-

2017-11-18 11:46:06 +09:00

hw_breakpoint

…

kdb

…

kfifo

…

kobject

kobject: Remove redundant license text

2017-12-07 18:36:43 +01:00

kprobes

…

livepatch

livepatch: Remove immediate feature

2018-01-11 10:58:03 +01:00

mei

…

mic/mpssd

…

pktgen

…

rpmsg

…

seccomp

samples/seccomp: do not compile when cross compiled

2018-02-22 09:31:43 -08:00

sockmap

bpf: samples/sockmap detach sock ops program

2018-02-13 17:46:53 -08:00

statx

kbuild: remove all dummy assignments to obj-

2017-11-18 11:46:06 +09:00

timers

…

trace_events

Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2017-11-15 10:14:11 -08:00

trace_printk

…

uhid

kbuild: remove all dummy assignments to obj-

2017-11-18 11:46:06 +09:00

v4l

…

vfio-mdev

…

watchdog

…

Kconfig

…

Makefile

…