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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

blackfin

samples: move blackfin gptimers-example from Documentation

2016-10-10 07:12:02 -06:00

bpf

samples/bpf: add gre sequence number test.

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

configfs

configfs: make config_item_type const

2017-10-19 16:15:15 +02:00

connector

Merge tag 'docs-4.15' of git://git.lwn.net/linux

2017-11-13 08:25:06 -08:00

hidraw

kbuild: remove all dummy assignments to obj-

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

hw_breakpoint

perf: Add context field to perf_event

2011-07-01 11:06:38 +02:00

kdb

…

kfifo

kfifo: clean up example to not use page_link

2017-07-12 16:26:01 -07:00

kobject

kobject: Remove redundant license text

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

kprobes

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-13 13:05:08 -08:00

livepatch

livepatch: Remove immediate feature

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

mei

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

mic/mpssd

Merge branch 'linus' into locking/core, to resolve conflicts

2017-11-07 10:32:44 +01:00

pktgen

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

2017-11-04 09:26:51 +09:00

rpmsg

rpmsg: Allow callback to return errors

2016-09-08 22:15:25 -07:00

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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

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

tracing: Add trace_printk sample code

2016-06-20 09:54:21 -04:00

uhid

kbuild: remove all dummy assignments to obj-

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

v4l

[media] media: v4l2-pci-skeleton: Fix error handling path in 'skeleton_probe()'

2017-10-04 16:55:02 -03:00

vfio-mdev

vfio-mdev/samples: make mdev_fops const and static

2017-10-02 12:40:05 -06:00

watchdog

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

Kconfig

livepatch: introduce shadow variable API

2017-09-14 23:06:12 +02:00

Makefile

statx: Add a system call to make enhanced file info available

2017-03-02 20:51:15 -05:00