summaryrefslogtreecommitdiffstats
path: root/include/video
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-10-30 06:10:01 +0100
committerDavid S. Miller <davem@davemloft.net>2017-10-30 13:09:24 +0100
commite1ea2f9856b765a2eaabb403a6751f70efc9ba4c (patch)
tree771f0f96fdab1b27757730e96d911c73f5499ee4 /include/video
parentMerge branch 'ipvlan-private-vepa' (diff)
parentLinux 4.14-rc7 (diff)
downloadlinux-e1ea2f9856b765a2eaabb403a6751f70efc9ba4c.tar.xz
linux-e1ea2f9856b765a2eaabb403a6751f70efc9ba4c.zip
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>
Diffstat (limited to 'include/video')
0 files changed, 0 insertions, 0 deletions