[PATCH] MAINTAINERS: adjust to trusted keys subsystem creation

[PATCH] MAINTAINERS: adjust to trusted keys subsystem creation

[Lukas Bulwahn]

Commit 47f9c2796891 ("KEYS: trusted: Create trusted keys subsystem")
renamed trusted.h to trusted_tpm.h in include/keys/, and moved trusted.c
to trusted-keys/trusted_tpm1.c in security/keys/.

Since then, ./scripts/get_maintainer.pl --self-test complains:

  warning: no file matches F: security/keys/trusted.c
  warning: no file matches F: include/keys/trusted.h

Rectify the KEYS-TRUSTED entry in MAINTAINERS now.

Co-developed-by: Sebastian Duda <sebastian.duda@fau.de>
Signed-off-by: Sebastian Duda <sebastian.duda@fau.de>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
Sumit, please ack.
Jarkko, please pick this patch.

 MAINTAINERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 5c755e03ddee..cf389058ca76 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9276,8 +9276,8 @@ L:	keyrings@vger.kernel.org
 S:	Supported
 F:	Documentation/security/keys/trusted-encrypted.rst
 F:	include/keys/trusted-type.h
-F:	security/keys/trusted.c
-F:	include/keys/trusted.h
+F:	include/keys/trusted_tpm.h
+F:	security/keys/trusted-keys/trusted_tpm1.c
 
 KEYS/KEYRINGS
 M:	David Howells <dhowells@redhat.com>
-- 
2.17.1

Re: [PATCH] MAINTAINERS: adjust to trusted keys subsystem creation

[James Bottomley]

On Wed, 2020-03-04 at 17:03 +0100, Lukas Bulwahn wrote:
> Commit 47f9c2796891 ("KEYS: trusted: Create trusted keys subsystem")
> renamed trusted.h to trusted_tpm.h in include/keys/, and moved
> trusted.c
> to trusted-keys/trusted_tpm1.c in security/keys/.
> 
> Since then, ./scripts/get_maintainer.pl --self-test complains:
> 
>   warning: no file matches F: security/keys/trusted.c
>   warning: no file matches F: include/keys/trusted.h
> 
> Rectify the KEYS-TRUSTED entry in MAINTAINERS now.
> 
> Co-developed-by: Sebastian Duda <sebastian.duda@fau.de>
> Signed-off-by: Sebastian Duda <sebastian.duda@fau.de>
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> ---
> Sumit, please ack.
> Jarkko, please pick this patch.
> 
>  MAINTAINERS | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 5c755e03ddee..cf389058ca76 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -9276,8 +9276,8 @@ L:	keyrings@vger.kernel.org
>  S:	Supported
>  F:	Documentation/security/keys/trusted-encrypted.rst
>  F:	include/keys/trusted-type.h
> -F:	security/keys/trusted.c
> -F:	include/keys/trusted.h
> +F:	include/keys/trusted_tpm.h
> +F:	security/keys/trusted-keys/trusted_tpm1.c

Everything under trusted-keys is part of the subsystem, so this should
be a glob not a single file.

James

Re: [PATCH] MAINTAINERS: adjust to trusted keys subsystem creation

[Lukas Bulwahn]

On Wed, 4 Mar 2020, James Bottomley wrote:

> On Wed, 2020-03-04 at 17:03 +0100, Lukas Bulwahn wrote:
> > +F:	include/keys/trusted_tpm.h
> > +F:	security/keys/trusted-keys/trusted_tpm1.c
> 
> Everything under trusted-keys is part of the subsystem, so this should
> be a glob not a single file.
> 

Agree. I sent out a PATCH v2 for that:

https://lore.kernel.org/linux-integrity/20200304211254.5127-1-lukas.bulwahn@gmail.com/T/#u

Please ignore this v1 here and pick v2.

Thanks,

Lukas

Re: [PATCH] MAINTAINERS: adjust to trusted keys subsystem creation

[Jarkko Sakkinen]

On Wed, 2020-03-04 at 17:03 +0100, Lukas Bulwahn wrote:
> Commit 47f9c2796891 ("KEYS: trusted: Create trusted keys subsystem")
> renamed trusted.h to trusted_tpm.h in include/keys/, and moved trusted.c
> to trusted-keys/trusted_tpm1.c in security/keys/.
> 
> Since then, ./scripts/get_maintainer.pl --self-test complains:
> 
>   warning: no file matches F: security/keys/trusted.c
>   warning: no file matches F: include/keys/trusted.h
> 
> Rectify the KEYS-TRUSTED entry in MAINTAINERS now.
> 
> Co-developed-by: Sebastian Duda <sebastian.duda@fau.de>
> Signed-off-by: Sebastian Duda <sebastian.duda@fau.de>
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> ---
> Sumit, please ack.
> Jarkko, please pick this patch.

I'll pick it when it is done. I acknowledge the regression but I
see no reason for rushing as this does not break any systems in
the wild.

/Jarkko

Re: [PATCH] MAINTAINERS: adjust to trusted keys subsystem creation

[Lukas Bulwahn]

On Thu, 5 Mar 2020, Jarkko Sakkinen wrote:

