David S. Miller d864991b22 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were easy to resolve using immediate context mostly, except the cls_u32.c one where I simply too the entire HEAD chunk. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-10-12 21:38:46 -07:00
..
auxdisplay	auxdisplay: Replace licenses with SPDX identifiers	2018-04-12 19:02:45 +02:00
bpf	bpf, tracex3_user: erase "ARRAY_SIZE" redefined	2018-10-04 16:31:57 +02:00
configfs	configfs: make config_item_type const	2017-10-19 16:15:15 +02:00
connector	A relatively calm cycle for the docs tree again.	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	arch: remove tile port	2018-03-16 10:56:03 +01:00
livepatch	livepatch: Allow to call a custom callback when freeing shadow variables	2018-04-17 13:42:48 +02: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
qmi	samples: Introduce Qualcomm QMI sample client	2018-02-12 16:57:22 -08:00
rpmsg	rpmsg: Allow callback to return errors	2016-09-08 22:15:25 -07:00
seccomp	kbuild: Rename HOST_LOADLIBES to KBUILD_HOSTLDLIBS	2018-07-18 01:18:05 +09: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	sample: vfio-mdev: avoid deadlock in mdev_access()	2018-07-11 13:22:41 -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	samples: disable CONFIG_SAMPLES for UML	2018-10-11 02:15:46 +09:00
Makefile	remoteproc updates for v4.17	2018-04-10 12:09:27 -07:00