linux-next: manual merge of the keys tree with the integrity tree

Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the keys tree got a conflict in: certs/system_keyring.c between commit: 6cbdfb3d91ba ("ima: enable loading of build time generated key on .ima keyring") from the

linux-next: manual merge of the keys tree with the integrity tree

Hi all, Today's linux-next merge of the keys tree got a conflict in: certs/system_keyring.c between commit: df73a4001959 ("ima: enable loading of build time generated key on .ima keyring") from the integrity tree and commit: 9536390dcc8c ("certs: Move load_system_certificate_list to a

Re: linux-next: manual merge of the keys tree with the integrity tree

Hi Mimi, On Mon, 08 Jul 2019 20:31:35 -0400 Mimi Zohar wrote: > > Thank you for carrying the patch!  I did remember to mention it in the > pull request. :) Excellent! -- Cheers, Stephen Rothwell pgpYjn9KvlEGM.pgp Description: OpenPGP digital signature

Re: linux-next: manual merge of the keys tree with the integrity tree

Hi Stephen, On Tue, 2019-07-09 at 10:11 +1000, Stephen Rothwell wrote: > > diff --cc security/integrity/digsig.c > > index 868ade3e8970,e432900c00b9.. > > --- a/security/integrity/digsig.c > > +++ b/security/integrity/digsig.c > > @@@ -69,9 -70,8 +70,9 @@@ int

Re: linux-next: manual merge of the keys tree with the integrity tree

Hi all, On Wed, 26 Jun 2019 14:33:33 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the keys tree got a conflict in: > > security/integrity/digsig.c > > between commit: > > 8c655784e2cf ("integrity: Fix __integrity_init_keyring() section mismatch") > > from the integrity

linux-next: manual merge of the keys tree with the integrity tree

Hi all, Today's linux-next merge of the keys tree got a conflict in: security/integrity/digsig.c between commit: 8c655784e2cf ("integrity: Fix __integrity_init_keyring() section mismatch") from the integrity tree and commit: 79512db59dc8 ("keys: Replace uid/gid/perm permissions