Skip to content

Commit

Permalink
Merge tag 'v4.18' into rdma.git for-next
Browse files Browse the repository at this point in the history 
Resolve merge conflicts from the -rc cycle against the rdma.git tree:

Conflicts:
 drivers/infiniband/core/uverbs_cmd.c
  - New ifs added to ib_uverbs_ex_create_flow in -rc and for-next
  - Merge removal of file->ucontext in for-next with new code in -rc
 drivers/infiniband/core/uverbs_main.c
  - for-next removed code from ib_uverbs_write() that was modified
    in for-rc

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
  • Loading branch information
@jgunthorpe
jgunthorpe committed Aug 16, 2018
2 parents a1ceeca + 94710ca commit 89982f7
Show file tree
Hide file tree
Showing 1,684 changed files with 18,047 additions and 9,534 deletions.
5 changes: 5 additions & 0 deletions Documentation/admin-guide/kernel-parameters.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4846,3 +4846,8 @@
xirc2ps_cs= [NET,PCMCIA]
Format:
<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

xhci-hcd.quirks [USB,KNL]
A hex value specifying bitmask with supplemental xhci
host controller quirks. Meaning of each bit can be
consulted in header drivers/usb/host/xhci.h.
16 changes: 13 additions & 3 deletions Documentation/admin-guide/pm/intel_pstate.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,7 @@ Global Attributes

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

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

``hwp_dynamic_boost``
This attribute is only present if ``intel_pstate`` works in the
`active mode with the HWP feature enabled <Active Mode With HWP_>`_ in
the processor. If set (equal to 1), it causes the minimum P-state limit
to be increased dynamically for a short time whenever a task previously
waiting on I/O is selected to run on a given logical CPU (the purpose
of this mechanism is to improve performance).

This setting has no effect on logical CPUs whose minimum P-state limit
is directly set to the highest non-turbo P-state or above it.

.. _status_attr:

``status``
Expand Down Expand Up @@ -410,7 +420,7 @@ argument is passed to the kernel in the command line.
That only is supported in some configurations, though (for example, if
the `HWP feature is enabled in the processor <Active Mode With HWP_>`_,
the operation mode of the driver cannot be changed), and if it is not
supported in the current configuration, writes to this attribute with
supported in the current configuration, writes to this attribute will
fail with an appropriate error.

Interpretation of Policy Attributes
Expand Down
2 changes: 1 addition & 1 deletion Documentation/core-api/kernel-api.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ Resources Management
MTRR Handling
-------------

.. kernel-doc:: arch/x86/kernel/cpu/mtrr/main.c
.. kernel-doc:: arch/x86/kernel/cpu/mtrr/mtrr.c
:export:

Security Framework
Expand Down
2 changes: 2 additions & 0 deletions Documentation/device-mapper/writecache.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ Constructor parameters:
size)
5. the number of optional parameters (the parameters with an argument
count as two)
start_sector n (default: 0)
offset from the start of cache device in 512-byte sectors
high_watermark n (default: 50)
start writeback when the number of used blocks reach this
watermark
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Required root node properties:
- "insignal,arndale-octa" - for Exynos5420-based Insignal Arndale
Octa board.
- "insignal,origen" - for Exynos4210-based Insignal Origen board.
- "insignal,origen4412 - for Exynos4412-based Insignal Origen board.
- "insignal,origen4412" - for Exynos4412-based Insignal Origen board.


Optional nodes:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Optional nodes:

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

- See also Documentation/devicetree/bindings/display/tilcdc/panel.txt and
Documentation/devicetree/bindings/display/tilcdc/tfp410.txt for connecting
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Nintendo Wii (Hollywood) GPIO controller

Required properties:
- compatible: "nintendo,hollywood-gpio
- compatible: "nintendo,hollywood-gpio"
- reg: Physical base address and length of the controller's registers.
- gpio-controller: Marks the device node as a GPIO controller.
- #gpio-cells: Should be <2>. The first cell is the pin number and the
Expand Down
23 changes: 23 additions & 0 deletions Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Spreadtrum SC27xx PMIC Vibrator

Required properties:
- compatible: should be "sprd,sc2731-vibrator".
- reg: address of vibrator control register.

Example :

