subtree updates

poky: 29afbb5e14..aa6cd06a9f:
  Alejandro Hernandez Samaniego (1):
        testimage: Fix error message to reflect new syntax

  Alex Kiernan (2):
        rust: Upgrade 1.66.1 -> 1.67.0
        rust: Add `update_snapshot` task to generate `rust-snapshot.inc`

  Alexander Kanavin (49):
        oeqa/qemurunner: do not use Popen.poll() when terminating runqemu with a signal
        ifupdown: update 0.8.39 -> 0.8.41
        python3-pip: update 22.3.1 -> 23.0
        diffutils: update 3.8 -> 3.9
        mc: update 4.8.28 -> 4.8.29
        xf86-video-vmware: update 13.3.0 -> 13.4.0
        lttng-tools: update 2.13.8 -> 2.13.9
        rt-tests: update 2.4 -> 2.5
        apr: update 1.7.0 -> 1.7.2
        apr-util: update 1.6.1 -> 1.6.3
        glib-2.0: upgrade 2.74.4 -> 2.74.5
        systemd: update 252.4 -> 252.5
        cmake: upgrade 3.25.1 -> 3.25.2
        python3-setuptools: update 65.7.0 -> 67.2.0
        lighttpd: upgrade 1.4.67 -> 1.4.68
        lsof: upgrade 4.96.5 -> 4.98.0
        igt-gpu-tools: upgrade 1.26 -> 1.27.1
        vulkan-headers: upgrade 1.3.236.0 -> 1.3.239.0
        vulkan-loader: upgrade 1.3.236.0 -> 1.3.239.0
        vulkan-tools: upgrade 1.3.236.0 -> 1.3.239.0
        spirv-tools: upgrade 1.3.236.0 -> 1.3.239.0
        glslang: upgrade 1.3.236.0 -> 1.3.239.0
        spirv-headers: upgrade 1.3.236.0 -> 1.3.239.0
        libxpm: upgrade 3.5.14 -> 3.5.15
        rng-tools: upgrade 6.15 -> 6.16
        fontconfig: upgrade 2.14.1 -> 2.14.2
        ncurses: upgrade 6.3+20220423 -> 6.4
        mpg123: upgrade 1.31.1 -> 1.31.2
        python3-pycryptodomex: upgrade 3.16.0 -> 3.17
        bind: upgrade 9.18.10 -> 9.18.11
        libjpeg-turbo: upgrade 2.1.4 -> 2.1.5
        pkgconf: upgrade 1.9.3 -> 1.9.4
        python3-pycryptodome: upgrade 3.16.0 -> 3.17
        python3-dtschema: upgrade 2022.12 -> 2023.1
        llvm: upgrade 15.0.6 -> 15.0.7
        puzzles: upgrade to latest revision
        dpkg: upgrade 1.21.18 -> 1.21.19
        shaderc: upgrade 2022.4 -> 2023.2
        sysstat: upgrade 12.6.1 -> 12.6.2
        piglit: upgrade to latest revision
        ltp: upgrade 20220930 -> 20230127
        linux-firmware: upgrade 20221214 -> 20230117
        libinput: upgrade 1.22.0 -> 1.22.1
        sudo: upgrade 1.9.12p1 -> 1.9.12p2
        diffoscope: upgrade 230 -> 234
        texinfo: upgrade 7.0.1 -> 7.0.2
        stress-ng: upgrade 0.15.02 -> 0.15.03
        libgit2: upgrade 1.5.0 -> 1.5.1
        python3-pathspec: upgrade 0.10.3 -> 0.11.0

  Andrej Valek (1):
        busybox: 1.35.0 -> 1.36.0

  Arnout Vandecappelle (1):
        python3-pytest: Remove dependency on python3-toml

  Bruce Ashfield (5):
        linux-yocto/6.1: update to v6.1.7
        linux-yocto/5.15: update to v5.15.89
        linux-yocto/6.1: cfg: remove depreciated configs
        linux-yocto/6.1: update to v6.1.9
        linux-yocto/5.15: update to v5.15.91

  Changqing Li (1):
        apt: fix do_package_qa failure

  Chen Qi (1):
        ffmpeg: fix configure failure on noexec /tmp host

  Etienne Cordonnier (1):
        bitbake: siggen: Fix inefficient string concatenation

  George Kelly (1):
        bitbake: fetch2: Add NODE_EXTRA_CA_CERTS to export list

  Harald Seiler (1):
        bootchart2: Fix usrmerge support

  Jan Luebbe (1):
        systemd: add PACKAGECONFIG for pstore

  Khem Raj (6):
        busybox: Make provisions to disable sha256/sha1 accelaration on x86
        nghttp2: Disable python bindings
        scons: Pass MAXLINELENGTH to scons invocation
        scons.bbclass: Make MAXLINELENGTH overridable
        glibc: Upgrade to 2.37 release
        lttng-tools: Update LFS64 patch with upstream feedback

  Louis Rannou (1):
        oeqa/selftest/locales: Add selftest for locale generation/presence

  Markus Volk (3):
        libtiff: add PACKAGECONFIG for libdeflate and zstd
        mesa: add PACKAGECONFIG for video-codecs
        ell: update 0.55 -> 0.56

  Martin Jansa (2):
        meta: remove True option to getVar and getVarFlag calls (again)
        xinetd: move xconv.pl script to separate package

  Mauro Queiros (1):
        image.bbclass: print all QA functions exceptions

  Michael Halstead (1):
        uninative: Upgrade to 3.9 to include glibc 2.37

  Michael Opdenacker (1):
        bitbake: bitbake-user-manual: show how use BB_LOGCONFIG to log warnings

  Mikko Rapeli (1):
        oeqa context.py: fix --target-ip comment to include ssh port number

  Mingli Yu (1):
        glslang: branch rename master -> main

  Pavel Zhukov (1):
        bitbake.conf: Add mercurial to HOSTTOOLS_NONFATAL

  Pedro Baptista (2):
        bitbake: bblayers/query: Replace layer directory name with layer name for show-layers
        bitbake: bblayers/query: Adjust show-layers output layout

  Peter Kjellerstedt (1):
        poky.conf: Switch to post release name/version

  Ravineet Singh (1):
        gnutls: add ptest support

  Richard Purdie (6):
        python3-markupsafe: upgrade 2.1.1 -> 2.1.2
        perf: Fix 6.1 kernel reproducibility issue
        perf: Enable debug/source packaging
        libc-locale: Fix on target locale generation
        oeqa/selftest/locales: Add test for disabled binary locale generation
        valgrind: Workaround glibc upgrade

  Ross Burton (5):
        git: upgrade to 2.39.1
        git: ignore CVE-2022-41953
        sdkext/cases/devtool: pass a logger to HTTPService
        oeqa/utils/httpserver: connect up the request logging
        httpserver: add error handler that write to the logger

  Tim Orling (14):
        libtest-needs-perl: upgrade 0.002009 -> 0.002010
        python3-pytest: upgrade 7.2.0 -> 7.2.1
        python3-hypothesis: upgrade 6.62.0 -> 6.66.0
        python3-poetry-core: upgrade 1.4.0 -> 1.5.0
        python3-iniconfig: upgrade 1.1.1 -> 2.0.0
        python3-pytz: upgrade 2022.7 -> 2022.7.1
        python3-zipp: upgrade 3.11.0 -> 3.12.0
        python3-requests: upgrade 2.28.1 -> 2.28.2
        python3-sphinxcontrib-applehelp: 1.0.3 -> 1.0.4
        python3-sphinxcontrib-htmlhelp: 2.0.0 -> 2.0.1
        python3-pyopenssl: upgrade 22.1.0 -> 23.0.0
        python3-wcwidth: upgrade 0.2.5 -> 0.2.6
        python3-urllib3: upgrade 1.26.13 -> 1.26.14
        python3-sphinx: upgrade 6.0.0 -> 6.1.3

  Tobias Hagelborn (1):
        sstate.bbclass: Fetch non-existing local .sig files if needed

  Ulrich Ölmann (3):
        recipe_sanity: fix old override syntax
        lsof: fix old override syntax
        update-alternatives: fix typos

  Vivek Kumbhar (1):
        openssl: fix CVE-2022-3996 double locking leads to denial of service

  Wang Mingyu (2):
        btrfs-tools: upgrade 6.1.2 -> 6.1.3
        msmtp: upgrade 1.8.22 -> 1.8.23

  Xiaotian Wu (5):
        base: add support for loongarch64
        linux: add loongarch64 support
        binutils: disable gold on loongarch64
        loongarch: disable seccomp from default feature
        uboot: add a loongarch64 entry

