diff --git a/.kernel.metadata b/.kernel.metadata index 378f4c0..1a802d0 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,2 +1,2 @@ d1113deb77327ff8526613fce852277935d70100 SOURCES/linux-5.10.tar.xz -e61dc723603fdf31586a7d228ea1a068a37ef938 SOURCES/patch-5.10.102.xz +58db2db2b1b8551b577aa0ba58233fef93e4a01f SOURCES/patch-5.10.106.xz diff --git a/SOURCES/linux-5.10-lx2160a-network.patch b/SOURCES/linux-5.10-lx2160a-network.patch index 20b8546..6845b62 100644 --- a/SOURCES/linux-5.10-lx2160a-network.patch +++ b/SOURCES/linux-5.10-lx2160a-network.patch @@ -152,11 +152,11 @@ This is in accordance with the DSDT table added for Guts Signed-off-by: Makarand Pawagi --- - drivers/soc/fsl/guts.c | 27 ++++++++++++++++++++++----- - 1 file changed, 22 insertions(+), 5 deletions(-) + drivers/soc/fsl/guts.c | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c -index 34810f9bb2ee..56b6797c265e 100644 +index 091e94c04f30..16b9e951dbd6 100644 --- a/drivers/soc/fsl/guts.c +++ b/drivers/soc/fsl/guts.c @@ -3,6 +3,7 @@ @@ -167,16 +167,7 @@ index 34810f9bb2ee..56b6797c265e 100644 */ #include -@@ -138,7 +139,7 @@ static u32 fsl_guts_get_svr(void) - - static int fsl_guts_probe(struct platform_device *pdev) - { -- struct device_node *np = pdev->dev.of_node; -+ struct device_node *root; - struct device *dev = &pdev->dev; - struct resource *res; - const struct fsl_soc_die_attr *soc_die; -@@ -150,7 +151,8 @@ static int fsl_guts_probe(struct platform_device *pdev) +@@ -149,7 +150,8 @@ static int fsl_guts_probe(struct platform_device *pdev) if (!guts) return -ENOMEM; @@ -186,7 +177,7 @@ index 34810f9bb2ee..56b6797c265e 100644 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); guts->regs = devm_ioremap_resource(dev, res); -@@ -158,9 +160,17 @@ static int fsl_guts_probe(struct platform_device *pdev) +@@ -157,17 +159,23 @@ static int fsl_guts_probe(struct platform_device *pdev) return PTR_ERR(guts->regs); /* Register soc device */ @@ -204,10 +195,18 @@ index 34810f9bb2ee..56b6797c265e 100644 + "model", &machine); + } + - if (machine) - soc_dev_attr.machine = machine; + if (machine) { + soc_dev_attr.machine = devm_kstrdup(dev, machine, GFP_KERNEL); + if (!soc_dev_attr.machine) { +- of_node_put(root); + return -ENOMEM; + } + } +- of_node_put(root); -@@ -234,10 +244,17 @@ static const struct of_device_id fsl_guts_of_match[] = { + svr = fsl_guts_get_svr(); + soc_die = fsl_soc_die_match(svr, fsl_soc_die); +@@ -238,10 +246,17 @@ static const struct of_device_id fsl_guts_of_match[] = { }; MODULE_DEVICE_TABLE(of, fsl_guts_of_match); diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 66c4be7..b1a41b5 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -94,7 +94,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 102 +%define stable_update 106 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -3011,6 +3011,9 @@ fi # # %changelog +* Thu Mar 17 2022 Pablo Greco - 5.10.106-200 +- Update to version v5.10.106 + * Sat Feb 26 2022 Pablo Greco - 5.10.102-200 - Update to version v5.10.102