Skip to content

Commit 9ff3b40

Browse files
davem330davem330
committed
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2 parents 8238195 + 6f0d349 commit 9ff3b40

File tree

251 files changed

+2947
-1069
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+2947
-1069
lines changed

‎Documentation/admin-guide/pm/intel_pstate.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ argument is passed to the kernel in the command line.
410410
That only is supported in some configurations, though (for example, if
411411
the `HWP feature is enabled in the processor <Active Mode With HWP_>`_,
412412
the operation mode of the driver cannot be changed), and if it is not
413-
supported in the current configuration, writes to this attribute with
413+
supported in the current configuration, writes to this attribute will
414414
fail with an appropriate error.
415415

416416
Interpretation of Policy Attributes

‎Documentation/networking/e100.rst

Lines changed: 57 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
==============================================================
12
Linux* Base Driver for the Intel(R) PRO/100 Family of Adapters
23
==============================================================
34

@@ -86,83 +87,84 @@ Event Log Message Level: The driver uses the message level flag to log events
8687
Additional Configurations
8788
=========================
8889

89-
Configuring the Driver on Different Distributions
90-
-------------------------------------------------
90+
Configuring the Driver on Different Distributions
91+
-------------------------------------------------
9192

92-
Configuring a network driver to load properly when the system is started is
93-
distribution dependent. Typically, the configuration process involves adding
94-
an alias line to /etc/modprobe.d/*.conf as well as editing other system
95-
startup scripts and/or configuration files. Many popular Linux
96-
distributions ship with tools to make these changes for you. To learn the
97-
proper way to configure a network device for your system, refer to your
98-
distribution documentation. If during this process you are asked for the
99-
driver or module name, the name for the Linux Base Driver for the Intel
100-
PRO/100 Family of Adapters is e100.
93+
Configuring a network driver to load properly when the system is started
94+
is distribution dependent. Typically, the configuration process involves
95+
adding an alias line to /etc/modprobe.d/*.conf as well as editing other
96+
system startup scripts and/or configuration files. Many popular Linux
97+
distributions ship with tools to make these changes for you. To learn
98+
the proper way to configure a network device for your system, refer to
99+
your distribution documentation. If during this process you are asked
100+
for the driver or module name, the name for the Linux Base Driver for
101+
the Intel PRO/100 Family of Adapters is e100.
101102
102-
As an example, if you install the e100 driver for two PRO/100 adapters
103-
(eth0 and eth1), add the following to a configuration file in /etc/modprobe.d/
103+
As an example, if you install the e100 driver for two PRO/100 adapters
104+
(eth0 and eth1), add the following to a configuration file in
105+
/etc/modprobe.d/::
104106

105107
alias eth0 e100
106108
alias eth1 e100
107109

108-
Viewing Link Messages
109-
---------------------
110-
In order to see link messages and other Intel driver information on your
111-
console, you must set the dmesg level up to six. This can be done by
112-
entering the following on the command line before loading the e100 driver::
113-
114-
dmesg -n 6
110+
Viewing Link Messages
111+
---------------------
115112

116-
If you wish to see all messages issued by the driver, including debug
117-
messages, set the dmesg level to eight.
113+
In order to see link messages and other Intel driver information on your
114+
console, you must set the dmesg level up to six. This can be done by
115+
entering the following on the command line before loading the e100
116+
driver::
118117

119-
NOTE: This setting is not saved across reboots.
118+
dmesg -n 6
120119

120+
If you wish to see all messages issued by the driver, including debug
121+
messages, set the dmesg level to eight.
121122

122-
ethtool
123-
-------
123+
NOTE: This setting is not saved across reboots.
124124

125-
The driver utilizes the ethtool interface for driver configuration and
126-
diagnostics, as well as displaying statistical information. The ethtool
127-
version 1.6 or later is required for this functionality.
125+
ethtool
126+
-------
128127

129-
The latest release of ethtool can be found from
130-
https://www.kernel.org/pub/software/network/ethtool/
128+
The driver utilizes the ethtool interface for driver configuration and
129+
diagnostics, as well as displaying statistical information. The ethtool
130+
version 1.6 or later is required for this functionality.
131131

132-
Enabling Wake on LAN* (WoL)
133-
---------------------------
134-
WoL is provided through the ethtool* utility. For instructions on enabling
135-
WoL with ethtool, refer to the ethtool man page.
132+
The latest release of ethtool can be found from
133+
https://www.kernel.org/pub/software/network/ethtool/
136134

137-
WoL will be enabled on the system during the next shut down or reboot. For
138-
this driver version, in order to enable WoL, the e100 driver must be
139-
loaded when shutting down or rebooting the system.
135+
Enabling Wake on LAN* (WoL)
136+
---------------------------
137+
WoL is provided through the ethtool* utility. For instructions on
138+
enabling WoL with ethtool, refer to the ethtool man page. WoL will be
139+
enabled on the system during the next shut down or reboot. For this
140+
driver version, in order to enable WoL, the e100 driver must be loaded
141+
when shutting down or rebooting the system.
140142

141-
NAPI
142-
----
143+
NAPI
144+
----
143145

144-
NAPI (Rx polling mode) is supported in the e100 driver.
146+
NAPI (Rx polling mode) is supported in the e100 driver.
145147

146-
See https://wiki.linuxfoundation.org/networking/napi for more information
147-
on NAPI.
148+
See https://wiki.linuxfoundation.org/networking/napi for more
149+
information on NAPI.
148150

149-
Multiple Interfaces on Same Ethernet Broadcast Network
150-
------------------------------------------------------
151+
Multiple Interfaces on Same Ethernet Broadcast Network
152+
------------------------------------------------------
151153

152-
Due to the default ARP behavior on Linux, it is not possible to have
153-
one system on two IP networks in the same Ethernet broadcast domain
154-
(non-partitioned switch) behave as expected. All Ethernet interfaces
155-
will respond to IP traffic for any IP address assigned to the system.
156-
This results in unbalanced receive traffic.
154+
Due to the default ARP behavior on Linux, it is not possible to have one
155+
system on two IP networks in the same Ethernet broadcast domain
156+
(non-partitioned switch) behave as expected. All Ethernet interfaces
157+
will respond to IP traffic for any IP address assigned to the system.
158+
This results in unbalanced receive traffic.
157159

158-
If you have multiple interfaces in a server, either turn on ARP
159-
filtering by
160+
If you have multiple interfaces in a server, either turn on ARP
161+
filtering by
160162

161-
(1) entering:: echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter
162-
(this only works if your kernel's version is higher than 2.4.5), or
163+
(1) entering:: echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter
164+
(this only works if your kernel's version is higher than 2.4.5), or
163165

164-
(2) installing the interfaces in separate broadcast domains (either
165-
in different switches or in a switch partitioned to VLANs).
166+
(2) installing the interfaces in separate broadcast domains (either
167+
in different switches or in a switch partitioned to VLANs).
166168

167169

168170
Support

‎Documentation/networking/e1000.rst

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
===========================================================
12
Linux* Base Driver for Intel(R) Ethernet Network Connection
23
===========================================================
34

@@ -354,57 +355,58 @@ previously mentioned to force the adapter to the same speed and duplex.
354355
Additional Configurations
355356
=========================
356357

357-
Jumbo Frames
358-
------------
359-
Jumbo Frames support is enabled by changing the MTU to a value larger than
360-
the default of 1500. Use the ifconfig command to increase the MTU size.
361-
For example::
358+
Jumbo Frames
359+
------------
360+
Jumbo Frames support is enabled by changing the MTU to a value larger
361+
than the default of 1500. Use the ifconfig command to increase the MTU
362+
size. For example::
362363

363364
ifconfig eth<x> mtu 9000 up
364365

365-
This setting is not saved across reboots. It can be made permanent if
366-
you add::
366+
This setting is not saved across reboots. It can be made permanent if
367+
you add::
367368

368369
MTU=9000
369370

370-
to the file /etc/sysconfig/network-scripts/ifcfg-eth<x>. This example
371-
applies to the Red Hat distributions; other distributions may store this
372-
setting in a different location.
371+
to the file /etc/sysconfig/network-scripts/ifcfg-eth<x>. This example
372+
applies to the Red Hat distributions; other distributions may store this
373+
setting in a different location.
374+
375+
Notes: Degradation in throughput performance may be observed in some
376+
Jumbo frames environments. If this is observed, increasing the
377+
application's socket buffer size and/or increasing the
378+
/proc/sys/net/ipv4/tcp_*mem entry values may help. See the specific
379+
application manual and /usr/src/linux*/Documentation/
380+
networking/ip-sysctl.txt for more details.
373381