meta-security: 7eed4a60f5..3529cfb43e:
  Mikko Rapeli (1):
        linux-yocto: drop version from bbappends

meta-raspberrypi: 6c57b92708..e43af1e3a6:
  Allan Xavier (2):
        linux-raspberrypi: Build eeprom access into kernel
        rpi-eeprom: Add recipe for eeprom update/configuration

  Khem Raj (3):
        linux-raspberrypi: Update to 5.15.90
        linux-raspberrypi: Fix build with gcc13
        linux-raspberrypi: Remove unused patches

  Martin Jansa (1):
        raspidmx, userland, omxplayer: Fix Upstream-Status formatting

meta-arm: aecbb77f72..dc10b73cc5:
  Jon Mason (1):
        arm/linux-yocto: avoid kernel defconfig warning

  Khem Raj (2):
        gator-daemon: Fix build with gcc13
        sbsa: Fix build with gcc13

  Ross Burton (2):
        arm-bsp/corstone*00: disable openssl in kmod
        CI: pin to kas 3.2 as 3.2.1 fails

  Rui Miguel Silva (6):
        meta-arm: add build to gitignore
        kas/corstone1000: move from langdale to master
        arm-bsp/corstone500: bump u-boot version to 2023.01
        arm-bsp/corstone1000: bump u-boot version to 2023.01
        arm-bsp: corstone500: bump kernel version to 6.1
        arm-bsp/corstone1000: bump kernel version to v6.1

