up to 5.17.4

diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index 8d2e3fc578d290d0489b0894b521afc8d9fd3b9d..a037e6c98dbe8c1d4001bdedb52460b014bdbf74 100644 (file)
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -719,14 +719,6 @@ index 7d2e692b66a94..91942789c49aa 100644
  
  /*
   * Variant of alloc_empty_file() that doesn't check and modify nr_files.
-@@ -412,6 +413,7 @@ void __fput_sync(struct file *file)
- }
- 
- EXPORT_SYMBOL(fput);
-+EXPORT_SYMBOL_GPL(__fput_sync);
- 
- void __init files_init(void)
- {
 diff --git a/fs/namespace.c b/fs/namespace.c
 index e189393b34b14..5d7d122d1067a 100644
 --- a/fs/namespace.c

diff --git a/kernel-pinebook-pro.patch b/kernel-pinebook-pro.patch
index 851771b0ce9c8d75b146631520f7a2634ffda098..44bd2cb574ad18447e289aaf00e2e0683281e943 100644 (file)
--- a/kernel-pinebook-pro.patch
+++ b/kernel-pinebook-pro.patch
@@ -994,36 +994,3 @@ index 3871c7fd83b0..9cbf6ccdd256 100644
                interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
                assigned-clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
                assigned-clock-rates = <400000000>, <100000000>;
-From: Kyle Copperfield <kmcopper@danwin1210.me>
-Subject: [PATCH] media: rockchip/rga: do proper error checking in probe
-Date: Sat, 20 Nov 2021 12:23:02 +0000
-
-The latest fix for probe error handling contained a typo that causes
-probing to fail with the following message:
-
-  rockchip-rga: probe of ff680000.rga failed with error -12
-
-This patch fixes the typo.
-
-Fixes: e58430e1d4fd (media: rockchip/rga: fix error handling in probe)
-Reviewed-by: Dragan Simic <dragan.simic@gmail.com>
-Signed-off-by: Kyle Copperfield <kmcopper@danwin1210.me>
-Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
-Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
----
- drivers/media/platform/rockchip/rga/rga.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
-index 6759091b15e0..d99ea8973b67 100644
---- a/drivers/media/platform/rockchip/rga/rga.c
-+++ b/drivers/media/platform/rockchip/rga/rga.c
-@@ -895,7 +895,7 @@ static int rga_probe(struct platform_device *pdev)
-       }
-       rga->dst_mmu_pages =
-               (unsigned int *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 3);
--      if (rga->dst_mmu_pages) {
-+      if (!rga->dst_mmu_pages) {
-               ret = -ENOMEM;
-               goto free_src_pages;
-       }

diff --git a/kernel.spec b/kernel.spec
index 4df51dddab05d4ddfcac788d9d27512aa87ace4e..7704fa31e522a2103e9f37e21fe354484f91d908 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
 
 %define                rel             1
 %define                basever         5.17
-%define                postver         .2
+%define                postver         .4
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -121,7 +121,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5: 07321a70a48d062cebd0358132f11771
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  c330d3c9074016317b427a09b784e013
+# Patch0-md5:  b76bfbb5308a55f951ec17365fe3560d
 %endif
 Source1:       kernel.sysconfig