Skip to content

Commit d2fc88a

Browse files
committed
Merge 4.18-rc7 into driver-core-next
We need the driver core changes in here as well for testing. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents e16f4f3 + acb1872 commit d2fc88a

File tree

1,241 files changed

+11712
-6667
lines changed

Some content is hidden

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

1,241 files changed

+11712
-6667
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4855,3 +4855,8 @@
48554855
xirc2ps_cs= [NET,PCMCIA]
48564856
Format:
48574857
<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]
4858+
4859+
xhci-hcd.quirks [USB,KNL]
4860+
A hex value specifying bitmask with supplemental xhci
4861+
host controller quirks. Meaning of each bit can be
4862+
consulted in header drivers/usb/host/xhci.h.

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/device-mapper/writecache.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Constructor parameters:
1515
size)
1616
5. the number of optional parameters (the parameters with an argument
1717
count as two)
18+
start_sector n (default: 0)
19+
offset from the start of cache device in 512-byte sectors
1820
high_watermark n (default: 50)
1921
start writeback when the number of used blocks reach this
2022
watermark

Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Required root node properties:
6666
- "insignal,arndale-octa" - for Exynos5420-based Insignal Arndale
6767
Octa board.
6868
- "insignal,origen" - for Exynos4210-based Insignal Origen board.
69-
- "insignal,origen4412 - for Exynos4412-based Insignal Origen board.
69+
- "insignal,origen4412" - for Exynos4412-based Insignal Origen board.
7070

7171

7272
Optional nodes:

Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Optional nodes:
3636

3737
- port/ports: to describe a connection to an external encoder. The
3838
binding follows Documentation/devicetree/bindings/graph.txt and
39-
suppors a single port with a single endpoint.
39+
supports a single port with a single endpoint.
4040

4141
- See also Documentation/devicetree/bindings/display/tilcdc/panel.txt and
4242
Documentation/devicetree/bindings/display/tilcdc/tfp410.txt for connecting

Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Nintendo Wii (Hollywood) GPIO controller
22

