Pablo Neira Ayuso aef833c58d net: openvswitch: rename flow_stats to sw_flow_stats ... There is a flow_stats structure defined in include/net/flow_offload.h and a follow up patch adds #include <net/flow_offload.h> to net/sch_generic.h. This breaks compilation since OVS codebase includes net/sock.h which pulls in linux/filter.h which includes net/sch_generic.h. In file included from ./include/net/sch_generic.h:18:0, from ./include/linux/filter.h:25, from ./include/net/sock.h:59, from ./include/linux/tcp.h:19, from net/openvswitch/datapath.c:24 This definition takes precedence on OVS since it is placed in the networking core, so rename flow_stats in OVS to sw_flow_stats since this structure is contained in sw_flow. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Acked-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2019-07-19 21:27:45 -07:00
..
6lowpan	6lowpan: no need to check return value of debugfs_create functions	2019-07-06 12:50:01 +02:00
9p	9p pull request for inclusion in 5.13	2019-07-12 17:31:19 -07:00
802
8021q
appletalk
atm
ax25
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-07-08 19:48:57 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2019-07-11 10:55:49 -07:00
bpf
bpfilter	Kbuild updates for v5.3	2019-07-12 16:03:16 -07:00
bridge	netfilter: bridge: make NF_TABLES_BRIDGE tristate	2019-07-19 18:08:14 +02:00
caif
can
ceph	Lots of exciting things this time!	2019-07-18 11:05:25 -07:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-07-19 10:06:06 -07:00
dcb
dccp	proc/sysctl: add shared variables for range check	2019-07-18 17:08:07 -07:00
decnet
dns_resolver	Revert "Merge tag 'keys-acl-20190703' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs"	2019-07-10 18:43:43 -07:00
dsa	net: dsa: sja1105: Fix missing unlock on error in sk_buff()	2019-07-18 16:32:39 -07:00
ethernet
hsr	hsr: switch ->dellink() to ->ndo_uninit()	2019-07-11 14:37:45 -07:00
ieee802154
ife
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2019-07-19 21:25:10 -07:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2019-07-19 21:25:10 -07:00
iucv
kcm
key	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-07-08 19:48:57 -07:00
l2tp	ipv6: elide flowlabel check if no exclusive leases exist	2019-07-08 19:38:03 -07:00
l3mdev
lapb
llc
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2019-07-11 10:55:49 -07:00
mac802154
mpls	proc/sysctl: add shared variables for range check	2019-07-18 17:08:07 -07:00
ncsi
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2019-07-19 21:25:10 -07:00
netlabel
netlink
netrom
nfc	nfc: fix potential illegal memory access	2019-07-08 12:46:24 -07:00
nsh
openvswitch	net: openvswitch: rename flow_stats to sw_flow_stats	2019-07-19 21:27:45 -07:00
packet
phonet
psample
qrtr
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-07-19 10:06:06 -07:00
rfkill
rose
rxrpc	proc/sysctl: add shared variables for range check	2019-07-18 17:08:07 -07:00
sched	net_sched: unset TCQ_F_CAN_BYPASS when adding filters	2019-07-17 13:34:09 -07:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-07-19 10:06:06 -07:00
smc
strparser
sunrpc	Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2019-07-19 10:42:02 -07:00
switchdev
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-07-19 10:06:06 -07:00
tls	net/tls: fix socket wmem accounting on fallback with netem	2019-07-08 20:21:10 -07:00
unix
vmw_vsock	vsock/virtio: fix flush of works during the .remove()	2019-07-08 15:35:17 -07:00
wimax
wireless	pci-v5.3-changes	2019-07-15 20:44:49 -07:00
x25
xdp	xdp: fix potential deadlock on socket mutex	2019-07-12 15:02:21 +02:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-07-08 19:48:57 -07:00
compat.c
Kconfig
Makefile
socket.c	Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2019-07-19 10:42:02 -07:00
sysctl_net.c