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
..
caif
device_drivers	Documentation: fix some freescale dpio-driver.rst warnings	2019-02-11 21:29:02 -08:00
dsa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-24 12:06:19 -08:00
mac80211_hwsim	mac80211_hwsim: suggest nl80211 instead of wext driver in documentation	2016-10-17 11:38:01 +02:00
6lowpan.txt	docs: networking: fix minor typos in various documentation files	2018-06-04 17:21:28 -04:00
6pack.txt
af_xdp.rst	bpf: typo fix in Documentation/networking/af_xdp.rst	2018-10-05 00:11:24 +02:00
alias.rst	docs: networking: Convert alias.txt to rst	2018-07-18 15:28:27 -07:00
altera_tse.txt
arcnet-hardware.txt
arcnet.txt
atm.txt
ax25.txt
batman-adv.rst	batman-adv: Add SPDX license identifier to batman-adv.rst	2017-12-15 17:22:46 +01:00
baycom.txt
bonding.txt	bonding: Fix a typo in bonding.txt	2018-07-16 13:32:12 -07:00
bridge.rst	docs: networking: Convert bridge.txt to rst	2018-07-18 15:28:27 -07:00
can_ucan_protocol.rst	can: ucan: add driver for Theobroma Systems UCAN devices	2018-07-27 10:40:16 +02:00
can.rst	docs: can.rst: fix a footnote reference	2018-06-15 12:48:59 -03:00
cdc_mbim.txt	Documentation: fix usb related doc refs	2017-10-12 11:15:48 -06:00
checksum-offloads.txt	Documentation: fix networking related doc refs.	2017-10-12 11:21:05 -06:00
conf.py	docs-rst: convert networking book to ReST	2017-05-16 08:44:13 -03:00
cops.txt
cxacru-cf.py
cxacru.txt
dccp.txt
dctcp.txt
decnet.txt
defza.txt	FDDI: defza: Add support for DEC FDDIcontroller 700 TURBOchannel adapter	2018-10-15 21:46:06 -07:00
devlink-health.txt	devlink: Add Documentation/networking/devlink-health.txt	2019-02-07 10:34:29 -08:00
devlink-info-versions.rst	devlink: add a generic board.manufacture version name	2019-02-11 20:39:56 -08:00
devlink-params-bnxt.txt	devlink: Add Documentation/networking/devlink-params-bnxt.txt	2018-10-04 13:49:43 -07:00
devlink-params-mlxsw.txt	mlxsw: spectrum: add "acl_region_rehash_interval" devlink param	2019-02-08 15:02:50 -08:00
devlink-params.txt	devlink: Add 'fw_load_policy' generic parameter	2018-12-03 13:55:43 -08:00
dns_resolver.txt	doc: ReSTify keys-request-key.txt	2017-05-18 10:33:51 -06:00
driver.txt
eql.txt
failover.rst	net: Introduce generic failover module	2018-05-28 22:59:54 -04:00
fib_trie.txt
filter.txt	bpf, doc: add RISC-V JIT to BPF documentation	2019-02-05 16:56:10 +01:00
fore200e.txt
framerelay.txt
gen_stats.txt
generic_netlink.txt
generic-hdlc.txt
gtp.txt	docs: networking: fix minor typos in various documentation files	2018-06-04 17:21:28 -04:00
hinic.txt	net-next/hinic: Initialize hw interface	2017-08-22 10:48:52 -07:00
ieee802154.txt	doc: linux-wpan: Fulfill the description of missed 802.15.4 APIs	2017-11-29 16:49:40 +01:00
ila.txt	docs: networking: fix minor typos in various documentation files	2018-06-04 17:21:28 -04:00
index.rst	devlink: add generic info version names	2019-02-01 15:30:30 -08:00
ip_dynaddr.txt
ip-sysctl.txt	neighbor: Improve garbage collection	2018-12-07 16:03:10 -08:00
ipddp.txt
iphase.txt
ipsec.txt	docs: networking: fix minor typos in various documentation files	2018-06-04 17:21:28 -04:00
ipv6.txt
ipvlan.txt	docs: networking: fix minor typos in various documentation files	2018-06-04 17:21:28 -04:00
ipvs-sysctl.txt	ipvs: Document sysctl pmtu_disc	2017-03-16 13:33:39 +01:00
kapi.rst	sfp: add documentation for kernel APIs	2017-12-05 11:16:19 -05:00
kcm.txt	docs: networking: fix minor typos in various documentation files	2018-06-04 17:21:28 -04:00
l2tp.txt	net: l2tp: deprecate PPPOL2TP_MSG_* in favour of L2TP_MSG_*	2016-12-10 23:29:11 -05:00
lapb-module.txt
ltpc.txt
mac80211-auth-assoc-deauth.txt
mac80211-injection.txt
mpls-sysctl.txt	mpls: allow TTL propagation from IP packets to be configured	2017-03-13 15:29:22 -07:00
msg_zerocopy.rst	doc: Mention MSG_ZEROCOPY implementation for UDP	2019-02-17 15:30:02 -08:00
multiqueue.txt
net_dim.txt	Documentation/networking: Add net DIM documentation	2018-03-22 14:50:44 -04:00
net_failover.rst	docs: networking: Fix failover build warnings	2018-07-16 11:23:54 -07:00
netconsole.txt	docs: fix locations of several documents that got moved	2016-10-24 08:12:35 -02:00
netdev-FAQ.rst	docs: net: Convert netdev-FAQ to restructured text	2018-07-26 21:27:54 -07:00
netdev-features.txt	docs-networking: fix typo in define	2018-11-21 10:30:30 -08:00
netdevices.txt
netfilter-sysctl.txt	netfilter: allow logging from non-init namespaces	2017-02-02 14:31:58 +01:00
netif-msg.txt
nf_conntrack-sysctl.txt	netfilter: conntrack: register sysctl table for gre	2018-12-21 00:51:25 +01:00
nf_flowtable.txt	netfilter: add flowtable documentation	2018-03-30 11:04:41 +02:00
nfc.txt
openvswitch.txt
operstates.txt	Documentation: bring operstate documentation up-to-date	2019-02-11 12:38:51 -08:00
packet_mmap.txt	doc: remove out of date links and info from packet mmap	2018-03-16 10:48:52 -04:00
phonet.txt
phy.rst	Documentation: net: phy: switch documentation to rst format	2019-01-26 09:16:55 -08:00
pktgen.txt	Documentation/pktgen: Clearify how-to use pktgen samples	2018-01-24 15:03:36 -05:00
PLIP.txt
ppp_generic.txt	ppp: remove the PPPIOCDETACH ioctl	2018-05-24 22:55:07 -04:00
proc_net_tcp.txt
radiotap-headers.txt
ray_cs.txt
rds.txt
regulatory.txt	cfg80211: reg: remove support for built-in regdb	2017-10-11 13:18:51 +02:00
rxrpc.txt	Revert "rxrpc: Allow failed client calls to be retried"	2019-01-15 21:33:36 -08:00
scaling.txt	Documentation: Add explanation for XPS using Rx-queue(s) map	2018-07-02 09:06:24 +09:00
sctp.txt
secid.txt
seg6-sysctl.txt	ipv6: sr: add documentation file for per-interface sysctls	2016-11-09 20:40:06 -05:00
segmentation-offloads.txt	net: use skb_is_gso_sctp() instead of open-coding	2018-03-09 11:41:47 -05:00
skfp.txt
snmp_counter.rst	add snmp counter document	2019-02-09 19:00:25 -08:00
strparser.txt	strparser: Corrected typo in documentation.	2018-06-24 16:40:20 +09:00
switchdev.txt	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-24 12:06:19 -08:00
tc-actions-env-rules.txt
tcp-thin.txt
team.txt
timestamping.txt	socket: Update timestamping Documentation	2019-02-03 11:17:31 -08:00
tls.txt	tls: Add receive path documentation	2018-03-23 12:25:54 -04:00
tproxy.txt	netfilter: doc: Add nf_tables part in tproxy.txt	2018-08-16 19:37:07 +02:00
tuntap.txt
udplite.txt
vrf.txt	net: provide a sysctl raw_l3mdev_accept for raw socket lookup with VRFs	2018-11-07 16:12:38 -08:00
vxlan.txt
x25-iface.txt
x25.txt
xfrm_device.txt	net: switch secpath to use skb extension infrastructure	2018-12-19 11:21:38 -08:00
xfrm_proc.txt	xfrm: update the stats documentation	2017-12-22 06:45:48 +01:00
xfrm_sync.txt
xfrm_sysctl.txt
z8530book.rst	docs-rst: convert scsi DocBook to ReST	2017-05-16 08:44:15 -03:00
z8530drv.txt