lkml.org 
[lkml]   [2023]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the rcu tree with the tomoyo tree
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.


\
 
 \ /
  Last update: 2023-03-26 23:38    [W:1.699 / U:0.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site