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

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

[Stephen Rothwell]

Hi all,

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

  Documentation/DocBook/kernel-hacking.tmpl

between commit:

  c4fcd7cabb83 ("docs-rst: convert kernel-hacking to ReST")

from the jc_docs tree and commit:

  ac6424b981bc ("sched/wait: Rename wait_queue_t => wait_queue_entry_t")

from the tip tree.

I deleted the file and added the following fixup patch.

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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Jun 2017 14:14:45 +1000
Subject: [PATCH] sched/wait: fix up for "docs-rst: convert kernel-hacking to
 ReST"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 Documentation/kernel-hacking/hacking.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/kernel-hacking/hacking.rst b/Documentation/kernel-hacking/hacking.rst
index 1a456b60a7cf..daf3883b2694 100644
--- a/Documentation/kernel-hacking/hacking.rst
+++ b/Documentation/kernel-hacking/hacking.rst
@@ -498,7 +498,7 @@ Wait Queues ``include/linux/wait.h``
 A wait queue is used to wait for someone to wake you up when a certain
 condition is true. They must be used carefully to ensure there is no
 race condition. You declare a :c:type:`wait_queue_head_t`, and then processes
-which want to wait for that condition declare a :c:type:`wait_queue_t`
+which want to wait for that condition declare a :c:type:`wait_queue_entry_t`
 referring to themselves, and place that in the queue.
 
 Declaring
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi all,

With the merge window opening, just a reminder that this conflict still
exists.

On Wed, 21 Jun 2017 14:18:09 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   Documentation/DocBook/kernel-hacking.tmpl
> 
> between commit:
> 
>   c4fcd7cabb83 ("docs-rst: convert kernel-hacking to ReST")
> 
> from the jc_docs tree and commit:
> 
>   ac6424b981bc ("sched/wait: Rename wait_queue_t => wait_queue_entry_t")
> 
> from the tip tree.
> 
> I deleted the file and added the following fixup patch.
> 
> 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.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 21 Jun 2017 14:14:45 +1000
> Subject: [PATCH] sched/wait: fix up for "docs-rst: convert kernel-hacking to
>  ReST"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  Documentation/kernel-hacking/hacking.rst | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Documentation/kernel-hacking/hacking.rst b/Documentation/kernel-hacking/hacking.rst
> index 1a456b60a7cf..daf3883b2694 100644
> --- a/Documentation/kernel-hacking/hacking.rst
> +++ b/Documentation/kernel-hacking/hacking.rst
> @@ -498,7 +498,7 @@ Wait Queues ``include/linux/wait.h``
>  A wait queue is used to wait for someone to wake you up when a certain
>  condition is true. They must be used carefully to ensure there is no
>  race condition. You declare a :c:type:`wait_queue_head_t`, and then processes
> -which want to wait for that condition declare a :c:type:`wait_queue_t`
> +which want to wait for that condition declare a :c:type:`wait_queue_entry_t`
>  referring to themselves, and place that in the queue.
>  
>  Declaring
> -- 
> 2.11.0

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

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

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.

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

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

[Stephen Rothwell]

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

Hi all,

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

  samples/kprobes/kprobe_example.c

between commits:

  61fa308f23b5 ("samples/kprobes: Fix typo in handler_fault()")
  db1ea668843e ("samples/kprobes: Fix typo in handler_post()")

from the jc_docs tree and commit:

  ec6aba3d2be1 ("kprobes: Remove kprobe::fault_handler")

from the tip tree.

I fixed it up (the latter removed some code updated by the former) 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

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

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

[Stephen Rothwell]

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

Hi all,

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

  Documentation/x86/index.rst

between commit:

  ed13a92d0fde ("docs: archis: add a per-architecture features list")

from the jc_docs tree and commit:

  3fa97bf00126 ("Documentation/x86: Document SGX kernel architecture")

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/x86/index.rst
index b4fcb6f258b2,e7eb84484ddc..000000000000
--- a/Documentation/x86/index.rst
+++ b/Documentation/x86/index.rst
@@@ -33,4 -33,4 +33,5 @@@ x86-specific Documentatio
     i386/index
     x86_64/index
     sva
+    sgx
 +   features

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

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

[Stephen Rothwell]

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

Hi all,

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

  Documentation/trace/ftrace.txt

between commit:

  1f198e22bc3a ("trace doc: convert trace/ftrace.txt to rst format")

from the jc_docs tree and commit:

  92af4dcb4e1c ("tracing: Unify the "boot" and "mono" tracing clocks")

from the tip tree.

I fixed it up (the former moved the file, so I added the following patch)
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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Mar 2018 13:53:45 +1100
Subject: [PATCH] trace doc: merge fix for "tracing: Unify the "boot" and
 "mono" tracing clocks"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 Documentation/trace/ftrace.rst | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst
index 0bc33ad4a3f9..55637926abdc 100644
--- a/Documentation/trace/ftrace.rst
+++ b/Documentation/trace/ftrace.rst
@@ -461,17 +461,9 @@ of ftrace. Here is a list of some of the key files:
 		and ticks at the same rate as the hardware clocksource.
 
 	boot:
-		This is the boot clock (CLOCK_BOOTTIME) and is based on the
-		fast monotonic clock, but also accounts for time spent in
-		suspend. Since the clock access is designed for use in
-		tracing in the suspend path, some side effects are possible
-		if clock is accessed after the suspend time is accounted before
-		the fast mono clock is updated. In this case, the clock update
-		appears to happen slightly sooner than it normally would have.
-		Also on 32-bit systems, it's possible that the 64-bit boot offset
-		sees a partial update. These effects are rare and post
-		processing should be able to handle them. See comments in the
-		ktime_get_boot_fast_ns() function for more information.
+		Same as mono. Used to be a separate clock which accounted
+		for the time spent in suspend while CLOCK_MONOTONIC did
+		not.
 
 		To set a clock, simply echo the clock name into this file::
 
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell

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