> On Wed, 2020-03-04 at 17:03 +0100, Lukas Bulwahn wrote:
> > Commit 47f9c2796891 ("KEYS: trusted: Create trusted keys subsystem")
> > renamed trusted.h to trusted_tpm.h in include/keys/, and moved trusted.c
> > to trusted-keys/trusted_tpm1.c in security/keys/.
> > 
> > Since then, ./scripts/get_maintainer.pl --self-test complains:
> > 
> >   warning: no file matches F: security/keys/trusted.c
> >   warning: no file matches F: include/keys/trusted.h
> > 
> > Rectify the KEYS-TRUSTED entry in MAINTAINERS now.
> > 
> > Co-developed-by: Sebastian Duda <sebastian.duda@fau.de>
> > Signed-off-by: Sebastian Duda <sebastian.duda@fau.de>
> > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> > ---
> > Sumit, please ack.
> > Jarkko, please pick this patch.
> 
> I'll pick it when it is done. I acknowledge the regression but I
> see no reason for rushing as this does not break any systems in
> the wild.
> 

Agree. No need to rush this. I sent out a v3, and I hope to get Sumit's 
ACK and then you can pick it for the next merge window.


Lukas

Re: [PATCH] MAINTAINERS: adjust to trusted keys subsystem creation

[James Bottomley]

On Thu, 2020-03-05 at 21:34 +0100, Lukas Bulwahn wrote:
> 
> On Thu, 5 Mar 2020, Jarkko Sakkinen wrote:
> 
> > On Wed, 2020-03-04 at 17:03 +0100, Lukas Bulwahn wrote:
> > > Commit 47f9c2796891 ("KEYS: trusted: Create trusted keys
> > > subsystem")
> > > renamed trusted.h to trusted_tpm.h in include/keys/, and moved
> > > trusted.c
> > > to trusted-keys/trusted_tpm1.c in security/keys/.
> > > 
> > > Since then, ./scripts/get_maintainer.pl --self-test complains:
> > > 
> > >   warning: no file matches F: security/keys/trusted.c
> > >   warning: no file matches F: include/keys/trusted.h
> > > 
> > > Rectify the KEYS-TRUSTED entry in MAINTAINERS now.
> > > 
> > > Co-developed-by: Sebastian Duda <sebastian.duda@fau.de>
> > > Signed-off-by: Sebastian Duda <sebastian.duda@fau.de>
> > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> > > ---
> > > Sumit, please ack.
> > > Jarkko, please pick this patch.
> > 
> > I'll pick it when it is done. I acknowledge the regression but I
> > see no reason for rushing as this does not break any systems in
> > the wild.
> > 
> 
> Agree. No need to rush this. I sent out a v3, and I hope to get
> Sumit's ACK and then you can pick it for the next merge window.

From a process point of view, I don't quite understand this.  You're
altering an entry in the MAINTAINERS file which belongs to the three
maintainers of trusted keys, you only need our ack to do that, which
picking up via the trusted key tree will substitute for.  It would be
useful to have Sumit review this because he moved the files and there
may be something we missed, but a reviewed-by: is a nice to have and
not a block on the process.

James

Re: [PATCH] MAINTAINERS: adjust to trusted keys subsystem creation

[Lukas Bulwahn]

On Thu, 5 Mar 2020, James Bottomley wrote:

> On Thu, 2020-03-05 at 21:34 +0100, Lukas Bulwahn wrote:
> > 
> > On Thu, 5 Mar 2020, Jarkko Sakkinen wrote:
> > 
> > > On Wed, 2020-03-04 at 17:03 +0100, Lukas Bulwahn wrote:
> > > > Commit 47f9c2796891 ("KEYS: trusted: Create trusted keys
> > > > subsystem")
> > > > renamed trusted.h to trusted_tpm.h in include/keys/, and moved
> > > > trusted.c
> > > > to trusted-keys/trusted_tpm1.c in security/keys/.
> > > > 
> > > > Since then, ./scripts/get_maintainer.pl --self-test complains:
> > > > 
> > > >   warning: no file matches F: security/keys/trusted.c
> > > >   warning: no file matches F: include/keys/trusted.h
> > > > 
> > > > Rectify the KEYS-TRUSTED entry in MAINTAINERS now.
> > > > 
> > > > Co-developed-by: Sebastian Duda <sebastian.duda@fau.de>
> > > > Signed-off-by: Sebastian Duda <sebastian.duda@fau.de>
> > > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> > > > ---
> > > > Sumit, please ack.
> > > > Jarkko, please pick this patch.
> > > 
> > > I'll pick it when it is done. I acknowledge the regression but I
> > > see no reason for rushing as this does not break any systems in
> > > the wild.
> > > 
> > 
> > Agree. No need to rush this. I sent out a v3, and I hope to get
> > Sumit's ACK and then you can pick it for the next merge window.
> 
> From a process point of view, I don't quite understand this.  You're
> altering an entry in the MAINTAINERS file which belongs to the three
> maintainers of trusted keys, you only need our ack to do that, which
> picking up via the trusted key tree will substitute for.  It would be
> useful to have Sumit review this because he moved the files and there
> may be something we missed, but a reviewed-by: is a nice to have and
> not a block on the process.
>

Agree. I expect Sumit to acknowledge that the PATCH v3 "fixes" what he 
missed in his commit from his point of view. I do not use the Fixes: tag, 
because it just some basic administrative clean-up, but not any 
functional change; commits with Fixes: tags are quickly picked up for 
stable, but this patch should not be picked up, because changes to 
MAINTAINERS do not need to be reflected in stable branches.

There is no rush and no blocker here.

Lukas