374-
Notes:
375-
Degradation in throughput performance may be observed in some Jumbo frames
376-
environments. If this is observed, increasing the application's socket buffer
377-
size and/or increasing the /proc/sys/net/ipv4/tcp_*mem entry values may help.
378-
See the specific application manual and /usr/src/linux*/Documentation/
379-
networking/ip-sysctl.txt for more details.
382+
- The maximum MTU setting for Jumbo Frames is 16110. This value
383+
coincides with the maximum Jumbo Frames size of 16128.
380384

381-
- The maximum MTU setting for Jumbo Frames is 16110. This value coincides
382-
with the maximum Jumbo Frames size of 16128.
385+
- Using Jumbo frames at 10 or 100 Mbps is not supported and may result
386+
in poor performance or loss of link.
383387

384-
- Using Jumbo frames at 10 or 100 Mbps is not supported and may result in
385-
poor performance or loss of link.
388+
- Adapters based on the Intel(R) 82542 and 82573V/E controller do not
389+
support Jumbo Frames. These correspond to the following product names:
390+
Intel(R) PRO/1000 Gigabit Server Adapter Intel(R) PRO/1000 PM Network
391+
Connection
386392

387-
- Adapters based on the Intel(R) 82542 and 82573V/E controller do not
388-
support Jumbo Frames. These correspond to the following product names:
389-
Intel(R) PRO/1000 Gigabit Server Adapter
390-
Intel(R) PRO/1000 PM Network Connection
393+
ethtool
394+
-------
395+
The driver utilizes the ethtool interface for driver configuration and
396+
diagnostics, as well as displaying statistical information. The ethtool
397+
version 1.6 or later is required for this functionality.
391398