sc2731_pmic: pmic@0 {
compatible = "sprd,sc2731";
reg = <0>;
spi-max-frequency = <26000000>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller;
#interrupt-cells = <2>;
#address-cells = <1>;
#size-cells = <0>;

vibrator@eb4 {
compatible = "sprd,sc2731-vibrator";
reg = <0xeb4>;
};
};
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/input/touchscreen/hideep.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ i2c@00000000 {
reg = <0x6c>;
interrupt-parent = <&gpx1>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&ldo15_reg>";
vdd-supply = <&ldo15_reg>;
vid-supply = <&ldo18_reg>;
reset-gpios = <&gpx1 5 0>;
touchscreen-size-x = <1080>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Required properties:
include "nvidia,tegra30-ictlr".
- reg : Specifies base physical address and size of the registers.
Each controller must be described separately (Tegra20 has 4 of them,
whereas Tegra30 and later have 5"
whereas Tegra30 and later have 5).
- interrupt-controller : Identifies the node as an interrupt controller.
- #interrupt-cells : Specifies the number of cells needed to encode an
interrupt source. The value must be 3.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Required properties:
specifier, shall be 2
- interrupts: interrupts references to primary interrupt controller
(only needed for exti controller with multiple exti under
same parent interrupt: st,stm32-exti and st,stm32h7-exti")
same parent interrupt: st,stm32-exti and st,stm32h7-exti)

Example:

Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/mips/brcm/soc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Required properties:
- compatible : should contain one of:
"brcm,bcm7425-timers"
"brcm,bcm7429-timers"
"brcm,bcm7435-timers and
"brcm,bcm7435-timers" and
"brcm,brcmstb-timers"
- reg : the timers register range
- interrupts : the interrupt line for this timer block
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/net/fsl-fman.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ PROPERTIES
Must include one of the following:
- "fsl,fman-dtsec" for dTSEC MAC
- "fsl,fman-xgec" for XGEC MAC
- "fsl,fman-memac for mEMAC MAC
- "fsl,fman-memac" for mEMAC MAC

- cell-index
Usage: required
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/power/power_domain.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ located inside a PM domain with index 0 of a power controller represented by a
node with the label "power".
In the second example the consumer device are partitioned across two PM domains,
the first with index 0 and the second with index 1, of a power controller that
is represented by a node with the label "power.
is represented by a node with the label "power".

Optional properties:
- required-opps: This contains phandle to an OPP node in another device's OPP
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/regulator/tps65090.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Required properties:
Optional properties:
- ti,enable-ext-control: This is applicable for DCDC1, DCDC2 and DCDC3.
If DCDCs are externally controlled then this property should be there.
- "dcdc-ext-control-gpios: This is applicable for DCDC1, DCDC2 and DCDC3.
- dcdc-ext-control-gpios: This is applicable for DCDC1, DCDC2 and DCDC3.
If DCDCs are externally controlled and if it is from GPIO then GPIO
number should be provided. If it is externally controlled and no GPIO
entry then driver will just configure this rails as external control
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/reset/st,sti-softreset.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Please refer to reset.txt in this directory for common reset
controller binding usage.

Required properties:
- compatible: Should be st,stih407-softreset";
- compatible: Should be "st,stih407-softreset";
- #reset-cells: 1, see below

example:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Required properties:

Optional property:
- clock-frequency: Desired I2C bus clock frequency in Hz.
When missing default to 400000Hz.
When missing default to 100000Hz.

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

Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Required properties:

Board connectors:
* Headset Mic
* Secondary Mic",
* Secondary Mic
* DMIC
* Ext Spk

Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/sound/qcom,apq8096.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ This binding describes the APQ8096 sound card, which uses qdsp for audio.
"Digital Mic3"

Audio pins and MicBias on WCD9335 Codec:
"MIC_BIAS1
"MIC_BIAS1"
"MIC_BIAS2"
"MIC_BIAS3"
"MIC_BIAS4"
Expand Down
3 changes: 2 additions & 1 deletion Documentation/devicetree/bindings/usb/rockchip,dwc3.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ A child node must exist to represent the core DWC3 IP block. The name of
the node is not important. The content of the node is defined in dwc3.txt.

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

Example device nodes:

Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/w1/w1-gpio.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Optional properties:

Examples:

onewire@0 {
onewire {
compatible = "w1-gpio";
gpios = <&gpio 126 0>, <&gpio 105 0>;
};
Expand Down
4 changes: 2 additions & 2 deletions Documentation/driver-api/infrastructure.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ Device Drivers Base
Device Drivers DMA Management
-----------------------------

.. kernel-doc:: drivers/base/dma-coherent.c
.. kernel-doc:: kernel/dma/coherent.c
:export:

.. kernel-doc:: drivers/base/dma-mapping.c
.. kernel-doc:: kernel/dma/mapping.c
:export:

Device drivers PnP support
Expand Down
7 changes: 1 addition & 6 deletions Documentation/filesystems/Locking
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,6 @@ prototypes:
int (*iterate) (struct file *, struct dir_context *);
int (*iterate_shared) (struct file *, struct dir_context *);
__poll_t (*poll) (struct file *, struct poll_table_struct *);
struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
__poll_t (*poll_mask) (struct file *, __poll_t);
long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
int (*mmap) (struct file *, struct vm_area_struct *);
Expand Down Expand Up @@ -473,7 +471,7 @@ prototypes:
};

locking rules:
All except for ->poll_mask may block.
All may block.

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

->poll_mask can be called with or without the waitqueue lock for the waitqueue
returned from ->get_poll_head.

--------------------------- dquot_operations -------------------------------
prototypes:
int (*write_dquot) (struct dquot *);
Expand Down
7 changes: 4 additions & 3 deletions Documentation/filesystems/cifs/AUTHORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@ Jeff Layton (many, many fixes, as well as great work on the cifs Kerberos code)
Scott Lovenberg
Pavel Shilovsky (for great work adding SMB2 support, and various SMB3 features)
Aurelien Aptel (for DFS SMB3 work and some key bug fixes)
Ronnie Sahlberg (for SMB3 xattr work and bug fixes)
Ronnie Sahlberg (for SMB3 xattr work, bug fixes, and lots of great work on compounding)
Shirish Pargaonkar (for many ACL patches over the years)
Sachin Prabhu (many bug fixes, including for reconnect, copy offload and security)
Paulo Alcantara
Long Li (some great work on RDMA, SMB Direct)


Test case and Bug Report contributors
Expand All @@ -58,5 +60,4 @@ mention to the Stanford Checker (SWAT) which pointed out many minor
bugs in error paths. Valuable suggestions also have come from Al Viro
and Dave Miller.

And thanks to the IBM LTC and Power test teams and SuSE testers for
finding multiple bugs during excellent stress test runs.
And thanks to the IBM LTC and Power test teams and SuSE and Citrix and RedHat testers for finding multiple bugs during excellent stress test runs.
3 changes: 3 additions & 0 deletions Documentation/filesystems/cifs/CHANGES
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
See https://wiki.samba.org/index.php/LinuxCIFSKernel for
more current information.

Version 1.62
------------
Add sockopt=TCP_NODELAY mount option. EA (xattr) routines hardened
Expand Down
17 changes: 9 additions & 8 deletions Documentation/filesystems/cifs/TODO
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ is a partial list of the known problems and missing features:

a) SMB3 (and SMB3.02) missing optional features:
- multichannel (started), integration with RDMA
- directory leases (improved metadata caching)
- T10 copy offload (copy chunk, and "Duplicate Extents" ioctl
- directory leases (improved metadata caching), started (root dir only)
- T10 copy offload ie "ODX" (copy chunk, and "Duplicate Extents" ioctl
currently the only two server side copy mechanisms supported)

b) improved sparse file support