meta-openembedded: ea63f13846..cba6df61c7:
  Alex Kiernan (2):
        mdns: Upgrade 1790.60.25 -> 1790.80.10
        dnsmasq: Upgrade 2.88 -> 2.89

  Chen Qi (1):
        syslog-ng: workaround segfault for ppc64le

  Christian Hohnstaedt (1):
        libb64: reactivate BUFFERSIZE patch

  David Bagonyi (1):
        concurrencykit: Make patch compatible with Bourne shell

  Geoff Parker (1):
        python3-pillow: add tk to RDEPENDS ptest pkg only if x11 in DISTRO_FEATURES

  Jan Luebbe (4):
        softhsm: avoid unnecessary check for native sqlite binary
        softhsm: enable objectstore backend
        extract-cert: add recipe
        opensc: fix private key import

  Kai Kang (1):
        crda: remove recipe

  Khem Raj (39):
        rwmem: Update to latest
        pipewire: Split dymanic modules to target recipe alone
        upm: Fix build with gcc13
        openthread: Use __attribute__ ((unused)) instead of removing 't'
        wireshark: Add nghttp2 packageconfig
        rdma-core: Inherit python3targetconfig
        wireshark: Inherit python3targetconfig
        hplip: Inherit python3targetconfig
        hplip: Inherit python3targetconfig
        dante: Add -P to preprocessor flags
        breakpad: Fix build with gcc13
        mongodb: Fix build with gcc13
        mongodb: Upgrade to 4.4.18
        mongodb: Pass MAXLINELENGTH to scons invocation
        perfetto: Disable ccache
        nodejs: Fix build with gcc13
        zeromq: Fix build with gcc13
        python3-greenlet: Fix build with gcc13
        perfetto: Upgrade to 31.0 release
        perfetto: Fix build with gcc13
        ntopng: Add hiredis to depends
        python3-grpcio: Fix build with gcc13
        tesseract: Fix build with gcc13
        lcdproc: Update to latest tip of trunk
        mongodb: Use bfd linker for x86/musl with gcc
        gegl: Depend on openmp when using clang
        pipewire: Do not split modules using PACKAGES_DYNAMIC for native case
        sysdig: Fix build with gcc13
        zfs: Update to 2.1.9
        python3-isort: Upgrade to isort 5.12.0
        minicoredumper: Upgrade to 2.0.2 release
        perfetto: Add missing dependencies.
        vulkan-cts: Rename patch to avoid problems on case insensitive filesytems
        python3-greenlet: Upgrade to 2.0.2
        cups-filters: Fix build with clang16/c++17
        cups-filters: Upgrade to 1.28.17 release
        ltrace: Fix build with clang16
        oprofile: Do not use std::bind2nd
        perfetto: Fix build on musl again

  Markus Volk (7):
        python3-pycups: add recipe
        blueman: add missing runtime dependency, add polkit rule
        system-config-printer: add recipe
        rtkit: add recipe
        xdg-desktop-portal: add runtime dependency on rtkit
        pipewire: update 0.3.64 -> 0.3.65
        xfdesktop: update 4.18.0 -> 4.18.1

  Martin Jansa (3):
        hunspell: move ispellaff2myspell script to separate package
        meta: remove True option to getVar calls (again)
        mctp: fix overrides syntax in SYSTEMD_AUTO_ENABLE:${PN}

  Randy MacLeod (1):
        python3-pillow: add ptest support

  Simone Weiss (1):
        minicoredumper: Add ptest

  Ulrich Ölmann (2):
        initramfs-{debug,kexecboot}-image: fix override syntax in comment
        kexecboot: update homepage

  Wang Mingyu (5):
        byacc: upgrade 20221229 -> 20230201
        ccid: upgrade 1.5.1 -> 1.5.2
        cglm: upgrade 0.8.7 -> 0.8.9
        cmark: upgrade 0.30.2 -> 0.30.3
        apache2: upgrade 2.4.54 -> 2.4.55

  Yi Zhao (2):
        samba: upgrade 4.17.4 -> 4.17.5
        frr: upgrade 8.4.1 -> 8.4.2

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Idbe7ba3bb68f0858849f8abf80cc488f94920dda
diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/enum-int-mismatch.patch b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/enum-int-mismatch.patch
new file mode 100644
index 0000000..29b2e2f
--- /dev/null
+++ b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs/enum-int-mismatch.patch
@@ -0,0 +1,32 @@
+Fix function protype mismatches
+
+These are flagged by gcc13
+avs_gic.c:241:1: error: conflicting types for 'val_gic_get_info' due to enum/integer mismatch; have 'uint32_t(uint32_t)' {aka 'unsigned int(unsigned int)'} [-Werror=enum-int-mismatch]
+|   241 | val_gic_get_info(uint32_t type)
+|       | ^~~~~~~~~~~~~~~~
+
+Upstream-Status: Submitted [https://github.com/ARM-software/sbsa-acs/pull/291]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/ShellPkg/Application/sbsa-acs/val/include/val_interface.h
++++ b/ShellPkg/Application/sbsa-acs/val/include/val_interface.h
+@@ -155,7 +155,7 @@ typedef enum {
+ void     val_wd_create_info_table(uint64_t *wd_info_table);
+ void     val_wd_free_info_table(void);
+ uint32_t val_wd_execute_tests(uint32_t level, uint32_t num_pe);
+-uint64_t val_wd_get_info(uint32_t index, uint32_t info_type);
++uint64_t val_wd_get_info(uint32_t index, WD_INFO_TYPE_e info_type);
+ uint32_t val_wd_set_ws0(uint32_t index, uint32_t timeout);
+ 
+ 
+--- a/ShellPkg/Application/sbsa-acs/val/src/avs_gic.c
++++ b/ShellPkg/Application/sbsa-acs/val/src/avs_gic.c
+@@ -238,7 +238,7 @@ val_get_cpuif_base(void)
+   @return  32-bit data
+ **/
+ uint32_t
+-val_gic_get_info(uint32_t type)
++val_gic_get_info(GIC_INFO_e type)
+ {
+   uint32_t rdbase_len;
+ 
diff --git a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs_1.0.bb b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs_1.0.bb
index 95096e6..8c0473a 100644
--- a/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs_1.0.bb
+++ b/meta-arm/meta-arm/recipes-bsp/uefi/sbsa-acs_1.0.bb
@@ -8,6 +8,7 @@
             git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=libc \
             file://shell.patch \
             file://use_bfd_linker.patch \
+            file://enum-int-mismatch.patch \
             file://0001-Revert-peripheral-test-3-updated-for-multiple-uarts.patch;patchdir=ShellPkg/Application/sbsa-acs \
             "
 
diff --git a/meta-arm/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch b/meta-arm/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
new file mode 100644
index 0000000..294f804
--- /dev/null
+++ b/meta-arm/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
@@ -0,0 +1,32 @@
+From 87745a6cad0f7819ac8f8d3826f5e228ebd843c5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 2 Feb 2023 16:39:26 -0800
+Subject: [PATCH] Include missing <cstdint>
+
+gcc 13 moved some includes around and as a result <cstdint> is no
+longer transitively included [1]. Explicitly include it
+for uintXX_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Upstream-Status: Submitted [https://github.com/ARM-software/gator/pull/40]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ daemon/xml/CurrentConfigXML.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/daemon/xml/CurrentConfigXML.h b/daemon/xml/CurrentConfigXML.h
+index 0b239fd..d9047e3 100644
+--- a/daemon/xml/CurrentConfigXML.h
++++ b/daemon/xml/CurrentConfigXML.h
+@@ -1,6 +1,7 @@
+ /* Copyright (C) 2020-2021 by Arm Limited. All rights reserved. */
+ #pragma once
+ 
++#include <cstdint>
+ #include <set>
+ #include <string>
+ 
+-- 
+2.39.1
+
diff --git a/meta-arm/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb b/meta-arm/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
index 0daebfd..6188b07 100644
--- a/meta-arm/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
+++ b/meta-arm/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
@@ -18,6 +18,7 @@
 SRCREV = "6a944e7ee1f1c3ab9b2a57efd24c58503122db02"
 SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main;protocol=https \
            file://0001-daemon-mxml-Define-_GNU_SOURCE.patch;striplevel=2 \
+           file://0001-Include-missing-cstdint.patch;striplevel=2 \
           "
 
 S = "${WORKDIR}/git/daemon"
diff --git a/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch b/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch
new file mode 100644
index 0000000..995bc2c
--- /dev/null
+++ b/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch
@@ -0,0 +1,28 @@
+From 7bc0bae10b0f21cfc8df23848844b66bf1b4d751 Mon Sep 17 00:00:00 2001
+From: Jon Mason <jdmason@kudzu.us>
+Date: Fri, 3 Feb 2023 05:16:43 -0500
+Subject: [PATCH 1/2] Revert "arm64: defconfig: Enable Tegra MGBE driver"
+
+This reverts commit 4cac4de4b05f0a1d5920d12278bf8787011661d3.
+
+Signed-off-by: Jon Mason <jon.mason@arm.com>
+Upstream-Status: Inappropriate
+---
+ arch/arm64/configs/defconfig | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
+index 0b6af3348e79..70919b241469 100644
+--- a/arch/arm64/configs/defconfig
++++ b/arch/arm64/configs/defconfig
+@@ -362,7 +362,6 @@ CONFIG_SMSC911X=y
+ CONFIG_SNI_AVE=y
+ CONFIG_SNI_NETSEC=y
+ CONFIG_STMMAC_ETH=m
+-CONFIG_DWMAC_TEGRA=m
+ CONFIG_TI_K3_AM65_CPSW_NUSS=y
+ CONFIG_QCOM_IPA=m
+ CONFIG_MESON_GXL_PHY=m
+-- 
+2.30.2
+
diff --git a/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch b/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch
new file mode 100644
index 0000000..d5b5363
--- /dev/null
+++ b/meta-arm/meta-arm/recipes-kernel/linux/files/aarch64/0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch
@@ -0,0 +1,45 @@
+From 891eeb87cddb0d52bc9eac39afcca5027a660be6 Mon Sep 17 00:00:00 2001
+From: Jon Mason <jdmason@kudzu.us>
+Date: Fri, 3 Feb 2023 05:21:07 -0500
+Subject: [PATCH 2/2] Revert "arm64: defconfig: Add Nuvoton NPCM family
+ support"
+
+This reverts commit 45472f1e5348c7b755b4912f2f529ec81cea044b
+
+Signed-off-by: Jon Mason <jon.mason@arm.com>
+Upstream-Status: Inappropriate
+---
+ arch/arm64/configs/defconfig | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
+index 70919b241469..4f09b80a1b96 100644
+--- a/arch/arm64/configs/defconfig
++++ b/arch/arm64/configs/defconfig
+@@ -51,7 +51,6 @@ CONFIG_ARCH_MESON=y
+ CONFIG_ARCH_MVEBU=y
+ CONFIG_ARCH_NXP=y
+ CONFIG_ARCH_MXC=y
+-CONFIG_ARCH_NPCM=y
+ CONFIG_ARCH_QCOM=y
+ CONFIG_ARCH_RENESAS=y
+ CONFIG_ARCH_ROCKCHIP=y
+@@ -637,7 +636,6 @@ CONFIG_UNIPHIER_WATCHDOG=y
+ CONFIG_PM8916_WATCHDOG=m
+ CONFIG_BCM2835_WDT=y
+ CONFIG_BCM7038_WDT=m
+-CONFIG_NPCM7XX_WATCHDOG=y
+ CONFIG_MFD_ALTERA_SYSMGR=y
+ CONFIG_MFD_BD9571MWV=y
+ CONFIG_MFD_AXP20X_I2C=y
+@@ -1049,7 +1047,6 @@ CONFIG_COMMON_CLK_FSL_SAI=y
+ CONFIG_COMMON_CLK_S2MPS11=y
+ CONFIG_COMMON_CLK_PWM=y
+ CONFIG_COMMON_CLK_VC5=y
+-CONFIG_COMMON_CLK_NPCM8XX=y
+ CONFIG_COMMON_CLK_BD718XX=m
+ CONFIG_CLK_RASPBERRYPI=m
+ CONFIG_CLK_IMX8MM=y
+-- 
+2.30.2
+
diff --git a/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend
index a641ec2..91dc000 100644
--- a/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -2,7 +2,7 @@
 
 COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64"
 FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}"
-SRC_URI:append:generic-arm64 =" \
+SRC_URI:append:generic-arm64 = " \
     file://generic-arm64-kmeta;type=kmeta;destsuffix=generic-arm64-kmeta \
     "
 
diff --git a/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend b/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend
new file mode 100644
index 0000000..754e5c2
--- /dev/null
+++ b/meta-arm/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend
@@ -0,0 +1,7 @@
+ARMFILESPATHS := "${THISDIR}/files:"
+
+FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}"
+SRC_URI:append:aarch64 = " \
+    file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \
+    file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \
+    "