33
Required properties:
4-
- compatible: "nintendo,hollywood-gpio
4+
- compatible: "nintendo,hollywood-gpio"
55
- reg: Physical base address and length of the controller's registers.
66
- gpio-controller: Marks the device node as a GPIO controller.
77
- #gpio-cells: Should be <2>. The first cell is the pin number and the
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/devicetree/bindings/input/touchscreen/hideep.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ i2c@00000000 {
3232
reg = <0x6c>;
3333
interrupt-parent = <&gpx1>;
3434
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
35-
vdd-supply = <&ldo15_reg>";
35+
vdd-supply = <&ldo15_reg>;
3636
vid-supply = <&ldo18_reg>;
3737
reset-gpios = <&gpx1 5 0>;
3838
touchscreen-size-x = <1080>;

Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Required properties:
1515
include "nvidia,tegra30-ictlr".
1616
- reg : Specifies base physical address and size of the registers.
1717
Each controller must be described separately (Tegra20 has 4 of them,
18-
whereas Tegra30 and later have 5"
18+
whereas Tegra30 and later have 5).
1919
- interrupt-controller : Identifies the node as an interrupt controller.
2020
- #interrupt-cells : Specifies the number of cells needed to encode an
2121
interrupt source. The value must be 3.

Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Required properties:
1212
specifier, shall be 2
1313
- interrupts: interrupts references to primary interrupt controller
1414
(only needed for exti controller with multiple exti under
15-
same parent interrupt: st,stm32-exti and st,stm32h7-exti")
15+
same parent interrupt: st,stm32-exti and st,stm32h7-exti)
1616

1717
Example:
1818

Documentation/devicetree/bindings/mips/brcm/soc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ Required properties:
152152
- compatible : should contain one of:
153153
"brcm,bcm7425-timers"
154154
"brcm,bcm7429-timers"
155-
"brcm,bcm7435-timers and
155+
"brcm,bcm7435-timers" and
156156
"brcm,brcmstb-timers"
157157
- reg : the timers register range
158158
- interrupts : the interrupt line for this timer block

Documentation/devicetree/bindings/net/fsl-fman.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ PROPERTIES
238238
Must include one of the following:
239239
- "fsl,fman-dtsec" for dTSEC MAC
240240
- "fsl,fman-xgec" for XGEC MAC
241-
- "fsl,fman-memac for mEMAC MAC
241+
- "fsl,fman-memac" for mEMAC MAC
242242

243243
- cell-index
244244
Usage: required

Documentation/devicetree/bindings/power/power_domain.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ located inside a PM domain with index 0 of a power controller represented by a
133133
node with the label "power".
134134
In the second example the consumer device are partitioned across two PM domains,
135135
the first with index 0 and the second with index 1, of a power controller that
136-
is represented by a node with the label "power.
136+
is represented by a node with the label "power".
137137

138138
Optional properties:
139139
- required-opps: This contains phandle to an OPP node in another device's OPP

Documentation/devicetree/bindings/regulator/tps65090.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Required properties:
1616
Optional properties:
1717
- ti,enable-ext-control: This is applicable for DCDC1, DCDC2 and DCDC3.
1818
If DCDCs are externally controlled then this property should be there.
19-
- "dcdc-ext-control-gpios: This is applicable for DCDC1, DCDC2 and DCDC3.
19+
- dcdc-ext-control-gpios: This is applicable for DCDC1, DCDC2 and DCDC3.
2020
If DCDCs are externally controlled and if it is from GPIO then GPIO
2121
number should be provided. If it is externally controlled and no GPIO
2222
entry then driver will just configure this rails as external control

Documentation/devicetree/bindings/reset/st,sti-softreset.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Please refer to reset.txt in this directory for common reset
1515
controller binding usage.
1616

1717
Required properties:
18-
- compatible: Should be st,stih407-softreset";
18+
- compatible: Should be "st,stih407-softreset";
1919
- #reset-cells: 1, see below
2020

2121
example:

Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Required properties:
3939

4040
Optional property:
4141
- clock-frequency: Desired I2C bus clock frequency in Hz.
42-
When missing default to 400000Hz.
42+
When missing default to 100000Hz.
4343

4444
Child nodes should conform to I2C bus binding as described in i2c.txt.
4545

Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Required properties:
3030

3131
Board connectors:
3232
* Headset Mic
33-
* Secondary Mic",
33+
* Secondary Mic
3434
* DMIC
3535
* Ext Spk
3636

Documentation/devicetree/bindings/sound/qcom,apq8096.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This binding describes the APQ8096 sound card, which uses qdsp for audio.
3535
"Digital Mic3"
3636

3737
Audio pins and MicBias on WCD9335 Codec:
38-
"MIC_BIAS1
38+
"MIC_BIAS1"
3939
"MIC_BIAS2"
4040
"MIC_BIAS3"
4141
"MIC_BIAS4"

Documentation/devicetree/bindings/usb/rockchip,dwc3.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ A child node must exist to represent the core DWC3 IP block. The name of
1616
the node is not important. The content of the node is defined in dwc3.txt.
1717

1818
Phy documentation is provided in the following places:
19-
Documentation/devicetree/bindings/phy/qcom-dwc3-usb-phy.txt
19+
Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt - USB2.0 PHY
20+
Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt - Type-C PHY
2021

2122
Example device nodes:
2223

Documentation/devicetree/bindings/w1/w1-gpio.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Optional properties:
1515

1616
Examples:
1717

18-
onewire@0 {
18+
onewire {
1919
compatible = "w1-gpio";
2020
gpios = <&gpio 126 0>, <&gpio 105 0>;
2121
};

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/kbuild.txt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ LDFLAGS_MODULE
5050
--------------------------------------------------
5151
Additional options used for $(LD) when linking modules.
5252

53+
KBUILD_KCONFIG
54+
--------------------------------------------------
55+
Set the top-level Kconfig file to the value of this environment
56+
variable. The default name is "Kconfig".
57+
5358
KBUILD_VERBOSE
5459
--------------------------------------------------
5560
Set the kbuild verbosity. Can be assigned same values as "V=...".
@@ -88,7 +93,8 @@ In most cases the name of the architecture is the same as the
8893
directory name found in the arch/ directory.
8994
But some architectures such as x86 and sparc have aliases.
9095
x86: i386 for 32 bit, x86_64 for 64 bit
91-
sparc: sparc for 32 bit, sparc64 for 64 bit
96+
sh: sh for 32 bit, sh64 for 64 bit
97+
sparc: sparc32 for 32 bit, sparc64 for 64 bit
9298

9399
CROSS_COMPILE
94100
--------------------------------------------------
@@ -148,15 +154,6 @@ stripped after they are installed. If INSTALL_MOD_STRIP is '1', then
148154
the default option --strip-debug will be used. Otherwise,
149155
INSTALL_MOD_STRIP value will be used as the options to the strip command.
150156

151-
INSTALL_FW_PATH
152-
--------------------------------------------------
153-
INSTALL_FW_PATH specifies where to install the firmware blobs.
154-
The default value is:
155-
156-
$(INSTALL_MOD_PATH)/lib/firmware
157-
158-
The value can be overridden in which case the default value is ignored.
159-
160157
INSTALL_HDR_PATH
161158
--------------------------------------------------
162159
INSTALL_HDR_PATH specifies where to install user space headers when

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
-------------

0 commit comments

Comments
 (0)