392-
ethtool
393-
-------
394-
The driver utilizes the ethtool interface for driver configuration and
395-
diagnostics, as well as displaying statistical information. The ethtool
396-
version 1.6 or later is required for this functionality.
399+
The latest release of ethtool can be found from
400+
https://www.kernel.org/pub/software/network/ethtool/
397401

398-
The latest release of ethtool can be found from
399-
https://www.kernel.org/pub/software/network/ethtool/
402+
Enabling Wake on LAN* (WoL)
403+
---------------------------
404+
WoL is configured through the ethtool* utility.
400405

401-
Enabling Wake on LAN* (WoL)
402-
---------------------------
403-
WoL is configured through the ethtool* utility.
406+
WoL will be enabled on the system during the next shut down or reboot.
407+
For this driver version, in order to enable WoL, the e1000 driver must be
408+
loaded when shutting down or rebooting the system.
404409

405-
WoL will be enabled on the system during the next shut down or reboot.
406-
For this driver version, in order to enable WoL, the e1000 driver must be
407-
loaded when shutting down or rebooting the system.
408410

409411
Support
410412
=======

‎Documentation/networking/strparser.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void strp_pause(struct strparser *strp)
4848
Temporarily pause a stream parser. Message parsing is suspended
4949
and no new messages are delivered to the upper layer.
5050

51-
void strp_pause(struct strparser *strp)
51+
void strp_unpause(struct strparser *strp)
5252

5353
Unpause a paused stream parser.
5454

‎Documentation/trace/histogram.txt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,35 +1729,35 @@ If a variable isn't a key variable or prefixed with 'vals=', the
17291729
associated event field will be saved in a variable but won't be summed
17301730
as a value:
17311731

1732-
# echo 'hist:keys=next_pid:ts1=common_timestamp ... >> event/trigger
1732+
# echo 'hist:keys=next_pid:ts1=common_timestamp ...' >> event/trigger
17331733

17341734
Multiple variables can be assigned at the same time. The below would
17351735
result in both ts0 and b being created as variables, with both
17361736
common_timestamp and field1 additionally being summed as values:
17371737

1738-
# echo 'hist:keys=pid:vals=$ts0,$b:ts0=common_timestamp,b=field1 ... >> \
1738+
# echo 'hist:keys=pid:vals=$ts0,$b:ts0=common_timestamp,b=field1 ...' >> \
17391739
event/trigger
17401740

17411741
Note that variable assignments can appear either preceding or
17421742
following their use. The command below behaves identically to the
17431743
command above:
17441744

1745-
# echo 'hist:keys=pid:ts0=common_timestamp,b=field1:vals=$ts0,$b ... >> \
1745+
# echo 'hist:keys=pid:ts0=common_timestamp,b=field1:vals=$ts0,$b ...' >> \
17461746
event/trigger
17471747

17481748
Any number of variables not bound to a 'vals=' prefix can also be
17491749
assigned by simply separating them with colons. Below is the same
17501750
thing but without the values being summed in the histogram:
17511751

1752-
# echo 'hist:keys=pid:ts0=common_timestamp:b=field1 ... >> event/trigger
1752+
# echo 'hist:keys=pid:ts0=common_timestamp:b=field1 ...' >> event/trigger
17531753

17541754
Variables set as above can be referenced and used in expressions on
17551755
another event.
17561756

17571757
For example, here's how a latency can be calculated:
17581758

