LKML Archive on lore.kernel.org
 help / Atom feed
* linux-next: manual merge of the rcu tree with the net-next tree
@ 2018-12-07  4:47 Stephen Rothwell
  2018-12-10 19:21 ` Paul E. McKenney
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2018-12-07  4:47 UTC (permalink / raw)
  To: Paul E. McKenney, David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Nikolay Aleksandrov

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

Hi all,

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

  net/bridge/br_mdb.c
  net/bridge/br_multicast.c

between commits:

  19e3a9c90c53 ("net: bridge: convert multicast to generic rhashtable")
  4329596cb10d ("net: bridge: multicast: use non-bh rcu flavor")

from the net-next tree and commit:

  1a56f7d53b5c ("net/bridge: Replace call_rcu_bh() and rcu_barrier_bh()")

from the rcu tree.

I fixed it up (I used the versions form net-next) 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 rcu tree with the net-next tree
  2018-12-07  4:47 linux-next: manual merge of the rcu tree with the net-next tree Stephen Rothwell
@ 2018-12-10 19:21 ` Paul E. McKenney
  0 siblings, 0 replies; 3+ messages in thread
From: Paul E. McKenney @ 2018-12-10 19:21 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux Next Mailing List,
	Linux Kernel Mailing List, Nikolay Aleksandrov, mingo

On Fri, Dec 07, 2018 at 03:47:07PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rcu tree got conflicts in:
> 
>   net/bridge/br_mdb.c
>   net/bridge/br_multicast.c
> 
> between commits:
> 
>   19e3a9c90c53 ("net: bridge: convert multicast to generic rhashtable")
>   4329596cb10d ("net: bridge: multicast: use non-bh rcu flavor")
> 
> from the net-next tree and commit:
> 
>   1a56f7d53b5c ("net/bridge: Replace call_rcu_bh() and rcu_barrier_bh()")
> 
> from the rcu tree.
> 
> I fixed it up (I used the versions form net-next) 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.

This one is already in -tip, so there is no time like the present to
notify my upstream maintainer, who I have added on CC.

Ingo, I agree with Stephen's analysis, so please feel free to revert
1a56f7d53b5c ("net/bridge: Replace call_rcu_bh() and rcu_barrier_bh()").
Or let me know if some other approach would be preferable.

I really did get an Acked-by, but perhaps my long development cycles for
RCU-related patches resulted in this being lost or forgotten.  Been
there myself...  ;-)

							Thanx, Paul


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

* linux-next: manual merge of the rcu tree with the net-next tree
@ 2015-05-15  5:25 Stephen Rothwell
  0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2015-05-15  5:25 UTC (permalink / raw)
  To: Paul E. McKenney, David Miller, netdev
  Cc: linux-next, linux-kernel, Patrick Marlier, Pablo Neira

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

Hi Paul,

Today's linux-next merge of the rcu tree got a conflict in
net/netfilter/core.c between commit f7191483461c ("netfilter: add hook
list to nf_hook_state") from the net-next tree and commit e4dcfe3a648b
("netfilter: Fix list_entry_rcu usage") from the rcu tree.

I fixed it up (I used the net-next tree version) and can carry the fix
as necessary (no action is required).

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 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 --
2018-12-07  4:47 linux-next: manual merge of the rcu tree with the net-next tree Stephen Rothwell
2018-12-10 19:21 ` Paul E. McKenney
  -- strict thread matches above, loose matches on Subject: below --
2015-05-15  5:25 Stephen Rothwell

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git

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


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


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