David S. Miller 36583eb54d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/cadence/macb.c drivers/net/phy/phy.c include/linux/skbuff.h net/ipv4/tcp.c net/switchdev/switchdev.c Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD} renaming overlapping with net-next changes of various sorts. phy.c was a case of two changes, one adding a local variable to a function whilst the second was removing one. tcp.c overlapped a deadlock fix with the addition of new tcp_info statistic values. macb.c involved the addition of two zyncq device entries. skbuff.h involved adding back ipv4_daddr to nf_bridge_info whilst net-next changes put two other existing members of that struct into a union. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-05-23 01:22:35 -04:00
..
9p	9p: switch p9_client_read() to passing struct iov_iter *	2015-04-11 22:28:27 -04:00
bluetooth	Bluetooth: Read LE remote features during connection establishment	2015-04-09 08:36:54 +03:00
caif	…
irda	…
iucv	…
netfilter	netfilter: nf_tables: mark stateful expressions	2015-04-13 20:12:31 +02:00
netns	tcp: add rfc3168, section 6.1.1.1. fallback	2015-05-19 16:53:37 -04:00
nfc	nfc: nci: Add comment to explain NCI_HCI_MAX_PIPES	2015-04-06 00:19:05 +02:00
phonet	…
sctp	sctp: avoid to repeatedly declare external variables	2015-03-25 11:40:16 -04:00
tc_act	act_bpf: add initial eBPF support for actions	2015-03-20 19:10:44 -04:00
6lowpan.h	…
Space.h	…
act_api.h	…
addrconf.h	net: Export IGMP/MLD message validation code	2015-05-04 14:49:23 -04:00
af_ieee802154.h	…
af_rxrpc.h	…
af_unix.h	…
af_vsock.h	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
ah.h	…
arp.h	…
atmclip.h	…
ax25.h	…
ax88796.h	…
bond_3ad.h	…
bond_alb.h	…
bond_options.h	bonding: Implement user key part of port_key in an AD system.	2015-05-11 10:59:32 -04:00
bonding.h	bonding: Implement user key part of port_key in an AD system.	2015-05-11 10:59:32 -04:00
busy_poll.h	…
cfg80211-wext.h	…
cfg80211.h	cfg80211: change GO_CONCURRENT to IR_CONCURRENT for STA	2015-05-06 15:50:02 +02:00
cfg802154.h	cfg802154: pass name_assign_type to rdev_add_virtual_intf()	2015-04-30 18:48:10 +02:00
checksum.h	net: fix sparse error in csum_replace4()	2015-05-17 13:08:29 -04:00
cipso_ipv4.h	…
cls_cgroup.h	…
codel.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
compat.h	net: switch importing msghdr from userland to {compat_,}import_iovec()	2015-04-09 00:02:26 -04:00
datalink.h	…
dcbevent.h	…
dcbnl.h	…
dn.h	…
dn_dev.h	…
dn_fib.h	…
dn_neigh.h	netfilter: Pass socket pointer down through okfn().	2015-04-07 15:25:55 -04:00
dn_nsp.h	…
dn_route.h	…
dsa.h	net: dsa: Add basic framework to support ndo_fdb functions	2015-03-29 13:23:54 -07:00
dsfield.h	…
dst.h	net: make skb_dst_pop routine static	2015-05-12 23:19:49 -04:00
dst_ops.h	…
esp.h	…
ethoc.h	…
fib_rules.h	…
firewire.h	…
flow.h	…
flow_dissector.h	flow_dissector: change port array into src, dst tuple	2015-05-13 15:19:47 -04:00
flowcache.h	…
fou.h	…
garp.h	…
gen_stats.h	…
genetlink.h	…
geneve.h	geneve: move definition of geneve_hdr() to geneve.h	2015-05-13 15:59:13 -04:00
gre.h	…
gro_cells.h	…
gue.h	…
icmp.h	…
ieee80211_radiotap.h	…
ieee802154_netdev.h	…
if_inet6.h	ipv6: do retries on stable privacy addresses	2015-03-23 22:12:09 -04:00
inet6_connection_sock.h	…
inet6_hashtables.h	…
inet_common.h	net: Modify sk_alloc to not reference count the netns of kernel sockets.	2015-05-11 10:50:18 -04:00
inet_connection_sock.h	inet: properly align icsk_ca_priv	2015-05-19 11:08:00 -04:00
inet_ecn.h	…
inet_frag.h	…
inet_hashtables.h	inet_hashinfo: remove bsocket counter	2015-05-21 18:55:32 -04:00
inet_sock.h	…
inet_timewait_sock.h	tcp/dccp: get rid of central timewait timer	2015-04-13 16:40:05 -04:00
inetpeer.h	tcp: simplify inetpeer_addr_base use	2015-03-31 13:58:35 -04:00
ip.h	ip: remove unused function prototype	2015-05-19 16:54:36 -04:00
ip6_checksum.h	…
ip6_fib.h	ipv6: Remove DST_METRICS_FORCE_OVERWRITE and _rt6i_peer	2015-05-01 20:57:06 -04:00
ip6_route.h	netfilter: Pass socket pointer down through okfn().	2015-04-07 15:25:55 -04:00
ip6_tunnel.h	udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().	2015-04-07 15:29:08 -04:00
ip_fib.h	…
ip_tunnels.h	ipip,gre,vti,sit: implement ndo_get_iflink	2015-04-02 14:05:00 -04:00
ip_vs.h	…
ipcomp.h	…
ipconfig.h	…
ipv6.h	flow_dissector: change port array into src, dst tuple	2015-05-13 15:19:47 -04:00
ipx.h	…
iw_handler.h	…
lapb.h	…
lib80211.h	…
llc.h	…
llc_c_ac.h	…
llc_c_ev.h	…
llc_c_st.h	…
llc_conn.h	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
llc_if.h	…
llc_pdu.h	…
llc_s_ac.h	…
llc_s_ev.h	…
llc_s_st.h	…
llc_sap.h	…
mac80211.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
mac802154.h	mac802154: add description to mac802154 APIs	2015-04-30 18:48:09 +02:00
mip6.h	…
mld.h	…
mpls.h	…
mrp.h	…
ndisc.h	…
neighbour.h	net: neighbour: Add mcast_resolicit to configure the number of multicast resolicitations in PROBE state.	2015-03-20 21:47:40 -04:00
net_namespace.h	netns: make nsid_lock per net	2015-05-17 23:41:11 -04:00
net_ratelimit.h	…
netevent.h	…
netlabel.h	…
netlink.h	netlink: implement nla_get_in_addr and nla_get_in6_addr	2015-03-31 13:58:35 -04:00
netprio_cgroup.h	…
netrom.h	…
nexthop.h	…
nl802154.h	…
p8022.h	…
ping.h	…
pkt_cls.h	…
pkt_sched.h	…
protocol.h	…
psnap.h	…
raw.h	…
rawv6.h	…
red.h	…
regulatory.h	…
request_sock.h	tcp: provide SYN headers for passive connections	2015-05-05 16:02:34 -04:00
rose.h	…
route.h	…
rtnetlink.h	rtnetlink: Mark name argument of rtnl_create_link() const	2015-04-10 12:42:40 -07:00
sch_generic.h	net: sched: use counter to break reclassify loops	2015-05-13 15:08:14 -04:00
scm.h	…
secure_seq.h	…
slhc_vj.h	…
snmp.h	…
sock.h	tcp: add a force_schedule argument to sk_stream_alloc_skb()	2015-05-21 16:56:40 -04:00
stp.h	…
switchdev.h	switchdev: add support for fdb add/del/dump via switchdev_port_obj ops.	2015-05-17 22:49:09 -04:00
tcp.h	tcp: add rfc3168, section 6.1.1.1. fallback	2015-05-19 16:53:37 -04:00
tcp_memcontrol.h	…
tcp_states.h	…
timewait_sock.h	…
transp_v6.h	…
tso.h	…
udp.h	…
udp_tunnel.h	udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().	2015-04-07 15:29:08 -04:00
udplite.h	…
vsock_addr.h	…
vxlan.h	udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().	2015-04-07 15:29:08 -04:00
wext.h	…
wimax.h	…
x25.h	…
x25device.h	…
xfrm.h	netfilter: Pass socket pointer down through okfn().	2015-04-07 15:25:55 -04:00