David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three conflicts, one of which, for marvell10g.c is non-trivial and requires some follow-up from Heiner or someone else. The issue is that Heiner converted the marvell10g driver over to use the generic c45 code as much as possible. However, in 'net' a bug fix appeared which makes sure that a new local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0 is cleared. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-24 12:06:19 -08:00
..
9p
bluetooth
caif
iucv
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2019-02-18 11:38:30 -08:00
netns	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2019-01-28 19:38:33 -08:00
nfc
phonet	phonet: fix building with clang	2019-02-21 16:23:56 -08:00
sctp	sctp: add SCTP_FUTURE_ASOC and SCTP_CURRENT_ASSOC for SCTP_STREAM_SCHEDULER sockopt	2019-01-30 00:44:08 -08:00
tc_act	net: Change TCA_ACT_* to TCA_ID_* to match that of TCA_ID_POLICE	2019-02-10 09:28:43 -08:00
6lowpan.h
act_api.h	net: Change TCA_ACT_* to TCA_ID_* to match that of TCA_ID_POLICE	2019-02-10 09:28:43 -08:00
addrconf.h	ipv6_stub: add ipv6_route_input stub/proxy.	2019-02-13 18:27:55 -08:00
af_ieee802154.h
af_rxrpc.h	Revert "rxrpc: Allow failed client calls to be retried"	2019-01-15 21:33:36 -08:00
af_unix.h
af_vsock.h
ah.h
arp.h
atmclip.h
ax25.h	ax25: fix possible use-after-free	2019-01-23 11:18:00 -08:00
ax88796.h
bond_3ad.h	bonding: count master 3ad stats separately	2019-01-24 22:18:48 -08:00
bond_alb.h
bond_options.h
bonding.h
busy_poll.h
calipso.h
cfg80211-wext.h
cfg80211.h	cfg80211: allow sending vendor events unicast	2019-02-22 13:46:43 +01:00
cfg802154.h
checksum.h	Remove 'type' argument from access_ok() function	2019-01-03 18:57:57 -08:00
cipso_ipv4.h
cls_cgroup.h
codel.h
codel_impl.h
codel_qdisc.h
compat.h
datalink.h
dcbevent.h
dcbnl.h
devlink.h	ethtool: add compat for flash update	2019-02-17 15:27:38 -08:00
dn.h
dn_dev.h
dn_fib.h
dn_neigh.h
dn_nsp.h
dn_route.h
dsa.h	net: dsa: add support for bridge flags	2019-02-21 14:53:07 -08:00
dsfield.h
dst.h
dst_cache.h
dst_metadata.h
dst_ops.h
erspan.h
esp.h
ethoc.h
failover.h
fib_notifier.h
fib_rules.h
firewire.h
flow.h
flow_dissector.h
flow_offload.h	flow_offload: fix block stats	2019-02-13 21:07:47 -08:00
fou.h
fq.h
fq_impl.h
garp.h
gen_stats.h
genetlink.h
geneve.h
gre.h
gro_cells.h
gtp.h
gue.h
hwbm.h
icmp.h
ieee80211_radiotap.h	wireless-drivers-next patches for 5.1	2019-02-22 12:56:24 -08:00
ieee802154_netdev.h
if_inet6.h
ife.h
ila.h
inet6_connection_sock.h
inet6_hashtables.h
inet_common.h
inet_connection_sock.h	tcp: change pingpong threshold to 3	2019-01-27 13:29:43 -08:00
inet_ecn.h
inet_frag.h	net: IP defrag: encapsulate rbtree defrag code into callable functions	2019-01-25 21:37:11 -08:00
inet_hashtables.h	net: dccp: fix kernel crash on module load	2018-12-24 15:27:56 -08:00
inet_sock.h
inet_timewait_sock.h
inetpeer.h	net: ipv4: use a dedicated counter for icmp_v4 redirect packets	2019-02-08 21:50:15 -08:00
ip.h
ip6_checksum.h
ip6_fib.h
ip6_route.h
ip6_tunnel.h
ip_fib.h	net: ipv4: Fix memory leak in network namespace dismantle	2019-01-15 13:33:44 -08:00
ip_tunnels.h	ip_tunnel: Add tnl_update_pmtu in ip_md_tunnel_xmit	2019-01-26 09:43:03 -08:00
ip_vs.h	ipvs: avoid indirect calls when calculating checksums	2019-01-28 11:15:58 +01:00
ipcomp.h
ipconfig.h
ipv6.h
ipv6_frag.h	net: IP6 defrag: use rbtrees for IPv6 defrag	2019-01-25 21:37:11 -08:00
ipx.h
iw_handler.h
kcm.h
l3mdev.h	ipvlan, l3mdev: fix broken l3s mode wrt local routes	2019-01-30 22:13:34 -08:00
lag.h
lapb.h
lib80211.h
llc.h
llc_c_ac.h
llc_c_ev.h
llc_c_st.h
llc_conn.h
llc_if.h
llc_pdu.h
llc_s_ac.h
llc_s_ev.h
llc_s_st.h
llc_sap.h
lwtunnel.h	bpf: implement BPF_LWT_ENCAP_IP mode in bpf_lwt_push_encap	2019-02-13 18:27:55 -08:00
mac80211.h	mac80211: notify driver on subsequent CSA beacons	2019-02-22 13:45:51 +01:00
mac802154.h
mip6.h
mld.h
mpls.h
mpls_iptunnel.h
mrp.h
ncsi.h
ndisc.h
neighbour.h
net_failover.h
net_namespace.h	net: xsk: track AF_XDP sockets on a per-netns list	2019-01-25 01:50:03 +01:00
net_ratelimit.h
netevent.h
netlabel.h
netlink.h	netlink: reduce NLA_POLICY_NESTED{,_ARRAY} arguments	2019-02-01 11:06:55 +01:00
netprio_cgroup.h
netrom.h
nexthop.h
nl802154.h
nsh.h
p8022.h
page_pool.h
ping.h
pkt_cls.h	net_sched: initialize net pointer inside tcf_exts_init()	2019-02-22 15:26:51 -08:00
pkt_sched.h
pptp.h
protocol.h
psample.h
psnap.h
raw.h
rawv6.h
red.h
regulatory.h
request_sock.h
rose.h
route.h
rsi_91x.h
rtnetlink.h
sch_generic.h	net: sched: add flags to Qdisc class ops struct	2019-02-12 13:41:33 -05:00
scm.h
secure_seq.h
seg6.h
seg6_hmac.h
seg6_local.h
slhc_vj.h
smc.h	net/smc: add smcd support to the pnet table	2019-02-21 10:34:37 -08:00
snmp.h
sock.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
sock_reuseport.h
Space.h
stp.h
strparser.h
switchdev.h	net: Get rid of switchdev_port_attr_get()	2019-02-21 14:55:14 -08:00
tcp.h	tcp: allow zerocopy with fastopen	2019-01-25 22:41:08 -08:00
tcp_states.h
timewait_sock.h
tipc.h
tls.h	net/tls: Move protocol constants from cipher context to tls context	2019-02-19 10:40:36 -08:00
transp_v6.h
tso.h
tun_proto.h
udp.h
udp_tunnel.h
udplite.h
vsock_addr.h
vxlan.h	vxlan: Add extack to switchdev operations	2019-01-17 15:18:47 -08:00
wext.h
wimax.h
x25.h
x25device.h
xdp.h
xdp_sock.h	xsk: add id to umem	2019-01-25 01:50:03 +01:00
xfrm.h	xfrm: destroy xfrm_state synchronously on net exit path	2019-02-05 06:29:20 +01:00