Subject: linux-next: manual merge of the tip tree with the jc_docs tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 19 Apr 2022 11:55:35 +1000

Hi all,

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

  Documentation/admin-guide/kernel-parameters.txt

between commits:

  d2fc83c149a7 ("Docs/admin: alphabetize some kernel-parameters (part 1)")

from the jc_docs tree and commits:

  f8858b5eff30 ("x86/cpu: Remove "noclflush"")
  1625c833db93 ("x86/cpu: Allow feature bit names from /proc/cpuinfo in clearcpuid=")

from the tip 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 7ca823a3d5ba,269be339d738..000000000000
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -563,20 -563,6 +563,25 @@@
  
  	cio_ignore=	[S390]
  			See Documentation/s390/common_io.rst for details.
 +
- 	clearcpuid=BITNUM[,BITNUM...] [X86]
++	clearcpuid=X[,X...] [X86]
 +			Disable CPUID feature X for the kernel. See
 +			arch/x86/include/asm/cpufeatures.h for the valid bit
- 			numbers. Note the Linux specific bits are not necessarily
- 			stable over kernel options, but the vendor specific
++			numbers X. Note the Linux-specific bits are not necessarily
++			stable over kernel options, but the vendor-specific
 +			ones should be.
++			X can also be a string as appearing in the flags: line
++			in /proc/cpuinfo which does not have the above
++			instability issue. However, not all features have names
++			in /proc/cpuinfo.
++			Note that using this option will taint your kernel.
 +			Also note that user programs calling CPUID directly
 +			or using the feature without checking anything
 +			will still see it. This just prevents it from
 +			being used by the kernel or shown in /proc/cpuinfo.
 +			Also note the kernel might malfunction if you disable
 +			some critical bits.
 +
  	clk_ignore_unused
  			[CLK]
  			Prevents the clock framework from automatically gating
@@@ -3463,8 -3444,8 +3468,6 @@@
  
  	nocache		[ARM]
  
- 	noclflush	[BUGS=X86] Don't use the CLFLUSH instruction
 -	delayacct	[KNL] Enable per-task delay accounting
--
  	nodsp		[SH] Disable hardware DSP at boot time.
  
  	noefi		Disable EFI runtime services support.