Commit 54bbfe75 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into locking/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents ddb20d1d 771acc7e

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ Morten Welinder <welinder@darter.rentec.com> 
Morten Welinder <welinder@troll.com>

Mythri P K <mythripk@ti.com>

Nguyen Anh Quynh <aquynh@gmail.com>

Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>

Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Patrick Mochel <mochel@digitalimplant.org>

Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>

Documentation/accounting/psi.txt

+6 −6
Original line number Diff line number Diff line
@@ -56,12 +56,12 @@ situation from a state where some tasks are stalled but the CPU is 
still doing productive work. As such, time spent in this subset of the

stall state is tracked separately and exported in the "full" averages.



The ratios are tracked as recent trends over ten, sixty, and three

hundred second windows, which gives insight into short term events as

well as medium and long term trends. The total absolute stall time is

tracked and exported as well, to allow detection of latency spikes

which wouldn't necessarily make a dent in the time averages, or to

average trends over custom time frames.

The ratios (in %) are tracked as recent trends over ten, sixty, and

three hundred second windows, which gives insight into short term events

as well as medium and long term trends. The total absolute stall time

(in us) is tracked and exported as well, to allow detection of latency

spikes which wouldn't necessarily make a dent in the time averages,

or to average trends over custom time frames.



Cgroup2 interface

=================

Documentation/bpf/btf.rst

+4 −4
Original line number Diff line number Diff line
@@ -148,16 +148,16 @@ The ``btf_type.size * 8`` must be equal to or greater than ``BTF_INT_BITS()`` 
for the type. The maximum value of ``BTF_INT_BITS()`` is 128.



The ``BTF_INT_OFFSET()`` specifies the starting bit offset to calculate values

for this int. For example, a bitfield struct member has: * btf member bit

offset 100 from the start of the structure, * btf member pointing to an int

type, * the int type has ``BTF_INT_OFFSET() = 2`` and ``BTF_INT_BITS() = 4``

for this int. For example, a bitfield struct member has:

 * btf member bit offset 100 from the start of the structure,

 * btf member pointing to an int type,

 * the int type has ``BTF_INT_OFFSET() = 2`` and ``BTF_INT_BITS() = 4``



Then in the struct memory layout, this member will occupy ``4`` bits starting

from bits ``100 + 2 = 102``.



Alternatively, the bitfield struct member can be the following to access the

same bits as the above:



 * btf member bit offset 102,

 * btf member pointing to an int type,

 * the int type has ``BTF_INT_OFFSET() = 0`` and ``BTF_INT_BITS() = 4``

Documentation/devicetree/bindings/hwmon/adc128d818.txt

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ Required node properties: 


Optional node properties:



 - ti,mode:     Operation mode (see above).

 - ti,mode:     Operation mode (u8) (see above).





Example (operation mode 2):
@@ -34,5 +34,5 @@ Example (operation mode 2): 
	adc128d818@1d {

		compatible = "ti,adc128d818";

		reg = <0x1d>;

		ti,mode = <2>;

		ti,mode = /bits/ 8 <2>;

	};

Documentation/lzo.txt

+5 −3
Original line number Diff line number Diff line
@@ -102,9 +102,11 @@ Byte sequences 
                dictionary which is empty, and that it will always be

                invalid at this place.



      17      : bitstream version. If the first byte is 17, the next byte

                gives the bitstream version (version 1 only). If the first byte

                is not 17, the bitstream version is 0.

      17      : bitstream version. If the first byte is 17, and compressed

                stream length is at least 5 bytes (length of shortest possible

                versioned bitstream), the next byte gives the bitstream version

                (version 1 only).

                Otherwise, the bitstream version is 0.



      18..21  : copy 0..3 literals

                state = (byte - 17) = 0..3  [ copy <state> literals ]