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
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
kobject
kprobes
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
pktgen
qmi
rpmsg
seccomp	samples/seccomp: Fix 32-bit build	2019-01-08 07:45:01 +01:00
statx
timers
trace_events
trace_printk
uhid
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
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