David S. Miller a655fe9f19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... An ipvlan bug fix in 'net' conflicted with the abstraction away of the IPV6 specific support in 'net-next'. Similarly, a bug fix for mlx5 in 'net' conflicted with the flow action conversion in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-08 15:00:17 -08:00
..
auxdisplay	auxdisplay: Replace licenses with SPDX identifiers	2018-04-12 19:02:45 +02:00
bpf	samples/bpf: Check the prog id before exiting	2019-02-01 23:37:51 +01:00
configfs	configfs: make config_item_type const	2017-10-19 16:15:15 +02:00
connector	kbuild: announce removal of SUBDIRS if used	2018-12-01 22:21:56 +09:00
hidraw	HID: samples/hidraw: fix typo in printed message	2018-11-21 00:31:58 +01:00
hw_breakpoint
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: check kzalloc return values	2018-12-18 10:23:07 +01:00
mei	samples: mei: use /dev/mei0 instead of /dev/mei	2019-01-30 15:24:45 +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	samples/seccomp: Fix 32-bit build	2019-01-08 07:45:01 +01: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
uhid	kbuild: remove all dummy assignments to obj-	2017-11-18 11:46:06 +09:00
v4l	media: v4l2-pci-skeleton: replace vb2_buffer with vb2_v4l2_buffer	2018-12-03 14:41:51 -05:00
vfio-mdev	vfio-mdev/samples: Use u8 instead of char for handle functions	2018-12-17 11:07:13 -07: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