Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2d6cee1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



The bpf syscall and selftests conflicts were trivial
overlapping changes.

The r8169 change involved moving the added mdelay from 'net' into a
different function.

A TLS close bug fix overlapped with the splitting of the TLS state
into separate TX and RX parts.  I just expanded the tests in the bug
fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf
== X".

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b753a9fa 4bc87198

Documentation/admin-guide/pm/intel_pstate.rst

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ feature enabled.] 


In this mode ``intel_pstate`` registers utilization update callbacks with the

CPU scheduler in order to run a P-state selection algorithm, either

``powersave`` or ``performance``, depending on the ``scaling_cur_freq`` policy

``powersave`` or ``performance``, depending on the ``scaling_governor`` policy

setting in ``sysfs``.  The current CPU frequency information to be made

available from the ``scaling_cur_freq`` policy attribute in ``sysfs`` is

periodically updated by those utilization update callbacks too.

Documentation/admin-guide/pm/sleep-states.rst

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Sleep States That Can Be Supported 
==================================



Depending on its configuration and the capabilities of the platform it runs on,

the Linux kernel can support up to four system sleep states, includig

the Linux kernel can support up to four system sleep states, including

hibernation and up to three variants of system suspend.  The sleep states that

can be supported by the kernel are listed below.

Documentation/device-mapper/thin-provisioning.txt

+4 −1
Original line number Diff line number Diff line
@@ -264,7 +264,10 @@ i) Constructor 
			   data device, but just remove the mapping.



      read_only: Don't allow any changes to be made to the pool

		 metadata.

		 metadata.  This mode is only available after the

		 thin-pool has been created and first used in full

		 read/write mode.  It cannot be specified on initial

		 thin-pool creation.



      error_if_no_space: Error IOs, instead of queueing, if no space.

Documentation/devicetree/bindings/ata/ahci-platform.txt

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ compatible: 
Optional properties:

- dma-coherent      : Present if dma operations are coherent

- clocks            : a list of phandle + clock specifier pairs

- resets            : a list of phandle + reset specifier pairs

- target-supply     : regulator for SATA target power

- phys              : reference to the SATA PHY node

- phy-names         : must be "sata-phy"

Documentation/devicetree/bindings/display/panel/panel-common.txt

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ Display Timings 
  require specific display timings. The panel-timing subnode expresses those

  timings as specified in the timing subnode section of the display timing

  bindings defined in

  Documentation/devicetree/bindings/display/display-timing.txt.

  Documentation/devicetree/bindings/display/panel/display-timing.txt.





Connectivity