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
..
acpi	ACPI / bus: Make ACPI_HANDLE() work for non-GPL code again	2017-09-19 22:42:31 +02:00
asm-generic	percpu: make this_cpu_generic_read() atomic w.r.t. interrupts	2017-09-26 07:37:33 -07:00
clocksource
crypto
drm	lib/interval_tree: fast overlap detection	2017-09-08 18:26:49 -07:00
dt-bindings	ARC: reset: remove the misleading v1 suffix all over	2017-09-18 13:02:03 +02:00
keys
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
math-emu
media	media updates for v4.14-rc1	2017-09-07 12:53:14 -07:00
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
pcmcia
ras
rdma	IB: Correct MR length field to be 64-bit	2017-09-25 11:47:23 -04:00
scsi	scsi: libiscsi: Remove iscsi_destroy_session	2017-10-02 22:23:21 -04:00
soc	ARM: SoC driver updates for v4.14	2017-09-10 20:40:00 -07:00
sound	ALSA: hda - Fix incorrect TLV callback check introduced during set_fs() removal	2017-10-18 12:27:00 +02:00
target
trace	bpf: permit multiple bpf attachments for a single perf event	2017-10-25 10:47:47 +09:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
video
xen	xen, arm64: drop dummy lookup_address()	2017-09-19 09:25:05 -04:00