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

Posted by Stephen Rothwell 2 years, 8 months ago

Hi all,

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

  security/tomoyo/Kconfig

between commit:

  80f8be7af03f ("tomoyo: Omit use of bin2c")

from the tomoyo tree and commit:

  ed87f6865857 ("tomoyo: Remove "select SRCU"")

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 security/tomoyo/Kconfig
index 772d2ab58fd1,a9796b400312..000000000000
--- a/security/tomoyo/Kconfig
+++ b/security/tomoyo/Kconfig
@@@ -6,7 -6,7 +6,6 @@@ config SECURITY_TOMOY
  	select SECURITYFS
  	select SECURITY_PATH
  	select SECURITY_NETWORK
- 	select SRCU
 -	select BUILD_BIN2C
  	default n
  	help
  	  This selects TOMOYO Linux, pathname-based access control.

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

Posted by Stephen Rothwell 2 years, 8 months ago

Hi all,

On Wed, 11 Jan 2023 11:14:39 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the rcu tree got a conflict in:
> 
>   security/tomoyo/Kconfig
> 
> between commit:
> 
>   80f8be7af03f ("tomoyo: Omit use of bin2c")
> 
> from the tomoyo tree and commit:
> 
>   ed87f6865857 ("tomoyo: Remove "select SRCU"")
> 
> from the rcu tree.

So the rcu tree commit is now duplicated in the tomoyo tree (but
slightly different due to the bin2c commit).

-- 
Cheers,
Stephen Rothwell

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

Posted by Paul E. McKenney 2 years, 8 months ago

On Mon, Jan 16, 2023 at 12:28:41PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Wed, 11 Jan 2023 11:14:39 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the rcu tree got a conflict in:
> > 
> >   security/tomoyo/Kconfig
> > 
> > between commit:
> > 
> >   80f8be7af03f ("tomoyo: Omit use of bin2c")
> > 
> > from the tomoyo tree and commit:
> > 
> >   ed87f6865857 ("tomoyo: Remove "select SRCU"")
> > 
> > from the rcu tree.
> 
> So the rcu tree commit is now duplicated in the tomoyo tree (but
> slightly different due to the bin2c commit).

I will be dropping it from -rcu on my next rebase, and apologies for
the hassle!

							Thanx, Paul

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

Posted by Paul E. McKenney 2 years, 8 months ago

On Wed, Jan 11, 2023 at 11:14:39AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rcu tree got a conflict in:
> 
>   security/tomoyo/Kconfig
> 
> between commit:
> 
>   80f8be7af03f ("tomoyo: Omit use of bin2c")
> 
> from the tomoyo tree and commit:
> 
>   ed87f6865857 ("tomoyo: Remove "select SRCU"")
> 
> 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.

I have it noted down, thank you!

							Thanx, Paul

> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc security/tomoyo/Kconfig
> index 772d2ab58fd1,a9796b400312..000000000000
> --- a/security/tomoyo/Kconfig
> +++ b/security/tomoyo/Kconfig
> @@@ -6,7 -6,7 +6,6 @@@ config SECURITY_TOMOY
>   	select SECURITYFS
>   	select SECURITY_PATH
>   	select SECURITY_NETWORK
> - 	select SRCU
>  -	select BUILD_BIN2C
>   	default n
>   	help
>   	  This selects TOMOYO Linux, pathname-based access control.