Skip to content

Commit 714c95c

Browse files
gregkhgregkh
committed
Merge 4.18-rc3 into usb-next
We want the USB and other fixes in here as well to make merges and testing easier. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2 parents aaf3f4e + 021c917 commit 714c95c

File tree

390 files changed

+2735
-1978
lines changed

Some content is hidden

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

390 files changed

+2735
-1978
lines changed

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,7 @@ Global Attributes
324324

325325
``intel_pstate`` exposes several global attributes (files) in ``sysfs`` to
326326
control its functionality at the system level. They are located in the
327-
``/sys/devices/system/cpu/cpufreq/intel_pstate/`` directory and affect all
328-
CPUs.
327+
``/sys/devices/system/cpu/intel_pstate/`` directory and affect all CPUs.
329328

330329
Some of them are not present if the ``intel_pstate=per_cpu_perf_limits``
331330
argument is passed to the kernel in the command line.
@@ -379,6 +378,17 @@ argument is passed to the kernel in the command line.
379378
but it affects the maximum possible value of per-policy P-state limits
380379
(see `Interpretation of Policy Attributes`_ below for details).
381380

381+
``hwp_dynamic_boost``
382+
This attribute is only present if ``intel_pstate`` works in the
383+
`active mode with the HWP feature enabled <Active Mode With HWP_>`_ in
384+
the processor. If set (equal to 1), it causes the minimum P-state limit
385+
to be increased dynamically for a short time whenever a task previously
386+
waiting on I/O is selected to run on a given logical CPU (the purpose
387+
of this mechanism is to improve performance).
388+
389+
This setting has no effect on logical CPUs whose minimum P-state limit
390+
is directly set to the highest non-turbo P-state or above it.
391+
382392
.. _status_attr:
383393

384394
``status``

‎Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Spreadtrum SC27xx PMIC Vibrator
2+
3+
Required properties:
4+
- compatible: should be "sprd,sc2731-vibrator".
5+
- reg: address of vibrator control register.
6+
7+
Example :
8+
9+
sc2731_pmic: pmic@0 {
10+
compatible = "sprd,sc2731";
11+
reg = <0>;
12+
spi-max-frequency = <26000000>;
13+
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
14+
interrupt-controller;
15+
#interrupt-cells = <2>;
16+
#address-cells = <1>;
17+
#size-cells = <0>;
18+
19+
vibrator@eb4 {
20+
compatible = "sprd,sc2731-vibrator";
21+
reg = <0xeb4>;
22+
};
23+
};

‎Documentation/filesystems/Locking

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,6 @@ prototypes:
441441
int (*iterate) (struct file *, struct dir_context *);
442442
int (*iterate_shared) (struct file *, struct dir_context *);
443443
__poll_t (*poll) (struct file *, struct poll_table_struct *);
444-
struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
445-
__poll_t (*poll_mask) (struct file *, __poll_t);
446444
long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
447445
long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
448446
int (*mmap) (struct file *, struct vm_area_struct *);
@@ -473,7 +471,7 @@ prototypes:
473471
};
474472

475473
locking rules:
476-
All except for ->poll_mask may block.
474+
All may block.
477475

478476
->llseek() locking has moved from llseek to the individual llseek
479477
implementations. If your fs is not using generic_file_llseek, you
@@ -505,9 +503,6 @@ in sys_read() and friends.
505503
the lease within the individual filesystem to record the result of the
506504
operation
507505

508-
->poll_mask can be called with or without the waitqueue lock for the waitqueue
509-
returned from ->get_poll_head.
510-
511506
--------------------------- dquot_operations -------------------------------
512507
prototypes:
513508
int (*write_dquot) (struct dquot *);

‎Documentation/filesystems/vfs.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -857,8 +857,6 @@ struct file_operations {
857857
ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
858858
int (*iterate) (struct file *, struct dir_context *);
859859
__poll_t (*poll) (struct file *, struct poll_table_struct *);
860-
struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
861-
__poll_t (*poll_mask) (struct file *, __poll_t);
862860
long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
863861
long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
864862
int (*mmap) (struct file *, struct vm_area_struct *);
@@ -903,17 +901,6 @@ otherwise noted.
903901
activity on this file and (optionally) go to sleep until there
904902
is activity. Called by the select(2) and poll(2) system calls
905903

906-
get_poll_head: Returns the struct wait_queue_head that callers can
907-
wait on. Callers need to check the returned events using ->poll_mask
908-
once woken. Can return NULL to indicate polling is not supported,
909-
or any error code using the ERR_PTR convention to indicate that a
910-
grave error occured and ->poll_mask shall not be called.
911-
912-
poll_mask: return the mask of EPOLL* values describing the file descriptor
913-
state. Called either before going to sleep on the waitqueue returned by
914-
get_poll_head, or after it has been woken. If ->get_poll_head and
915-
->poll_mask are implemented ->poll does not need to be implement.
916-
917904
unlocked_ioctl: called by the ioctl(2) system call.
918905

919906
compat_ioctl: called by the ioctl(2) system call when 32 bit system calls

‎Documentation/kbuild/kconfig-language.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,12 @@ This sets the config program's title bar if the config program chooses
430430
to use it. It should be placed at the top of the configuration, before any
431431
other statement.
432432

433+
'#' Kconfig source file comment:
434+
435+
An unquoted '#' character anywhere in a source file line indicates
436+
the beginning of a source file comment. The remainder of that line
437+
is a comment.
438+
433439

434440
Kconfig hints
435441
-------------

‎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/usb/gadget_configfs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ $ rm configs/<config name>.<number>/<function>
226226
where <config name>.<number> specify the configuration and <function> is
227227
a symlink to a function being removed from the configuration, e.g.:
228228

229-
$ rm configfs/c.1/ncm.usb0
229+
$ rm configs/c.1/ncm.usb0
230230

231231
...
232232
...

0 commit comments

Comments
 (0)