[packages/kernel/LINUX_6_1] - 6.1.119

[baggins]

commit 30f73632e273479835a9b19e28a323cc27f8158b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Dec 14 11:29:29 2024 +0100

    - 6.1.119

 kernel-aufs.patch | 20 ++++++++++----------
 kernel.spec       |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 2e75b545..3469820d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
 
 %define		rel		1
 %define		basever		6.1
-%define		postver		.117
+%define		postver		.119
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	-%{basever}
@@ -121,7 +121,7 @@ Source0:	https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
 # Source0-md5:	475320de08f16c9fa486fc4edfe98b30
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5:	43ec31f9719aa93a0fd894ab3e6a9861
+# Patch0-md5:	0da46585f753bc463d3b1b8cf39ad174
 %endif
 Source1:	kernel.sysconfig
 
diff --git a/kernel-aufs.patch b/kernel-aufs.patch
index cfc953c0..9a04e153 100644
--- a/kernel-aufs.patch
+++ b/kernel-aufs.patch
@@ -432,8 +432,8 @@ index 2def55555e05..fefc5c67e96e 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -139,7 +139,7 @@ static void remove_vma(struct vm_area_struct *vma)
- 	if (vma->vm_ops && vma->vm_ops->close)
- 		vma->vm_ops->close(vma);
+ 	might_sleep();
+ 	vma_close(vma);
  	if (vma->vm_file)
 -		fput(vma->vm_file);
 +		vma_fput(vma);
@@ -468,18 +468,18 @@ index 2def55555e05..fefc5c67e96e 100644
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
 @@ -2250,7 +2250,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
- 	if (new->vm_ops && new->vm_ops->close)
- 		new->vm_ops->close(new);
+ 	/* Clean everything up if vma_adjust failed. */
+ 	vma_close(new);
  	if (new->vm_file)
 -		fput(new->vm_file);
 +		vma_fput(new);
  	unlink_anon_vmas(new);
   out_free_mpol:
  	mpol_put(vma_policy(new));
-@@ -2746,7 +2746,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
- 	if (vma->vm_ops && vma->vm_ops->close)
- 		vma->vm_ops->close(vma);
- unmap_and_free_vma:
+@@ -2746,7 +2746,7 @@ static unsigned long __mmap_region(struct file *file, unsigned long addr,
+ 	return addr;
+ 
+ unmap_and_free_file_vma:
 -	fput(vma->vm_file);
 +	vma_fput(vma);
  	vma->vm_file = NULL;
@@ -553,8 +553,8 @@ index 214c70e1d059..dccbb939d2a9 100644
  		/* IO memory and memory shared directly out of the pagecache
  		 * from ramfs/tmpfs mustn't be released here */
 @@ -653,7 +653,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
- 	if (vma->vm_ops && vma->vm_ops->close)
- 		vma->vm_ops->close(vma);
+ {
+ 	vma_close(vma);
  	if (vma->vm_file)
 -		fput(vma->vm_file);
 +		vma_fput(vma);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/30f73632e273479835a9b19e28a323cc27f8158b