1759-
# echo 'hist:keys=pid,prio:ts0=common_timestamp ... >> event1/trigger
1760-
# echo 'hist:keys=next_pid:wakeup_lat=common_timestamp-$ts0 ... >> event2/trigger
1759+
# echo 'hist:keys=pid,prio:ts0=common_timestamp ...' >> event1/trigger
1760+
# echo 'hist:keys=next_pid:wakeup_lat=common_timestamp-$ts0 ...' >> event2/trigger
17611761

17621762
In the first line above, the event's timetamp is saved into the
17631763
variable ts0. In the next line, ts0 is subtracted from the second
@@ -1766,7 +1766,7 @@ yet another variable, 'wakeup_lat'. The hist trigger below in turn
17661766
makes use of the wakeup_lat variable to compute a combined latency
17671767
using the same key and variable from yet another event:
17681768

1769-
# echo 'hist:key=pid:wakeupswitch_lat=$wakeup_lat+$switchtime_lat ... >> event3/trigger
1769+
# echo 'hist:key=pid:wakeupswitch_lat=$wakeup_lat+$switchtime_lat ...' >> event3/trigger
17701770

17711771
2.2.2 Synthetic Events
17721772
----------------------
@@ -1807,10 +1807,11 @@ the command that defined it with a '!':
18071807
At this point, there isn't yet an actual 'wakeup_latency' event
18081808
instantiated in the event subsytem - for this to happen, a 'hist
18091809
trigger action' needs to be instantiated and bound to actual fields
1810-
and variables defined on other events (see Section 6.3.3 below).
1810+
and variables defined on other events (see Section 2.2.3 below on
1811+
how that is done using hist trigger 'onmatch' action). Once that is
1812+
done, the 'wakeup_latency' synthetic event instance is created.
18111813

1812-
Once that is done, an event instance is created, and a histogram can
1813-
be defined using it:
1814+
A histogram can now be defined for the new synthetic event:
18141815

18151816
# echo 'hist:keys=pid,prio,lat.log2:sort=pid,lat' >> \
18161817
/sys/kernel/debug/tracing/events/synthetic/wakeup_latency/trigger
@@ -1960,7 +1961,7 @@ hist trigger specification.
19601961
back to that pid, the timestamp difference is calculated. If the
19611962
resulting latency, stored in wakeup_lat, exceeds the current
19621963
maximum latency, the values specified in the save() fields are
1963-
recoreded:
1964+
recorded:
19641965

19651966
# echo 'hist:keys=pid:ts0=common_timestamp.usecs \
19661967
if comm=="cyclictest"' >> \

‎Documentation/virtual/kvm/api.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4610,7 +4610,7 @@ This capability indicates that kvm will implement the interfaces to handle
46104610
reset, migration and nested KVM for branch prediction blocking. The stfle
46114611
facility 82 should not be provided to the guest without this capability.
46124612

4613-
8.14 KVM_CAP_HYPERV_TLBFLUSH
4613+
8.18 KVM_CAP_HYPERV_TLBFLUSH
46144614

46154615
Architectures: x86
46164616

‎MAINTAINERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9882,6 +9882,7 @@ M: Andrew Lunn <andrew@lunn.ch>
98829882
M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
98839883
M: Florian Fainelli <f.fainelli@gmail.com>
98849884
S: Maintained
9885+
F: Documentation/devicetree/bindings/net/dsa/
98859886
F: net/dsa/
98869887
F: include/net/dsa.h
98879888
F: include/linux/dsa/
@@ -15574,6 +15575,7 @@ M: x86@kernel.org
1557415575
L: linux-kernel@vger.kernel.org
1557515576
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
1557615577
S: Maintained
15578+
F: Documentation/devicetree/bindings/x86/
1557715579
F: Documentation/x86/
1557815580
F: arch/x86/
1557915581

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 4
33
PATCHLEVEL = 18
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc1
5+
EXTRAVERSION = -rc2
66
NAME = Merciless Moray
77

88
# *DOCUMENTATION*

‎arch/alpha/Kconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -555,11 +555,6 @@ config SMP
555555

556556
If you don't know what to do here, say N.
557557

558-
config HAVE_DEC_LOCK
559-
bool
560-
depends on SMP
561-
default y
562-
563558
config NR_CPUS
564559
int "Maximum number of CPUs (2-32)"
565560
range 2 32

‎arch/alpha/lib/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ lib-y = __divqu.o __remqu.o __divlu.o __remlu.o \
3535
callback_srm.o srm_puts.o srm_printk.o \
3636
fls.o
3737

38-
lib-$(CONFIG_SMP) += dec_and_lock.o
39-
4038
# The division routines are built from single source, with different defines.
4139
AFLAGS___divqu.o = -DDIV
4240
AFLAGS___remqu.o = -DREM

0 commit comments

Comments
 (0)