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

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

[Stephen Rothwell]

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

Hi all,

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

  Documentation/memory-barriers.txt

between commit:

  537f3a7cf48e ("docs/memory-barriers.txt: Fix references for DMA*.txt files")

from the jc_docs tree and commit:

  6f6705147bab ("docs: fix references for DMA*.txt files")

from the rcu tree.

I fixed it up (they are preety much the same - I used 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 --]

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

[Paul E. McKenney]

On Wed, Sep 02, 2020 at 02:31:01PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rcu tree got a conflict in:
> 
>   Documentation/memory-barriers.txt
> 
> between commit:
> 
>   537f3a7cf48e ("docs/memory-barriers.txt: Fix references for DMA*.txt files")
> 
> from the jc_docs tree and commit:
> 
>   6f6705147bab ("docs: fix references for DMA*.txt files")
> 
> from the rcu tree.
> 
> I fixed it up (they are preety much the same - I used 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.

I removed my copy, and if testing goes well, it should get to you in a
few hours.

							Thanx, Paul

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

[Vlastimil Babka]

On 12/18/23 04:25, Stephen Rothwell wrote:
> Hi all,

Hi,


> Today's linux-next merge of the rcu tree got a conflict in:
> 
>   Documentation/admin-guide/kernel-parameters.txt
> 
> between commit:
> 
>   a3a27827452f ("Documentation, mm/unaccepted: document accept_memory kernel parameter")
> 
> from the jc_docs tree and commit:
> 
>   801f246637ed ("doc: Add EARLY flag to early-parsed kernel boot parameters")

in light of that commit, the accept_memory should now have:

 +	accept_memory=  [MM,EARLY]

Jon, can you update it still, or want a followup patch, or perhaps will
suggest Linus to do that as part of the merge?

> 
> from the rcu 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.
> 

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

[Stephen Rothwell]

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

Hi all,

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

  Documentation/admin-guide/kernel-parameters.txt

between commit:

  a3a27827452f ("Documentation, mm/unaccepted: document accept_memory kernel parameter")

from the jc_docs tree and commit:

  801f246637ed ("doc: Add EARLY flag to early-parsed kernel boot parameters")

from the rcu 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 33859d298907,b8f131977682..000000000000
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -1,15 -1,4 +1,15 @@@
 +	accept_memory=  [MM]
 +			Format: { eager | lazy }
 +			default: lazy
 +			By default, unaccepted memory is accepted lazily to
 +			avoid prolonged boot times. The lazy option will add
 +			some runtime overhead until all memory is eventually
 +			accepted. In most cases the overhead is negligible.
 +			For some workloads or for debugging purposes
 +			accept_memory=eager can be used to accept all memory
 +			at once during boot.
 +
- 	acpi=		[HW,ACPI,X86,ARM64,RISCV64]
+ 	acpi=		[HW,ACPI,X86,ARM64,RISCV64,EARLY]
  			Advanced Configuration and Power Interface
  			Format: { force | on | off | strict | noirq | rsdt |
  				  copy_dsdt }
@@@ -2449,9 -2440,9 +2451,9 @@@
  			between unregistering the boot console and initializing
  			the real console.
  
 -	keepinitrd	[HW,ARM]
 +	keepinitrd	[HW,ARM] See retain_initrd.
  
- 	kernelcore=	[KNL,X86,IA-64,PPC]
+ 	kernelcore=	[KNL,X86,IA-64,PPC,EARLY]
  			Format: nn[KMGTPE] | nn% | "mirror"
  			This parameter specifies the amount of memory usable by
  			the kernel for non-movable allocations.  The requested

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

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

[Paul E. McKenney]

On Fri, Sep 23, 2022 at 01:48:34PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rcu tree got a conflict in:
> 
>   Documentation/RCU/checklist.rst
> 
> between commit:
> 
>   712e1dea2e4f ("Delete duplicate words from kernel docs")
> 
> from the jc_docs tree and commit:
> 
>   1f0e704eea04 ("doc: Update checklist.txt")
> 
> from the rcu tree.
> 
> I fixed it up (I just used the latter since it removed the words removed
> 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.

I have it down, thank you!

							Thanx, Paul

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

[Stephen Rothwell]

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

Hi all,

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

  Documentation/RCU/checklist.rst

between commit:

  712e1dea2e4f ("Delete duplicate words from kernel docs")

from the jc_docs tree and commit:

  1f0e704eea04 ("doc: Update checklist.txt")

from the rcu tree.

I fixed it up (I just used the latter since it removed the words removed
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 --]