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

Commit 4f56186e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into perf/core, to refresh the branch 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents aa469aaf 9cd6681c

Documentation/devicetree/bindings/clock/st,stm32h7-rcc.txt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Example: 
		compatible = "st,stm32h743-rcc", "st,stm32-rcc";

		reg = <0x58024400 0x400>;

		#reset-cells = <1>;

		#clock-cells = <2>;

		#clock-cells = <1>;

		clocks = <&clk_hse>, <&clk_lse>, <&clk_i2s_ckin>;



		st,syscfg = <&pwrcfg>;

Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,12 @@ Required properties: 
                   the firmware event log

- linux,sml-size : size of the memory allocated for the firmware event log



Optional properties:



- powered-while-suspended: present when the TPM is left powered on between

                           suspend and resume (makes the suspend/resume

                           callbacks do nothing).



Example (for OpenPower Systems with Nuvoton TPM 2.0 on I2C)

----------------------------------------------------------

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ Device tree binding vendor prefix registry. Keep list in alphabetical order. 
This isn't an exhaustive list, but you should add new prefixes to it before

using them to avoid name-space collisions.



abcn	Abracon Corporation

abilis	Abilis Systems

abracon	Abracon Corporation

actions	Actions Semiconductor Co., Ltd.

active-semi	Active-Semi International Inc

ad	Avionic Design GmbH

Documentation/driver-api/pm/devices.rst

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ sub-domain of the parent domain. 


Support for power domains is provided through the :c:member:`pm_domain` field of

|struct device|.  This field is a pointer to an object of type

|struct dev_pm_domain|, defined in :file:`include/linux/pm.h``, providing a set

|struct dev_pm_domain|, defined in :file:`include/linux/pm.h`, providing a set

of power management callbacks analogous to the subsystem-level and device driver

callbacks that are executed for the given device during all power transitions,

instead of the respective subsystem-level callbacks.  Specifically, if a

Documentation/networking/filter.txt

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ Examples for low-level BPF: 
  jeq #14, good           /* __NR_rt_sigprocmask */

  jeq #13, good           /* __NR_rt_sigaction */

  jeq #35, good           /* __NR_nanosleep */

  bad: ret #0             /* SECCOMP_RET_KILL */

  bad: ret #0             /* SECCOMP_RET_KILL_THREAD */

  good: ret #0x7fff0000   /* SECCOMP_RET_ALLOW */



The above example code can be placed into a file (here called "foo"), and