David S. Miller e1ea2f9856 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Several conflicts here. NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to nfp_fl_output() needed some adjustments because the code block is in an else block now. Parallel additions to net/pkt_cls.h and net/sch_generic.h A bug fix in __tcp_retransmit_skb() conflicted with some of the rbtree changes in net-next. The tc action RCU callback fixes in 'net' had some overlap with some of the recent tcf_block reworking. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-30 21:09:24 +09:00
..
auxdisplay	samples: move auxdisplay example code from Documentation	2016-09-23 11:52:32 -06:00
blackfin	samples: move blackfin gptimers-example from Documentation	2016-10-10 07:12:02 -06:00
bpf	samples/bpf: adjust rlimit RLIMIT_MEMLOCK for xdp_redirect_map	2017-10-29 12:17:32 +09:00
configfs	configfs: remove old API	2015-10-13 22:17:57 -07:00
connector	make use of make variable CURDIR instead of calling pwd	2016-12-11 12:12:56 +01:00
hidraw
hw_breakpoint
kdb
kfifo	kfifo: clean up example to not use page_link	2017-07-12 16:26:01 -07:00
kobject	samples/kobject: be explicit in the module license	2015-03-25 13:41:42 +01:00
kprobes	samples/kretprobe: fix the wrong type	2016-08-04 08:50:07 -04:00
livepatch	livepatch: allow removal of a disabled patch	2017-03-08 09:38:43 +01:00
mei	mei: drop the TODO from samples	2017-04-26 11:38:56 +02:00
mic/mpssd	samples: move mic/mpssd example code from Documentation	2016-09-20 12:38:48 -06:00
pktgen	pktgen: Specify the index of first thread	2017-06-16 12:32:34 -04:00
rpmsg	rpmsg: Allow callback to return errors	2016-09-08 22:15:25 -07:00
seccomp	samples/seccomp: fix 64-bit comparison macros	2017-01-09 17:22:03 +11:00
sockmap	bpf: avoid preempt enable/disable in sockmap using tcp_skb_cb region	2017-10-20 13:01:29 +01:00
statx	statx: Include a mask for stx_attributes in struct statx	2017-04-03 01:06:00 -04:00
timers	samples: move timers example code from Documentation	2016-09-23 11:51:58 -06:00
trace_events	Fix tracing sample code warning.	2017-10-27 20:35:31 -07:00
trace_printk	tracing: Add trace_printk sample code	2016-06-20 09:54:21 -04:00
uhid
v4l	media: v4l2-pci-skeleton: constify vb2_ops structures	2017-08-20 08:03:09 -04:00
vfio-mdev	vfio-mdev: remove some dead code	2017-01-11 12:12:37 -07:00
watchdog	samples: move watchdog example code from Documentation	2016-09-23 11:52:14 -06:00
Kconfig	statx: Add a system call to make enhanced file info available	2017-03-02 20:51:15 -05:00
Makefile	statx: Add a system call to make enhanced file info available	2017-03-02 20:51:15 -05:00