linux-next: manual merge of the powerpc tree with Linus' tree

Stephen Rothwell
2018-08-14T23:19:45Z

[-- Attachment #1: Type: text/plain, Size: 1682 bytes --]

Hi all,

Today's linux-next merge of the powerpc tree got a conflict in:

Documentation/admin-guide/kernel-parameters.txt

between commits:

05736e4ac13c ("cpu/hotplug: Provide knobs to control SMT")
506a66f37489 ("Revert "x86/apic: Ignore secondary threads if nosmt=force"")

from Linus' tree and commit:

26cb1f36c43e ("Documentation: Add nospectre_v1 parameter")

from the powerpc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--
Cheers,
Stephen Rothwell

diff --cc Documentation/admin-guide/kernel-parameters.txt
index 5a67e409d370,4167bbea51e1..000000000000
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -2761,10 -2687,10 +2761,14 @@@
nosmt [KNL,S390] Disable symmetric multithreading (SMT).
Equivalent to smt=1.

+ [KNL,x86] Disable symmetric multithreading (SMT).
+ nosmt=force: Force disable SMT, cannot be undone
+ via the sysfs control file.
+
+ nospectre_v1 [PPC] Disable mitigations for Spectre Variant 1 (bounds
+ check bypass). With this option data leaks are possible
+ in the system.
+
nospectre_v2 [X86] Disable all mitigations for the Spectre variant 2
(indirect branch prediction) vulnerability. System may
allow data leaks with this option, which is equivalent

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]