--- v25
+++ v24
@@ -20,10 +20,10 @@
  6 files changed, 35 insertions(+), 48 deletions(-)
 
 diff --git a/include/linux/security.h b/include/linux/security.h
-index 6fa19899903e..175c8032b636 100644
+index e8d73b0220e4..e4a4816f1b94 100644
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
-@@ -479,7 +479,7 @@ int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);
+@@ -468,7 +468,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);
@@ -33,7 +33,7 @@
  int security_kernel_create_files_as(struct cred *new, struct inode *inode);
  int security_kernel_module_request(char *kmod_name);
 diff --git a/kernel/audit.c b/kernel/audit.c
-index 70df7ac1b357..c06133104695 100644
+index e70bbd6b91c4..f6af7b27a6fa 100644
 --- a/kernel/audit.c
 +++ b/kernel/audit.c
 @@ -125,7 +125,7 @@ static u32	audit_backlog_wait_time = AUDIT_BACKLOG_WAIT_TIME;
@@ -121,7 +121,7 @@
  
  	struct audit_tree_refs *trees, *first_trees;
 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
-index 59cb2c4ad149..768989b2f09e 100644
+index 7883b8ac8ea4..c766502b58f2 100644
 --- a/kernel/auditsc.c
 +++ b/kernel/auditsc.c
 @@ -111,7 +111,7 @@ struct audit_aux_data_pids {
@@ -238,10 +238,10 @@
  	axp->pid_count++;
  
 diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
-index 360c5e3760cc..5a6ba57beef3 100644
+index 175a79076569..e4ed01b1919a 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)
+@@ -469,7 +469,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(current, &blob);
-@@ -480,9 +479,10 @@ int ima_bprm_check(struct linux_binprm *bprm)
+@@ -479,9 +478,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 54bca6d52ab7..0d9a4b50f252 100644
+index 9241245a9d4b..45824239cb2f 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -1752,10 +1752,16 @@ void security_transfer_creds(struct cred *new, const struct cred *old)
+@@ -1739,10 +1739,16 @@ void security_transfer_creds(struct cred *new, const struct cred *old)
  	call_void_hook(cred_transfer, new, old);
  }
  
@@ -288,5 +288,5 @@
  EXPORT_SYMBOL(security_cred_getsecid);
  
 -- 
-2.29.2
+2.25.4