# # Makefile for Open vSwitch. # obj-$(CONFIG_OPENVSWITCH) += openvswitch.o openvswitch-y := \ actions.o \ datapath.o \ dp_notify.o \ flow.o \ flow_netlink.o \ flow_table.o \ vport.o \ vport-internal_dev.o \ vport-netdev.o ifneq ($(CONFIG_NF_CONNTRACK),) openvswitch-y += conntrack.o endif obj-$(CONFIG_OPENVSWITCH_VXLAN)+= vport-vxlan.o obj-$(CONFIG_OPENVSWITCH_GENEVE)+= vport-geneve.o obj-$(CONFIG_OPENVSWITCH_GRE) += vport-gre.o ext.git' title='net-next.git Git repository'/>
summaryrefslogtreecommitdiff
path: root/net/dcb
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-02-08 09:56:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-08 09:56:15 -0800
commit23fbe2cdc1de80120cf9ccd478ac57c3a3a0764b (patch)
tree4aff32d5f2f6fe2f54028bfd4d1b66fdd2f8d281 /net/dcb
parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
parenteeeefd41843218c55a8782a6920f044d9bf6207a (diff)
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fix from Jens Axboe: "A single fix that should go into 4.10, fixing a regression on some devices with the WRITE_SAME command" * 'for-linus' of git://git.kernel.dk/linux-block: block: don't try Write Same from __blkdev_issue_zeroout
Diffstat (limited to 'net/dcb')