--- v28
+++ v29
@@ -5,7 +5,7 @@
 
 Reviewed-by: Kees Cook <keescook@chromium.org>
 Reviewed-by: John Johansen <john.johansen@canonical.com>
-Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
+Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com>
 Acked-by: Paul Moore <paul@paul-moore.com>
 Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
 Cc: linux-integrity@vger.kernel.org
@@ -20,10 +20,10 @@
  6 files changed, 35 insertions(+), 48 deletions(-)
 
 diff --git a/include/linux/security.h b/include/linux/security.h
-index aa19fa4a553f..cdd8d9122795 100644
+index 5a336fa10818..58c853eabcc9 100644
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
-@@ -481,7 +481,7 @@ int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);
+@@ -482,7 +482,7 @@ int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);
  void security_cred_free(struct cred *cred);
  int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp);
  void security_transfer_creds(struct cred *new, const struct cred *old);
@@ -100,10 +100,10 @@
  
  	return audit_signal_info_syscall(t);
 diff --git a/kernel/audit.h b/kernel/audit.h
-index b565ea16c0a5..b679517a3030 100644
+index d6a2c899a8db..d43a08eabd86 100644
 --- a/kernel/audit.h
 +++ b/kernel/audit.h
-@@ -9,6 +9,7 @@
+@@ -12,6 +12,7 @@
  #include <linux/fs.h>
  #include <linux/audit.h>
  #include <linux/skbuff.h>
@@ -111,7 +111,7 @@
  #include <uapi/linux/mqueue.h>
  #include <linux/tty.h>
  
-@@ -134,7 +135,7 @@ struct audit_context {
+@@ -137,7 +138,7 @@ struct audit_context {
  	kuid_t		    target_auid;
  	kuid_t		    target_uid;
  	unsigned int	    target_sessionid;
@@ -238,10 +238,10 @@
  	axp->pid_count++;
  
 diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
-index 29befd24b945..de084954d0b9 100644
+index c327f93d3962..1a4f7b00253b 100644
 --- a/security/integrity/ima/ima_main.c
 +++ b/security/integrity/ima/ima_main.c
-@@ -470,7 +470,6 @@ int ima_file_mprotect(struct vm_area_struct *vma, unsigned long prot)
+@@ -486,7 +486,6 @@ int ima_file_mprotect(struct vm_area_struct *vma, unsigned long prot)
  int ima_bprm_check(struct linux_binprm *bprm)
  {
  	int ret;
@@ -249,7 +249,7 @@
  	struct lsmblob blob;
  
  	security_task_getsecid_subj(current, &blob);
-@@ -480,9 +479,10 @@ int ima_bprm_check(struct linux_binprm *bprm)
+@@ -496,9 +495,10 @@ int ima_bprm_check(struct linux_binprm *bprm)
  	if (ret)
  		return ret;
  
@@ -264,10 +264,10 @@
  
  /**
 diff --git a/security/security.c b/security/security.c
-index da85932a4d53..b4a268c1aaec 100644
+index 5fbcccbdbccd..f5e9f2eaf5da 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -1798,10 +1798,16 @@ void security_transfer_creds(struct cred *new, const struct cred *old)
+@@ -1799,10 +1799,16 @@ void security_transfer_creds(struct cred *new, const struct cred *old)
  	call_void_hook(cred_transfer, new, old);
  }