tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next

James Morris fbf98265 d72c3911

+1 -1
+1 -1
security/integrity/digsig.c
··· 105 105 rc, 106 106 ((KEY_POS_ALL & ~KEY_POS_SETATTR) | 107 107 KEY_USR_VIEW | KEY_USR_READ), 108 - KEY_ALLOC_NOT_IN_QUOTA | KEY_ALLOC_TRUSTED); 108 + KEY_ALLOC_NOT_IN_QUOTA); 109 109 if (IS_ERR(key)) { 110 110 rc = PTR_ERR(key); 111 111 pr_err("Problem loading X.509 certificate (%d): %s\n",