diff for duplicates of <1566402203.5162.12.camel@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index aeb3460..a2679fd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,7 +29,8 @@ this is fine. > --- a/certs/system_keyring.c > +++ b/certs/system_keyring.c > @@ -99,7 +99,7 @@ static __init int system_trusted_keyring_init(void) -> builtin_trusted_keys > keyring_alloc(".builtin_trusted_keys", +> builtin_trusted_keys = +> keyring_alloc(".builtin_trusted_keys", > KUIDT_INIT(0), KGIDT_INIT(0), current_cred(), > - &internal_key_acl, KEY_ALLOC_NOT_IN_QUOTA, > + &internal_keyring_acl, KEY_ALLOC_NOT_IN_QUOTA, diff --git a/a/content_digest b/N1/content_digest index fb1b588..a1f861f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,7 +7,7 @@ "ref\023498.1565962602@warthog.procyon.org.uk\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [GIT PULL] Keys: Set 4 - Key ACLs for 5.3\0" - "Date\0Wed, 21 Aug 2019 15:43:23 +0000\0" + "Date\0Wed, 21 Aug 2019 11:43:23 -0400\0" "To\0David Howells <dhowells@redhat.com>\0" "Cc\0Linus Torvalds <torvalds@linux-foundation.org>" James Morris <jmorris@namei.org> @@ -53,7 +53,8 @@ "> --- a/certs/system_keyring.c\n" "> +++ b/certs/system_keyring.c\n" "> @@ -99,7 +99,7 @@ static __init int system_trusted_keyring_init(void)\n" - "> \tbuiltin_trusted_keys > \t\tkeyring_alloc(\".builtin_trusted_keys\",\n" + "> \tbuiltin_trusted_keys =\n" + "> \t\tkeyring_alloc(\".builtin_trusted_keys\",\n" "> \t\t\t KUIDT_INIT(0), KGIDT_INIT(0), current_cred(),\n" "> -\t\t\t &internal_key_acl, KEY_ALLOC_NOT_IN_QUOTA,\n" "> +\t\t\t &internal_keyring_acl, KEY_ALLOC_NOT_IN_QUOTA,\n" @@ -78,4 +79,4 @@ "\n" Mimi -76b68b63265e18a4fb946dc95afa599d892613964859e7633e1a87a9d6015152 +793faf1781d0f3b0dc9a9ad5c4280dead695df74cd9ad7378bd88452633289f5
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.