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

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

[Stephen Rothwell]

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

Hi all,

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

  lib/Kconfig.debug

between commit:

  dfd402a4c4ba ("kcsan: Add Kernel Concurrency Sanitizer infrastructure")

from the rcu tree and commit:

  fa95a0eadaa7 ("kernel-hacking: group sysrq/kgdb/ubsan into 'Generic Kernel Debugging Instruments'")

from the akpm tree.

I fixed it up (I added kcsan into the above) 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 akpm tree with the rcu tree

[Marco Elver]

On Tue, 19 Nov 2019 at 08:30, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
>   lib/Kconfig.debug
>
> between commit:
>
>   dfd402a4c4ba ("kcsan: Add Kernel Concurrency Sanitizer infrastructure")
>
> from the rcu tree and commit:
>
>   fa95a0eadaa7 ("kernel-hacking: group sysrq/kgdb/ubsan into 'Generic Kernel Debugging Instruments'")
>
> from the akpm tree.
>
> I fixed it up (I added kcsan into the above) 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.

Thanks, looks good to me -- makes sense to also move this into the
'Generic Kernel Debugging Instruments' section.

Many thanks,
-- Marco

> --
> Cheers,
> Stephen Rothwell

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

[Stephen Rothwell]

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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
kernel/rcutree.c between commit 3c62110a0cd6 ("rcu: Tone down debugging
during boot-up and shutdown") from the rcu tree and commit "kernel/:
rename random32() to prandom_u32()" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc kernel/rcutree.c
index 2d5f94c,2f8530b..0000000
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@@ -1441,8 -1319,7 +1441,8 @@@ static int rcu_gp_init(struct rcu_stat
  					    rnp->grphi, rnp->qsmask);
  		raw_spin_unlock_irq(&rnp->lock);
  #ifdef CONFIG_PROVE_RCU_DELAY
- 		if ((random32() % (rcu_num_nodes * 8)) == 0 &&
 -		if ((prandom_u32() % (rcu_num_nodes * 8)) == 0)
++		if ((prandom_u32() % (rcu_num_nodes * 8)) == 0 &&
 +		    system_state == SYSTEM_RUNNING)
  			schedule_timeout_uninterruptible(2);
  #endif /* #ifdef CONFIG_PROVE_RCU_DELAY */
  		cond_resched();

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]