Commit 30691a59 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 6.13-rc3 into tty-next 



We need the serial fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents aea2654c 78d4f34e

Documentation/ABI/testing/sysfs-class-watchdog

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ Description: 
		timeout when the pretimeout interrupt is delivered.  Pretimeout

		is an optional feature.



What:		/sys/class/watchdog/watchdogn/pretimeout_avaialable_governors

What:		/sys/class/watchdog/watchdogn/pretimeout_available_governors

Date:		February 2017

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

Documentation/admin-guide/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -4822,6 +4822,11 @@ 
			       can be preempted anytime.  Tasks will also yield

			       contended spinlocks (if the critical section isn't

			       explicitly preempt disabled beyond the lock itself).

			lazy - Scheduler controlled. Similar to full but instead

			       of preempting the task immediately, the task gets

			       one HZ tick time to yield itself before the

			       preemption will be forced. One preemption is when the

			       task returns to user space.



	print-fatal-signals=

			[KNL] debug: print fatal signals

Documentation/arch/arm64/silicon-errata.rst

+3 −2
Original line number Diff line number Diff line
@@ -255,8 +255,9 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip08 SMMU PMCG | #162001800      | N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip{08,09,10,10C| #162001900      | N/A                         |

|                | ,11} SMMU PMCG  |                 |                             |

| Hisilicon      | Hip{08,09,09A,10| #162001900      | N/A                         |

|                | ,10C,11}        |                 |                             |

|                | SMMU PMCG       |                 |                             |

+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip09           | #162100801      | HISILICON_ERRATUM_162100801 |

+----------------+-----------------+-----------------+-----------------------------+

Documentation/core-api/symbol-namespaces.rst

+4 −4
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ is to define the default namespace in the ``Makefile`` of the subsystem. E.g. to 
export all symbols defined in usb-common into the namespace USB_COMMON, add a

line like this to drivers/usb/common/Makefile::



	ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON

	ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'



That will affect all EXPORT_SYMBOL() and EXPORT_SYMBOL_GPL() statements. A

symbol exported with EXPORT_SYMBOL_NS() while this definition is present, will
@@ -79,7 +79,7 @@ A second option to define the default namespace is directly in the compilation 
unit as preprocessor statement. The above example would then read::



	#undef  DEFAULT_SYMBOL_NAMESPACE

	#define DEFAULT_SYMBOL_NAMESPACE USB_COMMON

	#define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"



within the corresponding compilation unit before any EXPORT_SYMBOL macro is

used.
@@ -106,7 +106,7 @@ inspected with modinfo:: 
	[...]





It is advisable to add the MODULE_IMPORT_NS("") statement close to other module

It is advisable to add the MODULE_IMPORT_NS() statement close to other module

metadata definitions like MODULE_AUTHOR() or MODULE_LICENSE(). Refer to section

5. for a way to create missing import statements automatically.
@@ -128,7 +128,7 @@ enable loading regardless, but will emit a warning. 
Missing namespaces imports can easily be detected at build time. In fact,

modpost will emit a warning if a module uses a symbol from a namespace

without importing it.

MODULE_IMPORT_NS("") statements will usually be added at a definite location

MODULE_IMPORT_NS() statements will usually be added at a definite location

(along with other module meta data). To make the life of module authors (and

subsystem maintainers) easier, a script and make target is available to fixup

missing imports. Fixing missing imports can be done with::

Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml

+2 −5
Original line number Diff line number Diff line
@@ -113,11 +113,8 @@ allOf: 
          maxItems: 1



  - if:

      properties:

        compatible:

          contains:

            enum:

              - fsl,imx95-usb-phy

      required:

        - orientation-switch

    then:

      $ref: /schemas/usb/usb-switch.yaml#