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
..
block	s390/scm_blk: consistently use blk_status_t as error type	2017-09-19 08:36:18 +02:00
char	s390/vmcp: simplify vmcp_response_free()	2017-08-29 16:29:02 +02:00
cio	s390/cio: recover from bad paths	2017-09-19 08:36:19 +02:00
crypto	s390/zcrypt: externalize AP queue interrupt control	2017-09-06 09:24:42 +02:00
net	s390/qeth: don't dump control cmd twice	2017-10-20 13:11:05 +01:00
scsi	scsi: zfcp: fix erp_action use-before-initialize in REC action trace	2017-10-16 22:45:26 -04:00
virtio	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2017-05-16 09:24:44 -07:00
Makefile