Skip to content

Commit 817e929

Browse files
committed
Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says: ==================== Intel Wired LAN Doc Updates 2018-10-18 This series contains documentation fixes and updates for Intel wired LAN drivers. The following was done: - Updated incorrect URLs - removed document references which did not apply to the current in-kernel drivers - added documentation for fm10k driver - added missing documentation on existing or new features - added SPDX headers to all the documentation files Lastly, the documentation was converted over to the RST (reStructured Text) format, so that 'make htmldocs' produces pretty html driver documentation for our drivers. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 64b9d16 + 828092e commit 817e929

File tree

25 files changed

+2982
-1675
lines changed

25 files changed

+2982
-1675
lines changed

Documentation/networking/00-INDEX

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,6 @@ driver.txt
7070
- Softnet driver issues.
7171
ena.txt
7272
- info on Amazon's Elastic Network Adapter (ENA)
73-
e100.txt
74-
- info on Intel's EtherExpress PRO/100 line of 10/100 boards
75-
e1000.txt
76-
- info on Intel's E1000 line of gigabit ethernet boards
77-
e1000e.txt
78-
- README for the Intel Gigabit Ethernet Driver (e1000e).
7973
eql.txt
8074
- serial IP load balancing
8175
fib_trie.txt
@@ -94,16 +88,8 @@ generic_netlink.txt
9488
- info on Generic Netlink
9589
gianfar.txt
9690
- Gianfar Ethernet Driver.
97-
i40e.txt
98-
- README for the Intel Ethernet Controller XL710 Driver (i40e).
99-
iavf.txt
100-
- README for the Intel Ethernet Adaptive Virtual Function Driver (iavf).
10191
ieee802154.txt
10292
- Linux IEEE 802.15.4 implementation, API and drivers
103-
igb.txt
104-
- README for the Intel Gigabit Ethernet Driver (igb).
105-
igbvf.txt
106-
- README for the Intel Gigabit Ethernet Driver (igbvf).
10793
ip-sysctl.txt
10894
- /proc/sys/net/ipv4/* variables
10995
ip_dynaddr.txt
@@ -120,12 +106,6 @@ ipvs-sysctl.txt
120106
- Per-inode explanation of the /proc/sys/net/ipv4/vs interface.
121107
irda.txt
122108
- where to get IrDA (infrared) utilities and info for Linux.
123-
ixgb.txt
124-
- README for the Intel 10 Gigabit Ethernet Driver (ixgb).
125-
ixgbe.txt
126-
- README for the Intel 10 Gigabit Ethernet Driver (ixgbe).
127-
ixgbevf.txt
128-
- README for the Intel Virtual Function (VF) Driver (ixgbevf).
129109
l2tp.txt
130110
- User guide to the L2TP tunnel protocol.
131111
lapb-module.txt

Documentation/networking/e100.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
==============================================================
1+
.. SPDX-License-Identifier: GPL-2.0+
2+
23
Linux* Base Driver for the Intel(R) PRO/100 Family of Adapters
34
==============================================================
45

Documentation/networking/e1000.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
===========================================================
1+
.. SPDX-License-Identifier: GPL-2.0+
2+
23
Linux* Base Driver for Intel(R) Ethernet Network Connection
34
===========================================================
45

0 commit comments

Comments
 (0)