c) Directory entry caching relies on a 1 second timer, rather than
using Directory Leases
using Directory Leases, currently only the root file handle is cached longer

d) quota support (needs minor kernel change since quota calls
to make it to network filesystems or deviceless filesystems)
Expand All @@ -42,6 +42,8 @@ mount or a per server basis to client UIDs or nobody if no mapping
exists. Also better integration with winbind for resolving SID owners

k) Add tools to take advantage of more smb3 specific ioctls and features
(passthrough ioctl/fsctl for sending various SMB3 fsctls to the server
is in progress)

l) encrypted file support

Expand Down Expand Up @@ -71,9 +73,8 @@ t) split cifs and smb3 support into separate modules so legacy (and less
secure) CIFS dialect can be disabled in environments that don't need it
and simplify the code.

u) Finish up SMB3.1.1 dialect support

v) POSIX Extensions for SMB3.1.1
v) POSIX Extensions for SMB3.1.1 (started, create and mkdir support added
so far).

KNOWN BUGS
====================================
Expand All @@ -92,8 +93,8 @@ Misc testing to do
1) check out max path names and max path name components against various server
types. Try nested symlinks (8 deep). Return max path name in stat -f information

2) Improve xfstest's cifs enablement and adapt xfstests where needed to test
cifs better
2) Improve xfstest's cifs/smb3 enablement and adapt xfstests where needed to test
cifs/smb3 better

3) Additional performance testing and optimization using iozone and similar -
there are some easy changes that can be done to parallelize sequential writes,
Expand Down
13 changes: 0 additions & 13 deletions Documentation/filesystems/vfs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -857,8 +857,6 @@ struct file_operations {
ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
int (*iterate) (struct file *, struct dir_context *);
__poll_t (*poll) (struct file *, struct poll_table_struct *);
struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
__poll_t (*poll_mask) (struct file *, __poll_t);
long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
int (*mmap) (struct file *, struct vm_area_struct *);
Expand Down Expand Up @@ -903,17 +901,6 @@ otherwise noted.
activity on this file and (optionally) go to sleep until there
is activity. Called by the select(2) and poll(2) system calls

get_poll_head: Returns the struct wait_queue_head that callers can
wait on. Callers need to check the returned events using ->poll_mask
once woken. Can return NULL to indicate polling is not supported,
or any error code using the ERR_PTR convention to indicate that a
grave error occured and ->poll_mask shall not be called.

poll_mask: return the mask of EPOLL* values describing the file descriptor
state. Called either before going to sleep on the waitqueue returned by
get_poll_head, or after it has been woken. If ->get_poll_head and
->poll_mask are implemented ->poll does not need to be implement.

unlocked_ioctl: called by the ioctl(2) system call.

compat_ioctl: called by the ioctl(2) system call when 32 bit system calls
Expand Down
Loading

0 comments on commit 89982f7

Please sign in to comment.