Commit 05453d36 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/cleanups, to resolve conflict 



These two commits interact:

 upstream:     73da582a ("x86/cpu/topology: Remove limit of CPUs due to disabled IO/APIC")
 x86/cleanups: 13148e22 ("x86/apic: Remove "disablelapic" cmdline option")

Resolve it.

 Conflicts:
	arch/x86/kernel/cpu/topology.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 13148e22 7cb1b466

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
@@ -4977,6 +4977,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
@@ -46,7 +46,7 @@ Please note that due to macro expansion that argument needs to be a 
preprocessor symbol. E.g. to export the symbol ``usb_stor_suspend`` into the

namespace ``USB_STORAGE``, use::



	EXPORT_SYMBOL_NS(usb_stor_suspend, USB_STORAGE);

	EXPORT_SYMBOL_NS(usb_stor_suspend, "USB_STORAGE");



The corresponding ksymtab entry struct ``kernel_symbol`` will have the member

``namespace`` set accordingly. A symbol that is exported without a namespace will
@@ -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.
@@ -94,7 +94,7 @@ for the namespaces it uses symbols from. E.g. a module using the 
usb_stor_suspend symbol from above, needs to import the namespace USB_STORAGE

using a statement like::



	MODULE_IMPORT_NS(USB_STORAGE);

	MODULE_IMPORT_NS("USB_STORAGE");



This will create a ``modinfo`` tag in the module for each imported namespace.

This has the side effect, that the imported namespaces of a module can be

Documentation/devicetree/bindings/power/mediatek,power-controller.yaml

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ patternProperties: 
            patternProperties:

              "^power-domain@[0-9a-f]+$":

                $ref: "#/$defs/power-domain-node"

                patternProperties:

                  "^power-domain@[0-9a-f]+$":

                    $ref: "#/$defs/power-domain-node"

                    unevaluatedProperties: false

                unevaluatedProperties: false

            unevaluatedProperties: false

        unevaluatedProperties: false