Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the akpm tree with the rcu tree
@ 2019-11-19  7:30 Stephen Rothwell
  2019-11-19 11:50 ` Marco Elver
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2019-11-19  7:30 UTC (permalink / raw)
  To: Andrew Morton, Paul E. McKenney
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Marco Elver,
	Changbin Du

[-- 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 --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the akpm tree with the rcu tree
  2019-11-19  7:30 linux-next: manual merge of the akpm tree with the rcu tree Stephen Rothwell
@ 2019-11-19 11:50 ` Marco Elver
  0 siblings, 0 replies; 3+ messages in thread
From: Marco Elver @ 2019-11-19 11:50 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Andrew Morton, Paul E. McKenney, Linux Next Mailing List,
	Linux Kernel Mailing List, Changbin Du

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* linux-next: manual merge of the akpm tree with the rcu tree
@ 2013-03-13  4:54 Stephen Rothwell
  0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2013-03-13  4:54 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-next, linux-kernel, Paul E. McKenney, Akinobu Mita

[-- 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 --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-19  7:30 linux-next: manual merge of the akpm tree with the rcu tree Stephen Rothwell
2019-11-19 11:50 ` Marco Elver
  -- strict thread matches above, loose matches on Subject: below --
2013-03-13  4:54 Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git