main/postmarketos-ui-lomiri: new aport

fairphone-fp4: add lomiri subpackage
2024-09-07 19:24:05 +02:00 · 2024-09-07 19:24:01 +02:00
274 changed files with 6553 additions and 16076 deletions
@@ -6,6 +6,7 @@

 if [ "$(id -u)" = 0 ]; then
 	set -x
+	export PMBOOTSTRAP_TAG=master
 	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
@@ -2,7 +2,6 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys
-import pathlib

 # Same dir
 import common
@@ -12,7 +11,6 @@ import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
 import pmb.helpers.pmaports
-from pmb.core.context import get_context


 def build_strict(packages, arch):
@@ -61,16 +59,15 @@ if __name__ == "__main__":
        verify_checksums(packages, arch)
        sys.exit(0)

-    # Load context
-    sys.argv = ["pmbootstrap.py", "chroot"]
+    # Prepare "args" to use pmbootstrap code
+    sys.argv = ["pmbootstrap", "chroot"]
    args = pmb.parse.arguments()
-    context = get_context()

    # Filter out packages that can't be built for given arch
    # (Iterate over copy of packages, because we modify it in this loop)
    for package in packages.copy():
-        apkbuild_path = pmb.helpers.pmaports.find(package)
-        apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))
+        apkbuild_path = pmb.helpers.pmaports.find(args, package)
+        apkbuild = pmb.parse._apkbuild.apkbuild(f"{apkbuild_path}/APKBUILD")

        if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
            print(f"{package}: not enabled for {arch}, skipping")
@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 import glob
-import pathlib
 import tempfile
 import sys
 import subprocess
@@ -16,9 +15,8 @@ import add_pmbootstrap_to_import_path  # noqa
 import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging
-from pmb.core.context import get_context

-def get_package_contents(package, revision, check=True):
+def get_package_contents(args, package, revision, check=True):
    # Redirect stderr to /dev/null, so git doesn't complain about files not
    # existing in upstream branch for new packages
    stderr = None
@@ -39,16 +37,15 @@ def get_package_contents(package, revision, check=True):
    with tempfile.TemporaryDirectory() as tempdir:
        with open(tempdir + "/APKBUILD", "w", encoding="utf-8") as handle:
            handle.write(apkbuild_content)
-        parsed = pmb.parse.apkbuild(pathlib.Path(tempdir, "APKBUILD"),
-                                    False, False)
+        parsed = pmb.parse.apkbuild(tempdir + "/APKBUILD", False, False)

    return parsed


-def get_package_version(package, revision, check=True):
+def get_package_version(args, package, revision, check=True):
    """ returns version in the format "{pkgver}-r{pkgrel}", or None if no 
        matching package is found """
-    parsed = get_package_contents(package, revision, check)
+    parsed = get_package_contents(args, package, revision, check)
    if parsed is None:
        return None
    return parsed["pkgver"] + "-r" + parsed["pkgrel"]
@@ -94,7 +91,7 @@ def exit_with_error_message():
    exit(1)


-def check_versions(packages):
+def check_versions(args, packages):
    error = False

    # Get relevant commits: compare HEAD against upstream branch or HEAD~1
@@ -113,8 +110,8 @@ def check_versions(packages):

    for package in packages:
        # Get versions, skip new packages
-        head = get_package_version(package, "HEAD")
-        upstream = get_package_version(package, commit, False)
+        head = get_package_version(args, package, "HEAD")
+        upstream = get_package_version(args, package, commit, False)
        if not upstream:
            if head.rpartition('r')[2] != "0":
                print(f"- {package}: {head} (HEAD) (new package) [ERROR]")
@@ -132,8 +129,8 @@ def check_versions(packages):

        # Additional checks for device packages
        if package.startswith('device-'):
-            head_parsed = get_package_contents(package, "HEAD", False)
-            upstream_parsed = get_package_contents(package, commit, False)
+            head_parsed = get_package_contents(args, package, "HEAD", False)
+            upstream_parsed = get_package_contents(args, package, commit, False)

            # checksums did not change
            if head_parsed["sha512sums"] == upstream_parsed["sha512sums"]:
@@ -194,12 +191,8 @@ if __name__ == "__main__":
    # Initialize args (so we can use pmbootstrap's APKBUILD parsing)
    sys.argv = ["pmbootstrap.py", "chroot"]
    args = pmb.parse.arguments()
-    context = get_context()
-
-    # pmb.helpers.logging.init(args)
-    pmb.helpers.logging.init(context.log, args.verbose, context.details_to_stdout)
-
+    pmb.helpers.logging.init(args)

    # Verify package versions
    print("checking changed package versions...")
-    check_versions(packages)
+    check_versions(args, packages)
@@ -19,11 +19,16 @@ if [ -z "$(command -v pytest)" ]; then
 	exit 1
 fi

+# Wrap pmbootstrap to use this repository for --aports
 pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
+_pmbootstrap="$(command -v pmbootstrap)"
+pmbootstrap() {
+	"$_pmbootstrap" --aports="$pmaports" "$@"
+}
+
 # Make sure that the work folder format is up to date, and that there are no
 # mounts from aborted test cases (pmbootstrap#1595)
 pmbootstrap work_migrate
-pmbootstrap config aports "$pmaports"
 pmbootstrap -q shutdown

 # Make sure we have a valid device (pmbootstrap#1128)
@@ -2,33 +2,24 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

-from pathlib import Path
 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.helpers.args import init as init_args
-from pmb.types import PmbArgs
-import pmb.config
-from pmb.core.pkgrepo import pkgrepo_default_path
 import pytest
 import sys
 import os

-@pytest.fixture(scope="session", autouse=True)
+
+@pytest.fixture
 def args(request):
    # Initialize args
-    pmaports = Path(os.path.realpath(f"{os.path.dirname(__file__)}/../.."))
-    args = PmbArgs()
-    args.aports = [pmaports]
-    args.config = pmb.config.defaults["config"]
-    args.timeout = 900
-    args.details_to_stdout = False
-    args.quiet = False
-    args.verbose = True
-    args.offline = False
-    args.action = "init"
-    args.cross = False
-    args.log = None
+    pmaports = os.path.realpath(f"{os.path.dirname(__file__)}/../..")
+    sys.argv = ["pmbootstrap",
+                "--aports", pmaports,
+                "--log", "$WORK/log_testsuite_pmaports.txt"
+                "chroot"]
+    args = pmb.parse.arguments()

-    init_args(args)
+    # Initialize logging
+    pmb.helpers.logging.init(args)
    request.addfinalizer(pmb.helpers.logging.logfd.close)
    return args
@@ -11,8 +11,6 @@ import sys
 import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
-from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob, pkgrepo_relative_path
-from pmb.core.arch import Arch

 # Cache for codeowners_parse
 codeowners_parsed = {}
@@ -34,11 +32,11 @@ def device_dependency_check(apkbuild, path):
                               " depends anymore (see pmaports!3478)")


-def test_aports_device():
+def test_aports_device(args):
    """
    Various tests performed on the /device/*/device-* aports.
    """
-    for path in pkgrepo_iglob("device/*/device-*/APKBUILD"):
+    for path in glob.iglob(args.aports + "/device/*/device-*/APKBUILD"):
        apkbuild = pmb.parse.apkbuild(path)

        # Depends: Require "postmarketos-base"
@@ -56,27 +54,27 @@ def test_aports_device():

        # Architecture
        device = apkbuild["pkgname"][len("device-"):]
-        deviceinfo = pmb.parse.deviceinfo(device)
-        if Arch.from_str("".join(apkbuild["arch"])) != deviceinfo.arch:
-            raise RuntimeError("wrong architecture, please change to arch=\""
-                               f"{deviceinfo.arch}\": {path}")
+        deviceinfo = pmb.parse.deviceinfo(args, device)
+        if "".join(apkbuild["arch"]) != deviceinfo["arch"]:
+            raise RuntimeError("wrong architecture, please change to arch=\"" +
+                               deviceinfo["arch"] + "\": " + path)
        if "!archcheck" not in apkbuild["options"]:
            raise RuntimeError("!archcheck missing in options= line: " + path)


-def test_aports_device_kernel():
+def test_aports_device_kernel(args):
    """
    Verify the kernels specified in the device packages:
    * Kernel must not be in depends when kernels are in subpackages
    * Check if only one kernel is defined in depends
    """
-    aports = pkgrepo_default_path()
+
    # Iterate over device aports
-    for path in aports.glob("device/*/device-*/APKBUILD"):
+    for path in glob.glob(args.aports + "/device/*/device-*/APKBUILD"):
        # Parse apkbuild and kernels from subpackages
        apkbuild = pmb.parse.apkbuild(path)
        device = apkbuild["pkgname"][len("device-"):]
-        kernels_subpackages = pmb.parse._apkbuild.kernels(device)
+        kernels_subpackages = pmb.parse._apkbuild.kernels(args, device)

        # Parse kernels from depends
        kernels_depends = []
@@ -87,29 +85,29 @@ def test_aports_device_kernel():

            # Kernel in subpackages *and* depends
            if kernels_subpackages:
-                raise RuntimeError(f"Kernel package '{depend}' needs to"
+                raise RuntimeError("Kernel package '" + depend + "' needs to"
                                   " be removed when using kernel" +
-                                   f" subpackages: {path}")
+                                   " subpackages: " + path)

        # No kernel
        if not kernels_depends and not kernels_subpackages:
            raise RuntimeError("Device doesn't have a kernel in depends or"
-                               f" subpackages: {path}")
+                               " subpackages: " + path)

        # Multiple kernels in depends
        if len(kernels_depends) > 1:
            raise RuntimeError("Please use kernel subpackages instead of"
                               " multiple kernels in depends (see"
-                               f" <https://postmarketos.org/devicepkg>): {path}")
+                               " <https://postmarketos.org/devicepkg>): " +
+                               path)


-def codeowners_parse():
+def codeowners_parse(args):
    global codeowners_parsed

    pattern_prev = None
-    aports = pkgrepo_default_path()

-    with open(aports / "CODEOWNERS") as h:
+    with open(f"{args.aports}/CODEOWNERS") as h:
        for line in h:
            line = line.rstrip()
            if not line or line.startswith("#"):
@@ -133,13 +131,12 @@ def codeowners_parse():
            pattern_prev = pattern


-def require_enough_codeowners_entries(path, maintainers):
+def require_enough_codeowners_entries(args, path, maintainers):
    """
    :param path: full path to an APKBUILD (e.g. /home/user/…/APKBUILD)
    :param maintainers: list of one or more maintainers
    """
-
-    _, path = pkgrepo_relative_path(path)
+    path = os.path.relpath(path, args.aports)

    nicks = set()
    for pattern, pattern_nicks in codeowners_parsed.items():
@@ -161,38 +158,36 @@ def require_enough_codeowners_entries(path, maintainers):
        f"{path}: make sure that each maintainer is listed in CODEOWNERS!"


-# @pytest.mark.xfail # Not all aports have been updated yet
-def test_aports_maintained():
+def test_aports_maintained(args):
    """
    Ensure that aports in /device/{main,community} have "Maintainer:" and
    "Co-Maintainer:" (only required for main) listed in their APKBUILDs. Also
    check that at least as many are listed in CODEOWNERS.
    """
-    codeowners_parse()
+    codeowners_parse(args)

-    for path in pkgrepo_iglob("device/main/*/APKBUILD"):
-        if 'firmware-' in path.parent.name:
+    for path in glob.iglob(f"{args.aports}/device/main/*/APKBUILD"):
+        if '/firmware-' in path:
            continue
        maintainers = pmb.parse._apkbuild.maintainers(path)
        assert maintainers and len(maintainers) >= 2, \
            f"{path} in main needs at least 1 Maintainer and 1 Co-Maintainer"
-        require_enough_codeowners_entries(path, maintainers)
+        require_enough_codeowners_entries(args, path, maintainers)

-    for path in pkgrepo_iglob("device/community/*/APKBUILD"):
-        if 'firmware-' in path.parent.name:
+    for path in glob.iglob(f"{args.aports}/device/community/*/APKBUILD"):
+        if '/firmware-' in path:
            continue
        maintainers = pmb.parse._apkbuild.maintainers(path)
        assert maintainers, f"{path} in community needs at least 1 Maintainer"
-        require_enough_codeowners_entries(path, maintainers)
+        require_enough_codeowners_entries(args, path, maintainers)


-def test_aports_unmaintained():
+def test_aports_unmaintained(args):
    """
    Ensure that aports in /device/unmaintained have an "Unmaintained:" comment
    that describes why the aport is unmaintained.
    """
-
-    for path in pkgrepo_iglob("device/unmaintained/*/APKBUILD"):
+    for path in glob.iglob(f"{args.aports}/device/unmaintained/*/APKBUILD"):
        unmaintained = pmb.parse._apkbuild.unmaintained(path)
        assert unmaintained, f"{path} should have an Unmaintained: " +\
            "comment that describes why the package is unmaintained"
@@ -10,7 +10,6 @@ import sys

 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iglob


 def deviceinfo_obsolete(info):
@@ -23,13 +22,13 @@ def deviceinfo_obsolete(info):
        "weston_pixman_type",
    ]
    for option in obsolete_options:
-        if getattr(info, option, None):
+        if option in info and info[option]:
            raise RuntimeError(f"option {option} is obsolete, please rename"
                               " or remove it (see reasons for removal of at"
                               " https://postmarketos.org/deviceinfo)")


-def test_deviceinfo():
+def test_deviceinfo(args):
    """
    Parse all deviceinfo files successfully and run checks on the parsed data.
    """
@@ -38,10 +37,10 @@ def test_deviceinfo():
    count = 0
    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"$")

-    for folder in pkgrepo_iglob("device/*/device-*"):
-        device = folder.name.split("-", 1)[1]
+    for folder in glob.glob(args.aports + "/device/*/device-*"):
+        device = folder[len(args.aports):].split("-", 1)[1]

-        f = open(folder / "deviceinfo")
+        f = open(folder[len(args.aports):][1:] + "/deviceinfo")
        lines = f.read().split("\n")
        f.close()

@@ -67,12 +66,12 @@ def test_deviceinfo():
                                       f" to line instead of above? {line}")

            # Successful deviceinfo parsing / obsolete options
-            info = pmb.parse.deviceinfo(device)
+            info = pmb.parse.deviceinfo(args, device)
            deviceinfo_obsolete(info)

            # deviceinfo_name must start with manufacturer
-            name = info.name
-            manufacturer = info.manufacturer
+            name = info["name"]
+            manufacturer = info["manufacturer"]
            if not name.startswith(manufacturer) and \
                    not name.startswith("Google"):
                raise RuntimeError("Please add the manufacturer in front of"
@@ -7,10 +7,9 @@ import os

 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob


-def test_aports_firmware():
+def test_aports_firmware(args):
    """
    Various tests performed on the /**/firmware-* aports.
    """
@@ -27,9 +26,9 @@ def test_aports_firmware():
        "firmware-xiaomi-willow",  # Doesn't build, source link is dead (pma#1212)
    ]

-    for path in pkgrepo_iglob("**/firmware-*/APKBUILD", recursive=True):
+    for path in glob.iglob(f"{args.aports}/**/firmware-*/APKBUILD", recursive=True):
        apkbuild = pmb.parse.apkbuild(path)
-        aport_name = os.path.basename(path.parent)
+        aport_name = os.path.basename(os.path.dirname(path))

        if aport_name not in excluded:
            if "pmb:cross-native" not in apkbuild["options"]:
@@ -15,10 +15,9 @@ import sys
 import add_pmbootstrap_to_import_path
 import pmb.config
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iter_package_dirs


-def get_categorized_packages():
+def get_categorized_packages(args):
    """
    Parse all aports and categorize them.

@@ -29,7 +28,7 @@ def get_categorized_packages():
    """
    ret = {}

-    for path in pkgrepo_iter_package_dirs():
+    for path in glob.glob(args.aports + "/*/*/APKBUILD"):
        # Parse APKBUILD
        apkbuild = pmb.parse.apkbuild(path)
        url = apkbuild["url"]
@@ -110,10 +109,10 @@ def check_categories(categories):
    return ret


-def test_framework_versions():
+def test_framework_versions(args):
    """
    Make sure that packages of the same framework have the same version.
    """
-    categories = get_categorized_packages()
+    categories = get_categorized_packages(args)
    if not check_categories(categories):
        raise RuntimeError("Framework version check failed!")
@@ -11,15 +11,14 @@ from pathlib import Path

 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iglob, pkgrepo_relative_path


-def test_aports_kernel():
+def test_aports_kernel(args):
    """
    Various tests performed on the /**/linux-* aports.
    """

-    for path in pkgrepo_iglob("**/linux-*/APKBUILD", recursive=True):
+    for path in glob.iglob(f"{args.aports}/**/linux-*/APKBUILD", recursive=True):
        apkbuild = pmb.parse.apkbuild(path)
        aport_name = os.path.basename(os.path.dirname(path))

@@ -38,15 +37,14 @@ def test_aports_kernel():
                                   " automatically.")

        # check some options only for main and community devices
-        _, relpath = pkgrepo_relative_path(path)
-        for part in ["main", "community"]:
-            if part in relpath.parts:
+        for dir in ["main", "device/main", "device/community"]:
+            if path.startswith(f"{args.aports}/{dir}"):
                if "pmb:kconfigcheck-community" not in apkbuild["options"]:
                    raise RuntimeError(f"{aport_name}: \"pmb:kconfigcheck-community\" missing in"
                                       " options= line, required for all community/main devices.")

        # check for postmarketos-installkernel in makedepends when installing kernel with make
-        if bool(re.search("make z?install", path.read_text(encoding="utf-8"))):
+        if bool(re.search("make z?install", Path(path).read_text(encoding="utf-8"))):
            if "postmarketos-installkernel" not in apkbuild["makedepends"]:
                raise RuntimeError(f"{aport_name}: \"postmarketos-installkernel\" missing in"
                                   " makedepends, required when using make install/zinstall.")
@@ -10,7 +10,6 @@ import sys
 import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
-from pmb.core.pkgrepo import pkgrepo_iter_package_dirs, pkgrepo_relative_path


 def apkbuild_check_provides(path, apkbuild, version, pkgname, subpkgname=None):
@@ -66,14 +65,13 @@ def apkbuild_check_provides(path, apkbuild, version, pkgname, subpkgname=None):
    return ret


-def test_provides():
+def test_provides(args):
    errors = []
-    for path in pkgrepo_iter_package_dirs():
-        path = path / "APKBUILD"
+    for path in glob.iglob(f"{args.aports}/**/APKBUILD", recursive=True):
        apkbuild = pmb.parse.apkbuild(path)
        pkgname = apkbuild["pkgname"]
        version = f"{apkbuild['pkgver']}-r{apkbuild['pkgrel']}"
-        _, path_rel = pkgrepo_relative_path(path)
+        path_rel = os.path.relpath(path, args.aports)
        errors += apkbuild_check_provides(path_rel, apkbuild, version, pkgname)

        for subpkg, subpkg_data in apkbuild["subpackages"].items():
@@ -14,10 +14,9 @@ import pmb.parse
 import pmb.parse._apkbuild
 import pmb.parse.apkindex
 import pmb.helpers.repo
-from pmb.core.pkgrepo import pkgrepo_iter_package_dirs, pkgrepo_relative_path


-def parse_source_from_checksums(apkbuild_path):
+def parse_source_from_checksums(args, apkbuild_path):
    """
    Read the APKBUILD file and parse source files from the checksums at the
    bottom. This has always the same format, even if $source is built with hard
@@ -65,20 +64,17 @@ def parse_source_from_checksums(apkbuild_path):
    return ret


-def test_aports_unreferenced_files():
+def test_aports_unreferenced_files(args):
    """
    Raise an error if an unreferenced file is found
    """
-    for apkbuild_path in pkgrepo_iter_package_dirs():
+    for apkbuild_path in glob.iglob(args.aports + "/**/APKBUILD", recursive=True):
        # pmbootstrap parser has some issues with complicated APKBUILDs, skip those.
-        _, relpath = pkgrepo_relative_path(apkbuild_path)
-        if relpath.parts[0] == "cross":
+        if apkbuild_path.startswith(args.aports + "/cross/"):
            continue

-        apkbuild_path = apkbuild_path / "APKBUILD"
-
        apkbuild = pmb.parse.apkbuild(apkbuild_path)
-        sources_chk = parse_source_from_checksums(apkbuild_path)
+        sources_chk = parse_source_from_checksums(args, apkbuild_path)

        # Collect files from subpackages
        subpackage_installs = []
@@ -109,7 +105,7 @@ def test_aports_unreferenced_files():
                raise RuntimeError(f"{apkbuild_path}: found unreferenced file: {rel_file_path}")


-def test_distfiles_conflict():
+def test_distfiles_conflict(args):
    """
    Make sure that each filename mentioned in any source= of any APKBUILD
    always has the same checksum. This is important because apk caches
@@ -119,11 +115,10 @@ def test_distfiles_conflict():
    with a checksum error.
    """
    source_all = {}
-    for apkbuild_path in pkgrepo_iter_package_dirs():
-        apkbuild_path = apkbuild_path / "APKBUILD"
-        source = parse_source_from_checksums(apkbuild_path)
+    for apkbuild_path in glob.iglob(f"{args.aports}/**/APKBUILD", recursive=True):
+        source = parse_source_from_checksums(args, apkbuild_path)
        dir_path = os.path.dirname(apkbuild_path)
-        _, apkbuild_rel = pkgrepo_relative_path(apkbuild_path)
+        apkbuild_rel = os.path.relpath(apkbuild_path, args.aports)
        for filename, checksum in source.items():
            # Files bundled with the APKBUILD don't get copied to the distfiles
            # cache, so not relevant for this check. Use glob.glob here and not
@@ -9,26 +9,25 @@ import os

 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iglob


-def test_aports_ui():
+def test_aports_ui(args):
    """
    Raise an error if package in _pmb_recommends is not found
    """
-    pmaports_cfg = pmb.config.pmaports.read_config()
+    pmaports_cfg = pmb.config.pmaports.read_config(args)

    for arch in pmaports_cfg["supported_arches"].split(","):
-        for path in pkgrepo_iglob("main/postmarketos-ui-*/APKBUILD"):
+        for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"):
            apkbuild = pmb.parse.apkbuild(path)
            # Skip if arch isn't enabled
-            if not pmb.helpers.package.check_arch(apkbuild["pkgname"], arch, False):
+            if not pmb.helpers.package.check_arch(args, apkbuild["pkgname"], arch, False):
                continue

            for package in apkbuild["_pmb_recommends"]:
-                depend = pmb.helpers.package.get(package,
+                depend = pmb.helpers.package.get(args, package,
                                                 arch, must_exist=False)
-                if depend is None or not pmb.helpers.package.check_arch(package, arch):
+                if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
                    raise RuntimeError(f"{path}: package '{package}' from"
                                       f" _pmb_recommends not found for arch '{arch}'")

@@ -36,8 +35,8 @@ def test_aports_ui():
            if f"{apkbuild['pkgname']}-extras" in apkbuild["subpackages"]:
                apkbuild = apkbuild["subpackages"][f"{apkbuild['pkgname']}-extras"]
                for package in apkbuild["_pmb_recommends"]:
-                    depend = pmb.helpers.package.get(package,
+                    depend = pmb.helpers.package.get(args, package,
                                                     arch, must_exist=False)
-                    if depend is None or not pmb.helpers.package.check_arch(package, arch):
+                    if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
                        raise RuntimeError(f"{path}: package '{package}' from _pmb_recommends "
                                           f"of -extras subpackage is not found for arch '{arch}'")
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=32
+pkgrel=31

 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-88f07677919711bb577f60e1861f4fa555168a8703a0a3b904550e24d4045135bb0296e00464899fc6231df07db09bb11f1bc81cdf593a71a8f74dfc3333c29e  busybox-static-1.36.1-r32-aarch64-edge.apk
+c34906bb0a5d7e268ab43ca1e3e2f9c75c06f3f5de8d41671396bcd7d585a79a66e25ad43e80a3e107a1de0ecaf83ac7198163d3e775edbd6d626ef014307ec5  busybox-static-1.36.1-r31-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=32
+pkgrel=31

 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-b0985e2f62df8f1d4e1b7a1206dc3e462df1e6b2a8aae662e57cc497ca3f474f37cc952de0d3bbaad6532d569bf540f17ad4eccc9cabfdc3c9f95f8feaf08049  busybox-static-1.36.1-r32-armhf-edge.apk
+7e6a961a0adcbc2912f5b261ce84a62b9189dce49c5dd3d2bcbdae407645dec72c27af8804c1d5446d50e78ea938a4d812c477db199ed83cac7c647c4b41f3fe  busybox-static-1.36.1-r31-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=32
+pkgrel=31

 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-f383286e58183232b41a0d299528734cb29b11e51112eab1fe513322a269a2cdf90a1341d7e329ed7cd58e2d158e3a80bc3a5290ef93de2b28aaf7a25b78bfd7  busybox-static-1.36.1-r32-armv7-edge.apk
+b9736dc7df4230196bf05de3bd76b61fc689c56861bc7c5194cd310e23f513cec649c1b3e3f338266b8d58540468d97e8525948a3efc2d1af53e288cd525e836  busybox-static-1.36.1-r31-armv7-edge.apk
 "
@@ -4,17 +4,17 @@ Date: Fri, 21 Aug 2020 07:07:48 +0000
 Subject: [PATCH 26/35] ada: musl support fixes

 ---
- gcc/ada/Makefile.rtl | 16 ++++++++--------
+ gcc/ada/Makefile.rtl | 10 +++++-----
 gcc/ada/adaint.c     | 34 +++++++++++++++++++---------------
 gcc/ada/adaint.h     | 10 ++++------
 gcc/ada/terminals.c  |  8 ++++----
- 4 files changed, 35 insertions(+), 33 deletions(-)
+ 4 files changed, 32 insertions(+), 30 deletions(-)

 diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
-index 32cbdb692..463028fbe 100644
+index 96306f8cc9a..090b6770ae5 100644
 --- a/gcc/ada/Makefile.rtl
 +++ b/gcc/ada/Makefile.rtl
-@@ -1558,7 +1558,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+@@ -1549,7 +1549,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   s-intman.adb<libgnarl/s-intman__posix.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -23,16 +23,7 @@ index 32cbdb692..463028fbe 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2144,7 +2144,7 @@ ifeq ($(strip $(filter-out loongarch% linux%,$(target_cpu) $(target_os))),)
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-   $(GNATRTL_128BIT_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-loongarch.ads
-@@ -2232,7 +2232,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2174,7 +2174,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
   s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -41,7 +32,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2267,7 +2267,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2205,7 +2205,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
 endif
 
 # ARM linux, GNU eabi
@@ -59,7 +50,7 @@ index 32cbdb692..463028fbe 100644
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-@@ -2488,7 +2488,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+@@ -2420,7 +2420,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -68,16 +59,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2592,7 +2592,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   s-taspri.ads<libgnarl/s-taspri__posix.ads \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(X86_64_TARGET_PAIRS) \
-   $(SIMD_PATH_TARGET_PAIRS) \
-@@ -2637,7 +2637,7 @@ ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)
+@@ -2524,7 +2524,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -87,10 +69,10 @@ index 32cbdb692..463028fbe 100644
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 74aa3c412..ef6118f37 100644
+index 8522094164e..92b230a462b 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
-@@ -94,6 +94,11 @@
+@@ -91,6 +91,11 @@
 #include <sys/param.h>
 #include <sys/pstat.h>
 #endif
@@ -102,7 +84,7 @@ index 74aa3c412..ef6118f37 100644
 
 #ifdef __PikeOS__
 #define __BSD_VISIBLE 1
-@@ -3465,7 +3470,6 @@ __gnat_lwp_self (void)
+@@ -3438,7 +3443,6 @@ __gnat_lwp_self (void)
 #endif
 
 #if defined (__linux__)
@@ -110,7 +92,7 @@ index 74aa3c412..ef6118f37 100644
 
 /* glibc versions earlier than 2.7 do not define the routines to handle
    dynamically allocated CPU sets. For these targets, we use the static
-@@ -3475,7 +3479,7 @@ __gnat_lwp_self (void)
+@@ -3448,7 +3452,7 @@ __gnat_lwp_self (void)
 
 /* Dynamic cpu sets */
 
@@ -119,7 +101,7 @@ index 74aa3c412..ef6118f37 100644
 __gnat_cpu_alloc (size_t count)
 {
   return CPU_ALLOC (count);
-@@ -3488,33 +3492,33 @@ __gnat_cpu_alloc_size (size_t count)
+@@ -3461,33 +3465,33 @@ __gnat_cpu_alloc_size (size_t count)
 }
 
 void
@@ -161,7 +143,7 @@ index 74aa3c412..ef6118f37 100644
 }
 
 size_t
-@@ -3524,23 +3528,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+@@ -3497,23 +3501,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
 }
 
 void
@@ -191,7 +173,7 @@ index 74aa3c412..ef6118f37 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0cbfd0e15..f97ed905b 100644
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -213,10 +195,10 @@ index 0cbfd0e15..f97ed905b 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 05af82c27..626ac35bc 100644
+index c0ee4a16bb1..ed796a48c1b 100644
 --- a/gcc/ada/terminals.c
 +++ b/gcc/ada/terminals.c
-@@ -1134,7 +1134,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1127,7 +1127,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 /* POSIX does not specify how to open the master side of a terminal.Several
    methods are available (system specific):
       1- using a cloning device (USE_CLONE_DEVICE)
@@ -225,7 +207,7 @@ index 05af82c27..626ac35bc 100644
       3- openpty                (USE_OPENPTY)
 
    When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1148,7 +1148,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1141,7 +1141,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 #if defined (__APPLE__) || defined (BSD)
 #define USE_OPENPTY
 #elif defined (__linux__)
@@ -234,7 +216,7 @@ index 05af82c27..626ac35bc 100644
 #elif defined (__sun__)
 #define USE_CLONE_DEVICE "/dev/ptmx"
 #elif defined (_AIX)
-@@ -1197,8 +1197,8 @@ allocate_pty_desc (pty_desc **desc) {
+@@ -1190,8 +1190,8 @@ allocate_pty_desc (pty_desc **desc) {
    int  master_fd   = -1;
    char *slave_name = NULL;
 
@@ -245,3 +227,6 @@ index 05af82c27..626ac35bc 100644
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+2.41.0
+
@@ -1,87 +0,0 @@
-From: Celeste <cielesti@protonmail.com>
-Date: Mon, 2 Sep 2024 02:54:17 +0000
-Subject: [PATCH] libphobos: add riscv64 and loongarch64 support
-
-Add musl support for these 2 architectures based on fenv.h and signal.h from:
-
-https://git.musl-libc.org/cgit/musl/tree/arch/riscv64/bits?h=v1.2.5
-
-https://git.musl-libc.org/cgit/musl/tree/arch/loongarch64/bits?h=v1.2.5
---
- libphobos/libdruntime/core/stdc/fenv.d        | 13 +++++++++++++
- libphobos/libdruntime/core/sys/posix/signal.d | 10 ++++++++++
- 2 files changed, 23 insertions(+)
-
-diff --git a/libphobos/libdruntime/core/stdc/fenv.d b/libphobos/libdruntime/core/stdc/fenv.d
-index a7364c0a..5b327e4a 100644
--- a/libphobos/libdruntime/core/stdc/fenv.d
-+++ b/libphobos/libdruntime/core/stdc/fenv.d
-@@ -436,20 +436,33 @@ else version (CRuntime_Musl)
-             ushort __cs_selector;
-             ushort __opcode;
-             uint   __data_offset;
-             ushort __data_selector;
-             ushort __unused5;
-             version (X86_64)
-                 uint __mxcsr;
-         }
-         alias ushort fexcept_t;
-     }
-+    else version (RISCV64)
-+    {
-+        alias uint fenv_t;
-+        alias uint fexcept_t;
-+    }
-+    else version (LoongArch64)
-+    {
-+        struct fenv_t
-+        {
-+            uint __cw;
-+        }
-+        alias uint fexcept_t;
-+    }
-     else
-     {
-         static assert(false, "Architecture not supported.");
-     }
- }
- else version (CRuntime_Newlib)
- {
-     version (AArch64)
-     {
-         alias fenv_t = ulong;
-diff --git a/libphobos/libdruntime/core/sys/posix/signal.d b/libphobos/libdruntime/core/sys/posix/signal.d
-index a8b7f751..78d8b3cd 100644
--- a/libphobos/libdruntime/core/sys/posix/signal.d
-+++ b/libphobos/libdruntime/core/sys/posix/signal.d
-@@ -2751,20 +2751,30 @@ else version (CRuntime_Musl)
-     else version (PPC_Any)
-     {
-         enum MINSIGSTKSZ = 4096;
-         enum SIGSTKSZ    = 10240;
-     }
-     else version (X86_Any)
-     {
-         enum MINSIGSTKSZ = 2048;
-         enum SIGSTKSZ    = 8192;
-     }
-+    else version (RISCV64)
-+    {
-+        enum MINSIGSTKSZ = 2048;
-+        enum SIGSTKSZ    = 8192;
-+    }
-+    else version (LoongArch64)
-+    {
-+        enum MINSIGSTKSZ = 4096;
-+        enum SIGSTKSZ    = 16384;
-+    }
-     else
-         static assert(0, "unimplemented");
- 
-     //ucontext_t (defined in core.sys.posix.ucontext)
-     //mcontext_t (defined in core.sys.posix.ucontext)
- 
-     version (MIPS_Any)
-     {
-         struct stack_t
-         {
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -64,7 +64,6 @@ _libitm=true
 if [ "$CHOST" != "$CTARGET" ]; then
 	if [ "$BOOTSTRAP" = nolibc ]; then
 		LANG_CXX=false
-		LANG_D=false
 		LANG_ADA=false
 		_libgcc=false
 		_builddir="$srcdir/build-cross-pass2"
@@ -74,6 +73,7 @@ if [ "$CHOST" != "$CTARGET" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false
 	_libgomp=false
 	_libatomic=false
@@ -115,6 +115,7 @@ elif [ "$CBUILD" != "$CHOST" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false

 	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
@@ -139,11 +140,11 @@ else
 	export BOOT_LDFLAGS="$LDFLAGS"
 fi

-case "$CTARGET_ARCH" in
+case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -170,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

@@ -183,8 +184,13 @@ if $_libgomp; then
 	subpackages="$subpackages libgomp::$CTARGET_ARCH"
 fi

+case "$CARCH" in
+riscv64)
+LANG_ADA=false;;
+esac
+
 case "$CTARGET_ARCH" in
-riscv64|loongarch64)
+loongarch64)
 LANG_ADA=false;;
 esac

@@ -193,17 +199,9 @@ if $LANG_CXX; then
 	_languages="$_languages,c++"
 fi
 if $LANG_D; then
-	subpackages="$subpackages gcc-gdc$_target:gdc"
+	subpackages="$subpackages libgphobos::$CTARGET_ARCH gcc-gdc$_target:gdc"
 	_languages="$_languages,d"
-	makedepends_build="$makedepends_build libucontext-dev"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gdc-bootstrap"
-		subpackages="$subpackages libgphobos::$CTARGET_ARCH"
-	else
-		# shared libgphobos is for D programs to link against, so
-		# skip building that while cross-compiling the GDC compiler
-		makedepends_build="$makedepends_build gcc-gdc gcc-gdc$_cross"
-	fi
+	makedepends_build="$makedepends_build libucontext-dev gcc-gdc-bootstrap"
 fi
 if $LANG_OBJC; then
 	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
@@ -280,9 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
 	0035-loongarch-disable-multilib-support.patch
-	0036-libphobos-add-riscv64-and-loongarch64-support.patch
 	fix-arm64.patch
-	ppc64le-quadmath.patch
 	"

 # secfixes:
@@ -343,7 +339,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d --with-tls=trad";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -364,23 +360,20 @@ build() {

 	case "$BOOTSTRAP" in
 	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
-	*)
-		# cross-bootstrap GDC with a static libphobos: due to GCC's
-		# ./configure not having a --disable-shared=libphobos option,
-		# we have to use --enable-shared with everything else instead.
-		if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-			_bootstrap_configure="--enable-shared=libgcc,libstdc++,libffi,zlib,boehm-gc,ada,libada,libgo,libobjc,libatomic,libgomp,libitm,libgfortran,libquadmath"
-		else
-			_bootstrap_configure="--enable-shared"
-		fi
-		_bootstrap_configure="$_bootstrap_configure --enable-threads --enable-tls"
-		;;
+	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
 	esac

 	$_libgomp	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"
+	if ! $_libquadmath; then
+		_arch_configure="$_arch_configure --disable-libquadmath"
+		# ppc64le needs both --disable-libquadmath{,-support}
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
+		[ "$CARCH" = "ppc64le" ] &&
+			_arch_configure="$_arch_configure
+				--disable-libquadmath-support"
+	fi

 	msg "Building the following:"
 	echo ""
@@ -434,10 +427,6 @@ build() {
 		--with-pkgversion="$version"

 	msg "building gcc"
-	if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-		# cross-compiling libphobos with parallel make fails
-		make all-target-libphobos
-	fi
 	make

 	# we build gccjit separate to not build all of gcc with --enable-host-shared
@@ -678,9 +667,9 @@ libgphobos() {

 gdc() {
 	pkgdesc="GCC-based D language compiler"
-	depends="gcc$_target=$_gccrel musl-dev libucontext-dev"
-	[ "$CBUILD" = "$CTARGET" ] && depends="$depends libgphobos=$_gccrel"
-	[ "$CHOST" = "$CTARGET" ] && provides="gcc-gdc-bootstrap=$_gccrel"
+	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
+	depends="$depends libucontext-dev"
+	provides="gcc-gdc-bootstrap=$_gccrel"

 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -691,25 +680,13 @@ gdc() {
 	# without installing the compiler
 	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
-	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
+	mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }

 libgo() {
@@ -851,7 +828,7 @@ f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8
 abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
 ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
 8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-684bf2db12aa45e8db7a895ab0f227b4e4351f611b4fcc6e1745d7ad94d31b3554f39d8cf9e2203520b3c6ee35cf309b417d4a842e7a8cd55a2b2accb23f2f24  0026-ada-musl-support-fixes.patch
+5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
 3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
 2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@@ -861,7 +838,5 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
 c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
 65df1d489e8d07a811f39e27fd29e3b2b4164fbc2c5fdc16a5142886d94a96e3fb28ccf4f20dd297ba6540ef8ea1ac3eb65a4279494639bf2f0f8376a3896cc3  0035-loongarch-disable-multilib-support.patch
-06f64544fd8bc4b6c8b06410c5198aa8fb4e82c232afc0cad83b2c69ac5d39399968206defa78297222700cd18e7fd7e8244afa76d343406a01f657c86306453  0036-libphobos-add-riscv64-and-loongarch64-support.patch
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
-815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
 "
@@ -1,56 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=3fe5720430a9ba61ed7562aac4d758cc77d49a28
--
-From 3fe5720430a9ba61ed7562aac4d758cc77d49a28 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Sat, 3 Aug 2024 20:37:54 +0200
-Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in
- some powerpc* configurations [PR116007]
-
-My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation.
-Unfortunately, that seems to fail building in some powerpc* configurations, where
-TFmode isn't available.
-quad.h has:
- #ifndef TFtype
- typedef float TFtype __attribute__ ((mode (TF)));
- #endif
-and uses TFtype.  quad.h has:
- /* Define the complex type corresponding to __float128
-    ("_Complex __float128" is not allowed) */
- #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__)
- typedef _Complex float __attribute__((mode(TC))) __complex128;
- #else
- typedef _Complex float __attribute__((mode(KC))) __complex128;
- #endif
-with the conditional and KCmode use added during porting of libquadmath
-to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__
-isn't defined; I could define it to float __attribute__ ((mode (KF))) but it
-seemed easier to just define it to __float128 which should do the same thing.
-
-2024-08-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/116007
-	* math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__
-	define to __float128 before including soft-fp.h and quad.h.
-
-(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b)
---
- libquadmath/math/sqrtq.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c
-index 8ca2828d42ce..a58998a06670 100644
--- a/libquadmath/math/sqrtq.c
-+++ b/libquadmath/math/sqrtq.c
-@@ -9,6 +9,9 @@
-     && defined(FE_TOWARDZERO) \
-     && defined(FE_INEXACT)
- #define USE_SOFT_FP 1
-+#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__)
-+#define TFtype __float128
-+#endif
- #include "../../libgcc/soft-fp/soft-fp.h"
- #include "../../libgcc/soft-fp/quad.h"
- #endif
-- 
-2.43.5
-
@@ -4,17 +4,17 @@ Date: Fri, 21 Aug 2020 07:07:48 +0000
 Subject: [PATCH 26/35] ada: musl support fixes

 ---
- gcc/ada/Makefile.rtl | 16 ++++++++--------
+ gcc/ada/Makefile.rtl | 10 +++++-----
 gcc/ada/adaint.c     | 34 +++++++++++++++++++---------------
 gcc/ada/adaint.h     | 10 ++++------
 gcc/ada/terminals.c  |  8 ++++----
- 4 files changed, 35 insertions(+), 33 deletions(-)
+ 4 files changed, 32 insertions(+), 30 deletions(-)

 diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
-index 32cbdb692..463028fbe 100644
+index 96306f8cc9a..090b6770ae5 100644
 --- a/gcc/ada/Makefile.rtl
 +++ b/gcc/ada/Makefile.rtl
-@@ -1558,7 +1558,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+@@ -1549,7 +1549,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   s-intman.adb<libgnarl/s-intman__posix.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -23,16 +23,7 @@ index 32cbdb692..463028fbe 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2144,7 +2144,7 @@ ifeq ($(strip $(filter-out loongarch% linux%,$(target_cpu) $(target_os))),)
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-   $(GNATRTL_128BIT_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-loongarch.ads
-@@ -2232,7 +2232,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2174,7 +2174,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
   s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -41,7 +32,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2267,7 +2267,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2205,7 +2205,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
 endif
 
 # ARM linux, GNU eabi
@@ -59,7 +50,7 @@ index 32cbdb692..463028fbe 100644
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-@@ -2488,7 +2488,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+@@ -2420,7 +2420,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -68,16 +59,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2592,7 +2592,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   s-taspri.ads<libgnarl/s-taspri__posix.ads \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(X86_64_TARGET_PAIRS) \
-   $(SIMD_PATH_TARGET_PAIRS) \
-@@ -2637,7 +2637,7 @@ ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)
+@@ -2524,7 +2524,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -87,10 +69,10 @@ index 32cbdb692..463028fbe 100644
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 74aa3c412..ef6118f37 100644
+index 8522094164e..92b230a462b 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
-@@ -94,6 +94,11 @@
+@@ -91,6 +91,11 @@
 #include <sys/param.h>
 #include <sys/pstat.h>
 #endif
@@ -102,7 +84,7 @@ index 74aa3c412..ef6118f37 100644
 
 #ifdef __PikeOS__
 #define __BSD_VISIBLE 1
-@@ -3465,7 +3470,6 @@ __gnat_lwp_self (void)
+@@ -3438,7 +3443,6 @@ __gnat_lwp_self (void)
 #endif
 
 #if defined (__linux__)
@@ -110,7 +92,7 @@ index 74aa3c412..ef6118f37 100644
 
 /* glibc versions earlier than 2.7 do not define the routines to handle
    dynamically allocated CPU sets. For these targets, we use the static
-@@ -3475,7 +3479,7 @@ __gnat_lwp_self (void)
+@@ -3448,7 +3452,7 @@ __gnat_lwp_self (void)
 
 /* Dynamic cpu sets */
 
@@ -119,7 +101,7 @@ index 74aa3c412..ef6118f37 100644
 __gnat_cpu_alloc (size_t count)
 {
   return CPU_ALLOC (count);
-@@ -3488,33 +3492,33 @@ __gnat_cpu_alloc_size (size_t count)
+@@ -3461,33 +3465,33 @@ __gnat_cpu_alloc_size (size_t count)
 }
 
 void
@@ -161,7 +143,7 @@ index 74aa3c412..ef6118f37 100644
 }
 
 size_t
-@@ -3524,23 +3528,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+@@ -3497,23 +3501,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
 }
 
 void
@@ -191,7 +173,7 @@ index 74aa3c412..ef6118f37 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0cbfd0e15..f97ed905b 100644
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -213,10 +195,10 @@ index 0cbfd0e15..f97ed905b 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 05af82c27..626ac35bc 100644
+index c0ee4a16bb1..ed796a48c1b 100644
 --- a/gcc/ada/terminals.c
 +++ b/gcc/ada/terminals.c
-@@ -1134,7 +1134,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1127,7 +1127,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 /* POSIX does not specify how to open the master side of a terminal.Several
    methods are available (system specific):
       1- using a cloning device (USE_CLONE_DEVICE)
@@ -225,7 +207,7 @@ index 05af82c27..626ac35bc 100644
       3- openpty                (USE_OPENPTY)
 
    When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1148,7 +1148,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1141,7 +1141,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 #if defined (__APPLE__) || defined (BSD)
 #define USE_OPENPTY
 #elif defined (__linux__)
@@ -234,7 +216,7 @@ index 05af82c27..626ac35bc 100644
 #elif defined (__sun__)
 #define USE_CLONE_DEVICE "/dev/ptmx"
 #elif defined (_AIX)
-@@ -1197,8 +1197,8 @@ allocate_pty_desc (pty_desc **desc) {
+@@ -1190,8 +1190,8 @@ allocate_pty_desc (pty_desc **desc) {
    int  master_fd   = -1;
    char *slave_name = NULL;
 
@@ -245,3 +227,6 @@ index 05af82c27..626ac35bc 100644
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+2.41.0
+
@@ -1,87 +0,0 @@
-From: Celeste <cielesti@protonmail.com>
-Date: Mon, 2 Sep 2024 02:54:17 +0000
-Subject: [PATCH] libphobos: add riscv64 and loongarch64 support
-
-Add musl support for these 2 architectures based on fenv.h and signal.h from:
-
-https://git.musl-libc.org/cgit/musl/tree/arch/riscv64/bits?h=v1.2.5
-
-https://git.musl-libc.org/cgit/musl/tree/arch/loongarch64/bits?h=v1.2.5
---
- libphobos/libdruntime/core/stdc/fenv.d        | 13 +++++++++++++
- libphobos/libdruntime/core/sys/posix/signal.d | 10 ++++++++++
- 2 files changed, 23 insertions(+)
-
-diff --git a/libphobos/libdruntime/core/stdc/fenv.d b/libphobos/libdruntime/core/stdc/fenv.d
-index a7364c0a..5b327e4a 100644
--- a/libphobos/libdruntime/core/stdc/fenv.d
-+++ b/libphobos/libdruntime/core/stdc/fenv.d
-@@ -436,20 +436,33 @@ else version (CRuntime_Musl)
-             ushort __cs_selector;
-             ushort __opcode;
-             uint   __data_offset;
-             ushort __data_selector;
-             ushort __unused5;
-             version (X86_64)
-                 uint __mxcsr;
-         }
-         alias ushort fexcept_t;
-     }
-+    else version (RISCV64)
-+    {
-+        alias uint fenv_t;
-+        alias uint fexcept_t;
-+    }
-+    else version (LoongArch64)
-+    {
-+        struct fenv_t
-+        {
-+            uint __cw;
-+        }
-+        alias uint fexcept_t;
-+    }
-     else
-     {
-         static assert(false, "Architecture not supported.");
-     }
- }
- else version (CRuntime_Newlib)
- {
-     version (AArch64)
-     {
-         alias fenv_t = ulong;
-diff --git a/libphobos/libdruntime/core/sys/posix/signal.d b/libphobos/libdruntime/core/sys/posix/signal.d
-index a8b7f751..78d8b3cd 100644
--- a/libphobos/libdruntime/core/sys/posix/signal.d
-+++ b/libphobos/libdruntime/core/sys/posix/signal.d
-@@ -2751,20 +2751,30 @@ else version (CRuntime_Musl)
-     else version (PPC_Any)
-     {
-         enum MINSIGSTKSZ = 4096;
-         enum SIGSTKSZ    = 10240;
-     }
-     else version (X86_Any)
-     {
-         enum MINSIGSTKSZ = 2048;
-         enum SIGSTKSZ    = 8192;
-     }
-+    else version (RISCV64)
-+    {
-+        enum MINSIGSTKSZ = 2048;
-+        enum SIGSTKSZ    = 8192;
-+    }
-+    else version (LoongArch64)
-+    {
-+        enum MINSIGSTKSZ = 4096;
-+        enum SIGSTKSZ    = 16384;
-+    }
-     else
-         static assert(0, "unimplemented");
- 
-     //ucontext_t (defined in core.sys.posix.ucontext)
-     //mcontext_t (defined in core.sys.posix.ucontext)
- 
-     version (MIPS_Any)
-     {
-         struct stack_t
-         {
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -64,7 +64,6 @@ _libitm=true
 if [ "$CHOST" != "$CTARGET" ]; then
 	if [ "$BOOTSTRAP" = nolibc ]; then
 		LANG_CXX=false
-		LANG_D=false
 		LANG_ADA=false
 		_libgcc=false
 		_builddir="$srcdir/build-cross-pass2"
@@ -74,6 +73,7 @@ if [ "$CHOST" != "$CTARGET" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false
 	_libgomp=false
 	_libatomic=false
@@ -115,6 +115,7 @@ elif [ "$CBUILD" != "$CHOST" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false

 	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
@@ -139,11 +140,11 @@ else
 	export BOOT_LDFLAGS="$LDFLAGS"
 fi

-case "$CTARGET_ARCH" in
+case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -170,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

@@ -183,8 +184,13 @@ if $_libgomp; then
 	subpackages="$subpackages libgomp::$CTARGET_ARCH"
 fi

+case "$CARCH" in
+riscv64)
+LANG_ADA=false;;
+esac
+
 case "$CTARGET_ARCH" in
-riscv64|loongarch64)
+loongarch64)
 LANG_ADA=false;;
 esac

@@ -193,17 +199,9 @@ if $LANG_CXX; then
 	_languages="$_languages,c++"
 fi
 if $LANG_D; then
-	subpackages="$subpackages gcc-gdc$_target:gdc"
+	subpackages="$subpackages libgphobos::$CTARGET_ARCH gcc-gdc$_target:gdc"
 	_languages="$_languages,d"
-	makedepends_build="$makedepends_build libucontext-dev"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gdc-bootstrap"
-		subpackages="$subpackages libgphobos::$CTARGET_ARCH"
-	else
-		# shared libgphobos is for D programs to link against, so
-		# skip building that while cross-compiling the GDC compiler
-		makedepends_build="$makedepends_build gcc-gdc gcc-gdc$_cross"
-	fi
+	makedepends_build="$makedepends_build libucontext-dev gcc-gdc-bootstrap"
 fi
 if $LANG_OBJC; then
 	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
@@ -280,9 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
 	0035-loongarch-disable-multilib-support.patch
-	0036-libphobos-add-riscv64-and-loongarch64-support.patch
 	fix-arm64.patch
-	ppc64le-quadmath.patch
 	"

 # secfixes:
@@ -343,7 +339,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d --with-tls=trad";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -364,23 +360,20 @@ build() {

 	case "$BOOTSTRAP" in
 	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
-	*)
-		# cross-bootstrap GDC with a static libphobos: due to GCC's
-		# ./configure not having a --disable-shared=libphobos option,
-		# we have to use --enable-shared with everything else instead.
-		if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-			_bootstrap_configure="--enable-shared=libgcc,libstdc++,libffi,zlib,boehm-gc,ada,libada,libgo,libobjc,libatomic,libgomp,libitm,libgfortran,libquadmath"
-		else
-			_bootstrap_configure="--enable-shared"
-		fi
-		_bootstrap_configure="$_bootstrap_configure --enable-threads --enable-tls"
-		;;
+	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
 	esac

 	$_libgomp	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"
+	if ! $_libquadmath; then
+		_arch_configure="$_arch_configure --disable-libquadmath"
+		# ppc64le needs both --disable-libquadmath{,-support}
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
+		[ "$CARCH" = "ppc64le" ] &&
+			_arch_configure="$_arch_configure
+				--disable-libquadmath-support"
+	fi

 	msg "Building the following:"
 	echo ""
@@ -434,10 +427,6 @@ build() {
 		--with-pkgversion="$version"

 	msg "building gcc"
-	if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-		# cross-compiling libphobos with parallel make fails
-		make all-target-libphobos
-	fi
 	make

 	# we build gccjit separate to not build all of gcc with --enable-host-shared
@@ -678,9 +667,9 @@ libgphobos() {

 gdc() {
 	pkgdesc="GCC-based D language compiler"
-	depends="gcc$_target=$_gccrel musl-dev libucontext-dev"
-	[ "$CBUILD" = "$CTARGET" ] && depends="$depends libgphobos=$_gccrel"
-	[ "$CHOST" = "$CTARGET" ] && provides="gcc-gdc-bootstrap=$_gccrel"
+	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
+	depends="$depends libucontext-dev"
+	provides="gcc-gdc-bootstrap=$_gccrel"

 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -691,25 +680,13 @@ gdc() {
 	# without installing the compiler
 	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
-	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
+	mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }

 libgo() {
@@ -851,7 +828,7 @@ f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8
 abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
 ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
 8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-684bf2db12aa45e8db7a895ab0f227b4e4351f611b4fcc6e1745d7ad94d31b3554f39d8cf9e2203520b3c6ee35cf309b417d4a842e7a8cd55a2b2accb23f2f24  0026-ada-musl-support-fixes.patch
+5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
 3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
 2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@@ -861,7 +838,5 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
 c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
 65df1d489e8d07a811f39e27fd29e3b2b4164fbc2c5fdc16a5142886d94a96e3fb28ccf4f20dd297ba6540ef8ea1ac3eb65a4279494639bf2f0f8376a3896cc3  0035-loongarch-disable-multilib-support.patch
-06f64544fd8bc4b6c8b06410c5198aa8fb4e82c232afc0cad83b2c69ac5d39399968206defa78297222700cd18e7fd7e8244afa76d343406a01f657c86306453  0036-libphobos-add-riscv64-and-loongarch64-support.patch
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
-815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
 "
@@ -1,56 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=3fe5720430a9ba61ed7562aac4d758cc77d49a28
--
-From 3fe5720430a9ba61ed7562aac4d758cc77d49a28 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Sat, 3 Aug 2024 20:37:54 +0200
-Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in
- some powerpc* configurations [PR116007]
-
-My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation.
-Unfortunately, that seems to fail building in some powerpc* configurations, where
-TFmode isn't available.
-quad.h has:
- #ifndef TFtype
- typedef float TFtype __attribute__ ((mode (TF)));
- #endif
-and uses TFtype.  quad.h has:
- /* Define the complex type corresponding to __float128
-    ("_Complex __float128" is not allowed) */
- #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__)
- typedef _Complex float __attribute__((mode(TC))) __complex128;
- #else
- typedef _Complex float __attribute__((mode(KC))) __complex128;
- #endif
-with the conditional and KCmode use added during porting of libquadmath
-to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__
-isn't defined; I could define it to float __attribute__ ((mode (KF))) but it
-seemed easier to just define it to __float128 which should do the same thing.
-
-2024-08-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/116007
-	* math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__
-	define to __float128 before including soft-fp.h and quad.h.
-
-(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b)
---
- libquadmath/math/sqrtq.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c
-index 8ca2828d42ce..a58998a06670 100644
--- a/libquadmath/math/sqrtq.c
-+++ b/libquadmath/math/sqrtq.c
-@@ -9,6 +9,9 @@
-     && defined(FE_TOWARDZERO) \
-     && defined(FE_INEXACT)
- #define USE_SOFT_FP 1
-+#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__)
-+#define TFtype __float128
-+#endif
- #include "../../libgcc/soft-fp/soft-fp.h"
- #include "../../libgcc/soft-fp/quad.h"
- #endif
-- 
-2.43.5
-
@@ -4,17 +4,17 @@ Date: Fri, 21 Aug 2020 07:07:48 +0000
 Subject: [PATCH 26/35] ada: musl support fixes

 ---
- gcc/ada/Makefile.rtl | 16 ++++++++--------
+ gcc/ada/Makefile.rtl | 10 +++++-----
 gcc/ada/adaint.c     | 34 +++++++++++++++++++---------------
 gcc/ada/adaint.h     | 10 ++++------
 gcc/ada/terminals.c  |  8 ++++----
- 4 files changed, 35 insertions(+), 33 deletions(-)
+ 4 files changed, 32 insertions(+), 30 deletions(-)

 diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
-index 32cbdb692..463028fbe 100644
+index 96306f8cc9a..090b6770ae5 100644
 --- a/gcc/ada/Makefile.rtl
 +++ b/gcc/ada/Makefile.rtl
-@@ -1558,7 +1558,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+@@ -1549,7 +1549,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   s-intman.adb<libgnarl/s-intman__posix.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -23,16 +23,7 @@ index 32cbdb692..463028fbe 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2144,7 +2144,7 @@ ifeq ($(strip $(filter-out loongarch% linux%,$(target_cpu) $(target_os))),)
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-   $(GNATRTL_128BIT_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-loongarch.ads
-@@ -2232,7 +2232,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2174,7 +2174,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
   s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -41,7 +32,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2267,7 +2267,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2205,7 +2205,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
 endif
 
 # ARM linux, GNU eabi
@@ -59,7 +50,7 @@ index 32cbdb692..463028fbe 100644
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-@@ -2488,7 +2488,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+@@ -2420,7 +2420,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -68,16 +59,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2592,7 +2592,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   s-taspri.ads<libgnarl/s-taspri__posix.ads \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(X86_64_TARGET_PAIRS) \
-   $(SIMD_PATH_TARGET_PAIRS) \
-@@ -2637,7 +2637,7 @@ ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)
+@@ -2524,7 +2524,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -87,10 +69,10 @@ index 32cbdb692..463028fbe 100644
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 74aa3c412..ef6118f37 100644
+index 8522094164e..92b230a462b 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
-@@ -94,6 +94,11 @@
+@@ -91,6 +91,11 @@
 #include <sys/param.h>
 #include <sys/pstat.h>
 #endif
@@ -102,7 +84,7 @@ index 74aa3c412..ef6118f37 100644
 
 #ifdef __PikeOS__
 #define __BSD_VISIBLE 1
-@@ -3465,7 +3470,6 @@ __gnat_lwp_self (void)
+@@ -3438,7 +3443,6 @@ __gnat_lwp_self (void)
 #endif
 
 #if defined (__linux__)
@@ -110,7 +92,7 @@ index 74aa3c412..ef6118f37 100644
 
 /* glibc versions earlier than 2.7 do not define the routines to handle
    dynamically allocated CPU sets. For these targets, we use the static
-@@ -3475,7 +3479,7 @@ __gnat_lwp_self (void)
+@@ -3448,7 +3452,7 @@ __gnat_lwp_self (void)
 
 /* Dynamic cpu sets */
 
@@ -119,7 +101,7 @@ index 74aa3c412..ef6118f37 100644
 __gnat_cpu_alloc (size_t count)
 {
   return CPU_ALLOC (count);
-@@ -3488,33 +3492,33 @@ __gnat_cpu_alloc_size (size_t count)
+@@ -3461,33 +3465,33 @@ __gnat_cpu_alloc_size (size_t count)
 }
 
 void
@@ -161,7 +143,7 @@ index 74aa3c412..ef6118f37 100644
 }
 
 size_t
-@@ -3524,23 +3528,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+@@ -3497,23 +3501,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
 }
 
 void
@@ -191,7 +173,7 @@ index 74aa3c412..ef6118f37 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0cbfd0e15..f97ed905b 100644
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -213,10 +195,10 @@ index 0cbfd0e15..f97ed905b 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 05af82c27..626ac35bc 100644
+index c0ee4a16bb1..ed796a48c1b 100644
 --- a/gcc/ada/terminals.c
 +++ b/gcc/ada/terminals.c
-@@ -1134,7 +1134,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1127,7 +1127,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 /* POSIX does not specify how to open the master side of a terminal.Several
    methods are available (system specific):
       1- using a cloning device (USE_CLONE_DEVICE)
@@ -225,7 +207,7 @@ index 05af82c27..626ac35bc 100644
       3- openpty                (USE_OPENPTY)
 
    When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1148,7 +1148,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1141,7 +1141,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 #if defined (__APPLE__) || defined (BSD)
 #define USE_OPENPTY
 #elif defined (__linux__)
@@ -234,7 +216,7 @@ index 05af82c27..626ac35bc 100644
 #elif defined (__sun__)
 #define USE_CLONE_DEVICE "/dev/ptmx"
 #elif defined (_AIX)
-@@ -1197,8 +1197,8 @@ allocate_pty_desc (pty_desc **desc) {
+@@ -1190,8 +1190,8 @@ allocate_pty_desc (pty_desc **desc) {
    int  master_fd   = -1;
    char *slave_name = NULL;
 
@@ -245,3 +227,6 @@ index 05af82c27..626ac35bc 100644
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+2.41.0
+
@@ -1,87 +0,0 @@
-From: Celeste <cielesti@protonmail.com>
-Date: Mon, 2 Sep 2024 02:54:17 +0000
-Subject: [PATCH] libphobos: add riscv64 and loongarch64 support
-
-Add musl support for these 2 architectures based on fenv.h and signal.h from:
-
-https://git.musl-libc.org/cgit/musl/tree/arch/riscv64/bits?h=v1.2.5
-
-https://git.musl-libc.org/cgit/musl/tree/arch/loongarch64/bits?h=v1.2.5
---
- libphobos/libdruntime/core/stdc/fenv.d        | 13 +++++++++++++
- libphobos/libdruntime/core/sys/posix/signal.d | 10 ++++++++++
- 2 files changed, 23 insertions(+)
-
-diff --git a/libphobos/libdruntime/core/stdc/fenv.d b/libphobos/libdruntime/core/stdc/fenv.d
-index a7364c0a..5b327e4a 100644
--- a/libphobos/libdruntime/core/stdc/fenv.d
-+++ b/libphobos/libdruntime/core/stdc/fenv.d
-@@ -436,20 +436,33 @@ else version (CRuntime_Musl)
-             ushort __cs_selector;
-             ushort __opcode;
-             uint   __data_offset;
-             ushort __data_selector;
-             ushort __unused5;
-             version (X86_64)
-                 uint __mxcsr;
-         }
-         alias ushort fexcept_t;
-     }
-+    else version (RISCV64)
-+    {
-+        alias uint fenv_t;
-+        alias uint fexcept_t;
-+    }
-+    else version (LoongArch64)
-+    {
-+        struct fenv_t
-+        {
-+            uint __cw;
-+        }
-+        alias uint fexcept_t;
-+    }
-     else
-     {
-         static assert(false, "Architecture not supported.");
-     }
- }
- else version (CRuntime_Newlib)
- {
-     version (AArch64)
-     {
-         alias fenv_t = ulong;
-diff --git a/libphobos/libdruntime/core/sys/posix/signal.d b/libphobos/libdruntime/core/sys/posix/signal.d
-index a8b7f751..78d8b3cd 100644
--- a/libphobos/libdruntime/core/sys/posix/signal.d
-+++ b/libphobos/libdruntime/core/sys/posix/signal.d
-@@ -2751,20 +2751,30 @@ else version (CRuntime_Musl)
-     else version (PPC_Any)
-     {
-         enum MINSIGSTKSZ = 4096;
-         enum SIGSTKSZ    = 10240;
-     }
-     else version (X86_Any)
-     {
-         enum MINSIGSTKSZ = 2048;
-         enum SIGSTKSZ    = 8192;
-     }
-+    else version (RISCV64)
-+    {
-+        enum MINSIGSTKSZ = 2048;
-+        enum SIGSTKSZ    = 8192;
-+    }
-+    else version (LoongArch64)
-+    {
-+        enum MINSIGSTKSZ = 4096;
-+        enum SIGSTKSZ    = 16384;
-+    }
-     else
-         static assert(0, "unimplemented");
- 
-     //ucontext_t (defined in core.sys.posix.ucontext)
-     //mcontext_t (defined in core.sys.posix.ucontext)
- 
-     version (MIPS_Any)
-     {
-         struct stack_t
-         {
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armv7
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -64,7 +64,6 @@ _libitm=true
 if [ "$CHOST" != "$CTARGET" ]; then
 	if [ "$BOOTSTRAP" = nolibc ]; then
 		LANG_CXX=false
-		LANG_D=false
 		LANG_ADA=false
 		_libgcc=false
 		_builddir="$srcdir/build-cross-pass2"
@@ -74,6 +73,7 @@ if [ "$CHOST" != "$CTARGET" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false
 	_libgomp=false
 	_libatomic=false
@@ -115,6 +115,7 @@ elif [ "$CBUILD" != "$CHOST" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false

 	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
@@ -139,11 +140,11 @@ else
 	export BOOT_LDFLAGS="$LDFLAGS"
 fi

-case "$CTARGET_ARCH" in
+case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -170,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

@@ -183,8 +184,13 @@ if $_libgomp; then
 	subpackages="$subpackages libgomp::$CTARGET_ARCH"
 fi

+case "$CARCH" in
+riscv64)
+LANG_ADA=false;;
+esac
+
 case "$CTARGET_ARCH" in
-riscv64|loongarch64)
+loongarch64)
 LANG_ADA=false;;
 esac

@@ -193,17 +199,9 @@ if $LANG_CXX; then
 	_languages="$_languages,c++"
 fi
 if $LANG_D; then
-	subpackages="$subpackages gcc-gdc$_target:gdc"
+	subpackages="$subpackages libgphobos::$CTARGET_ARCH gcc-gdc$_target:gdc"
 	_languages="$_languages,d"
-	makedepends_build="$makedepends_build libucontext-dev"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gdc-bootstrap"
-		subpackages="$subpackages libgphobos::$CTARGET_ARCH"
-	else
-		# shared libgphobos is for D programs to link against, so
-		# skip building that while cross-compiling the GDC compiler
-		makedepends_build="$makedepends_build gcc-gdc gcc-gdc$_cross"
-	fi
+	makedepends_build="$makedepends_build libucontext-dev gcc-gdc-bootstrap"
 fi
 if $LANG_OBJC; then
 	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
@@ -280,9 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
 	0035-loongarch-disable-multilib-support.patch
-	0036-libphobos-add-riscv64-and-loongarch64-support.patch
 	fix-arm64.patch
-	ppc64le-quadmath.patch
 	"

 # secfixes:
@@ -343,7 +339,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d --with-tls=trad";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -364,23 +360,20 @@ build() {

 	case "$BOOTSTRAP" in
 	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
-	*)
-		# cross-bootstrap GDC with a static libphobos: due to GCC's
-		# ./configure not having a --disable-shared=libphobos option,
-		# we have to use --enable-shared with everything else instead.
-		if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-			_bootstrap_configure="--enable-shared=libgcc,libstdc++,libffi,zlib,boehm-gc,ada,libada,libgo,libobjc,libatomic,libgomp,libitm,libgfortran,libquadmath"
-		else
-			_bootstrap_configure="--enable-shared"
-		fi
-		_bootstrap_configure="$_bootstrap_configure --enable-threads --enable-tls"
-		;;
+	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
 	esac

 	$_libgomp	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"
+	if ! $_libquadmath; then
+		_arch_configure="$_arch_configure --disable-libquadmath"
+		# ppc64le needs both --disable-libquadmath{,-support}
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
+		[ "$CARCH" = "ppc64le" ] &&
+			_arch_configure="$_arch_configure
+				--disable-libquadmath-support"
+	fi

 	msg "Building the following:"
 	echo ""
@@ -434,10 +427,6 @@ build() {
 		--with-pkgversion="$version"

 	msg "building gcc"
-	if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-		# cross-compiling libphobos with parallel make fails
-		make all-target-libphobos
-	fi
 	make

 	# we build gccjit separate to not build all of gcc with --enable-host-shared
@@ -678,9 +667,9 @@ libgphobos() {

 gdc() {
 	pkgdesc="GCC-based D language compiler"
-	depends="gcc$_target=$_gccrel musl-dev libucontext-dev"
-	[ "$CBUILD" = "$CTARGET" ] && depends="$depends libgphobos=$_gccrel"
-	[ "$CHOST" = "$CTARGET" ] && provides="gcc-gdc-bootstrap=$_gccrel"
+	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
+	depends="$depends libucontext-dev"
+	provides="gcc-gdc-bootstrap=$_gccrel"

 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -691,25 +680,13 @@ gdc() {
 	# without installing the compiler
 	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
-	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
+	mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }

 libgo() {
@@ -851,7 +828,7 @@ f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8
 abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
 ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
 8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-684bf2db12aa45e8db7a895ab0f227b4e4351f611b4fcc6e1745d7ad94d31b3554f39d8cf9e2203520b3c6ee35cf309b417d4a842e7a8cd55a2b2accb23f2f24  0026-ada-musl-support-fixes.patch
+5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
 3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
 2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@@ -861,7 +838,5 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
 c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
 65df1d489e8d07a811f39e27fd29e3b2b4164fbc2c5fdc16a5142886d94a96e3fb28ccf4f20dd297ba6540ef8ea1ac3eb65a4279494639bf2f0f8376a3896cc3  0035-loongarch-disable-multilib-support.patch
-06f64544fd8bc4b6c8b06410c5198aa8fb4e82c232afc0cad83b2c69ac5d39399968206defa78297222700cd18e7fd7e8244afa76d343406a01f657c86306453  0036-libphobos-add-riscv64-and-loongarch64-support.patch
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
-815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
 "
@@ -1,56 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=3fe5720430a9ba61ed7562aac4d758cc77d49a28
--
-From 3fe5720430a9ba61ed7562aac4d758cc77d49a28 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Sat, 3 Aug 2024 20:37:54 +0200
-Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in
- some powerpc* configurations [PR116007]
-
-My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation.
-Unfortunately, that seems to fail building in some powerpc* configurations, where
-TFmode isn't available.
-quad.h has:
- #ifndef TFtype
- typedef float TFtype __attribute__ ((mode (TF)));
- #endif
-and uses TFtype.  quad.h has:
- /* Define the complex type corresponding to __float128
-    ("_Complex __float128" is not allowed) */
- #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__)
- typedef _Complex float __attribute__((mode(TC))) __complex128;
- #else
- typedef _Complex float __attribute__((mode(KC))) __complex128;
- #endif
-with the conditional and KCmode use added during porting of libquadmath
-to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__
-isn't defined; I could define it to float __attribute__ ((mode (KF))) but it
-seemed easier to just define it to __float128 which should do the same thing.
-
-2024-08-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/116007
-	* math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__
-	define to __float128 before including soft-fp.h and quad.h.
-
-(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b)
---
- libquadmath/math/sqrtq.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c
-index 8ca2828d42ce..a58998a06670 100644
--- a/libquadmath/math/sqrtq.c
-+++ b/libquadmath/math/sqrtq.c
-@@ -9,6 +9,9 @@
-     && defined(FE_TOWARDZERO) \
-     && defined(FE_INEXACT)
- #define USE_SOFT_FP 1
-+#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__)
-+#define TFtype __float128
-+#endif
- #include "../../libgcc/soft-fp/soft-fp.h"
- #include "../../libgcc/soft-fp/quad.h"
- #endif
-- 
-2.43.5
-
@@ -4,17 +4,17 @@ Date: Fri, 21 Aug 2020 07:07:48 +0000
 Subject: [PATCH 26/35] ada: musl support fixes

 ---
- gcc/ada/Makefile.rtl | 16 ++++++++--------
+ gcc/ada/Makefile.rtl | 10 +++++-----
 gcc/ada/adaint.c     | 34 +++++++++++++++++++---------------
 gcc/ada/adaint.h     | 10 ++++------
 gcc/ada/terminals.c  |  8 ++++----
- 4 files changed, 35 insertions(+), 33 deletions(-)
+ 4 files changed, 32 insertions(+), 30 deletions(-)

 diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
-index 32cbdb692..463028fbe 100644
+index 96306f8cc9a..090b6770ae5 100644
 --- a/gcc/ada/Makefile.rtl
 +++ b/gcc/ada/Makefile.rtl
-@@ -1558,7 +1558,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+@@ -1549,7 +1549,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   s-intman.adb<libgnarl/s-intman__posix.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -23,16 +23,7 @@ index 32cbdb692..463028fbe 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2144,7 +2144,7 @@ ifeq ($(strip $(filter-out loongarch% linux%,$(target_cpu) $(target_os))),)
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-   $(GNATRTL_128BIT_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-loongarch.ads
-@@ -2232,7 +2232,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2174,7 +2174,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
   s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -41,7 +32,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2267,7 +2267,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2205,7 +2205,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
 endif
 
 # ARM linux, GNU eabi
@@ -59,7 +50,7 @@ index 32cbdb692..463028fbe 100644
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-@@ -2488,7 +2488,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+@@ -2420,7 +2420,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -68,16 +59,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2592,7 +2592,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   s-taspri.ads<libgnarl/s-taspri__posix.ads \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(X86_64_TARGET_PAIRS) \
-   $(SIMD_PATH_TARGET_PAIRS) \
-@@ -2637,7 +2637,7 @@ ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)
+@@ -2524,7 +2524,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -87,10 +69,10 @@ index 32cbdb692..463028fbe 100644
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 74aa3c412..ef6118f37 100644
+index 8522094164e..92b230a462b 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
-@@ -94,6 +94,11 @@
+@@ -91,6 +91,11 @@
 #include <sys/param.h>
 #include <sys/pstat.h>
 #endif
@@ -102,7 +84,7 @@ index 74aa3c412..ef6118f37 100644
 
 #ifdef __PikeOS__
 #define __BSD_VISIBLE 1
-@@ -3465,7 +3470,6 @@ __gnat_lwp_self (void)
+@@ -3438,7 +3443,6 @@ __gnat_lwp_self (void)
 #endif
 
 #if defined (__linux__)
@@ -110,7 +92,7 @@ index 74aa3c412..ef6118f37 100644
 
 /* glibc versions earlier than 2.7 do not define the routines to handle
    dynamically allocated CPU sets. For these targets, we use the static
-@@ -3475,7 +3479,7 @@ __gnat_lwp_self (void)
+@@ -3448,7 +3452,7 @@ __gnat_lwp_self (void)
 
 /* Dynamic cpu sets */
 
@@ -119,7 +101,7 @@ index 74aa3c412..ef6118f37 100644
 __gnat_cpu_alloc (size_t count)
 {
   return CPU_ALLOC (count);
-@@ -3488,33 +3492,33 @@ __gnat_cpu_alloc_size (size_t count)
+@@ -3461,33 +3465,33 @@ __gnat_cpu_alloc_size (size_t count)
 }
 
 void
@@ -161,7 +143,7 @@ index 74aa3c412..ef6118f37 100644
 }
 
 size_t
-@@ -3524,23 +3528,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+@@ -3497,23 +3501,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
 }
 
 void
@@ -191,7 +173,7 @@ index 74aa3c412..ef6118f37 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0cbfd0e15..f97ed905b 100644
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -213,10 +195,10 @@ index 0cbfd0e15..f97ed905b 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 05af82c27..626ac35bc 100644
+index c0ee4a16bb1..ed796a48c1b 100644
 --- a/gcc/ada/terminals.c
 +++ b/gcc/ada/terminals.c
-@@ -1134,7 +1134,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1127,7 +1127,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 /* POSIX does not specify how to open the master side of a terminal.Several
    methods are available (system specific):
       1- using a cloning device (USE_CLONE_DEVICE)
@@ -225,7 +207,7 @@ index 05af82c27..626ac35bc 100644
       3- openpty                (USE_OPENPTY)
 
    When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1148,7 +1148,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1141,7 +1141,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 #if defined (__APPLE__) || defined (BSD)
 #define USE_OPENPTY
 #elif defined (__linux__)
@@ -234,7 +216,7 @@ index 05af82c27..626ac35bc 100644
 #elif defined (__sun__)
 #define USE_CLONE_DEVICE "/dev/ptmx"
 #elif defined (_AIX)
-@@ -1197,8 +1197,8 @@ allocate_pty_desc (pty_desc **desc) {
+@@ -1190,8 +1190,8 @@ allocate_pty_desc (pty_desc **desc) {
    int  master_fd   = -1;
    char *slave_name = NULL;
 
@@ -245,3 +227,6 @@ index 05af82c27..626ac35bc 100644
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+2.41.0
+
@@ -1,87 +0,0 @@
-From: Celeste <cielesti@protonmail.com>
-Date: Mon, 2 Sep 2024 02:54:17 +0000
-Subject: [PATCH] libphobos: add riscv64 and loongarch64 support
-
-Add musl support for these 2 architectures based on fenv.h and signal.h from:
-
-https://git.musl-libc.org/cgit/musl/tree/arch/riscv64/bits?h=v1.2.5
-
-https://git.musl-libc.org/cgit/musl/tree/arch/loongarch64/bits?h=v1.2.5
---
- libphobos/libdruntime/core/stdc/fenv.d        | 13 +++++++++++++
- libphobos/libdruntime/core/sys/posix/signal.d | 10 ++++++++++
- 2 files changed, 23 insertions(+)
-
-diff --git a/libphobos/libdruntime/core/stdc/fenv.d b/libphobos/libdruntime/core/stdc/fenv.d
-index a7364c0a..5b327e4a 100644
--- a/libphobos/libdruntime/core/stdc/fenv.d
-+++ b/libphobos/libdruntime/core/stdc/fenv.d
-@@ -436,20 +436,33 @@ else version (CRuntime_Musl)
-             ushort __cs_selector;
-             ushort __opcode;
-             uint   __data_offset;
-             ushort __data_selector;
-             ushort __unused5;
-             version (X86_64)
-                 uint __mxcsr;
-         }
-         alias ushort fexcept_t;
-     }
-+    else version (RISCV64)
-+    {
-+        alias uint fenv_t;
-+        alias uint fexcept_t;
-+    }
-+    else version (LoongArch64)
-+    {
-+        struct fenv_t
-+        {
-+            uint __cw;
-+        }
-+        alias uint fexcept_t;
-+    }
-     else
-     {
-         static assert(false, "Architecture not supported.");
-     }
- }
- else version (CRuntime_Newlib)
- {
-     version (AArch64)
-     {
-         alias fenv_t = ulong;
-diff --git a/libphobos/libdruntime/core/sys/posix/signal.d b/libphobos/libdruntime/core/sys/posix/signal.d
-index a8b7f751..78d8b3cd 100644
--- a/libphobos/libdruntime/core/sys/posix/signal.d
-+++ b/libphobos/libdruntime/core/sys/posix/signal.d
-@@ -2751,20 +2751,30 @@ else version (CRuntime_Musl)
-     else version (PPC_Any)
-     {
-         enum MINSIGSTKSZ = 4096;
-         enum SIGSTKSZ    = 10240;
-     }
-     else version (X86_Any)
-     {
-         enum MINSIGSTKSZ = 2048;
-         enum SIGSTKSZ    = 8192;
-     }
-+    else version (RISCV64)
-+    {
-+        enum MINSIGSTKSZ = 2048;
-+        enum SIGSTKSZ    = 8192;
-+    }
-+    else version (LoongArch64)
-+    {
-+        enum MINSIGSTKSZ = 4096;
-+        enum SIGSTKSZ    = 16384;
-+    }
-     else
-         static assert(0, "unimplemented");
- 
-     //ucontext_t (defined in core.sys.posix.ucontext)
-     //mcontext_t (defined in core.sys.posix.ucontext)
- 
-     version (MIPS_Any)
-     {
-         struct stack_t
-         {
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-riscv64
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -64,7 +64,6 @@ _libitm=true
 if [ "$CHOST" != "$CTARGET" ]; then
 	if [ "$BOOTSTRAP" = nolibc ]; then
 		LANG_CXX=false
-		LANG_D=false
 		LANG_ADA=false
 		_libgcc=false
 		_builddir="$srcdir/build-cross-pass2"
@@ -74,6 +73,7 @@ if [ "$CHOST" != "$CTARGET" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false
 	_libgomp=false
 	_libatomic=false
@@ -115,6 +115,7 @@ elif [ "$CBUILD" != "$CHOST" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false

 	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
@@ -139,11 +140,11 @@ else
 	export BOOT_LDFLAGS="$LDFLAGS"
 fi

-case "$CTARGET_ARCH" in
+case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -170,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

@@ -183,8 +184,13 @@ if $_libgomp; then
 	subpackages="$subpackages libgomp::$CTARGET_ARCH"
 fi

+case "$CARCH" in
+riscv64)
+LANG_ADA=false;;
+esac
+
 case "$CTARGET_ARCH" in
-riscv64|loongarch64)
+loongarch64)
 LANG_ADA=false;;
 esac

@@ -193,17 +199,9 @@ if $LANG_CXX; then
 	_languages="$_languages,c++"
 fi
 if $LANG_D; then
-	subpackages="$subpackages gcc-gdc$_target:gdc"
+	subpackages="$subpackages libgphobos::$CTARGET_ARCH gcc-gdc$_target:gdc"
 	_languages="$_languages,d"
-	makedepends_build="$makedepends_build libucontext-dev"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gdc-bootstrap"
-		subpackages="$subpackages libgphobos::$CTARGET_ARCH"
-	else
-		# shared libgphobos is for D programs to link against, so
-		# skip building that while cross-compiling the GDC compiler
-		makedepends_build="$makedepends_build gcc-gdc gcc-gdc$_cross"
-	fi
+	makedepends_build="$makedepends_build libucontext-dev gcc-gdc-bootstrap"
 fi
 if $LANG_OBJC; then
 	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
@@ -280,9 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
 	0035-loongarch-disable-multilib-support.patch
-	0036-libphobos-add-riscv64-and-loongarch64-support.patch
 	fix-arm64.patch
-	ppc64le-quadmath.patch
 	"

 # secfixes:
@@ -343,7 +339,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d --with-tls=trad";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -364,23 +360,20 @@ build() {

 	case "$BOOTSTRAP" in
 	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
-	*)
-		# cross-bootstrap GDC with a static libphobos: due to GCC's
-		# ./configure not having a --disable-shared=libphobos option,
-		# we have to use --enable-shared with everything else instead.
-		if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-			_bootstrap_configure="--enable-shared=libgcc,libstdc++,libffi,zlib,boehm-gc,ada,libada,libgo,libobjc,libatomic,libgomp,libitm,libgfortran,libquadmath"
-		else
-			_bootstrap_configure="--enable-shared"
-		fi
-		_bootstrap_configure="$_bootstrap_configure --enable-threads --enable-tls"
-		;;
+	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
 	esac

 	$_libgomp	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"
+	if ! $_libquadmath; then
+		_arch_configure="$_arch_configure --disable-libquadmath"
+		# ppc64le needs both --disable-libquadmath{,-support}
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
+		[ "$CARCH" = "ppc64le" ] &&
+			_arch_configure="$_arch_configure
+				--disable-libquadmath-support"
+	fi

 	msg "Building the following:"
 	echo ""
@@ -434,10 +427,6 @@ build() {
 		--with-pkgversion="$version"

 	msg "building gcc"
-	if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-		# cross-compiling libphobos with parallel make fails
-		make all-target-libphobos
-	fi
 	make

 	# we build gccjit separate to not build all of gcc with --enable-host-shared
@@ -678,9 +667,9 @@ libgphobos() {

 gdc() {
 	pkgdesc="GCC-based D language compiler"
-	depends="gcc$_target=$_gccrel musl-dev libucontext-dev"
-	[ "$CBUILD" = "$CTARGET" ] && depends="$depends libgphobos=$_gccrel"
-	[ "$CHOST" = "$CTARGET" ] && provides="gcc-gdc-bootstrap=$_gccrel"
+	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
+	depends="$depends libucontext-dev"
+	provides="gcc-gdc-bootstrap=$_gccrel"

 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -691,25 +680,13 @@ gdc() {
 	# without installing the compiler
 	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
-	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
+	mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }

 libgo() {
@@ -851,7 +828,7 @@ f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8
 abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
 ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
 8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-684bf2db12aa45e8db7a895ab0f227b4e4351f611b4fcc6e1745d7ad94d31b3554f39d8cf9e2203520b3c6ee35cf309b417d4a842e7a8cd55a2b2accb23f2f24  0026-ada-musl-support-fixes.patch
+5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
 3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
 2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@@ -861,7 +838,5 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
 c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
 65df1d489e8d07a811f39e27fd29e3b2b4164fbc2c5fdc16a5142886d94a96e3fb28ccf4f20dd297ba6540ef8ea1ac3eb65a4279494639bf2f0f8376a3896cc3  0035-loongarch-disable-multilib-support.patch
-06f64544fd8bc4b6c8b06410c5198aa8fb4e82c232afc0cad83b2c69ac5d39399968206defa78297222700cd18e7fd7e8244afa76d343406a01f657c86306453  0036-libphobos-add-riscv64-and-loongarch64-support.patch
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
-815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
 "
@@ -1,56 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=3fe5720430a9ba61ed7562aac4d758cc77d49a28
--
-From 3fe5720430a9ba61ed7562aac4d758cc77d49a28 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Sat, 3 Aug 2024 20:37:54 +0200
-Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in
- some powerpc* configurations [PR116007]
-
-My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation.
-Unfortunately, that seems to fail building in some powerpc* configurations, where
-TFmode isn't available.
-quad.h has:
- #ifndef TFtype
- typedef float TFtype __attribute__ ((mode (TF)));
- #endif
-and uses TFtype.  quad.h has:
- /* Define the complex type corresponding to __float128
-    ("_Complex __float128" is not allowed) */
- #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__)
- typedef _Complex float __attribute__((mode(TC))) __complex128;
- #else
- typedef _Complex float __attribute__((mode(KC))) __complex128;
- #endif
-with the conditional and KCmode use added during porting of libquadmath
-to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__
-isn't defined; I could define it to float __attribute__ ((mode (KF))) but it
-seemed easier to just define it to __float128 which should do the same thing.
-
-2024-08-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/116007
-	* math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__
-	define to __float128 before including soft-fp.h and quad.h.
-
-(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b)
---
- libquadmath/math/sqrtq.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c
-index 8ca2828d42ce..a58998a06670 100644
--- a/libquadmath/math/sqrtq.c
-+++ b/libquadmath/math/sqrtq.c
-@@ -9,6 +9,9 @@
-     && defined(FE_TOWARDZERO) \
-     && defined(FE_INEXACT)
- #define USE_SOFT_FP 1
-+#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__)
-+#define TFtype __float128
-+#endif
- #include "../../libgcc/soft-fp/soft-fp.h"
- #include "../../libgcc/soft-fp/quad.h"
- #endif
-- 
-2.43.5
-
@@ -4,17 +4,17 @@ Date: Fri, 21 Aug 2020 07:07:48 +0000
 Subject: [PATCH 26/35] ada: musl support fixes

 ---
- gcc/ada/Makefile.rtl | 16 ++++++++--------
+ gcc/ada/Makefile.rtl | 10 +++++-----
 gcc/ada/adaint.c     | 34 +++++++++++++++++++---------------
 gcc/ada/adaint.h     | 10 ++++------
 gcc/ada/terminals.c  |  8 ++++----
- 4 files changed, 35 insertions(+), 33 deletions(-)
+ 4 files changed, 32 insertions(+), 30 deletions(-)

 diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
-index 32cbdb692..463028fbe 100644
+index 96306f8cc9a..090b6770ae5 100644
 --- a/gcc/ada/Makefile.rtl
 +++ b/gcc/ada/Makefile.rtl
-@@ -1558,7 +1558,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+@@ -1549,7 +1549,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   s-intman.adb<libgnarl/s-intman__posix.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -23,16 +23,7 @@ index 32cbdb692..463028fbe 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2144,7 +2144,7 @@ ifeq ($(strip $(filter-out loongarch% linux%,$(target_cpu) $(target_os))),)
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-   $(GNATRTL_128BIT_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-loongarch.ads
-@@ -2232,7 +2232,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2174,7 +2174,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
   s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -41,7 +32,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2267,7 +2267,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2205,7 +2205,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
 endif
 
 # ARM linux, GNU eabi
@@ -59,7 +50,7 @@ index 32cbdb692..463028fbe 100644
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-@@ -2488,7 +2488,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+@@ -2420,7 +2420,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -68,16 +59,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2592,7 +2592,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   s-taspri.ads<libgnarl/s-taspri__posix.ads \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(X86_64_TARGET_PAIRS) \
-   $(SIMD_PATH_TARGET_PAIRS) \
-@@ -2637,7 +2637,7 @@ ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)
+@@ -2524,7 +2524,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -87,10 +69,10 @@ index 32cbdb692..463028fbe 100644
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 74aa3c412..ef6118f37 100644
+index 8522094164e..92b230a462b 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
-@@ -94,6 +94,11 @@
+@@ -91,6 +91,11 @@
 #include <sys/param.h>
 #include <sys/pstat.h>
 #endif
@@ -102,7 +84,7 @@ index 74aa3c412..ef6118f37 100644
 
 #ifdef __PikeOS__
 #define __BSD_VISIBLE 1
-@@ -3465,7 +3470,6 @@ __gnat_lwp_self (void)
+@@ -3438,7 +3443,6 @@ __gnat_lwp_self (void)
 #endif
 
 #if defined (__linux__)
@@ -110,7 +92,7 @@ index 74aa3c412..ef6118f37 100644
 
 /* glibc versions earlier than 2.7 do not define the routines to handle
    dynamically allocated CPU sets. For these targets, we use the static
-@@ -3475,7 +3479,7 @@ __gnat_lwp_self (void)
+@@ -3448,7 +3452,7 @@ __gnat_lwp_self (void)
 
 /* Dynamic cpu sets */
 
@@ -119,7 +101,7 @@ index 74aa3c412..ef6118f37 100644
 __gnat_cpu_alloc (size_t count)
 {
   return CPU_ALLOC (count);
-@@ -3488,33 +3492,33 @@ __gnat_cpu_alloc_size (size_t count)
+@@ -3461,33 +3465,33 @@ __gnat_cpu_alloc_size (size_t count)
 }
 
 void
@@ -161,7 +143,7 @@ index 74aa3c412..ef6118f37 100644
 }
 
 size_t
-@@ -3524,23 +3528,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+@@ -3497,23 +3501,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
 }
 
 void
@@ -191,7 +173,7 @@ index 74aa3c412..ef6118f37 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0cbfd0e15..f97ed905b 100644
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -213,10 +195,10 @@ index 0cbfd0e15..f97ed905b 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 05af82c27..626ac35bc 100644
+index c0ee4a16bb1..ed796a48c1b 100644
 --- a/gcc/ada/terminals.c
 +++ b/gcc/ada/terminals.c
-@@ -1134,7 +1134,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1127,7 +1127,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 /* POSIX does not specify how to open the master side of a terminal.Several
    methods are available (system specific):
       1- using a cloning device (USE_CLONE_DEVICE)
@@ -225,7 +207,7 @@ index 05af82c27..626ac35bc 100644
       3- openpty                (USE_OPENPTY)
 
    When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1148,7 +1148,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1141,7 +1141,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 #if defined (__APPLE__) || defined (BSD)
 #define USE_OPENPTY
 #elif defined (__linux__)
@@ -234,7 +216,7 @@ index 05af82c27..626ac35bc 100644
 #elif defined (__sun__)
 #define USE_CLONE_DEVICE "/dev/ptmx"
 #elif defined (_AIX)
-@@ -1197,8 +1197,8 @@ allocate_pty_desc (pty_desc **desc) {
+@@ -1190,8 +1190,8 @@ allocate_pty_desc (pty_desc **desc) {
    int  master_fd   = -1;
    char *slave_name = NULL;
 
@@ -245,3 +227,6 @@ index 05af82c27..626ac35bc 100644
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+2.41.0
+
@@ -1,87 +0,0 @@
-From: Celeste <cielesti@protonmail.com>
-Date: Mon, 2 Sep 2024 02:54:17 +0000
-Subject: [PATCH] libphobos: add riscv64 and loongarch64 support
-
-Add musl support for these 2 architectures based on fenv.h and signal.h from:
-
-https://git.musl-libc.org/cgit/musl/tree/arch/riscv64/bits?h=v1.2.5
-
-https://git.musl-libc.org/cgit/musl/tree/arch/loongarch64/bits?h=v1.2.5
---
- libphobos/libdruntime/core/stdc/fenv.d        | 13 +++++++++++++
- libphobos/libdruntime/core/sys/posix/signal.d | 10 ++++++++++
- 2 files changed, 23 insertions(+)
-
-diff --git a/libphobos/libdruntime/core/stdc/fenv.d b/libphobos/libdruntime/core/stdc/fenv.d
-index a7364c0a..5b327e4a 100644
--- a/libphobos/libdruntime/core/stdc/fenv.d
-+++ b/libphobos/libdruntime/core/stdc/fenv.d
-@@ -436,20 +436,33 @@ else version (CRuntime_Musl)
-             ushort __cs_selector;
-             ushort __opcode;
-             uint   __data_offset;
-             ushort __data_selector;
-             ushort __unused5;
-             version (X86_64)
-                 uint __mxcsr;
-         }
-         alias ushort fexcept_t;
-     }
-+    else version (RISCV64)
-+    {
-+        alias uint fenv_t;
-+        alias uint fexcept_t;
-+    }
-+    else version (LoongArch64)
-+    {
-+        struct fenv_t
-+        {
-+            uint __cw;
-+        }
-+        alias uint fexcept_t;
-+    }
-     else
-     {
-         static assert(false, "Architecture not supported.");
-     }
- }
- else version (CRuntime_Newlib)
- {
-     version (AArch64)
-     {
-         alias fenv_t = ulong;
-diff --git a/libphobos/libdruntime/core/sys/posix/signal.d b/libphobos/libdruntime/core/sys/posix/signal.d
-index a8b7f751..78d8b3cd 100644
--- a/libphobos/libdruntime/core/sys/posix/signal.d
-+++ b/libphobos/libdruntime/core/sys/posix/signal.d
-@@ -2751,20 +2751,30 @@ else version (CRuntime_Musl)
-     else version (PPC_Any)
-     {
-         enum MINSIGSTKSZ = 4096;
-         enum SIGSTKSZ    = 10240;
-     }
-     else version (X86_Any)
-     {
-         enum MINSIGSTKSZ = 2048;
-         enum SIGSTKSZ    = 8192;
-     }
-+    else version (RISCV64)
-+    {
-+        enum MINSIGSTKSZ = 2048;
-+        enum SIGSTKSZ    = 8192;
-+    }
-+    else version (LoongArch64)
-+    {
-+        enum MINSIGSTKSZ = 4096;
-+        enum SIGSTKSZ    = 16384;
-+    }
-     else
-         static assert(0, "unimplemented");
- 
-     //ucontext_t (defined in core.sys.posix.ucontext)
-     //mcontext_t (defined in core.sys.posix.ucontext)
- 
-     version (MIPS_Any)
-     {
-         struct stack_t
-         {
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-x86
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for x86"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -64,7 +64,6 @@ _libitm=true
 if [ "$CHOST" != "$CTARGET" ]; then
 	if [ "$BOOTSTRAP" = nolibc ]; then
 		LANG_CXX=false
-		LANG_D=false
 		LANG_ADA=false
 		_libgcc=false
 		_builddir="$srcdir/build-cross-pass2"
@@ -74,6 +73,7 @@ if [ "$CHOST" != "$CTARGET" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false
 	_libgomp=false
 	_libatomic=false
@@ -115,6 +115,7 @@ elif [ "$CBUILD" != "$CHOST" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false

 	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
@@ -139,11 +140,11 @@ else
 	export BOOT_LDFLAGS="$LDFLAGS"
 fi

-case "$CTARGET_ARCH" in
+case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -170,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

@@ -183,8 +184,13 @@ if $_libgomp; then
 	subpackages="$subpackages libgomp::$CTARGET_ARCH"
 fi

+case "$CARCH" in
+riscv64)
+LANG_ADA=false;;
+esac
+
 case "$CTARGET_ARCH" in
-riscv64|loongarch64)
+loongarch64)
 LANG_ADA=false;;
 esac

@@ -193,17 +199,9 @@ if $LANG_CXX; then
 	_languages="$_languages,c++"
 fi
 if $LANG_D; then
-	subpackages="$subpackages gcc-gdc$_target:gdc"
+	subpackages="$subpackages libgphobos::$CTARGET_ARCH gcc-gdc$_target:gdc"
 	_languages="$_languages,d"
-	makedepends_build="$makedepends_build libucontext-dev"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gdc-bootstrap"
-		subpackages="$subpackages libgphobos::$CTARGET_ARCH"
-	else
-		# shared libgphobos is for D programs to link against, so
-		# skip building that while cross-compiling the GDC compiler
-		makedepends_build="$makedepends_build gcc-gdc gcc-gdc$_cross"
-	fi
+	makedepends_build="$makedepends_build libucontext-dev gcc-gdc-bootstrap"
 fi
 if $LANG_OBJC; then
 	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
@@ -280,9 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
 	0035-loongarch-disable-multilib-support.patch
-	0036-libphobos-add-riscv64-and-loongarch64-support.patch
 	fix-arm64.patch
-	ppc64le-quadmath.patch
 	"

 # secfixes:
@@ -343,7 +339,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d --with-tls=trad";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -364,23 +360,20 @@ build() {

 	case "$BOOTSTRAP" in
 	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
-	*)
-		# cross-bootstrap GDC with a static libphobos: due to GCC's
-		# ./configure not having a --disable-shared=libphobos option,
-		# we have to use --enable-shared with everything else instead.
-		if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-			_bootstrap_configure="--enable-shared=libgcc,libstdc++,libffi,zlib,boehm-gc,ada,libada,libgo,libobjc,libatomic,libgomp,libitm,libgfortran,libquadmath"
-		else
-			_bootstrap_configure="--enable-shared"
-		fi
-		_bootstrap_configure="$_bootstrap_configure --enable-threads --enable-tls"
-		;;
+	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
 	esac

 	$_libgomp	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"
+	if ! $_libquadmath; then
+		_arch_configure="$_arch_configure --disable-libquadmath"
+		# ppc64le needs both --disable-libquadmath{,-support}
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
+		[ "$CARCH" = "ppc64le" ] &&
+			_arch_configure="$_arch_configure
+				--disable-libquadmath-support"
+	fi

 	msg "Building the following:"
 	echo ""
@@ -434,10 +427,6 @@ build() {
 		--with-pkgversion="$version"

 	msg "building gcc"
-	if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-		# cross-compiling libphobos with parallel make fails
-		make all-target-libphobos
-	fi
 	make

 	# we build gccjit separate to not build all of gcc with --enable-host-shared
@@ -678,9 +667,9 @@ libgphobos() {

 gdc() {
 	pkgdesc="GCC-based D language compiler"
-	depends="gcc$_target=$_gccrel musl-dev libucontext-dev"
-	[ "$CBUILD" = "$CTARGET" ] && depends="$depends libgphobos=$_gccrel"
-	[ "$CHOST" = "$CTARGET" ] && provides="gcc-gdc-bootstrap=$_gccrel"
+	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
+	depends="$depends libucontext-dev"
+	provides="gcc-gdc-bootstrap=$_gccrel"

 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -691,25 +680,13 @@ gdc() {
 	# without installing the compiler
 	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
-	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
+	mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }

 libgo() {
@@ -851,7 +828,7 @@ f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8
 abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
 ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
 8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-684bf2db12aa45e8db7a895ab0f227b4e4351f611b4fcc6e1745d7ad94d31b3554f39d8cf9e2203520b3c6ee35cf309b417d4a842e7a8cd55a2b2accb23f2f24  0026-ada-musl-support-fixes.patch
+5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
 3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
 2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@@ -861,7 +838,5 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
 c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
 65df1d489e8d07a811f39e27fd29e3b2b4164fbc2c5fdc16a5142886d94a96e3fb28ccf4f20dd297ba6540ef8ea1ac3eb65a4279494639bf2f0f8376a3896cc3  0035-loongarch-disable-multilib-support.patch
-06f64544fd8bc4b6c8b06410c5198aa8fb4e82c232afc0cad83b2c69ac5d39399968206defa78297222700cd18e7fd7e8244afa76d343406a01f657c86306453  0036-libphobos-add-riscv64-and-loongarch64-support.patch
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
-815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
 "
@@ -1,56 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=3fe5720430a9ba61ed7562aac4d758cc77d49a28
--
-From 3fe5720430a9ba61ed7562aac4d758cc77d49a28 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Sat, 3 Aug 2024 20:37:54 +0200
-Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in
- some powerpc* configurations [PR116007]
-
-My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation.
-Unfortunately, that seems to fail building in some powerpc* configurations, where
-TFmode isn't available.
-quad.h has:
- #ifndef TFtype
- typedef float TFtype __attribute__ ((mode (TF)));
- #endif
-and uses TFtype.  quad.h has:
- /* Define the complex type corresponding to __float128
-    ("_Complex __float128" is not allowed) */
- #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__)
- typedef _Complex float __attribute__((mode(TC))) __complex128;
- #else
- typedef _Complex float __attribute__((mode(KC))) __complex128;
- #endif
-with the conditional and KCmode use added during porting of libquadmath
-to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__
-isn't defined; I could define it to float __attribute__ ((mode (KF))) but it
-seemed easier to just define it to __float128 which should do the same thing.
-
-2024-08-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/116007
-	* math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__
-	define to __float128 before including soft-fp.h and quad.h.
-
-(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b)
---
- libquadmath/math/sqrtq.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c
-index 8ca2828d42ce..a58998a06670 100644
--- a/libquadmath/math/sqrtq.c
-+++ b/libquadmath/math/sqrtq.c
-@@ -9,6 +9,9 @@
-     && defined(FE_TOWARDZERO) \
-     && defined(FE_INEXACT)
- #define USE_SOFT_FP 1
-+#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__)
-+#define TFtype __float128
-+#endif
- #include "../../libgcc/soft-fp/soft-fp.h"
- #include "../../libgcc/soft-fp/quad.h"
- #endif
-- 
-2.43.5
-
@@ -4,17 +4,17 @@ Date: Fri, 21 Aug 2020 07:07:48 +0000
 Subject: [PATCH 26/35] ada: musl support fixes

 ---
- gcc/ada/Makefile.rtl | 16 ++++++++--------
+ gcc/ada/Makefile.rtl | 10 +++++-----
 gcc/ada/adaint.c     | 34 +++++++++++++++++++---------------
 gcc/ada/adaint.h     | 10 ++++------
 gcc/ada/terminals.c  |  8 ++++----
- 4 files changed, 35 insertions(+), 33 deletions(-)
+ 4 files changed, 32 insertions(+), 30 deletions(-)

 diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
-index 32cbdb692..463028fbe 100644
+index 96306f8cc9a..090b6770ae5 100644
 --- a/gcc/ada/Makefile.rtl
 +++ b/gcc/ada/Makefile.rtl
-@@ -1558,7 +1558,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+@@ -1549,7 +1549,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   s-intman.adb<libgnarl/s-intman__posix.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -23,16 +23,7 @@ index 32cbdb692..463028fbe 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2144,7 +2144,7 @@ ifeq ($(strip $(filter-out loongarch% linux%,$(target_cpu) $(target_os))),)
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-   $(GNATRTL_128BIT_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-loongarch.ads
-@@ -2232,7 +2232,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2174,7 +2174,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
   s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -41,7 +32,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2267,7 +2267,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2205,7 +2205,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
 endif
 
 # ARM linux, GNU eabi
@@ -59,7 +50,7 @@ index 32cbdb692..463028fbe 100644
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-@@ -2488,7 +2488,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+@@ -2420,7 +2420,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -68,16 +59,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2592,7 +2592,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   s-taspri.ads<libgnarl/s-taspri__posix.ads \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(X86_64_TARGET_PAIRS) \
-   $(SIMD_PATH_TARGET_PAIRS) \
-@@ -2637,7 +2637,7 @@ ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)
+@@ -2524,7 +2524,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -87,10 +69,10 @@ index 32cbdb692..463028fbe 100644
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 74aa3c412..ef6118f37 100644
+index 8522094164e..92b230a462b 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
-@@ -94,6 +94,11 @@
+@@ -91,6 +91,11 @@
 #include <sys/param.h>
 #include <sys/pstat.h>
 #endif
@@ -102,7 +84,7 @@ index 74aa3c412..ef6118f37 100644
 
 #ifdef __PikeOS__
 #define __BSD_VISIBLE 1
-@@ -3465,7 +3470,6 @@ __gnat_lwp_self (void)
+@@ -3438,7 +3443,6 @@ __gnat_lwp_self (void)
 #endif
 
 #if defined (__linux__)
@@ -110,7 +92,7 @@ index 74aa3c412..ef6118f37 100644
 
 /* glibc versions earlier than 2.7 do not define the routines to handle
    dynamically allocated CPU sets. For these targets, we use the static
-@@ -3475,7 +3479,7 @@ __gnat_lwp_self (void)
+@@ -3448,7 +3452,7 @@ __gnat_lwp_self (void)
 
 /* Dynamic cpu sets */
 
@@ -119,7 +101,7 @@ index 74aa3c412..ef6118f37 100644
 __gnat_cpu_alloc (size_t count)
 {
   return CPU_ALLOC (count);
-@@ -3488,33 +3492,33 @@ __gnat_cpu_alloc_size (size_t count)
+@@ -3461,33 +3465,33 @@ __gnat_cpu_alloc_size (size_t count)
 }
 
 void
@@ -161,7 +143,7 @@ index 74aa3c412..ef6118f37 100644
 }
 
 size_t
-@@ -3524,23 +3528,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+@@ -3497,23 +3501,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
 }
 
 void
@@ -191,7 +173,7 @@ index 74aa3c412..ef6118f37 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0cbfd0e15..f97ed905b 100644
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -213,10 +195,10 @@ index 0cbfd0e15..f97ed905b 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 05af82c27..626ac35bc 100644
+index c0ee4a16bb1..ed796a48c1b 100644
 --- a/gcc/ada/terminals.c
 +++ b/gcc/ada/terminals.c
-@@ -1134,7 +1134,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1127,7 +1127,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 /* POSIX does not specify how to open the master side of a terminal.Several
    methods are available (system specific):
       1- using a cloning device (USE_CLONE_DEVICE)
@@ -225,7 +207,7 @@ index 05af82c27..626ac35bc 100644
       3- openpty                (USE_OPENPTY)
 
    When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1148,7 +1148,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1141,7 +1141,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 #if defined (__APPLE__) || defined (BSD)
 #define USE_OPENPTY
 #elif defined (__linux__)
@@ -234,7 +216,7 @@ index 05af82c27..626ac35bc 100644
 #elif defined (__sun__)
 #define USE_CLONE_DEVICE "/dev/ptmx"
 #elif defined (_AIX)
-@@ -1197,8 +1197,8 @@ allocate_pty_desc (pty_desc **desc) {
+@@ -1190,8 +1190,8 @@ allocate_pty_desc (pty_desc **desc) {
    int  master_fd   = -1;
    char *slave_name = NULL;
 
@@ -245,3 +227,6 @@ index 05af82c27..626ac35bc 100644
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+2.41.0
+
@@ -1,87 +0,0 @@
-From: Celeste <cielesti@protonmail.com>
-Date: Mon, 2 Sep 2024 02:54:17 +0000
-Subject: [PATCH] libphobos: add riscv64 and loongarch64 support
-
-Add musl support for these 2 architectures based on fenv.h and signal.h from:
-
-https://git.musl-libc.org/cgit/musl/tree/arch/riscv64/bits?h=v1.2.5
-
-https://git.musl-libc.org/cgit/musl/tree/arch/loongarch64/bits?h=v1.2.5
---
- libphobos/libdruntime/core/stdc/fenv.d        | 13 +++++++++++++
- libphobos/libdruntime/core/sys/posix/signal.d | 10 ++++++++++
- 2 files changed, 23 insertions(+)
-
-diff --git a/libphobos/libdruntime/core/stdc/fenv.d b/libphobos/libdruntime/core/stdc/fenv.d
-index a7364c0a..5b327e4a 100644
--- a/libphobos/libdruntime/core/stdc/fenv.d
-+++ b/libphobos/libdruntime/core/stdc/fenv.d
-@@ -436,20 +436,33 @@ else version (CRuntime_Musl)
-             ushort __cs_selector;
-             ushort __opcode;
-             uint   __data_offset;
-             ushort __data_selector;
-             ushort __unused5;
-             version (X86_64)
-                 uint __mxcsr;
-         }
-         alias ushort fexcept_t;
-     }
-+    else version (RISCV64)
-+    {
-+        alias uint fenv_t;
-+        alias uint fexcept_t;
-+    }
-+    else version (LoongArch64)
-+    {
-+        struct fenv_t
-+        {
-+            uint __cw;
-+        }
-+        alias uint fexcept_t;
-+    }
-     else
-     {
-         static assert(false, "Architecture not supported.");
-     }
- }
- else version (CRuntime_Newlib)
- {
-     version (AArch64)
-     {
-         alias fenv_t = ulong;
-diff --git a/libphobos/libdruntime/core/sys/posix/signal.d b/libphobos/libdruntime/core/sys/posix/signal.d
-index a8b7f751..78d8b3cd 100644
--- a/libphobos/libdruntime/core/sys/posix/signal.d
-+++ b/libphobos/libdruntime/core/sys/posix/signal.d
-@@ -2751,20 +2751,30 @@ else version (CRuntime_Musl)
-     else version (PPC_Any)
-     {
-         enum MINSIGSTKSZ = 4096;
-         enum SIGSTKSZ    = 10240;
-     }
-     else version (X86_Any)
-     {
-         enum MINSIGSTKSZ = 2048;
-         enum SIGSTKSZ    = 8192;
-     }
-+    else version (RISCV64)
-+    {
-+        enum MINSIGSTKSZ = 2048;
-+        enum SIGSTKSZ    = 8192;
-+    }
-+    else version (LoongArch64)
-+    {
-+        enum MINSIGSTKSZ = 4096;
-+        enum SIGSTKSZ    = 16384;
-+    }
-     else
-         static assert(0, "unimplemented");
- 
-     //ucontext_t (defined in core.sys.posix.ucontext)
-     //mcontext_t (defined in core.sys.posix.ucontext)
- 
-     version (MIPS_Any)
-     {
-         struct stack_t
-         {
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-x86_64
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for x86_64"
 url="https://gcc.gnu.org"
 arch="aarch64"
@@ -64,7 +64,6 @@ _libitm=true
 if [ "$CHOST" != "$CTARGET" ]; then
 	if [ "$BOOTSTRAP" = nolibc ]; then
 		LANG_CXX=false
-		LANG_D=false
 		LANG_ADA=false
 		_libgcc=false
 		_builddir="$srcdir/build-cross-pass2"
@@ -74,6 +73,7 @@ if [ "$CHOST" != "$CTARGET" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false
 	_libgomp=false
 	_libatomic=false
@@ -115,6 +115,7 @@ elif [ "$CBUILD" != "$CHOST" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false

 	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
@@ -139,11 +140,11 @@ else
 	export BOOT_LDFLAGS="$LDFLAGS"
 fi

-case "$CTARGET_ARCH" in
+case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -170,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

@@ -183,8 +184,13 @@ if $_libgomp; then
 	subpackages="$subpackages libgomp::$CTARGET_ARCH"
 fi

+case "$CARCH" in
+riscv64)
+LANG_ADA=false;;
+esac
+
 case "$CTARGET_ARCH" in
-riscv64|loongarch64)
+loongarch64)
 LANG_ADA=false;;
 esac

@@ -193,17 +199,9 @@ if $LANG_CXX; then
 	_languages="$_languages,c++"
 fi
 if $LANG_D; then
-	subpackages="$subpackages gcc-gdc$_target:gdc"
+	subpackages="$subpackages libgphobos::$CTARGET_ARCH gcc-gdc$_target:gdc"
 	_languages="$_languages,d"
-	makedepends_build="$makedepends_build libucontext-dev"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gdc-bootstrap"
-		subpackages="$subpackages libgphobos::$CTARGET_ARCH"
-	else
-		# shared libgphobos is for D programs to link against, so
-		# skip building that while cross-compiling the GDC compiler
-		makedepends_build="$makedepends_build gcc-gdc gcc-gdc$_cross"
-	fi
+	makedepends_build="$makedepends_build libucontext-dev gcc-gdc-bootstrap"
 fi
 if $LANG_OBJC; then
 	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
@@ -280,9 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
 	0035-loongarch-disable-multilib-support.patch
-	0036-libphobos-add-riscv64-and-loongarch64-support.patch
 	fix-arm64.patch
-	ppc64le-quadmath.patch
 	"

 # secfixes:
@@ -343,7 +339,7 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d --with-tls=trad";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -364,23 +360,20 @@ build() {

 	case "$BOOTSTRAP" in
 	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
-	*)
-		# cross-bootstrap GDC with a static libphobos: due to GCC's
-		# ./configure not having a --disable-shared=libphobos option,
-		# we have to use --enable-shared with everything else instead.
-		if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-			_bootstrap_configure="--enable-shared=libgcc,libstdc++,libffi,zlib,boehm-gc,ada,libada,libgo,libobjc,libatomic,libgomp,libitm,libgfortran,libquadmath"
-		else
-			_bootstrap_configure="--enable-shared"
-		fi
-		_bootstrap_configure="$_bootstrap_configure --enable-threads --enable-tls"
-		;;
+	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
 	esac

 	$_libgomp	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"
+	if ! $_libquadmath; then
+		_arch_configure="$_arch_configure --disable-libquadmath"
+		# ppc64le needs both --disable-libquadmath{,-support}
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
+		[ "$CARCH" = "ppc64le" ] &&
+			_arch_configure="$_arch_configure
+				--disable-libquadmath-support"
+	fi

 	msg "Building the following:"
 	echo ""
@@ -434,10 +427,6 @@ build() {
 		--with-pkgversion="$version"

 	msg "building gcc"
-	if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-		# cross-compiling libphobos with parallel make fails
-		make all-target-libphobos
-	fi
 	make

 	# we build gccjit separate to not build all of gcc with --enable-host-shared
@@ -678,9 +667,9 @@ libgphobos() {

 gdc() {
 	pkgdesc="GCC-based D language compiler"
-	depends="gcc$_target=$_gccrel musl-dev libucontext-dev"
-	[ "$CBUILD" = "$CTARGET" ] && depends="$depends libgphobos=$_gccrel"
-	[ "$CHOST" = "$CTARGET" ] && provides="gcc-gdc-bootstrap=$_gccrel"
+	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
+	depends="$depends libucontext-dev"
+	provides="gcc-gdc-bootstrap=$_gccrel"

 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -691,25 +680,13 @@ gdc() {
 	# without installing the compiler
 	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
-	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
+	mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }

 libgo() {
@@ -851,7 +828,7 @@ f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8
 abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
 ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
 8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-684bf2db12aa45e8db7a895ab0f227b4e4351f611b4fcc6e1745d7ad94d31b3554f39d8cf9e2203520b3c6ee35cf309b417d4a842e7a8cd55a2b2accb23f2f24  0026-ada-musl-support-fixes.patch
+5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
 3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
 2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@@ -861,7 +838,5 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
 c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
 65df1d489e8d07a811f39e27fd29e3b2b4164fbc2c5fdc16a5142886d94a96e3fb28ccf4f20dd297ba6540ef8ea1ac3eb65a4279494639bf2f0f8376a3896cc3  0035-loongarch-disable-multilib-support.patch
-06f64544fd8bc4b6c8b06410c5198aa8fb4e82c232afc0cad83b2c69ac5d39399968206defa78297222700cd18e7fd7e8244afa76d343406a01f657c86306453  0036-libphobos-add-riscv64-and-loongarch64-support.patch
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
-815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
 "
@@ -1,56 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=3fe5720430a9ba61ed7562aac4d758cc77d49a28
--
-From 3fe5720430a9ba61ed7562aac4d758cc77d49a28 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Sat, 3 Aug 2024 20:37:54 +0200
-Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in
- some powerpc* configurations [PR116007]
-
-My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation.
-Unfortunately, that seems to fail building in some powerpc* configurations, where
-TFmode isn't available.
-quad.h has:
- #ifndef TFtype
- typedef float TFtype __attribute__ ((mode (TF)));
- #endif
-and uses TFtype.  quad.h has:
- /* Define the complex type corresponding to __float128
-    ("_Complex __float128" is not allowed) */
- #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__)
- typedef _Complex float __attribute__((mode(TC))) __complex128;
- #else
- typedef _Complex float __attribute__((mode(KC))) __complex128;
- #endif
-with the conditional and KCmode use added during porting of libquadmath
-to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__
-isn't defined; I could define it to float __attribute__ ((mode (KF))) but it
-seemed easier to just define it to __float128 which should do the same thing.
-
-2024-08-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/116007
-	* math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__
-	define to __float128 before including soft-fp.h and quad.h.
-
-(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b)
---
- libquadmath/math/sqrtq.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c
-index 8ca2828d42ce..a58998a06670 100644
--- a/libquadmath/math/sqrtq.c
-+++ b/libquadmath/math/sqrtq.c
-@@ -9,6 +9,9 @@
-     && defined(FE_TOWARDZERO) \
-     && defined(FE_INEXACT)
- #define USE_SOFT_FP 1
-+#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__)
-+#define TFtype __float128
-+#endif
- #include "../../libgcc/soft-fp/soft-fp.h"
- #include "../../libgcc/soft-fp/quad.h"
- #endif
-- 
-2.43.5
-
@@ -8,7 +8,7 @@ fi

 pkgname=musl-aarch64
 pkgver=1.2.5
-pkgrel=3
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-30c20d050028bbe9a2203a0db0bb1453d921ac381fc3a7dc2c79c535a7ac25ecf65d7ee367b17178a37aa0e26d028a860d03567e9662c6251171c53bf2562893  musl-1.2.5-r3-aarch64-edge.apk
-43ef19c8698e98eb473116e7c21dbb9e66d994bd1cd63837d0f0c43ceaf1ce4f1db582e48b22478574ef7fe4bc309aa7bb387af2f99d8d88bcecfaf7763ec82c  musl-dev-1.2.5-r3-aarch64-edge.apk
+a3c660153e2cd1859a83e692c4d1c9f92bb442948ec4ed63412ac1d75502fa40a5a383bb548c8ac98d83fdd27f067304e876be1e15f41eaa09f1414cf5d4e189  musl-1.2.5-r2-aarch64-edge.apk
+6e921c1a761125e768e78e072585b226180c1447f04a4d5fc50564787b30f9c1520b3bfe90d835cfba1716fc4672d3df95a0883187adb50627eed9a3c4249a04  musl-dev-1.2.5-r2-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armhf
 pkgver=1.2.5
-pkgrel=3
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-b98e17b30e5968ca8f6c963e8752544112337b641186c269dbc4dd4b0a9496de9f4a549deb1bbf03e419b145b86b0c48fd22db1b8dff188bd3b451632b8c2b3f  musl-1.2.5-r3-armhf-edge.apk
-0e9fa461b75f3a9832e26f8086c9397b9d5dbea9c5821cf7898c0ccf64281f603137265606ee97810cba988fdff967ea7ec240e4e59c1d87da7e001cd4bf719a  musl-dev-1.2.5-r3-armhf-edge.apk
+20f07f25e5267acac97f7f7bf98763869c9a193bf44d1ef2b79f46f2e854aeabe2baa74d0311057541fb99179addbd43c08c56d1361ed349ae22973141f639c5  musl-1.2.5-r2-armhf-edge.apk
+4afb4520885704849bec649f5488add0a3a7b25005172d69f03337cf5b0a82d9f564cba11bbfa84a43a9386e027a8516fcc4573210b4e1fe340cc295a7f52499  musl-dev-1.2.5-r2-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armv7
 pkgver=1.2.5
-pkgrel=3
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-05d888f66cb8bb75fcf767327068aff0152c32c97d6de680f7df0b9b11bbf99fefd8f2b7c1b92de8489e0f051d536e0d708faa3c5aaff783565e6c0e05d34c3b  musl-1.2.5-r3-armv7-edge.apk
-2c8775a37f2f7d5730857dcf7a7f038a1b0838a775a03e05ce299807f3608a112e95c61b776b32152434c27ee23b999915357b4e89e6559eb89e820666e36d97  musl-dev-1.2.5-r3-armv7-edge.apk
+0a542c678cfc7ed0cc4246985bd1ecce63247ca4db0ea9fde7c1ee2b30f683b46d7c4011b21931d19fc7c3faeb787413d243580417ec90f745b77534277a6f68  musl-1.2.5-r2-armv7-edge.apk
+26516f5ffc1f04223cce8bae2122a2eab17ec59ce1ef0c1d2382394d9dd0e014ac77336639592f24d15f0ec5120ea7b8329febab1bbbaf3dfecb777b944d6337  musl-dev-1.2.5-r2-armv7-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-riscv64
 pkgver=1.2.5
-pkgrel=3
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-d9adef7c000203504c357db8b84008f95f97fa68e3944103c345e0bc511f84bff7175ea1afd029de81dd2acce64795c55f100b7abfed3a5bad464c654e620ac3  musl-1.2.5-r3-riscv64-edge.apk
-51a20229c477c691429d2fb800ff441f0181e98879996c0fede94a39e37d66fd2bddd50f663c85090837b8cfaf41ed65c2d2142eaa0ce503b2c5bf6fd2d0194e  musl-dev-1.2.5-r3-riscv64-edge.apk
+ebc1f6759f73c492c00429fd735bd1f3f67bb5a1530156f0c0a821f693b415ba7b8807c22134ce8bd4043f18b12356151c4bfaff59946d059cd0523ebc8aad57  musl-1.2.5-r2-riscv64-edge.apk
+d5209392baedcee71455faa51f6a2e60a90b2bc51c1f5f2c9fb03ff6692b246225d8db7dd5f9165d76bd9d2463e797c9b3c805e04887a4b4b90ec55e96ced627  musl-dev-1.2.5-r2-riscv64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86
 pkgver=1.2.5
-pkgrel=3
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-68f290b5c1a8e8c1b5b70e34c4be391fa49fc8f91902a6dd432a3c34317788c69d5a31f9fedeec51a4d12509aee735d8875f0c4349d3d9cab1d9789a50a78bf8  musl-1.2.5-r3-x86-edge.apk
-2115a6da3ac624872a8e4d764aed69c0e729853d3b74643da83bef1083d20147de2f2f181df82d0bb273fad0597d37b719048bd66e23ed072982018ecf07b8fc  musl-dev-1.2.5-r3-x86-edge.apk
+bde9b17b3f8b696dd863509713113b720bdff8d125e98eed5165f5fa0934d3a8adc317ffb319e3c045b99389ebb0ac08896c0bedd6d0e7461c9f2d98ffee62f9  musl-1.2.5-r2-x86-edge.apk
+cfd0b502e1237024736b6215ac944299664f4b44802533f5cf6b5239a15c22bdc7782004e1485e15d8184ca0cc9afbf704c12cc39d4fe93611f65c8915d595a7  musl-dev-1.2.5-r2-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86_64
 pkgver=1.2.5
-pkgrel=3
+pkgrel=2
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-c4667bf824340766c2b6c41e88e4dc76a7e51b7247ece8f85e8e9347769fce6bd4459d94fcdc82ea12e0a67f7160d68cf2a1ed322eee7d6ca9d075036c17e193  musl-1.2.5-r3-x86_64-edge.apk
-a64220117e1614e585be89fcb00e387b4ea2f4251ce2b6af38c576787093b4ce6a0bed3e4d7bc86517369ee5c4f11db63c6f572e16f336a1178fa99dfa394aff  musl-dev-1.2.5-r3-x86_64-edge.apk
+2554e2ac0b3f02904197de5317db836e5dbd2631d2ab6e59c3453eeff9b1647b9110005cfe7922470512e7d8b561c94769bf348f7f959754fdb1ca05b403d99b  musl-1.2.5-r2-x86_64-edge.apk
+9a29dcb8cd82da7eb929269c75d2c6637a0ce457526c4960164bcff424f6a0cf581b5a4b2f0020624360d1e5c71b10042dbe59db21df4cd6ffa14b0845c71802  musl-dev-1.2.5-r2-x86_64-edge.apk
 "
@@ -43,10 +43,14 @@ install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	81-libssc-fairphone-fp4.rules
 	90-feedbackd-aw8695.rules
+	FP4.yaml
 	deviceinfo
 	hexagonrpcd.confd
 	modules-initfs
 	"
+subpackages="
+	$pkgname-lomiri
+"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -63,9 +67,16 @@ package() {
 		"$pkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
 }

+lomiri() {
+	install_if="$pkgname=$pkgver-r$pkgrel lomiri"
+	install -Dm644 "$srcdir"/FP4.yaml \
+		"$subpkgdir"/etc/lomiri-deviceinfo/devices/FP4.yaml
+}
+
 sha512sums="
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp4.rules
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
+1d7d59c513df6cebd15671b868a1f57dd0f407492de352efdbf89bac2ae1ca752d8cdc346f5d24aa2d324ce13ad23352543c94371c477fac278123020f8b2d1c  FP4.yaml
 9549f105f865d230e7b67819c96b7e06a5ed4d5808f083099a408934ffbacdb412984b861f6756fa4fde94b51e6a268b8d2ce9fed6f13ee3e8041bb96492310a  deviceinfo
 6a3d620f2cc60308a62ff651ffb00a5ee1f092131cca9d33b6afd61c8a372a3fd7d46540162213593107e0943b33f3f0119d003d43dcd06dbde757390a6c1729  hexagonrpcd.confd
 52bb7ed829caa4dcff9728bd6e3cdf118b3c7ee7dfe90df0d4e6422dd67bf3258ae2a4d2dc7599da4182fbd8eb47a0e1d20c58198dc17f2bf178b8f01a8887f7  modules-initfs
@@ -0,0 +1,8 @@
+FP4:
+  Names:
+    - Fairphone 4
+  PrettyName: Fairphone 4
+  DeviceType: phone
+  GridUnit: 21
+  PrimaryOrientation: Portrait
+  # SensorfwConfig: /etc/deviceinfo/sensorfw/pinephone.conf
@@ -2,7 +2,7 @@
 # Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=16
+pkgver=15
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -17,11 +17,10 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	modules-initfs
-	30-gpu-i915-firmware.files
+	30-gpu-firmware.files
 "
 install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="
-	$pkgname-intel
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-kernel-lts:kernel_lts
 "
@@ -42,14 +41,9 @@ build() {

 package() {
 	devicepkg_package $startdir $pkgname
-}

-intel() {
-	pkgdesc="Intel-specific configuration"
-	install_if="$pkgname=$pkgver-r$pkgrel oem-intel"
-
-	install -Dm644 "$srcdir"/30-gpu-i915-firmware.files \
-		-t "$subpkgdir"/usr/share/mkinitfs/files/
+	install -Dm644 "$srcdir"/30-gpu-firmware.files \
+		-t "$pkgdir"/usr/share/mkinitfs/files/
 }

 kernel_edge() {
@@ -71,5 +65,5 @@ kernel_lts() {
 sha512sums="
 e9dfcd70ccfb9a0fdaa0cdc52faf3be96d6de8af8c60a758bb703c515b0648cec4552e0eaf56e5168b0004cd3fc4b28118abb05dad2c581d3579a2e9134862cb  deviceinfo
 e464ef0ad4a4c34d2d53f69c4612b612ea878a77c9efdef69b0f842edf701036c8218809fd63aac286d6a08ae07f39e568199fc3e38d145e716c1723e7215019  modules-initfs
-9599a10679a43929e4ed2ea22269a0716219163817574d48db4dc1cb21a0fcf17ea54d77d5fd8efd034905c421ecb3eaa600a72927d683983ce48d1159329881  30-gpu-i915-firmware.files
+9599a10679a43929e4ed2ea22269a0716219163817574d48db4dc1cb21a0fcf17ea54d77d5fd8efd034905c421ecb3eaa600a72927d683983ce48d1159329881  30-gpu-firmware.files
 "
@@ -3,7 +3,7 @@
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
 pkgver=6
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -28,7 +28,10 @@ source="
 	no-hexagonrpcd-on-suspend.sh
 	q6voiced.conf
 "
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-camera
+	$pkgname-nonfree-firmware:nonfree_firmware
+	"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -43,6 +46,12 @@ package() {
 		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr-msm.conf
 }

+camera() {
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
+	depends="snapshot"
+	mkdir -p "$subpkgdir"
+}
+
 nonfree_firmware() {
 	pkgdesc="Proprietary firmware blobs for the Google Pixel 3a"
 	replaces="hexagonrpcd-openrc"
@@ -5,7 +5,7 @@
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
 pkgver=10
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -18,6 +18,8 @@ depends="
 	linux-firmware-qca
 	linux-firmware-qcom
 	linux-lenovo-21bx
+	pd-mapper
+	pd-mapper-openrc
 	postmarketos-base
 	qmi-utils
 	systemd-boot
@@ -34,6 +36,7 @@ subpackages="
 	$pkgname-usbguard
 	$pkgname-vulkan
 "
+install="$pkgname.post-install"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+rc-update add -q pd-mapper boot
@@ -2,7 +2,7 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=29
+pkgver=28
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
@@ -238,7 +238,7 @@ e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f178
 134f51d20decc0c63ab08010931a0b410b70d2f85bf6899f2ff137b1680f59f706a6287d01f5fbb41fa5309125df75a430d0783149bd1a6a1bca07d22f4f6a21  proxishot.sh
 fc21e3b7e045055c080a7f7ffb0cd4140b63a02690e92c8370dbccbef506fe271ee9584ac9f14725b8bc9fd6e74e7fafde589d2360f44491c614837472d8ad53  deviceprofile.sh
 5dab895c34599bf233635463271ea8308d434c97789efe931eec24870c3b4688fe48ca3b7cdc66e5c1a705940d042b9f18f26420b60f22e1cfad1854e97f8687  start_hook.sh
-42f916d87dd305111028992a1107bf6fe108bebbd782ae8edd065e76505db2b3a75e57515970c3e40cb0d1b7e83097a1bba92785be13df7c3fd80959a8d9c5c1  uboot-script.cmd
+7bd9dd2468ba6a0fc8e5e7118ecfc4b4ca2f0691190473e12770a857e4082ab2958d0a3a8ee2f0276ed83776aff3b5fff0099980c265d674b90d2ff3108f660d  uboot-script.cmd
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
 03079030237440080e833dbfeff80327c1ad6a8129c6c730b401a3052cd00a986783ec3473a526b14ae73ba1f20653b4c7b2a6590839bfe6cc156bbbc3b7bb74  80-feedbackd-twl4030.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
@@ -2,7 +2,7 @@ setenv mmcnum 0
 setenv mmcpart 1
 setenv mmctype ext2
 setenv setup_omap_atag 1
-setenv bootargs init=/init.sh rw console=tty0 PMOS_FORCE_PARTITION_RESIZE
+setenv bootargs init=/init.sh rw console=tty0 console=ttyS2 PMOS_FORCE_PARTITION_RESIZE
 setenv mmckernfile /uImage
 setenv mmcinitrdfile /uInitrd
 setenv mmcscriptfile
@@ -4,7 +4,7 @@
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
 pkgver=14
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -56,7 +56,7 @@ nonfree_firmware() {
 }

 nonfree_firmware_openrc() {
-	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel"
 	replaces="hexagonrpcd-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"

@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
-pkgver=12
-pkgrel=0
+pkgver=11
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -43,7 +43,7 @@ fake_goodix() {
 }

 sha512sums="
-a958e29c8ba4c079ee64a9882fe14ad03e7751ba4c2416a4bda07b0ee4e0342d5d6e3d43c95b05f47dabe06ff5be759401287da3c58ef0ecb31c8cba515cd560  deviceinfo
+327d6b49c6bc26725ed566ee968220cd7bbd5c8fd31b91705b6a02635daf5ce02567ba493a5bd431e0438339e004d42c7f4a57d4ed683274b94dc78668771d8d  deviceinfo
 7202f0a55dfe43348940412fc38e59c855594b070db8742419feadb2299086d5810107201a228b7137b7cc7a97c94afac95d81c0cd65c52f31dbcb619b0a4279  modules-initfs
 a2608b01b7b6e2dade694af355ff4f0f26cad49cf54bc332c77eb75d19fdc985f7f996fedb72753de447be0391deabf5fcea52406791d1e6e0d165703b63f145  90-device-xiaomi-daisy.rules
 "
@@ -25,6 +25,7 @@ deviceinfo_swap_size_recommended="1024"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-markw
 pkgdesc="Xiaomi Redmi 4 Prime"
-pkgver=7
-pkgrel=0
+pkgver=6
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -31,6 +31,6 @@ package() {
 }

 sha512sums="
-d5ecef8983110624e0cd69feed5f105204f8323e718435b19ffafa37cbe73d1c37a4d1d1cfb53d338dfeffa91ade137b3cf7c7b9f48408002c04260bbd3b5e65  deviceinfo
+dd33fe1f043da42f935a66b2d7bcf909bb65b737289574018917f3a5bb385f826c5ff441a808e442957ff9d3fdd1391e7f6381720c55062adcdc404d40754c1c  deviceinfo
 0cba88d7ede62dc7c47feefb27d10e58e4c93498bec97cd274a1d10c4f16dff06c5472ed555170e0392a57c9269cc50bf550523f41bf1ba6c600af533302574b  modules-initfs
 "
@@ -17,9 +17,11 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
+deviceinfo_getty="ttyMSM0;115200"

 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"
@@ -1,8 +1,8 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=device-xiaomi-mido
 pkgdesc="Xiaomi Redmi Note 4X"
-pkgver=8
-pkgrel=0
+pkgver=7
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -30,6 +30,6 @@ package() {
 }

 sha512sums="
-3424c103cc2878480527f57d75e122cfc5c95ffa66bf7133067dd691e664fee14ba43a626f70c5b2ffb70cd24a08b026e0571e99e390c0a485a3491e28883cda  deviceinfo
+22dd70e5730b46bfdb257eb5e577da2d91d72d0335e2f591af66dfb318169ccdf813d800c2c7adb12cbf8063fc35bb33519577cc33b6322104cd52f75e035e99  deviceinfo
 9f534c76689728c3fa699ac8c854ca82815d5158a3675a70ef879ddbf140460977187dc3c1a799dadd0ab53d5a08b6275a1594a7b976eda983f3e78b2738a8be  modules-initfs
 "
@@ -17,9 +17,11 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
+deviceinfo_getty="ttyMSM0;115200"

 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=13
+pkgrel=12
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,6 @@ options="!check !archcheck"
 depends="
 	linux-postmarketos-qcom-msm8996
 	mesa-egl
-	megapixels
 	mkbootimg
 	postmarketos-base
 	soc-qcom-msm8996
@@ -20,6 +19,7 @@ depends="
 	"
 makedepends="devicepkg-dev"
 subpackages="
+	$pkgname-camera
 	$pkgname-phosh
 	$pkgname-nonfree-firmware:nonfree_firmware
 	"
@@ -68,6 +68,11 @@ phosh() {
 		"$subpkgdir"/etc/phosh/phoc.ini
 }

+camera() {
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
+	depends="megapixels"
+	mkdir -p "$subpkgdir"
+}

 sha512sums="
 b033e7357c4ef91ba84f6f715e96e67637c2631d4746402f8a92333ba8974bbee7736a7bc081b0f84a84dc5b555a7db4dbb4f14f628bbfc42cbfa501c4f0ed36  30-gpu-firmware.files
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-vince
 pkgdesc="Xiaomi Redmi 5 Plus"
-pkgver=14
-pkgrel=0
+pkgver=13
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -34,6 +34,6 @@ package() {
 }

 sha512sums="
-902eea9986467553e129c11a387919f21aed496d09475e6fd3b8fa44b036c79f2705b9ccda9caa0e2954b62cc5bafe761bdf734de871463020926c7263032e44  deviceinfo
+e8cc57aa54f3564baf44e2d813a3573d999354ec81732de2a97ac7f0ebb32827c54ef1d4bb4e1149109c426cc1b4faad379b3bd16d0a72ef8f9be532f93ae7f8  deviceinfo
 69cfc8db6ea497576085e1b5861c766b5c6cfbd493e4d66aa0bfa29a0e80eeaeb8a465c4841c6a7959796f5a2325e621d60f2c35ccb0741d7934ab310abe807f  modules-initfs
 "
@@ -21,9 +21,11 @@ deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2160"
 deviceinfo_swap_size_recommended="1024"
+deviceinfo_getty="ttyMSM0;115200"

 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-google-veyron
 pkgver=6.1.39
-pkgrel=4
+pkgrel=3
 pkgdesc="Mainline kernel for Google Veyron devices"
 arch="armv7"
 _carch="arm"
@@ -68,7 +68,7 @@ package() {

 sha512sums="
 20d468ae89b57dda82d7c7b814c3d8b1b510e1623775b09a8a0b0a8a0431461e0a1d2df2bfa01f3102932c8eef91405546898b50ec3e6f30015098bb39722b41  linux-6.1.39.tar.xz
-3251546c093d41c3cd832d864a5f24b0de6da1e8ab2856bc7b168d450c450d66c82a141c0c4550ed124a3cf59745bdaef28eab6cef220e3fa8295889d222e1d3  config-google-veyron.armv7
+c2bc85928ce2025a2928af1e36d67a5ad66c6786e47e740dec806baf814adc8dcef76c4c4536e825bd09e56876eeb83373556d261c1d260476fc41e1c6d14d7b  config-google-veyron.armv7
 2912c675c1e07f7e91e2edcaa82738643907ed46614e4b871565930ff4ffece468d47db7905c2c081f936c020ea78db4a9d9f33b76c110125a0e68a1bd57f9fd  veyron.better_clock_selection_logic_and_dts_rate_list.patch
 b16da0e0b1da9f074a773300e954aa5e0da6c2113e20c0b594a7a4875e9addb10efcf5be694467fb00cd8d7c2e3cc83e6d7aac618047775dc0bb354245cf7c35  veyron.dts_allow_dedicating_npll_to_vop.patch
 b7bda162526abdb61c0223f1aac31893526d3d1d21d79ebd3e707be8d9b5dc464f6b4fa20b74444c44fda987352728433913f6f50b9b860c2621d11ae2306e1b  veyron.dts_do_dedicate_npll_to_vop.patch
@@ -2,9 +2,9 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm 6.1.39 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -131,7 +131,6 @@ CONFIG_TREE_RCU=y
 CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -822,8 +821,7 @@ CONFIG_BLOCK_LEGACY_AUTOLOAD=y
 CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 # CONFIG_BLK_DEV_BSGLIB is not set
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
@@ -1205,8 +1203,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -1496,7 +1494,7 @@ CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BT_BNEP is not set
-CONFIG_BT_HIDP=m
+# CONFIG_BT_HIDP is not set
 # CONFIG_BT_HS is not set
 CONFIG_BT_LE=y
 # CONFIG_BT_LEDS is not set
@@ -1504,6 +1502,7 @@ CONFIG_BT_LE=y
 # CONFIG_BT_AOSPEXT is not set
 CONFIG_BT_DEBUGFS=y
 # CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_FEATURE_DEBUG is not set

 #
 # Bluetooth device drivers
@@ -2129,7 +2128,7 @@ CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
+# CONFIG_DM_INTEGRITY is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
@@ -2654,37 +2653,7 @@ CONFIG_MOUSE_ELAN_I2C_I2C=y
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
@@ -5287,7 +5256,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 #
 CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
+# CONFIG_HIDRAW is not set
 CONFIG_UHID=m
 CONFIG_HID_GENERIC=y

@@ -5312,7 +5281,6 @@ CONFIG_HID_COUGAR=m
 CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
-# CONFIG_HID_CP2112 is not set
 CONFIG_HID_CREATIVE_SB0540=m
 CONFIG_HID_CYPRESS=m
 CONFIG_HID_DRAGONRISE=m
@@ -5322,7 +5290,6 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 CONFIG_HID_EZKEY=m
-# CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
 CONFIG_HID_GFRM=m
 CONFIG_HID_GLORIOUS=m
@@ -5350,7 +5317,6 @@ CONFIG_HID_LED=m
 CONFIG_HID_LENOVO=m
 CONFIG_HID_LETSKETCH=m
 CONFIG_HID_LOGITECH=m
-# CONFIG_HID_LOGITECH_DJ is not set
 CONFIG_HID_LOGITECH_HIDPP=m
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -5420,7 +5386,7 @@ CONFIG_HID_MCP2221=m
 #
 CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
+# CONFIG_USB_HIDDEV is not set
 # end of USB HID support

 #
@@ -5440,7 +5406,7 @@ CONFIG_USB_ULPI_BUS=y
 # CONFIG_USB_CONN_GPIO is not set
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set

 #
 # Miscellaneous USB options
@@ -5496,7 +5462,7 @@ CONFIG_USB_R8A66597_HCD=m
 # USB Device Class drivers
 #
 # CONFIG_USB_ACM is not set
-CONFIG_USB_PRINTER=m
+# CONFIG_USB_PRINTER is not set
 CONFIG_USB_WDM=m
 # CONFIG_USB_TMC is not set

@@ -7278,14 +7244,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y
@@ -7433,7 +7392,6 @@ CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
-# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=y
 # CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
@@ -7585,8 +7543,6 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -7719,8 +7675,7 @@ CONFIG_CRYPTO_XXHASH=y
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRC64_ROCKSOFT=y
+# CONFIG_CRYPTO_CRCT10DIF is not set
 # end of CRCs (cyclic redundancy checks)

 #
@@ -7782,7 +7737,6 @@ CONFIG_CRYPTO_AES_ARM_BS=y
 CONFIG_CRYPTO_AES_ARM_CE=y
 CONFIG_CRYPTO_CHACHA20_NEON=y
 CONFIG_CRYPTO_CRC32_ARM_CE=m
-# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
 # end of Accelerated Cryptographic Algorithms for CPU (arm)

 CONFIG_CRYPTO_HW=y
@@ -7869,8 +7823,8 @@ CONFIG_CRYPTO_LIB_SHA256=y

 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC64_ROCKSOFT=y
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC64_ROCKSOFT is not set
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
@@ -7878,7 +7832,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=y
+# CONFIG_CRC64 is not set
 CONFIG_CRC4=m
 # CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=y
@@ -7990,8 +7944,8 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DYNAMIC_DEBUG_CORE=y
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DYNAMIC_DEBUG_CORE is not set
 CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
@@ -8160,27 +8114,22 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
-CONFIG_BUILDTIME_MCOUNT_SORT=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 # CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
+# CONFIG_FUNCTION_TRACER is not set
 # CONFIG_STACK_TRACER is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
 # CONFIG_HWLAT_TRACER is not set
 # CONFIG_OSNOISE_TRACER is not set
 # CONFIG_TIMERLAT_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
 # CONFIG_FTRACE_SYSCALLS is not set
 # CONFIG_TRACER_SNAPSHOT is not set
 CONFIG_BRANCH_PROFILE_NONE=y
@@ -8191,17 +8140,12 @@ CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
 CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
 # CONFIG_SYNTH_EVENTS is not set
 # CONFIG_HIST_TRIGGERS is not set
 # CONFIG_TRACE_EVENT_INJECT is not set
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
@@ -2,9 +2,9 @@
 # Co-Maintainer: jane400 <jane400@postmarketos.org>
 # Contributor: Konrad Dybcio <konradybcio@kernel.org>
 pkgname=linux-lenovo-21bx
-pkgver=6.11
+pkgver=6.10
 pkgrel=0
-_commit="c8032fa3062e04cbb68f070959fc746b91abb16e"
+_commit="f0239008542ebdcd4a94755124b5700649df5c39"
 pkgdesc="Lenovo ThinkPad X13s kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -67,6 +67,6 @@ package() {
 }

 sha512sums="
-ed4429c4db569f7a7d06b1cf776d6ab02e17a4d66e1f7a90a69456036a4540be073876108a7ee89c91e66e4f8f4fa0d5e67a5849bdb2221a6323630dfa70ddce  linux-lenovo-21bx-c8032fa3062e04cbb68f070959fc746b91abb16e.tar.gz
-6bbdb466eb7f080868154fc38a5265f64d6f404c88b23925dd0b7bf18277f08dec94f0f52eb884910e79cccd98ef40ae640905ea8694f078426219a6da45913e  config-lenovo-21bx.aarch64
+efbf5fdaba513098c9c0f8eb2a559e58c6fd1180bcdf897514b2104480f0d2de2065f073d12204989804b61b083c2b3f9d605493ca6e89bb25e0beeae8545273  linux-lenovo-21bx-f0239008542ebdcd4a94755124b5700649df5c39.tar.gz
+4ce995e9f5d71d9e1037072d5f05166cfb1b03d95bfb9a88269e9e2be9960894e9a2ca29f8a25855777291b676e423ce2ee56386372692820ea1722e5b3e9c9e  config-lenovo-21bx.aarch64
 "
@@ -1,21 +1,21 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.0 Kernel Configuration
+# Linux/arm64 6.10.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24301
+CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24301
+CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -190,7 +190,7 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-# CONFIG_MEMCG_V1 is not set
+CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -266,6 +266,7 @@ CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
 # CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_GUEST_PERF_EVENTS=y
@@ -401,7 +402,9 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_SSBS=y
 CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -541,7 +544,6 @@ CONFIG_ARM64_CONTPTE=y
 CONFIG_CMDLINE=""
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
-CONFIG_COMPRESSED_INSTALL=y
 CONFIG_DMI=y
 # end of Boot options

@@ -762,7 +764,6 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
-CONFIG_RELR=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
 CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -785,8 +786,6 @@ CONFIG_GCC_PLUGINS=y
 CONFIG_FUNCTION_ALIGNMENT_4B=y
 CONFIG_FUNCTION_ALIGNMENT_8B=y
 CONFIG_FUNCTION_ALIGNMENT=8
-CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
-CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
@@ -813,7 +812,7 @@ CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 # CONFIG_BLK_DEV_BSGLIB is not set
-CONFIG_BLK_DEV_INTEGRITY=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
@@ -884,7 +883,6 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
-CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -896,7 +894,6 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -1191,8 +1188,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=y
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -1581,6 +1578,7 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_PCI_HOST_THUNDER_ECAM is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
+# CONFIG_PCIE_MICROCHIP_HOST is not set
 # CONFIG_PCI_XGENE is not set
 # CONFIG_PCIE_XILINX is not set

@@ -1607,12 +1605,6 @@ CONFIG_PCIE_QCOM=m
 # Mobiveil-based PCIe controllers
 #
 # end of Mobiveil-based PCIe controllers
-
-#
-# PLDA-based PCIe controllers
-#
-# CONFIG_PCIE_MICROCHIP_HOST is not set
-# end of PLDA-based PCIe controllers
 # end of PCI controller drivers

 #
@@ -1627,9 +1619,6 @@ CONFIG_PCIE_QCOM=m
 # CONFIG_PCI_SW_SWITCHTEC is not set
 # end of PCI switch controller drivers

-CONFIG_HAVE_PWRCTL=y
-CONFIG_PCI_PWRCTL=m
-CONFIG_PCI_PWRCTL_PWRSEQ=m
 # CONFIG_CXL_BUS is not set
 # CONFIG_PCCARD is not set
 # CONFIG_RAPIDIO is not set
@@ -1769,9 +1758,6 @@ CONFIG_ARM_PSCI_FW=y
 # Qualcomm firmware drivers
 #
 CONFIG_QCOM_SCM=y
-CONFIG_QCOM_TZMEM=y
-CONFIG_QCOM_TZMEM_MODE_GENERIC=y
-# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QCOM_QSEECOM=y
 CONFIG_QCOM_QSEECOM_UEFISECAPP=y
@@ -1908,7 +1894,6 @@ CONFIG_SRAM=y
 # CONFIG_UACCE is not set
 # CONFIG_PVPANIC is not set
 # CONFIG_GP_PCI1XXXX is not set
-# CONFIG_KEBA_CP500 is not set
 # end of Misc devices

 #
@@ -1981,8 +1966,8 @@ CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_AUDIT=y
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_AUDIT is not set
 # CONFIG_DM_VDO is not set
 # CONFIG_TARGET_CORE is not set
 # CONFIG_FUSION is not set
@@ -2143,7 +2128,6 @@ CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLX5_CORE is not set
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
-CONFIG_NET_VENDOR_META=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851 is not set
@@ -2227,7 +2211,6 @@ CONFIG_NET_VENDOR_SYNOPSYS=y
 # CONFIG_DWC_XLGMAC is not set
 CONFIG_NET_VENDOR_TEHUTI=y
 # CONFIG_TEHUTI is not set
-# CONFIG_TEHUTI_TN40 is not set
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
 # CONFIG_TLAN is not set
@@ -2340,7 +2323,6 @@ CONFIG_MDIO_DEVRES=y
 #
 # PCS device drivers
 #
-# CONFIG_PCS_XPCS is not set
 # end of PCS device drivers

 # CONFIG_PPP is not set
@@ -2455,7 +2437,7 @@ CONFIG_MHI_WWAN_MBIM=m
 #
 CONFIG_INPUT=y
 CONFIG_INPUT_LEDS=m
-CONFIG_INPUT_FF_MEMLESS=m
+# CONFIG_INPUT_FF_MEMLESS is not set
 # CONFIG_INPUT_SPARSEKMAP is not set
 # CONFIG_INPUT_MATRIXKMAP is not set

@@ -2503,38 +2485,7 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_BCM is not set
 # CONFIG_KEYBOARD_CYPRESS_SF is not set
 # CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
-# CONFIG_JOYSTICK_SEESAW is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
@@ -2763,7 +2714,6 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_CADENCE_QUADSPI is not set
-# CONFIG_SPI_CH341 is not set
 # CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_FSL_SPI is not set
@@ -2827,7 +2777,6 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_SCMI is not set
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_STMFX is not set
-# CONFIG_PINCTRL_IMX_SCMI is not set
 CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_IPQ5018 is not set
 # CONFIG_PINCTRL_IPQ5332 is not set
@@ -2870,7 +2819,6 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
 CONFIG_PINCTRL_LPASS_LPI=m
 # CONFIG_PINCTRL_SC7280_LPASS_LPI is not set
-# CONFIG_PINCTRL_SM4250_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM8250_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM8350_LPASS_LPI is not set
@@ -2969,12 +2917,6 @@ CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers

-#
-# GPIO Debugging utilities
-#
-# CONFIG_GPIO_VIRTUSER is not set
-# end of GPIO Debugging utilities
-
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO is not set
@@ -2990,8 +2932,6 @@ CONFIG_POWER_RESET_QCOM_PON=m
 CONFIG_REBOOT_MODE=m
 # CONFIG_SYSCON_REBOOT_MODE is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
-CONFIG_POWER_SEQUENCING=m
-CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -3011,7 +2951,6 @@ CONFIG_BATTERY_QCOM_BATTMGR=m
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -3052,6 +2991,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_AD7314 is not set
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1029 is not set
@@ -3123,6 +3063,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
@@ -3192,7 +3133,6 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_INA2XX is not set
 # CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_SPD5118 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -3387,8 +3327,6 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_ATC260X_I2C is not set
 CONFIG_MFD_QCOM_PM8008=m
-# CONFIG_MFD_CS40L50_I2C is not set
-# CONFIG_MFD_CS40L50_SPI is not set
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_INTEL_M10_BMC_SPI is not set
 # CONFIG_MFD_RSMU_I2C is not set
@@ -3587,7 +3525,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 #
 # Chips&Media media platform drivers
 #
-# CONFIG_VIDEO_E5010_JPEG_ENC is not set

 #
 # Intel media platform drivers
@@ -3624,11 +3561,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m

-#
-# Raspberry Pi media platform drivers
-#
-# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set
-
 #
 # Renesas media platform drivers
 #
@@ -3683,8 +3615,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_ALVIUM_CSI2 is not set
 # CONFIG_VIDEO_AR0521 is not set
 # CONFIG_VIDEO_GC0308 is not set
-# CONFIG_VIDEO_GC05A2 is not set
-# CONFIG_VIDEO_GC08A3 is not set
 # CONFIG_VIDEO_GC2145 is not set
 # CONFIG_VIDEO_HI556 is not set
 # CONFIG_VIDEO_HI846 is not set
@@ -3694,7 +3624,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_IMX219 is not set
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX283 is not set
 # CONFIG_VIDEO_IMX290 is not set
 # CONFIG_VIDEO_IMX296 is not set
 # CONFIG_VIDEO_IMX319 is not set
@@ -3750,7 +3679,7 @@ CONFIG_VIDEO_OV5675=m
 # CONFIG_VIDEO_S5C73M3 is not set
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_VGXY61 is not set
+# CONFIG_VIDEO_ST_VGXY61 is not set
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set

@@ -3793,8 +3722,6 @@ CONFIG_VIDEO_OV5675=m
 # CONFIG_VIDEO_DS90UB913 is not set
 # CONFIG_VIDEO_DS90UB953 is not set
 # CONFIG_VIDEO_DS90UB960 is not set
-# CONFIG_VIDEO_MAX96714 is not set
-# CONFIG_VIDEO_MAX96717 is not set
 # end of Video serializers and deserializers

 #
@@ -3821,14 +3748,11 @@ CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
 CONFIG_DRM_DISPLAY_HELPER=m
-CONFIG_DRM_BRIDGE_CONNECTOR=y
+CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
-CONFIG_DRM_DISPLAY_HDMI_HELPER=y
-CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
 CONFIG_DRM_EXEC=m
 CONFIG_DRM_GEM_DMA_HELPER=m
 CONFIG_DRM_SCHED=m
@@ -4060,7 +3984,6 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
@@ -4230,7 +4153,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 # CONFIG_SND_SOC_AK4613 is not set
-# CONFIG_SND_SOC_AK4619 is not set
 # CONFIG_SND_SOC_AK4642 is not set
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
@@ -4273,14 +4195,12 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_CS530X_I2C is not set
 # CONFIG_SND_SOC_CX2072X is not set
 # CONFIG_SND_SOC_DA7213 is not set
 # CONFIG_SND_SOC_DMIC is not set
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8311 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 # CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
@@ -4324,7 +4244,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_RT1308_SDW is not set
 # CONFIG_SND_SOC_RT1316_SDW is not set
 # CONFIG_SND_SOC_RT1318_SDW is not set
-# CONFIG_SND_SOC_RT1320_SDW is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_RT5640 is not set
@@ -4384,7 +4303,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_UDA1334 is not set
 CONFIG_SND_SOC_WCD_CLASSH=m
 CONFIG_SND_SOC_WCD_MBHC=m
-# CONFIG_SND_SOC_WCD937X_SDW is not set
 CONFIG_SND_SOC_WCD938X=m
 CONFIG_SND_SOC_WCD938X_SDW=m
 # CONFIG_SND_SOC_WCD939X_SDW is not set
@@ -4570,7 +4488,7 @@ CONFIG_HID_MULTITOUCH=m
 #
 CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
+# CONFIG_USB_HIDDEV is not set
 # end of USB HID support

 CONFIG_I2C_HID=m
@@ -4587,7 +4505,7 @@ CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
 # CONFIG_USB_PCI is not set
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set

 #
 # Miscellaneous USB options
@@ -4825,7 +4743,7 @@ CONFIG_USB_CONFIGFS_NCM=y
 CONFIG_USB_CONFIGFS_ECM_SUBSET=y
 CONFIG_USB_CONFIGFS_RNDIS=y
 CONFIG_USB_CONFIGFS_EEM=y
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
 # CONFIG_USB_CONFIGFS_F_LB_SS is not set
 CONFIG_USB_CONFIGFS_F_FS=y
 # CONFIG_USB_CONFIGFS_F_UAC1 is not set
@@ -5028,7 +4946,6 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
 # CONFIG_LEDS_TRIGGER_TTY is not set
-# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set

 #
 # Simple LED drivers
@@ -5193,7 +5110,7 @@ CONFIG_DMA_OF=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-CONFIG_UDMABUF=y
+# CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
@@ -5223,12 +5140,10 @@ CONFIG_VIRTIO=y
 # CONFIG_STAGING is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_ARM64_PLATFORM_DEVICES=y
 # CONFIG_EC_ACER_ASPIRE1 is not set
-# CONFIG_EC_LENOVO_YOGA_C630 is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -5262,13 +5177,13 @@ CONFIG_COMMON_CLK_SCPI=m
 # CONFIG_COMMON_CLK_VC7 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_QCOM_GDSC=y
+CONFIG_QCOM_RPMCC=y
 CONFIG_COMMON_CLK_QCOM=y
 # CONFIG_CLK_X1E80100_CAMCC is not set
 # CONFIG_CLK_X1E80100_DISPCC is not set
 # CONFIG_CLK_X1E80100_GCC is not set
 # CONFIG_CLK_X1E80100_GPUCC is not set
 # CONFIG_CLK_X1E80100_TCSRCC is not set
-# CONFIG_CLK_QCM2290_GPUCC is not set
 # CONFIG_QCOM_A53PLL is not set
 # CONFIG_QCOM_A7PLL is not set
 # CONFIG_QCOM_CLK_APCS_MSM8916 is not set
@@ -5283,7 +5198,6 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_IPQ_GCC_6018 is not set
 # CONFIG_IPQ_GCC_8074 is not set
 # CONFIG_IPQ_GCC_9574 is not set
-# CONFIG_IPQ_NSSCC_QCA8K is not set
 # CONFIG_MSM_GCC_8916 is not set
 # CONFIG_MSM_GCC_8917 is not set
 # CONFIG_MSM_GCC_8939 is not set
@@ -5335,11 +5249,9 @@ CONFIG_SC_LPASSCC_8280XP=m
 # CONFIG_SDM_LPASSCC_845 is not set
 # CONFIG_SDX_GCC_75 is not set
 # CONFIG_SM_CAMCC_6350 is not set
-# CONFIG_SM_CAMCC_7150 is not set
 # CONFIG_SM_CAMCC_8250 is not set
 # CONFIG_SM_CAMCC_8450 is not set
 # CONFIG_SM_CAMCC_8550 is not set
-# CONFIG_SM_CAMCC_8650 is not set
 # CONFIG_SM_DISPCC_8250 is not set
 # CONFIG_SM_DISPCC_8650 is not set
 # CONFIG_SM_GCC_4450 is not set
@@ -5366,7 +5278,6 @@ CONFIG_SM_GCC_8350=m
 # CONFIG_SM_GPUCC_8650 is not set
 # CONFIG_SM_TCSRCC_8550 is not set
 # CONFIG_SM_TCSRCC_8650 is not set
-# CONFIG_SM_VIDEOCC_7150 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
 # CONFIG_SM_VIDEOCC_8250 is not set
 CONFIG_SM_VIDEOCC_8350=m
@@ -5403,7 +5314,6 @@ CONFIG_ARM_MHU_V3=m
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_QCOM_APCS_IPC=m
-# CONFIG_QCOM_CPUCP_MBOX is not set
 CONFIG_QCOM_IPCC=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
@@ -5522,9 +5432,7 @@ CONFIG_QCOM_GENI_SE=y
 CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_MDT_LOADER=m
 # CONFIG_QCOM_OCMEM is not set
-CONFIG_QCOM_PD_MAPPER=m
 CONFIG_QCOM_PDR_HELPERS=m
-CONFIG_QCOM_PDR_MSG=m
 # CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
 CONFIG_QCOM_PMIC_GLINK=m
 CONFIG_QCOM_QMI_HELPERS=m
@@ -5687,7 +5595,6 @@ CONFIG_IIO=m
 # CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
 # CONFIG_AD7298 is not set
-# CONFIG_AD7380 is not set
 # CONFIG_AD7476 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD7606_IFACE_SPI is not set
@@ -5702,6 +5609,7 @@ CONFIG_IIO=m
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
 # CONFIG_AD9467 is not set
+# CONFIG_ADI_AXI_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HI8435 is not set
@@ -5742,7 +5650,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
 # CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_TI_ADS1298 is not set
@@ -5794,7 +5701,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
-# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
@@ -5839,6 +5745,7 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
 # CONFIG_AD9739A is not set
+# CONFIG_ADI_AXI_DAC is not set
 # CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
@@ -6027,7 +5934,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
-# CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -6175,7 +6081,6 @@ CONFIG_PWM=y
 # CONFIG_PWM_CLK is not set
 # CONFIG_PWM_DWC is not set
 # CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_GPIO is not set
 # CONFIG_PWM_PCA9685 is not set
 # CONFIG_PWM_XILINX is not set

@@ -6189,9 +6094,7 @@ CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
-CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
-# CONFIG_LAN966X_OIC is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_PARTITION_PERCPU=y
 CONFIG_QCOM_PDC=y
@@ -6285,7 +6188,6 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android

-CONFIG_TRACE_GPU_MEM=y
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
@@ -6324,7 +6226,6 @@ CONFIG_INTERCONNECT_QCOM_BCM_VOTER=y
 # CONFIG_INTERCONNECT_QCOM_MSM8909 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8939 is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8953 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8996 is not set
 CONFIG_INTERCONNECT_QCOM_OSM_L3=m
@@ -6354,7 +6255,6 @@ CONFIG_INTERCONNECT_QCOM_SC8280XP=y
 # CONFIG_INTERCONNECT_QCOM_SM8550 is not set
 # CONFIG_INTERCONNECT_QCOM_SM8650 is not set
 # CONFIG_INTERCONNECT_QCOM_X1E80100 is not set
-CONFIG_INTERCONNECT_CLK=y
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
 # CONFIG_PECI is not set
@@ -6383,15 +6283,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-CONFIG_XFS_SUPPORT_ASCII_CI=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y
@@ -6446,7 +6338,6 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=y
 # CONFIG_NETFS_STATS is not set
-# CONFIG_NETFS_DEBUG is not set
 # CONFIG_FSCACHE is not set
 # end of Caches

@@ -6454,7 +6345,7 @@ CONFIG_NETFS_SUPPORT=y
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
-CONFIG_UDF_FS=m
+# CONFIG_UDF_FS is not set
 # end of CD-ROM/DVD Filesystems

 #
@@ -6674,8 +6565,6 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -6721,6 +6610,7 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
+# CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
 # end of Public-key cryptography

@@ -6805,8 +6695,7 @@ CONFIG_CRYPTO_XXHASH=y
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRC64_ROCKSOFT=y
+# CONFIG_CRYPTO_CRCT10DIF is not set
 # end of CRCs (cyclic redundancy checks)

 #
@@ -6876,7 +6765,6 @@ CONFIG_CRYPTO_AES_ARM64_BS=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
-# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set
 # end of Accelerated Cryptographic Algorithms for CPU (arm64)

 CONFIG_CRYPTO_HW=y
@@ -6966,16 +6854,16 @@ CONFIG_CRYPTO_LIB_SHA256=y

 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC64_ROCKSOFT=y
-CONFIG_CRC_ITU_T=m
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC64_ROCKSOFT is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
 CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=y
+# CONFIG_CRC64 is not set
 # CONFIG_CRC4 is not set
 # CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=y
@@ -7059,7 +6947,6 @@ CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 # CONFIG_IRQ_POLL is not set
 CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
@@ -7126,9 +7013,7 @@ CONFIG_FRAME_POINTER=y
 #
 # Generic Kernel Debugging Instruments
 #
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-# CONFIG_MAGIC_SYSRQ_SERIAL is not set
+# CONFIG_MAGIC_SYSRQ is not set
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_FS_ALLOW_ALL=y
 # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
@@ -3,7 +3,7 @@ pkgname=linux-pine64-pinephonepro
 pkgver=6.6.0
 _pkgver=6.6
 _tagdate=20231104-22589
-pkgrel=5
+pkgrel=3
 pkgdesc="Mainline kernel for the pinephone pro"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -72,5 +72,5 @@ package() {

 sha512sums="
 d59c410ecc1a824b7b9a38f36b224693812003320220a3464a648084152023ed8be48d0448eb8054cd2b1d42befd5e8958d3ad243e50138e1c9d0269ac2917ea  linux-ppp-6.6-20231104-22589.tar.gz
-e3a80abf986226d753b64d57893781a12a2e04e0fa19d4de8d3b4732f709aadd1c317d0a9ecf33a828975f15e7c43fb8cae9f66136886699867bbee1a679ca4e  config-pine64-pinephonepro.aarch64
+0806ec3859bb71739c59108e66fe0f45c9db384f0beab9b736627e79b45363e2c0bc466e6b584c00f91ce262bd7a4a2d14c8f14eee1bb8158c7deddd18452bda  config-pine64-pinephonepro.aarch64
 "
@@ -2,9 +2,9 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.6.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -1277,8 +1277,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=y
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -2131,9 +2131,9 @@ CONFIG_DM_UEVENT=y
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
+# CONFIG_DM_INTEGRITY is not set
 # CONFIG_DM_ZONED is not set
-CONFIG_DM_AUDIT=y
+# CONFIG_DM_AUDIT is not set
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -2478,37 +2478,7 @@ CONFIG_KEYBOARD_PINEPHONE=m
 # CONFIG_KEYBOARD_BCM is not set
 # CONFIG_KEYBOARD_CYPRESS_SF is not set
 # CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
+# CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_TABLET=y
 # CONFIG_TABLET_USB_ACECAD is not set
 # CONFIG_TABLET_USB_AIPTEK is not set
@@ -4958,7 +4928,7 @@ CONFIG_USB_F_MASS_STORAGE=y
 CONFIG_USB_F_TCM=m
 CONFIG_USB_CONFIGFS=y
 # CONFIG_USB_CONFIGFS_SERIAL is not set
-CONFIG_USB_CONFIGFS_ACM=y
+# CONFIG_USB_CONFIGFS_ACM is not set
 # CONFIG_USB_CONFIGFS_OBEX is not set
 CONFIG_USB_CONFIGFS_NCM=y
 CONFIG_USB_CONFIGFS_ECM=y
@@ -5,7 +5,7 @@

 pkgname=linux-postmarketos-exynos4
 pkgver=6.10.0
-pkgrel=3
+pkgrel=0
 pkgdesc="Mainline kernel fork for Samsung Exynos4 devices"
 arch="armv7"
 _carch="arm"
@@ -19,6 +19,7 @@ options="!strip !check !tracedeps
 makedepends="
 	bash
 	bison
+	busybox-static-armv7
 	findutils
 	flex
 	gmp-dev
@@ -28,7 +29,6 @@ makedepends="
 	perl
 	postmarketos-installkernel
 	xz
-	zstd
 "

 # Source
@@ -70,5 +70,5 @@ package() {

 sha512sums="
 a320d0be4532f469be015e2a6706e507e89daaa55ad50d57a56451dca04b6bbea56f62d15877ef000027ce887ecd04257f9c71d7c9d80aab55607494205fa5c7  linux-postmarketos-exynos4-v6.10.0-exynos4.tar.bz2
-0a4ff7edb445bc20604e4e4d615a96ecac7d93174aa42d74b3d120b34890319262954e977748accc0c64302e79829b39216dc4f82d27a02ad672ddb775ea41ca  config-postmarketos-exynos4.armv7
+2dc3a1d57bf485b513308362b263de59dd4ee507f9a23935a91f7bee9fb119a172089b5b64b364a770e378e225e253424eacad6905e9f1be57231d4ed5cf7b9f  config-postmarketos-exynos4.armv7
 "
@@ -5,7 +5,7 @@

 pkgname=linux-postmarketos-exynos5
 pkgver=6.6.41
-pkgrel=3
+pkgrel=1
 pkgdesc="Mainline kernel fork for Samsung Exynos5 devices"
 arch="armv7"
 _carch="arm"
@@ -70,5 +70,5 @@ package() {

 sha512sums="
 f82cebbe5683baca5f1e2f7c51d3132d84e52dc553170ed21229b8c2e3d46aa5abd06b5059f8fc336034d39a9040ad96b35c704f6d027b8cd32ead0f3d9e6036  linux-postmarketos-exynos5-v6.6.41-exynos5-lts.tar.bz2
-7c35ceb606c2eb8af6e9f594d61f2cf055488bfd788602ee000da6575bb7c9cae3d6be93ebb0d2f8371acc5f357990c35e0f53bb5c597b6fc6c972a0f68bb6a4  config-postmarketos-exynos5.armv7
+ade407b0743c9411c5adea994fa6281f8cde943e42ac4229be2fc32ca96f9f59c86d211734845adcaa92a35c526996c221a590394e922e97e9e226ccc0086f38  config-postmarketos-exynos5.armv7
 "
@@ -2,9 +2,9 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm 6.6.41 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -13,6 +13,7 @@ CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -139,7 +140,6 @@ CONFIG_TREE_SRCU=y
 CONFIG_NEED_SRCU_NMI_SAFE=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -5010,14 +5010,14 @@ CONFIG_USB_F_RNDIS=y
 CONFIG_USB_F_MASS_STORAGE=m
 CONFIG_USB_CONFIGFS=y
 # CONFIG_USB_CONFIGFS_SERIAL is not set
-CONFIG_USB_CONFIGFS_ACM=y
+# CONFIG_USB_CONFIGFS_ACM is not set
 # CONFIG_USB_CONFIGFS_OBEX is not set
 CONFIG_USB_CONFIGFS_NCM=y
 # CONFIG_USB_CONFIGFS_ECM is not set
 # CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
 CONFIG_USB_CONFIGFS_RNDIS=y
 # CONFIG_USB_CONFIGFS_EEM is not set
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
 # CONFIG_USB_CONFIGFS_F_LB_SS is not set
 # CONFIG_USB_CONFIGFS_F_FS is not set
 # CONFIG_USB_CONFIGFS_F_UAC1 is not set
@@ -7200,21 +7200,15 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
-CONFIG_BUILDTIME_MCOUNT_SORT=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 # CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
+# CONFIG_FUNCTION_TRACER is not set
 # CONFIG_STACK_TRACER is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
@@ -7222,6 +7216,7 @@ CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_HWLAT_TRACER is not set
 # CONFIG_OSNOISE_TRACER is not set
 # CONFIG_TIMERLAT_TRACER is not set
+CONFIG_ENABLE_DEFAULT_TRACERS=y
 # CONFIG_FTRACE_SYSCALLS is not set
 # CONFIG_TRACER_SNAPSHOT is not set
 CONFIG_BRANCH_PROFILE_NONE=y
@@ -7232,8 +7227,6 @@ CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
 CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
 # CONFIG_SYNTH_EVENTS is not set
 # CONFIG_USER_EVENTS is not set
 # CONFIG_HIST_TRIGGERS is not set
@@ -7241,9 +7234,6 @@ CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
@@ -4,7 +4,7 @@

 pkgname=linux-postmarketos-grate
 pkgver=6.6.22
-pkgrel=5
+pkgrel=3
 pkgdesc="Linux kernel with experimental patches for Tegra"
 arch="armv7"
 url="https://gitlab.com/grate-driver/linux"
@@ -49,5 +49,5 @@ package() {

 sha512sums="
 db25898c5c4103e12ace113de7f7eba91b41f94a4dae270c9424341e8f796a98dee8676d1d02b229b0c4b11cc79b31454a13f9f2b7b1277b5ca9bb7328d54a39  linux-postmarketos-grate-v6.6.22-lts.tar.bz2
-ecc0336c289646ad55fbf5020a9bbb3a6ed67bc27ad7f06e6ee097fb645c822d8a9d57bba72464abf141405282573791f7e53adad833e19be82e6667f0cb42ac  config-postmarketos-grate.armv7
+a8f00af80d245c3ba0fb1b755d2114817dd3659f64dc7fed8ff5d4e0f48f303dbce68f2ab3642aaf8d71caa63b83d69e828cd2bb4e71d32ad4f837cb85c9b68b  config-postmarketos-grate.armv7
 "
@@ -2,17 +2,20 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm 6.6.22 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -127,7 +130,6 @@ CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_NEED_SRCU_NMI_SAFE=y
 CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -247,7 +249,6 @@ CONFIG_PERF_EVENTS=y

 CONFIG_SYSTEM_DATA_VERIFICATION=y
 # CONFIG_PROFILING is not set
-CONFIG_TRACEPOINTS=y

 #
 # Kexec and crash features
@@ -602,7 +603,6 @@ CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_HAVE_KPROBES=y
@@ -707,8 +707,7 @@ CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_ICQ=y
 # CONFIG_BLK_DEV_BSGLIB is not set
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
@@ -1072,8 +1071,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -1317,7 +1316,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
 # end of Network testing
 # end of Networking options

@@ -1339,6 +1337,7 @@ CONFIG_BT_LE_L2CAP_ECRED=y
 # CONFIG_BT_AOSPEXT is not set
 CONFIG_BT_DEBUGFS=y
 # CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_FEATURE_DEBUG is not set

 #
 # Bluetooth device drivers
@@ -1457,7 +1456,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_DEBUG=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_FW_LOADER_SYSFS=y
 CONFIG_EXTRA_FIRMWARE=""
@@ -1820,7 +1818,7 @@ CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
+# CONFIG_DM_INTEGRITY is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
@@ -2228,37 +2226,7 @@ CONFIG_MOUSE_PS2_SMBUS=y
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
@@ -4426,7 +4394,7 @@ CONFIG_USB_ULPI_BUS=y
 # CONFIG_USB_CONN_GPIO is not set
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set

 #
 # Miscellaneous USB options
@@ -4464,7 +4432,7 @@ CONFIG_USB_EHCI_TEGRA=y
 # USB Device Class drivers
 #
 CONFIG_USB_ACM=y
-CONFIG_USB_PRINTER=m
+# CONFIG_USB_PRINTER is not set
 CONFIG_USB_WDM=y
 # CONFIG_USB_TMC is not set

@@ -4646,14 +4614,14 @@ CONFIG_USB_F_EEM=y
 CONFIG_USB_F_RNDIS=y
 CONFIG_USB_CONFIGFS=y
 # CONFIG_USB_CONFIGFS_SERIAL is not set
-CONFIG_USB_CONFIGFS_ACM=y
+# CONFIG_USB_CONFIGFS_ACM is not set
 # CONFIG_USB_CONFIGFS_OBEX is not set
 CONFIG_USB_CONFIGFS_NCM=y
 # CONFIG_USB_CONFIGFS_ECM is not set
 # CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
 CONFIG_USB_CONFIGFS_RNDIS=y
 CONFIG_USB_CONFIGFS_EEM=y
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
 # CONFIG_USB_CONFIGFS_F_LB_SS is not set
 # CONFIG_USB_CONFIGFS_F_FS is not set
 # CONFIG_USB_CONFIGFS_F_UAC1 is not set
@@ -5936,15 +5904,7 @@ CONFIG_JBD2=m
 CONFIG_FS_MBCACHE=m
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-CONFIG_XFS_SUPPORT_ASCII_CI=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m
@@ -5999,7 +5959,7 @@ CONFIG_NETFS_SUPPORT=m
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
-CONFIG_UDF_FS=m
+# CONFIG_UDF_FS is not set
 # end of CD-ROM/DVD Filesystems

 #
@@ -6075,7 +6035,6 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 CONFIG_PSTORE_COMPRESS=y
 # CONFIG_PSTORE_CONSOLE is not set
 # CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
 # CONFIG_PSTORE_RAM is not set
 # CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
@@ -6223,8 +6182,6 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -6356,8 +6313,7 @@ CONFIG_CRYPTO_XXHASH=m
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRC64_ROCKSOFT=y
+# CONFIG_CRYPTO_CRCT10DIF is not set
 # end of CRCs (cyclic redundancy checks)

 #
@@ -6473,8 +6429,8 @@ CONFIG_CRYPTO_LIB_SHA256=y

 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC64_ROCKSOFT=y
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC64_ROCKSOFT is not set
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
@@ -6482,7 +6438,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=y
+# CONFIG_CRC64 is not set
 # CONFIG_CRC4 is not set
 # CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
@@ -6580,8 +6536,8 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DYNAMIC_DEBUG_CORE=y
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DYNAMIC_DEBUG_CORE is not set
 CONFIG_SYMBOLIC_ERRNAME=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # end of printk and dmesg options
@@ -6639,7 +6595,6 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_WX is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
@@ -6743,7 +6698,6 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
-CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -6752,53 +6706,8 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
-CONFIG_BUILDTIME_MCOUNT_SORT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_OSNOISE_TRACER is not set
-# CONFIG_TIMERLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_USER_EVENTS is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_RV is not set
+# CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
 # CONFIG_STRICT_DEVMEM is not set

@@ -6875,7 +6784,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_TEST_DYNAMIC_DEBUG is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_MEMINIT is not set
@@ -1,8 +1,8 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.10.10
-pkgrel=2
+pkgver=6.10.6
+pkgrel=0
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
 _carch="arm64"
@@ -36,7 +36,10 @@ esac
 source="
 	https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${pkgver//_/-}.tar.xz
 	$_config
+	fix-mmc1-speed.patch
 	fix-mmc-order.patch
+	fix-spi-nor-max-frequency.patch
+	temp-fix-build-error.patch
 "
 builddir="$srcdir/linux-${_kernver//_/-}"

@@ -66,7 +69,10 @@ package() {
 }

 sha512sums="
-affaa3690150ca13f0ee14f91f0e09a5ad3340a7ea6404e34286dfb4bd4fdfe12fcac47e83da7878681bf28a8a8b78e0b315e1563408885dbb07aac5bd2e4dce  linux-6.10.10.tar.xz
-44c35de93ea3bfe214585c4b8909613b17a6e280765ab84352e3d07490a42403e3e68ab7f26eb9442004a1ee7f78ef0fd6ebdeab01561ac84a8073d817ca3434  config-postmarketos-mediatek-mt8173.aarch64
+991ec7c7d2d490cb90b182a29e892dae586918eee7f3ff4b6e26f4ff9b31b6d7a31cdc31d25ca12243ecab59787aad75f0056b2fbe6997d0dfd68c357e7703af  linux-6.10.6.tar.xz
+c38ad0e98f763b1c3ece2f764ff6aed4dedf3064673a981c238ced9e0b51ce417375360ca86a471c1e53e11e838fec4b7540f21ecd9a8699e57352e22c941f6d  config-postmarketos-mediatek-mt8173.aarch64
+4b499c1fbf53631cffd6fa7299643dc744e0e2187f71804664b02f05296162b42e3f76aa0d8c688cecb43a8bcd41ec92991c98287951292260237b828dcca710  fix-mmc1-speed.patch
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
+caf48ac0f77661153ee94c7de4931baca135a69a97e93f01ad8f276b4a9944e077d7214c117450943cca07990c773661f79718cb0c2ff7c5789c93d37afb26de  fix-spi-nor-max-frequency.patch
+9842da152a3dd95054f6f0110c8b942935645ab5c6fbd07300021212ce477e70c85da56d54ceecc189378c0b4adc7a699068d6bc86bd5a67140565b1535f3af5  temp-fix-build-error.patch
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.10.10 Kernel Configuration
+# Linux/arm64 6.10.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -99,7 +99,6 @@ CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
-# CONFIG_BPF_LSM is not set
 # end of BPF subsystem

 CONFIG_PREEMPT_BUILD=y
@@ -141,7 +140,6 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_NEED_TASKS_RCU=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -254,6 +252,7 @@ CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_GUEST_PERF_EVENTS=y
@@ -267,7 +266,6 @@ CONFIG_PERF_EVENTS=y

 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y

 #
 # Kexec and crash features
@@ -661,7 +659,6 @@ CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -759,7 +756,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
-CONFIG_RELR=y
+# CONFIG_RELR is not set
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
 CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -780,8 +777,7 @@ CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_FUNCTION_ALIGNMENT_4B=y
-CONFIG_FUNCTION_ALIGNMENT_8B=y
-CONFIG_FUNCTION_ALIGNMENT=8
+CONFIG_FUNCTION_ALIGNMENT=4
 CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
 CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options
@@ -1222,8 +1218,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -1522,7 +1518,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
 # end of Network testing
 # end of Networking options

@@ -1547,6 +1542,7 @@ CONFIG_BT_LEDS=y
 # CONFIG_BT_AOSPEXT is not set
 # CONFIG_BT_DEBUGFS is not set
 # CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_FEATURE_DEBUG is not set

 #
 # Bluetooth device drivers
@@ -1788,7 +1784,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_DEBUG=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_FW_LOADER_SYSFS=y
 CONFIG_EXTRA_FIRMWARE=""
@@ -2421,8 +2416,8 @@ CONFIG_DM_ZERO=m
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_AUDIT=y
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_AUDIT is not set
 # CONFIG_DM_VDO is not set
 # CONFIG_TARGET_CORE is not set
 # CONFIG_FUSION is not set
@@ -2848,14 +2843,12 @@ CONFIG_ATH10K_SDIO=m
 CONFIG_ATH10K_DEBUG=y
 CONFIG_ATH10K_DEBUGFS=y
 # CONFIG_ATH10K_SPECTRAL is not set
-# CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_ATH11K=m
 CONFIG_ATH11K_AHB=m
 CONFIG_ATH11K_PCI=m
 # CONFIG_ATH11K_DEBUG is not set
-# CONFIG_ATH11K_TRACING is not set
 # CONFIG_ATH12K is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 # CONFIG_AT76C50X_USB is not set
@@ -3054,38 +3047,7 @@ CONFIG_MOUSE_ELAN_I2C_I2C=y
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
-# CONFIG_JOYSTICK_SEESAW is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
@@ -5509,7 +5471,7 @@ CONFIG_SND_VIRTIO=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_BATTERY_STRENGTH is not set
-CONFIG_HIDRAW=y
+# CONFIG_HIDRAW is not set
 CONFIG_UHID=m
 CONFIG_HID_GENERIC=y

@@ -5534,7 +5496,6 @@ CONFIG_HID_COUGAR=m
 CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
-# CONFIG_HID_CP2112 is not set
 CONFIG_HID_CREATIVE_SB0540=m
 CONFIG_HID_CYPRESS=m
 CONFIG_HID_DRAGONRISE=m
@@ -5545,7 +5506,6 @@ CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 # CONFIG_HID_EVISION is not set
 CONFIG_HID_EZKEY=m
-# CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
 CONFIG_HID_GFRM=m
 CONFIG_HID_GLORIOUS=m
@@ -5574,7 +5534,6 @@ CONFIG_HID_LED=m
 CONFIG_HID_LENOVO=m
 CONFIG_HID_LETSKETCH=m
 CONFIG_HID_LOGITECH=m
-# CONFIG_HID_LOGITECH_DJ is not set
 CONFIG_HID_LOGITECH_HIDPP=m
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -5652,7 +5611,6 @@ CONFIG_HID_MCP2221=m
 #
 # HID-BPF support
 #
-# CONFIG_HID_BPF is not set
 # end of HID-BPF support

 #
@@ -5660,7 +5618,7 @@ CONFIG_HID_MCP2221=m
 #
 CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
+# CONFIG_USB_HIDDEV is not set
 # end of USB HID support

 CONFIG_I2C_HID=y
@@ -5678,7 +5636,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
 CONFIG_USB_PCI=y
 # CONFIG_USB_PCI_AMD is not set
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set

 #
 # Miscellaneous USB options
@@ -5727,7 +5685,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
 # USB Device Class drivers
 #
 CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
+# CONFIG_USB_PRINTER is not set
 CONFIG_USB_WDM=m
 # CONFIG_USB_TMC is not set

@@ -6372,7 +6330,7 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-CONFIG_UDMABUF=y
+# CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
@@ -6854,7 +6812,6 @@ CONFIG_MTK_SOCINFO=y
 #
 # Qualcomm SoC drivers
 #
-# CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
 # CONFIG_QCOM_PMIC_GLINK is not set
 CONFIG_QCOM_QMI_HELPERS=m
 # CONFIG_QCOM_PBS is not set
@@ -7732,15 +7689,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-CONFIG_XFS_SUPPORT_ASCII_CI=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y
@@ -8073,8 +8022,6 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -8341,7 +8288,6 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 # CONFIG_INDIRECT_PIO is not set
-# CONFIG_TRACE_MMIO_ACCESS is not set

 #
 # Crypto library routines
@@ -8500,8 +8446,8 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DYNAMIC_DEBUG_CORE=y
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DYNAMIC_DEBUG_CORE is not set
 CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
@@ -8571,7 +8517,6 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_TABLE_CHECK is not set
 # CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_ARCH_HAS_DEBUG_WX=y
 # CONFIG_DEBUG_WX is not set
@@ -8684,67 +8629,17 @@ CONFIG_RCU_TRACE=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_FUNCTION_GRAPH_RETVAL is not set
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
-CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_OSNOISE_TRACER is not set
-# CONFIG_TIMERLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_USER_EVENTS is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_VALIDATE_RCU_IS_WATCHING is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_RV is not set
+# CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
@@ -0,0 +1,15 @@
+cut max-frequency to half because at full speed mmc is buggy
+
+Link: https://git.alpinelinux.org/aports/tree/testing/linux-elm?h=master
+
+--- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi	2020-12-28 21:22:16.614538427 +0000
+++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi	2020-12-28 21:23:59.702157398 +0000
+@@ -381,7 +381,7 @@
+ 	pinctrl-0 = <&mmc1_pins_default>;
+ 	pinctrl-1 = <&mmc1_pins_uhs>;
+ 	bus-width = <4>;
+-	max-frequency = <200000000>;
+	max-frequency = <100000000>;
+ 	cap-sd-highspeed;
+ 	sd-uhs-sdr50;
+ 	sd-uhs-sdr104;
@@ -0,0 +1,13 @@
+Link: https://git.alpinelinux.org/aports/tree/testing/linux-elm?h=master
+
+--- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi	2021-01-03 10:20:26.482347785 +0000
+++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi	2021-01-03 11:36:43.321775391 +0000
+@@ -437,7 +437,7 @@
+ 	flash@0 {
+ 		compatible = "jedec,spi-nor";
+ 		reg = <0>;
+-		spi-max-frequency = <50000000>;
+		spi-max-frequency = <109200000>;
+ 	};
+ };
+ 
@@ -0,0 +1,100 @@
+From 7258fdd7d7459616b3fe1a603e33900584b10c13 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <masahiroy@kernel.org>
+Date: Sat, 10 Aug 2024 01:07:20 +0900
+Subject: [PATCH] tty: vt: conmakehash: remove non-portable code printing
+ comment header
+
+Commit 6e20753da6bc ("tty: vt: conmakehash: cope with abs_srctree no
+longer in env") included <linux/limits.h>, which invoked another
+(wrong) patch that tried to address a build error on macOS.
+
+According to the specification [1], the correct header to use PATH_MAX
+is <limits.h>.
+
+The minimal fix would be to replace <linux/limits.h> with <limits.h>.
+
+However, the following commits seem questionable to me:
+
+ - 3bd85c6c97b2 ("tty: vt: conmakehash: Don't mention the full path of the input in output")
+ - 6e20753da6bc ("tty: vt: conmakehash: cope with abs_srctree no longer in env")
+
+These commits made too many efforts to cope with a comment header in
+drivers/tty/vt/consolemap_deftbl.c:
+
+  /*
+   * Do not edit this file; it was automatically generated by
+   *
+   * conmakehash drivers/tty/vt/cp437.uni > [this file]
+   *
+   */
+
+With this commit, the header part of the generate C file will be
+simplified as follows:
+
+  /*
+   * Automatically generated file; Do not edit.
+   */
+
+BTW, another series of excessive efforts for a comment header can be
+seen in the following:
+
+ - 5ef6dc08cfde ("lib/build_OID_registry: don't mention the full path of the script in output")
+ - 2fe29fe94563 ("lib/build_OID_registry: avoid non-destructive substitution for Perl < 5.13.2 compat")
+
+[1]: https://pubs.opengroup.org/onlinepubs/009695399/basedefs/limits.h.html
+
+Fixes: 6e20753da6bc ("tty: vt: conmakehash: cope with abs_srctree no longer in env")
+Cc: stable <stable@kernel.org>
+Reported-by: Daniel Gomez <da.gomez@samsung.com>
+Closes: https://lore.kernel.org/all/20240807-macos-build-support-v1-11-4cd1ded85694@samsung.com/
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Link: https://lore.kernel.org/r/20240809160853.1269466-1-masahiroy@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/tty/vt/conmakehash.c | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
+index 82d9db68b2ce81..a931fcde7ad98d 100644
+--- a/drivers/tty/vt/conmakehash.c
+++ b/drivers/tty/vt/conmakehash.c
+@@ -11,8 +11,6 @@
+  * Copyright (C) 1995-1997 H. Peter Anvin
+  */
+ 
+-#include <libgen.h>
+-#include <linux/limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sysexits.h>
+@@ -79,7 +77,6 @@ int main(int argc, char *argv[])
+ {
+   FILE *ctbl;
+   const char *tblname;
+-  char base_tblname[PATH_MAX];
+   char buffer[65536];
+   int fontlen;
+   int i, nuni, nent;
+@@ -245,20 +242,15 @@ int main(int argc, char *argv[])
+   for ( i = 0 ; i < fontlen ; i++ )
+     nuni += unicount[i];
+ 
+-  strncpy(base_tblname, tblname, PATH_MAX);
+-  base_tblname[PATH_MAX - 1] = 0;
+   printf("\
+ /*\n\
+- * Do not edit this file; it was automatically generated by\n\
+- *\n\
+- * conmakehash %s > [this file]\n\
+- *\n\
+ * Automatically generated file; Do not edit.\n\
+  */\n\
+ \n\
+ #include <linux/types.h>\n\
+ \n\
+ u8 dfont_unicount[%d] = \n\
+-{\n\t", basename(base_tblname), fontlen);
+{\n\t", fontlen);
+ 
+   for ( i = 0 ; i < fontlen ; i++ )
+     {
@@ -1,8 +1,8 @@
 # Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8183
-pkgver=6.6.36
-pkgrel=1
+pkgver=6.6.25
+pkgrel=3
 pkgdesc="Mainline kernel for mediatek mt8183"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -43,6 +43,7 @@ esac
 source="
 	https://cdn.kernel.org/pub/linux/kernel/v${_kernver%%.*}.x/linux-$_kernver.tar.xz
 	arm64-dts-mediatek-mt8183-Add-missing-GPU-clocks.patch
+	arm64-dts-mediatek-mt8183-Add-missing-syscon-power-d.patch
 	arm64-dts-mediatek-mt8183-Add-video-encoder-decoder.patch
 	arm64-dts-mediatek-mt8183-Drop-VDEC_SYS-register.patch
 	arm64-dts-mediatek-mt8183-Add-register-names-and-sys.patch
@@ -87,8 +88,9 @@ package() {


 sha512sums="
-7dc497868b5b134eb2aa06e3e33aaae3c8026701ebea5b2183a35c0396576eda20f1d5af2d8468086fe0f9cf6691f2e3f3b3d6d03c5546bf734a8559cde5eabe  linux-6.6.36.tar.xz
+1f1c31a104aa399cd7fd67c0e73c5037e95112e544b00ad70a2a809b52d9d190c303e3f946d67d805125181004fe7de500ff2069dcacad94f6b56bfb8f180f6a  linux-6.6.25.tar.xz
 669a1bbf8707ec9294da83336673fbb55061a2eed0c6ddb2613da3ae4fa9b0e2bdbdd91ad166694173e3540ea934b2f3bf27d5f9659a6952de806765eed9b824  arm64-dts-mediatek-mt8183-Add-missing-GPU-clocks.patch
+027fee259454764e47ffee7100dba7cb9f0741a156ba3d1b47815a0beb6b4ea6cccba885f93b068923ff88047fa82a3d937d3808d0199f1de85cf553068a9ba7  arm64-dts-mediatek-mt8183-Add-missing-syscon-power-d.patch
 40246a8da036dc6c21592efd6625a4be22d6f524b067854f17f5671f5f3b134ed1c63a8c03a15a55e9b45b7d8d1a9b63833b86f38a6f5863e02cc8ddbf70fa57  arm64-dts-mediatek-mt8183-Add-video-encoder-decoder.patch
 aee85972804ab4a254f007805e25d30a82bb87e48144a05805ccefd49f8530f588e2c50b6550f302895a675003ffbe8e7986c2214d76763474b88804fe7f1519  arm64-dts-mediatek-mt8183-Drop-VDEC_SYS-register.patch
 567b13d7508fdf584a64bf3f9d71ba34c045c6e4610ef7f7024ed98f4e7ebbd78c0ee2d5dccc7a50e651e4a088c0621f5150d477520069965466d5db265160ab  arm64-dts-mediatek-mt8183-Add-register-names-and-sys.patch
@@ -101,5 +103,5 @@ e9a128a8ddd98c6c8957ba45186afa2ea8ebeac83d4f2db3ff9ee8a5dd8027af90868c334a7b456b
 d74da1231181835bec82015da1b3f5b08a1fe9c3c35dd712e285891094d94d9427ceac75d32f74be3a635e17d93ad82b37adf97db8176efc91aed17535023fc2  mt8183-fix-bluetooth.patch
 9e64ef057ecd9bb23b0b0e830007c50ea9c481f64f460d063e9f64735d70d5a4bcf87d9148aa5cc90963ccd5860fe4a9e6f25556a902332b95ef48537d6ee045  Revert-ASoC-mediatek-mt8183-da7219-max98357-Map-miss.patch
 9b8707de42635734031495da055c5860addeb656051540f1a14404b10aa8b501168d8b0e274b37bce989db3bc050e9beef722189556f6d782b92cc907731488d  mt8183-kukui-jacuzzi-fennel14-rt1015p-sound.patch
-383aae874341d974231af8cf19e34cb2ec593200c6d4a7e6588bb9e7c0c569c5e0b2ec7ec8f3d7c7a59ce4a946824b5242ac634009adcf3460181113da779f00  config-postmarketos-mediatek-mt8183.aarch64
+7947e061b02ba235ec4ef1f65b222b371951dc0fed887d8d796eb7411a26bdd8f131307e791f3cee980d2782cbefa2742dc3bda36cecba69f7946bffefdeca6d  config-postmarketos-mediatek-mt8183.aarch64
 "
@@ -0,0 +1,25 @@
+From 9a42e6ea802f31e439c92516cd959f0a0ade020d Mon Sep 17 00:00:00 2001
+From: Alicja Michalska <ahplka19@gmail.com>
+Date: Sun, 26 Nov 2023 14:38:06 +0100
+Subject: [PATCH] arm64: dts: mediatek: mt8183: Add missing syscon power domain
+
+Signed-off-by: Alicja Michalska <ahplka19@gmail.com>
+---
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+index 5169779d01df..2c5665e695d2 100644
+--- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+@@ -1749,6 +1749,7 @@ mfgcfg: syscon@13000000 {
+ 			compatible = "mediatek,mt8183-mfgcfg", "syscon";
+ 			reg = <0 0x13000000 0 0x1000>;
+ 			#clock-cells = <1>;
+			power-domains = <&spm MT8183_POWER_DOMAIN_MFG_ASYNC>;
+ 		};
+ 
+ 		gpu: gpu@13040000 {
+-- 
+2.43.0
+
@@ -2,9 +2,9 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.6.25 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -13,6 +13,7 @@ CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -97,7 +98,6 @@ CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
-# CONFIG_BPF_LSM is not set
 # end of BPF subsystem

 CONFIG_PREEMPT_BUILD=y
@@ -138,7 +138,6 @@ CONFIG_PREEMPT_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -263,7 +262,6 @@ CONFIG_PERF_EVENTS=y

 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y

 #
 # Kexec and crash features
@@ -648,7 +646,6 @@ CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -759,8 +756,7 @@ CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_FUNCTION_ALIGNMENT_4B=y
-CONFIG_FUNCTION_ALIGNMENT_8B=y
-CONFIG_FUNCTION_ALIGNMENT=8
+CONFIG_FUNCTION_ALIGNMENT=4
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
@@ -1203,8 +1199,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -1505,7 +1501,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
 # end of Network testing
 # end of Networking options

@@ -2405,8 +2400,8 @@ CONFIG_DM_ZERO=m
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_AUDIT=y
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_AUDIT is not set
 # CONFIG_TARGET_CORE is not set
 # CONFIG_FUSION is not set

@@ -2812,7 +2807,6 @@ CONFIG_ATH10K_SDIO=m
 CONFIG_ATH10K_DEBUG=y
 CONFIG_ATH10K_DEBUGFS=y
 # CONFIG_ATH10K_SPECTRAL is not set
-# CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
@@ -3016,37 +3010,7 @@ CONFIG_MOUSE_ELAN_I2C_I2C=y
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
@@ -5456,7 +5420,7 @@ CONFIG_SND_VIRTIO=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_BATTERY_STRENGTH is not set
-CONFIG_HIDRAW=y
+# CONFIG_HIDRAW is not set
 CONFIG_UHID=m
 CONFIG_HID_GENERIC=y

@@ -5480,7 +5444,6 @@ CONFIG_HID_CHICONY=y
 # CONFIG_HID_MACALLY is not set
 # CONFIG_HID_PRODIKEYS is not set
 # CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CP2112 is not set
 # CONFIG_HID_CREATIVE_SB0540 is not set
 CONFIG_HID_CYPRESS=y
 # CONFIG_HID_DRAGONRISE is not set
@@ -5490,7 +5453,6 @@ CONFIG_HID_CYPRESS=y
 # CONFIG_HID_ELO is not set
 # CONFIG_HID_EVISION is not set
 CONFIG_HID_EZKEY=y
-# CONFIG_HID_FT260 is not set
 # CONFIG_HID_GEMBIRD is not set
 # CONFIG_HID_GFRM is not set
 # CONFIG_HID_GLORIOUS is not set
@@ -5518,7 +5480,6 @@ CONFIG_HID_KENSINGTON=y
 # CONFIG_HID_LENOVO is not set
 # CONFIG_HID_LETSKETCH is not set
 CONFIG_HID_LOGITECH=y
-# CONFIG_HID_LOGITECH_DJ is not set
 # CONFIG_HID_LOGITECH_HIDPP is not set
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -5579,7 +5540,6 @@ CONFIG_HID_RMI=m
 #
 # HID-BPF support
 #
-# CONFIG_HID_BPF is not set
 # end of HID-BPF support

 #
@@ -5587,7 +5547,7 @@ CONFIG_HID_RMI=m
 #
 CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
+# CONFIG_USB_HIDDEV is not set
 # end of USB HID support

 CONFIG_I2C_HID=y
@@ -5604,7 +5564,7 @@ CONFIG_USB_ULPI_BUS=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
 CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set

 #
 # Miscellaneous USB options
@@ -5652,7 +5612,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
 # USB Device Class drivers
 #
 CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
+# CONFIG_USB_PRINTER is not set
 # CONFIG_USB_WDM is not set
 # CONFIG_USB_TMC is not set

@@ -6286,7 +6246,7 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-CONFIG_UDMABUF=y
+# CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
@@ -7597,15 +7557,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-CONFIG_XFS_SUPPORT_ASCII_CI=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y
@@ -7926,8 +7878,6 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -8194,7 +8144,6 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 # CONFIG_INDIRECT_PIO is not set
-# CONFIG_TRACE_MMIO_ACCESS is not set

 #
 # Crypto library routines
@@ -8416,7 +8365,6 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_TABLE_CHECK is not set
 # CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_ARCH_HAS_DEBUG_WX=y
 # CONFIG_DEBUG_WX is not set
@@ -8527,66 +8475,17 @@ CONFIG_RCU_TRACE=y
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
-CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_FUNCTION_GRAPH_RETVAL is not set
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
-CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_OSNOISE_TRACER is not set
-# CONFIG_TIMERLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_USER_EVENTS is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_RV is not set
+# CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
@@ -4,7 +4,7 @@

 pkgname=linux-postmarketos-omap
 pkgver=6.10.6
-pkgrel=1
+pkgrel=0
 pkgdesc="Mainline kernel fork for OMAP devices"
 arch="armv7"
 url="https://kernel.org/"
@@ -71,7 +71,7 @@ package() {

 sha512sums="
 991ec7c7d2d490cb90b182a29e892dae586918eee7f3ff4b6e26f4ff9b31b6d7a31cdc31d25ca12243ecab59787aad75f0056b2fbe6997d0dfd68c357e7703af  linux-6.10.6.tar.xz
-a0e2eb717ff40f0c3e244233a54067d820b09c1f71107213bc5d8ee40b64056b156ec0b60a290b044863aa8cdc2de7a0a2af02d1c5f92e41bf7f883a9f10e546  config-postmarketos-omap.armv7
+b0bcd5aa9db5479d6daa310a9e167fd3316d523b5077c6aa25547af0c39249a4f1f94afb7e64b6bd626f05c949dd8baa76b3b55e4e642df55de9ffe786284564  config-postmarketos-omap.armv7
 9a187d93885f07467ec67094621b2d762607d58622e67172bdfcd8ba5f3d6aab900ca5d233efd3d447540f9b906ba950083a35997c84b315801604e1cd5cddc3  0001-Add-TWL6032-dtsi.patch
 f7d1a87088c65278a114125e732d5bebebb560a6245afb34e003083d808ef3f8c5f49ff23131953508a6daae111ab6adfffdbcf56b79260a6d4115f859c7bb3a  0002-arm-dts-Add-common-dtsi-for-espresso.patch
 089ca0547997c7cd5d1b65924c134eb6b7703a7439729923d3639d125763412fa7e826d1cb839ac0b6cd22e614f69a3b52605a75b571e271c33f9a27ff6ac9c2  0003-arm-dts-Add-espresso7-support.patch
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.10.6 Kernel Configuration
+# Linux/arm 6.9.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -13,6 +13,7 @@ CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -116,7 +117,7 @@ CONFIG_PREEMPTION=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_SCHED_HW_PRESSURE=y
+CONFIG_SCHED_THERMAL_PRESSURE=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
@@ -135,9 +136,7 @@ CONFIG_PREEMPT_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_NEED_SRCU_NMI_SAFE=y
 CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_NEED_TASKS_RCU=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -163,7 +162,6 @@ CONFIG_GCC10_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
 CONFIG_CC_NO_STRINGOP_OVERFLOW=y
-CONFIG_SLAB_OBJ_EXT=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
@@ -225,7 +223,7 @@ CONFIG_POSIX_TIMERS=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-# CONFIG_BASE_SMALL is not set
+CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
 CONFIG_EPOLL=y
@@ -500,7 +498,6 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
-CONFIG_ARM_PAN=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_ARM_MODULE_PLTS=y
@@ -686,7 +683,6 @@ CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_LTO_NONE=y
-CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
 CONFIG_HAVE_CONTEXT_TRACKING_USER=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -732,11 +728,10 @@ CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_FUNCTION_ALIGNMENT=0
-CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
-CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_DEBUG is not set
 CONFIG_MODULE_FORCE_LOAD=y
@@ -765,6 +760,7 @@ CONFIG_BLK_DEV_INTEGRITY_T10=y
 # CONFIG_BLK_DEV_WRITE_MOUNTED is not set
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
 # CONFIG_BLK_WBT is not set
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CGROUP_IOCOST is not set
@@ -900,7 +896,6 @@ CONFIG_LRU_GEN_ENABLED=y
 CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
-CONFIG_EXECMEM=y

 #
 # Data Access Monitoring
@@ -1127,8 +1122,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -1425,6 +1420,7 @@ CONFIG_BT_LE=y
 # CONFIG_BT_AOSPEXT is not set
 CONFIG_BT_DEBUGFS=y
 # CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_FEATURE_DEBUG is not set

 #
 # Bluetooth device drivers
@@ -1464,7 +1460,6 @@ CONFIG_BT_MRVL_SDIO=m
 # CONFIG_BT_MTKUART is not set
 # CONFIG_BT_VIRTIO is not set
 # CONFIG_BT_NXPUART is not set
-# CONFIG_BT_INTEL_PCIE is not set
 # end of Bluetooth device drivers

 CONFIG_AF_RXRPC=m
@@ -1619,7 +1614,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_DEBUG=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_FW_LOADER_SYSFS=y
 CONFIG_EXTRA_FIRMWARE=""
@@ -2206,7 +2200,6 @@ CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
 # CONFIG_BAREUDP is not set
 # CONFIG_GTP is not set
-# CONFIG_PFCP is not set
 # CONFIG_AMT is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
@@ -2394,7 +2387,6 @@ CONFIG_FIXED_PHY=y
 #
 # MII PHY device drivers
 #
-# CONFIG_AIR_EN8811H_PHY is not set
 # CONFIG_AMD_PHY is not set
 # CONFIG_ADIN_PHY is not set
 # CONFIG_ADIN1100_PHY is not set
@@ -2699,38 +2691,7 @@ CONFIG_KEYBOARD_TWL4030=m
 # CONFIG_KEYBOARD_BCM is not set
 # CONFIG_KEYBOARD_CYPRESS_SF is not set
 # CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
-# CONFIG_JOYSTICK_SEESAW is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=m
@@ -3089,6 +3050,7 @@ CONFIG_SPI_GPIO=m
 CONFIG_SPI_OMAP24XX=y
 CONFIG_SPI_TI_QSPI=m
 # CONFIG_SPI_PCI1XXXX is not set
+# CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_SC18IS602 is not set
 # CONFIG_SPI_SIFIVE is not set
 # CONFIG_SPI_SN_F_OSPI is not set
@@ -4630,7 +4592,6 @@ CONFIG_DRM_PANEL_LVDS=y
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 CONFIG_DRM_PANEL_LG_LB035Q02=m
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
-# CONFIG_DRM_PANEL_LG_SW43408 is not set
 # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 CONFIG_DRM_PANEL_NEC_NL8048HL11=m
@@ -4652,13 +4613,11 @@ CONFIG_DRM_PANEL_NEC_NL8048HL11=m
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
-# CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
@@ -4760,12 +4719,10 @@ CONFIG_DRM_TI_TPD12S015=m
 # CONFIG_DRM_TVE200 is not set
 # CONFIG_DRM_LIMA is not set
 # CONFIG_DRM_PANFROST is not set
-# CONFIG_DRM_PANTHOR is not set
 # CONFIG_DRM_MCDE is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
 # CONFIG_DRM_SSD130X is not set
-# CONFIG_DRM_WERROR is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y

 #
@@ -5149,6 +5106,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_HDA is not set
 # CONFIG_SND_SOC_ICS43432 is not set
 # CONFIG_SND_SOC_IDT821034 is not set
+# CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
 # CONFIG_SND_SOC_MAX98090 is not set
 # CONFIG_SND_SOC_MAX98357A is not set
@@ -5175,8 +5133,8 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_PCM5102A is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
-# CONFIG_SND_SOC_PCM6240 is not set
 # CONFIG_SND_SOC_PEB2466 is not set
+# CONFIG_SND_SOC_RK3328 is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_RT5640 is not set
@@ -5280,7 +5238,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_BATTERY_STRENGTH is not set
-CONFIG_HIDRAW=y
+# CONFIG_HIDRAW is not set
 CONFIG_UHID=m
 CONFIG_HID_GENERIC=m

@@ -5304,7 +5262,6 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_MACALLY is not set
 # CONFIG_HID_PRODIKEYS is not set
 # CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CP2112 is not set
 # CONFIG_HID_CREATIVE_SB0540 is not set
 # CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DRAGONRISE is not set
@@ -5314,7 +5271,6 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_ELO is not set
 # CONFIG_HID_EVISION is not set
 # CONFIG_HID_EZKEY is not set
-# CONFIG_HID_FT260 is not set
 # CONFIG_HID_GEMBIRD is not set
 # CONFIG_HID_GFRM is not set
 # CONFIG_HID_GLORIOUS is not set
@@ -5385,7 +5341,6 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_U2FZERO is not set
 # CONFIG_HID_WACOM is not set
 # CONFIG_HID_WIIMOTE is not set
-# CONFIG_HID_WINWING is not set
 # CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
@@ -5481,7 +5436,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=m
 # USB Device Class drivers
 #
 CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
+# CONFIG_USB_PRINTER is not set
 CONFIG_USB_WDM=m
 # CONFIG_USB_TMC is not set

@@ -5639,7 +5594,7 @@ CONFIG_USB_TEST=m
 # CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
 # CONFIG_USB_CHAOSKEY is not set
-# CONFIG_USB_ONBOARD_DEV is not set
+# CONFIG_USB_ONBOARD_HUB is not set

 #
 # USB Physical Layer drivers
@@ -5892,6 +5847,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_PANIC is not set
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
+# CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set

 #
@@ -5952,7 +5908,6 @@ CONFIG_RTC_DRV_PALMAS=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8111 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
@@ -6078,7 +6033,6 @@ CONFIG_VIRTIO_MENU=y
 # CONFIG_VIRTIO_BALLOON is not set
 # CONFIG_VIRTIO_INPUT is not set
 # CONFIG_VIRTIO_MMIO is not set
-# CONFIG_VIRTIO_DEBUG is not set
 # CONFIG_VDPA is not set
 CONFIG_VHOST_MENU=y
 # CONFIG_VHOST_NET is not set
@@ -6092,6 +6046,7 @@ CONFIG_VHOST_MENU=y
 # CONFIG_GREYBUS is not set
 # CONFIG_COMEDI is not set
 CONFIG_STAGING=y
+# CONFIG_PRISM2_USB is not set
 # CONFIG_RTLLIB is not set
 # CONFIG_RTL8723BS is not set
 # CONFIG_R8712U is not set
@@ -6141,6 +6096,7 @@ CONFIG_STAGING=y
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_KS7010 is not set
+# CONFIG_PI433 is not set
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_VME_BUS is not set
@@ -6199,9 +6155,9 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 # end of Clock Source drivers

 CONFIG_MAILBOX=y
-# CONFIG_ARM_MHU_V3 is not set
 # CONFIG_PLATFORM_MHU is not set
 CONFIG_OMAP2PLUS_MBOX=m
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_IOMMU_API=y
@@ -6415,7 +6371,6 @@ CONFIG_KXCJK1013=m
 # CONFIG_AD7091R5 is not set
 # CONFIG_AD7091R8 is not set
 # CONFIG_AD7124 is not set
-# CONFIG_AD7173 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
 # CONFIG_AD7280 is not set
@@ -6432,7 +6387,6 @@ CONFIG_KXCJK1013=m
 # CONFIG_AD7793 is not set
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
-# CONFIG_AD7944 is not set
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
 # CONFIG_AD9467 is not set
@@ -6573,8 +6527,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5593R is not set
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
-# CONFIG_AD9739A is not set
-# CONFIG_ADI_AXI_DAC is not set
 # CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
@@ -6717,7 +6669,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AL3010 is not set
 # CONFIG_AL3320A is not set
 # CONFIG_APDS9300 is not set
-# CONFIG_APDS9306 is not set
 # CONFIG_APDS9960 is not set
 # CONFIG_AS73211 is not set
 # CONFIG_BH1750 is not set
@@ -6915,6 +6866,7 @@ CONFIG_BMP280_SPI=m

 # CONFIG_NTB is not set
 CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_DEBUG is not set
 # CONFIG_PWM_ATMEL_TCB is not set
 # CONFIG_PWM_CLK is not set
@@ -7063,15 +7015,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-CONFIG_XFS_SUPPORT_ASCII_CI=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m
@@ -7134,7 +7078,7 @@ CONFIG_NETFS_SUPPORT=m
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
-CONFIG_UDF_FS=m
+# CONFIG_UDF_FS is not set
 # end of CD-ROM/DVD Filesystems

 #
@@ -7236,7 +7180,6 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 CONFIG_PSTORE_COMPRESS=y
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
-# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=y
 # CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
@@ -7743,7 +7686,6 @@ CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
 CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
-CONFIG_DMA_NEED_SYNC=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_ARCH_HAS_DMA_ALLOC=y
 CONFIG_DMA_CMA=y
@@ -7760,6 +7702,7 @@ CONFIG_CMA_ALIGNMENT=8
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_SGL_ALLOC=y
+# CONFIG_FORCE_NR_CPUS is not set
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
@@ -7813,8 +7756,8 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DYNAMIC_DEBUG_CORE=y
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DYNAMIC_DEBUG_CORE is not set
 CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
@@ -7891,7 +7834,6 @@ CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_DEBUG_KMAP_LOCAL is not set
 # CONFIG_DEBUG_HIGHMEM is not set
-# CONFIG_MEM_ALLOC_PROFILING is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
@@ -7988,21 +7930,15 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
-CONFIG_BUILDTIME_MCOUNT_SORT=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 # CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
+# CONFIG_FUNCTION_TRACER is not set
 # CONFIG_STACK_TRACER is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
@@ -8010,6 +7946,7 @@ CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_HWLAT_TRACER is not set
 # CONFIG_OSNOISE_TRACER is not set
 # CONFIG_TIMERLAT_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
 # CONFIG_FTRACE_SYSCALLS is not set
 # CONFIG_TRACER_SNAPSHOT is not set
 CONFIG_BRANCH_PROFILE_NONE=y
@@ -8017,13 +7954,10 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 CONFIG_KPROBE_EVENTS=y
-# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
 CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
 # CONFIG_SYNTH_EVENTS is not set
 # CONFIG_USER_EVENTS is not set
 # CONFIG_HIST_TRIGGERS is not set
@@ -8031,9 +7965,6 @@ CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
@@ -8103,7 +8034,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_TEST_DYNAMIC_DEBUG is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_MEMINIT is not set
@@ -8,7 +8,7 @@ pkgver=6.6
 # When making kernel config changes please also submit a PR to
 # https://github.com/msm8916-mainline/linux/blob/master/kernel/configs/pmos.config
 # since the kernel config is regenerated on upgrades and all changes will be lost!
-pkgrel=9
+pkgrel=7
 pkgdesc="Mainline kernel fork for Qualcomm MSM8909/MSM8916/MSM8939 devices"
 arch="aarch64 armv7"
 url="https://github.com/msm8916-mainline/linux"
@@ -92,6 +92,6 @@ package() {

 sha512sums="
 5fbbdf333412667e0a0e38dcc7e83f640bd5a1e0b07e1c7786ff3e18f17b9cdec088936263d68986b3869ee305cfcecdf22970134ca8fb8d2a2769874a5a4676  linux-postmarketos-qcom-msm8916-v6.6-msm8916.tar.gz
-677eb54cf58ef9b0992a8ed6c52188230b7e3ceb0dac4850b040458468637867f7b92dcce4895caae1053a425de64bfdf2ebc266a5dcf30b2626827fccb23419  config-postmarketos-qcom-msm8916.aarch64
-5a5d45f5a3dbefe8eaf5c796c5362a2c0b6e94b2b27cb5a139315c7894d74a37619800c549bf1d0eec6ca2d9d69b36d3957cc5ac6853e8fa43b4de022be246b0  config-postmarketos-qcom-msm8916.armv7
+1f671413ffa08a2452c6bde326235b8731b0fae88a5727dd5a547d0d62b8abe7d184ae26794cb5592ab276c3788962a5916592c417c013afcd99f20131008f85  config-postmarketos-qcom-msm8916.aarch64
+c6fe29dd7233ff10bd764ba516ecf61aa4b9036495af4499843192433020aeaa233dfed9bb06aa871177712bf4a1c43daecab64b97c4377d097f751adc815209  config-postmarketos-qcom-msm8916.armv7
 "
@@ -2,9 +2,9 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.6.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -149,7 +149,6 @@ CONFIG_PREEMPT_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -269,7 +268,6 @@ CONFIG_PERF_EVENTS=y

 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y

 #
 # Kexec and crash features
@@ -618,7 +616,6 @@ CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -729,8 +726,7 @@ CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_FUNCTION_ALIGNMENT_4B=y
-CONFIG_FUNCTION_ALIGNMENT_8B=y
-CONFIG_FUNCTION_ALIGNMENT=8
+CONFIG_FUNCTION_ALIGNMENT=4
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
@@ -758,8 +754,7 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_ICQ=y
 # CONFIG_BLK_DEV_BSGLIB is not set
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
@@ -1125,8 +1120,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -1375,7 +1370,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
 # end of Network testing
 # end of Networking options

@@ -1791,8 +1785,8 @@ CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_AUDIT=y
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_AUDIT is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
 CONFIG_MII=m
@@ -2198,37 +2192,7 @@ CONFIG_INPUT_MOUSE=y
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
@@ -4189,7 +4153,7 @@ CONFIG_SND_SOC_TFA989X=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_BATTERY_STRENGTH is not set
-CONFIG_HIDRAW=y
+# CONFIG_HIDRAW is not set
 CONFIG_UHID=m
 CONFIG_HID_GENERIC=y

@@ -4213,7 +4177,6 @@ CONFIG_HID_CHICONY=y
 # CONFIG_HID_MACALLY is not set
 # CONFIG_HID_PRODIKEYS is not set
 # CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CP2112 is not set
 # CONFIG_HID_CREATIVE_SB0540 is not set
 CONFIG_HID_CYPRESS=y
 # CONFIG_HID_DRAGONRISE is not set
@@ -4223,7 +4186,6 @@ CONFIG_HID_CYPRESS=y
 # CONFIG_HID_ELO is not set
 # CONFIG_HID_EVISION is not set
 CONFIG_HID_EZKEY=y
-# CONFIG_HID_FT260 is not set
 # CONFIG_HID_GEMBIRD is not set
 # CONFIG_HID_GFRM is not set
 # CONFIG_HID_GLORIOUS is not set
@@ -4249,7 +4211,6 @@ CONFIG_HID_KENSINGTON=y
 # CONFIG_HID_LENOVO is not set
 # CONFIG_HID_LETSKETCH is not set
 CONFIG_HID_LOGITECH=y
-# CONFIG_HID_LOGITECH_DJ is not set
 # CONFIG_HID_LOGITECH_HIDPP is not set
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -4311,7 +4272,6 @@ CONFIG_HID_MONTEREY=y
 #
 # HID-BPF support
 #
-# CONFIG_HID_BPF is not set
 # end of HID-BPF support

 #
@@ -4319,7 +4279,7 @@ CONFIG_HID_MONTEREY=y
 #
 CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
+# CONFIG_USB_HIDDEV is not set
 # end of USB HID support

 CONFIG_I2C_HID=y
@@ -4334,7 +4294,7 @@ CONFIG_USB_ULPI_BUS=y
 # CONFIG_USB_CONN_GPIO is not set
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set

 #
 # Miscellaneous USB options
@@ -4372,7 +4332,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 # USB Device Class drivers
 #
 # CONFIG_USB_ACM is not set
-CONFIG_USB_PRINTER=m
+# CONFIG_USB_PRINTER is not set
 # CONFIG_USB_WDM is not set
 # CONFIG_USB_TMC is not set

@@ -4845,7 +4805,7 @@ CONFIG_QCOM_BAM_DMA=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-CONFIG_UDMABUF=y
+# CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
@@ -5919,15 +5879,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-CONFIG_XFS_SUPPORT_ASCII_CI=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m
@@ -5993,7 +5945,7 @@ CONFIG_NETFS_SUPPORT=m
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
-CONFIG_UDF_FS=m
+# CONFIG_UDF_FS is not set
 # end of CD-ROM/DVD Filesystems

 #
@@ -6074,7 +6026,6 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 CONFIG_PSTORE_COMPRESS=y
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
-# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=y
 # CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
@@ -6208,8 +6159,6 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -6341,8 +6290,7 @@ CONFIG_CRYPTO_XXHASH=m
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRC64_ROCKSOFT=y
+# CONFIG_CRYPTO_CRCT10DIF is not set
 # end of CRCs (cyclic redundancy checks)

 #
@@ -6411,7 +6359,6 @@ CONFIG_CRYPTO_SM4_ARM64_NEON_BLK=m
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
-# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set
 # end of Accelerated Cryptographic Algorithms for CPU (arm64)

 CONFIG_CRYPTO_HW=y
@@ -6474,7 +6421,6 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 # CONFIG_INDIRECT_PIO is not set
-# CONFIG_TRACE_MMIO_ACCESS is not set

 #
 # Crypto library routines
@@ -6501,8 +6447,8 @@ CONFIG_CRYPTO_LIB_SHA256=y

 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC64_ROCKSOFT=y
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC64_ROCKSOFT is not set
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
@@ -6510,7 +6456,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=y
+# CONFIG_CRC64 is not set
 # CONFIG_CRC4 is not set
 # CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=y
@@ -6744,66 +6690,16 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
 # CONFIG_RCU_CPU_STALL_CPUTIME is not set
 # end of RCU Debugging

-CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_FUNCTION_GRAPH_RETVAL is not set
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
-CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_OSNOISE_TRACER is not set
-# CONFIG_TIMERLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_USER_EVENTS is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_RV is not set
+# CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
@@ -2,9 +2,9 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm 6.6.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -143,7 +143,6 @@ CONFIG_TREE_SRCU=y
 CONFIG_NEED_SRCU_NMI_SAFE=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -256,7 +255,6 @@ CONFIG_PERF_EVENTS=y

 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y

 #
 # Kexec and crash features
@@ -594,7 +592,6 @@ CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_HAVE_KPROBES=y
@@ -700,8 +697,7 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_ICQ=y
 # CONFIG_BLK_DEV_BSGLIB is not set
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
@@ -1036,8 +1032,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -1286,7 +1282,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
 # end of Network testing
 # end of Networking options

@@ -1701,8 +1696,8 @@ CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_AUDIT=y
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_AUDIT is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
 CONFIG_MII=m
@@ -2112,37 +2107,7 @@ CONFIG_INPUT_MOUSE=y
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
@@ -4087,7 +4052,7 @@ CONFIG_SND_SOC_TFA989X=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_BATTERY_STRENGTH is not set
-CONFIG_HIDRAW=y
+# CONFIG_HIDRAW is not set
 CONFIG_UHID=m
 CONFIG_HID_GENERIC=y

@@ -4111,7 +4076,6 @@ CONFIG_HID_CHICONY=y
 # CONFIG_HID_MACALLY is not set
 # CONFIG_HID_PRODIKEYS is not set
 # CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CP2112 is not set
 # CONFIG_HID_CREATIVE_SB0540 is not set
 CONFIG_HID_CYPRESS=y
 # CONFIG_HID_DRAGONRISE is not set
@@ -4121,7 +4085,6 @@ CONFIG_HID_CYPRESS=y
 # CONFIG_HID_ELO is not set
 # CONFIG_HID_EVISION is not set
 CONFIG_HID_EZKEY=y
-# CONFIG_HID_FT260 is not set
 # CONFIG_HID_GEMBIRD is not set
 # CONFIG_HID_GFRM is not set
 # CONFIG_HID_GLORIOUS is not set
@@ -4147,7 +4110,6 @@ CONFIG_HID_KENSINGTON=y
 # CONFIG_HID_LENOVO is not set
 # CONFIG_HID_LETSKETCH is not set
 CONFIG_HID_LOGITECH=y
-# CONFIG_HID_LOGITECH_DJ is not set
 # CONFIG_HID_LOGITECH_HIDPP is not set
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -4216,7 +4178,7 @@ CONFIG_HID_MONTEREY=y
 #
 CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
+# CONFIG_USB_HIDDEV is not set
 # end of USB HID support

 CONFIG_I2C_HID=y
@@ -4231,7 +4193,7 @@ CONFIG_USB_ULPI_BUS=y
 # CONFIG_USB_CONN_GPIO is not set
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set

 #
 # Miscellaneous USB options
@@ -4269,7 +4231,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 # USB Device Class drivers
 #
 # CONFIG_USB_ACM is not set
-CONFIG_USB_PRINTER=m
+# CONFIG_USB_PRINTER is not set
 # CONFIG_USB_WDM is not set
 # CONFIG_USB_TMC is not set

@@ -5754,15 +5716,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-CONFIG_XFS_SUPPORT_ASCII_CI=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m
@@ -5827,7 +5781,7 @@ CONFIG_NETFS_SUPPORT=m
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
-CONFIG_UDF_FS=m
+# CONFIG_UDF_FS is not set
 # end of CD-ROM/DVD Filesystems

 #
@@ -5902,7 +5856,6 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 CONFIG_PSTORE_COMPRESS=y
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
-# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=y
 # CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
@@ -6034,8 +5987,6 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -6167,8 +6118,7 @@ CONFIG_CRYPTO_XXHASH=m
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRC64_ROCKSOFT=y
+# CONFIG_CRYPTO_CRCT10DIF is not set
 # end of CRCs (cyclic redundancy checks)

 #
@@ -6230,7 +6180,6 @@ CONFIG_CRYPTO_AES_ARM_BS=y
 CONFIG_CRYPTO_AES_ARM_CE=y
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_CRC32_ARM_CE=y
-# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
 # end of Accelerated Cryptographic Algorithms for CPU (arm)

 CONFIG_CRYPTO_HW=y
@@ -6314,8 +6263,8 @@ CONFIG_CRYPTO_LIB_SHA256=y

 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC64_ROCKSOFT=y
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC64_ROCKSOFT is not set
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
@@ -6323,7 +6272,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=y
+# CONFIG_CRC64 is not set
 # CONFIG_CRC4 is not set
 # CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=y
@@ -6536,7 +6485,6 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
 # CONFIG_RCU_CPU_STALL_CPUTIME is not set
 # end of RCU Debugging

-CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -6545,54 +6493,8 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
-CONFIG_BUILDTIME_MCOUNT_SORT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_OSNOISE_TRACER is not set
-# CONFIG_TIMERLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_USER_EVENTS is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_RV is not set
+# CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_IO_STRICT_DEVMEM is not set
@@ -5,7 +5,7 @@

 _flavor="postmarketos-qcom-msm8953"
 pkgname=linux-$_flavor
-pkgver=6.11.0
+pkgver=6.10.0
 pkgrel=0
 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon MSM8953"
 arch="aarch64"
@@ -27,7 +27,7 @@ makedepends="
 	python3
 "

-_tag="$pkgver-r2"
+_tag="$pkgver-r0"

 source="
 	$pkgname-v$_tag.tar.gz::$url/archive/v$_tag.tar.gz
@@ -60,7 +60,8 @@ package() {
 	install -Dm644 "$builddir/include/config/kernel.release" \
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }
+
 sha512sums="
-3ae8f3f3fa3652b0eaa66d6c144815589969405db96bb60b0ac2fbf8cc6392c96242e5f3f5a4394019a0288821418ec7b6fd2eded4f6d0288cc16d708b71d54e  linux-postmarketos-qcom-msm8953-v6.11.0-r2.tar.gz
-08dc20ca5b72e4c4aaf13dcd34a9346fb08233e97f1cb30c329ac3740afb2cca39743deb0d67bc89a515cfaae41788e7ed105b170c77fc3bffe3242724ad215f  config-postmarketos-qcom-msm8953.aarch64
+e1204a5424e9991d2a48ece37c6924e72d5d82aed423d102cb6e6f9f309dfccb1814b63dd6dce4898ebed62055edb8302f0fe22e353698200913dac34ecf8bef  linux-postmarketos-qcom-msm8953-v6.10.0-r0.tar.gz
+d281fe69f1b06855f8c450a09a4fc30d3b1c9ef6c34ebb09197a51461c92fb73681989b22df8f49ceecf69ed1f0323584bf72982e166afe3769ebf6c1995b284  config-postmarketos-qcom-msm8953.aarch64
 "
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.0 Kernel Configuration
+# Linux/arm64 6.10.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -13,6 +13,7 @@ CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -97,7 +98,6 @@ CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
-# CONFIG_BPF_LSM is not set
 # end of BPF subsystem

 CONFIG_PREEMPT_BUILD=y
@@ -135,7 +135,6 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_NEED_TASKS_RCU=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -172,7 +171,7 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-# CONFIG_MEMCG_V1 is not set
+CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -248,6 +247,7 @@ CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_GUEST_PERF_EVENTS=y
@@ -261,7 +261,6 @@ CONFIG_PERF_EVENTS=y

 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y

 #
 # Kexec and crash features
@@ -389,7 +388,9 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_SSBS=y
 CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -531,7 +532,6 @@ CONFIG_ARM64_CONTPTE=y
 #
 CONFIG_CMDLINE=""
 # CONFIG_EFI is not set
-# CONFIG_COMPRESSED_INSTALL is not set
 # end of Boot options

 #
@@ -651,7 +651,6 @@ CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -768,10 +767,7 @@ CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_FUNCTION_ALIGNMENT_4B=y
-CONFIG_FUNCTION_ALIGNMENT_8B=y
-CONFIG_FUNCTION_ALIGNMENT=8
-CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
-CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
+CONFIG_FUNCTION_ALIGNMENT=4
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
@@ -800,6 +796,7 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
@@ -869,7 +866,6 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
-CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -881,7 +877,6 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -1356,7 +1351,6 @@ CONFIG_NET_DSA_TAG_OCELOT_8021Q=m
 # CONFIG_NET_DSA_TAG_LAN9303 is not set
 # CONFIG_NET_DSA_TAG_SJA1105 is not set
 # CONFIG_NET_DSA_TAG_TRAILER is not set
-# CONFIG_NET_DSA_TAG_VSC73XX_8021Q is not set
 # CONFIG_NET_DSA_TAG_XRS700X is not set
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
@@ -1473,7 +1467,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
 # end of Network testing
 # end of Networking options

@@ -1708,9 +1701,6 @@ CONFIG_ARM_PSCI_FW=y
 # Qualcomm firmware drivers
 #
 CONFIG_QCOM_SCM=y
-CONFIG_QCOM_TZMEM=y
-CONFIG_QCOM_TZMEM_MODE_GENERIC=y
-# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCOM_QSEECOM is not set
 # end of Qualcomm firmware drivers
@@ -1908,8 +1898,8 @@ CONFIG_DM_ZERO=m
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_AUDIT=y
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_AUDIT is not set
 # CONFIG_DM_VDO is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
@@ -1995,7 +1985,6 @@ CONFIG_NET_VENDOR_ADI=y
 # CONFIG_NET_VENDOR_LITEX is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_META is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -2025,7 +2014,7 @@ CONFIG_NET_VENDOR_VERTEXCOM=y
 CONFIG_NET_VENDOR_WANGXUN=y
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XILINX is not set
-# CONFIG_QCOM_IPA is not set
+CONFIG_QCOM_IPA=m
 CONFIG_QCOM_IPA2_LITE=m
 CONFIG_PHYLINK=m
 CONFIG_PHYLIB=y
@@ -2118,7 +2107,6 @@ CONFIG_MDIO_DEVRES=y
 #
 # PCS device drivers
 #
-# CONFIG_PCS_XPCS is not set
 # end of PCS device drivers

 # CONFIG_PPP is not set
@@ -2290,38 +2278,7 @@ CONFIG_MOUSE_PS2_SMBUS=y
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
-# CONFIG_JOYSTICK_SEESAW is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
@@ -2650,7 +2607,6 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_CADENCE_QUADSPI is not set
-# CONFIG_SPI_CH341 is not set
 # CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_FSL_SPI is not set
@@ -2756,7 +2712,6 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
 CONFIG_PINCTRL_LPASS_LPI=m
 # CONFIG_PINCTRL_SC7280_LPASS_LPI is not set
-# CONFIG_PINCTRL_SM4250_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM8250_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM8350_LPASS_LPI is not set
@@ -2852,12 +2807,6 @@ CONFIG_GPIO_MAX77620=y
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers

-#
-# GPIO Debugging utilities
-#
-# CONFIG_GPIO_VIRTUSER is not set
-# end of GPIO Debugging utilities
-
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO is not set
@@ -2873,7 +2822,6 @@ CONFIG_POWER_RESET_QCOM_PON=m
 CONFIG_REBOOT_MODE=m
 # CONFIG_SYSCON_REBOOT_MODE is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
@@ -2892,7 +2840,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_AXP20X_POWER is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -3004,7 +2951,6 @@ CONFIG_MFD_HI6421_PMIC=y
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_88PM886_PMIC is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 CONFIG_MFD_MAX77620=y
@@ -3081,13 +3027,10 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_ROHM_BD718XX=y
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
-# CONFIG_MFD_ROHM_BD96801 is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_ATC260X_I2C is not set
 # CONFIG_MFD_QCOM_PM8008 is not set
-# CONFIG_MFD_CS40L50_I2C is not set
-# CONFIG_MFD_CS40L50_SPI is not set
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_INTEL_M10_BMC_SPI is not set
 # CONFIG_MFD_RSMU_I2C is not set
@@ -3328,7 +3271,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 #
 # Chips&Media media platform drivers
 #
-# CONFIG_VIDEO_E5010_JPEG_ENC is not set

 #
 # Intel media platform drivers
@@ -3364,11 +3306,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m

-#
-# Raspberry Pi media platform drivers
-#
-# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set
-
 #
 # Renesas media platform drivers
 #
@@ -3428,8 +3365,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_ALVIUM_CSI2 is not set
 # CONFIG_VIDEO_AR0521 is not set
 # CONFIG_VIDEO_GC0308 is not set
-# CONFIG_VIDEO_GC05A2 is not set
-# CONFIG_VIDEO_GC08A3 is not set
 # CONFIG_VIDEO_GC2145 is not set
 # CONFIG_VIDEO_HI556 is not set
 CONFIG_VIDEO_SR556=m
@@ -3440,7 +3375,6 @@ CONFIG_VIDEO_SR556=m
 CONFIG_VIDEO_IMX219=m
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX283 is not set
 # CONFIG_VIDEO_IMX290 is not set
 # CONFIG_VIDEO_IMX296 is not set
 # CONFIG_VIDEO_IMX319 is not set
@@ -3497,7 +3431,7 @@ CONFIG_VIDEO_OV5695=m
 CONFIG_VIDEO_S5K2XX=m
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_VGXY61 is not set
+# CONFIG_VIDEO_ST_VGXY61 is not set
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set

@@ -3540,8 +3474,6 @@ CONFIG_VIDEO_S5K2XX=m
 # CONFIG_VIDEO_DS90UB913 is not set
 # CONFIG_VIDEO_DS90UB953 is not set
 # CONFIG_VIDEO_DS90UB960 is not set
-# CONFIG_VIDEO_MAX96714 is not set
-# CONFIG_VIDEO_MAX96717 is not set
 # end of Video serializers and deserializers

 #
@@ -3567,14 +3499,11 @@ CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
 CONFIG_DRM_DISPLAY_HELPER=m
-CONFIG_DRM_BRIDGE_CONNECTOR=y
+CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
-CONFIG_DRM_DISPLAY_HDMI_HELPER=y
-CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
 CONFIG_DRM_EXEC=m
 CONFIG_DRM_SCHED=m

@@ -3601,7 +3530,7 @@ CONFIG_DRM_SCHED=m
 CONFIG_DRM_MSM=m
 CONFIG_DRM_MSM_GPU_STATE=y
 CONFIG_DRM_MSM_MDSS=y
-# CONFIG_DRM_MSM_MDP4 is not set
+CONFIG_DRM_MSM_MDP4=y
 CONFIG_DRM_MSM_MDP5=y
 CONFIG_DRM_MSM_DPU=y
 # CONFIG_DRM_MSM_DP is not set
@@ -3612,7 +3541,8 @@ CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_DSI_14NM_PHY=y
 # CONFIG_DRM_MSM_DSI_10NM_PHY is not set
 # CONFIG_DRM_MSM_DSI_7NM_PHY is not set
-# CONFIG_DRM_MSM_HDMI is not set
+CONFIG_DRM_MSM_HDMI=y
+# CONFIG_DRM_MSM_HDMI_HDCP is not set
 CONFIG_DRM_PANEL=y

 #
@@ -3633,13 +3563,11 @@ CONFIG_DRM_PANEL_BOE_TV101WUM_LL2=m
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
 # CONFIG_DRM_PANEL_DSI_CM is not set
 CONFIG_DRM_PANEL_LVDS=m
-# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set
 # CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
@@ -3652,7 +3580,6 @@ CONFIG_DRM_PANEL_LVDS=m
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
-# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_LG_SW43408 is not set
@@ -3893,7 +3820,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_QCOM_WLED=y
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
@@ -3933,10 +3859,7 @@ CONFIG_SND_PCM_ELD=y
 CONFIG_SND_PCM_IEC958=y
 CONFIG_SND_DMAENGINE_PCM=y
 CONFIG_SND_HWDEP=m
-CONFIG_SND_SEQ_DEVICE=m
 CONFIG_SND_RAWMIDI=m
-CONFIG_SND_UMP=m
-# CONFIG_SND_UMP_LEGACY_RAWMIDI is not set
 CONFIG_SND_COMPRESS_OFFLOAD=y
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
@@ -3953,6 +3876,8 @@ CONFIG_SND_CTL_FAST_LOOKUP=y
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_CTL_INPUT_VALIDATION is not set
 CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_UMP=m
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_SEQ_MIDI_EVENT=m
 CONFIG_SND_SEQ_MIDI=m
@@ -3962,7 +3887,6 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_ALOOP is not set
 # CONFIG_SND_PCMTEST is not set
-# CONFIG_SND_VIRMIDI is not set
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_SERIAL_GENERIC is not set
@@ -4082,7 +4006,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 # CONFIG_SND_SOC_AK4613 is not set
-# CONFIG_SND_SOC_AK4619 is not set
 # CONFIG_SND_SOC_AK4642 is not set
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
@@ -4123,14 +4046,12 @@ CONFIG_SND_SOC_AW8738=m
 # CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_CS530X_I2C is not set
 # CONFIG_SND_SOC_CX2072X is not set
 # CONFIG_SND_SOC_DA7213 is not set
 # CONFIG_SND_SOC_DMIC is not set
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8311 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 # CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
@@ -4394,7 +4315,6 @@ CONFIG_HID_MULTITOUCH=m
 #
 # HID-BPF support
 #
-# CONFIG_HID_BPF is not set
 # end of HID-BPF support

 #
@@ -4402,7 +4322,7 @@ CONFIG_HID_MULTITOUCH=m
 #
 CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
+# CONFIG_USB_HIDDEV is not set
 # end of USB HID support

 CONFIG_I2C_HID=y
@@ -4418,7 +4338,7 @@ CONFIG_USB_ULPI_BUS=y
 CONFIG_USB_CONN_GPIO=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set

 #
 # Miscellaneous USB options
@@ -4461,7 +4381,7 @@ CONFIG_USB_EHCI_HCD_PLATFORM=y
 # USB Device Class drivers
 #
 CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
+# CONFIG_USB_PRINTER is not set
 # CONFIG_USB_WDM is not set
 # CONFIG_USB_TMC is not set

@@ -4830,7 +4750,6 @@ CONFIG_LEDS_LM3697=y
 # CONFIG_LEDS_RT4505 is not set
 # CONFIG_LEDS_RT8515 is not set
 # CONFIG_LEDS_SGM3140 is not set
-# CONFIG_LEDS_SY7802 is not set

 #
 # RGB LED drivers
@@ -4863,7 +4782,6 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=m
 # CONFIG_LEDS_TRIGGER_TTY is not set
-# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set

 #
 # Simple LED drivers
@@ -5025,13 +4943,13 @@ CONFIG_QCOM_BAM_DMA=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-CONFIG_UDMABUF=y
+# CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
 CONFIG_DMABUF_HEAPS=y
 # CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
+CONFIG_DMABUF_HEAPS_SYSTEM=y
 CONFIG_DMABUF_HEAPS_CMA=y
 # end of DMABUF options

@@ -5071,15 +4989,61 @@ CONFIG_XEN_AUTO_XLATE=y

 # CONFIG_GREYBUS is not set
 # CONFIG_COMEDI is not set
-# CONFIG_STAGING is not set
+CONFIG_STAGING=y
+# CONFIG_RTLLIB is not set
+# CONFIG_RTL8723BS is not set
+# CONFIG_R8712U is not set
+# CONFIG_VT6656 is not set
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7816 is not set
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+# CONFIG_ADT7316 is not set
+# end of Analog digital bi-direction converters
+
+#
+# Direct Digital Synthesis
+#
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+# CONFIG_AD5933 is not set
+# end of Network Analyzer, Impedance Converters
+# end of IIO staging drivers
+
+# CONFIG_STAGING_MEDIA is not set
+# CONFIG_LTE_GDM724X is not set
+# CONFIG_FB_TFT is not set
+# CONFIG_KS7010 is not set
+# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_FIELDBUS_DEV is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_SURFACE_PLATFORMS=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 # CONFIG_EC_ACER_ASPIRE1 is not set
-# CONFIG_EC_LENOVO_YOGA_C630 is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -5114,18 +5078,18 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_BD718XX is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_QCOM_GDSC=y
+CONFIG_QCOM_RPMCC=y
 CONFIG_COMMON_CLK_QCOM=y
 # CONFIG_CLK_X1E80100_CAMCC is not set
 # CONFIG_CLK_X1E80100_DISPCC is not set
 # CONFIG_CLK_X1E80100_GCC is not set
 # CONFIG_CLK_X1E80100_GPUCC is not set
 # CONFIG_CLK_X1E80100_TCSRCC is not set
-# CONFIG_CLK_QCM2290_GPUCC is not set
 # CONFIG_QCOM_A53PLL is not set
 # CONFIG_QCOM_A7PLL is not set
 # CONFIG_QCOM_CLK_APCS_MSM8916 is not set
 CONFIG_QCOM_CLK_APCS_MSM8953=y
-# CONFIG_QCOM_CLK_APCC_MSM8996 is not set
+CONFIG_QCOM_CLK_APCC_MSM8996=y
 # CONFIG_QCOM_CLK_RPM is not set
 CONFIG_QCOM_CLK_SMD_RPM=y
 # CONFIG_IPQ_APSS_PLL is not set
@@ -5136,7 +5100,6 @@ CONFIG_QCOM_CLK_SMD_RPM=y
 # CONFIG_IPQ_GCC_6018 is not set
 # CONFIG_IPQ_GCC_8074 is not set
 # CONFIG_IPQ_GCC_9574 is not set
-# CONFIG_IPQ_NSSCC_QCA8K is not set
 # CONFIG_MSM_GCC_8916 is not set
 # CONFIG_MSM_GCC_8917 is not set
 # CONFIG_MSM_GCC_8939 is not set
@@ -5162,7 +5125,7 @@ CONFIG_MSM_GCC_8953=y
 # CONFIG_SA_GCC_8775P is not set
 # CONFIG_SA_GPUCC_8775P is not set
 # CONFIG_SC_GCC_7180 is not set
-# CONFIG_SC_GCC_7280 is not set
+CONFIG_SC_GCC_7280=y
 # CONFIG_SC_GCC_8180X is not set
 # CONFIG_SC_GCC_8280XP is not set
 # CONFIG_SC_GPUCC_7180 is not set
@@ -5189,11 +5152,9 @@ CONFIG_MSM_GCC_8953=y
 # CONFIG_SDM_LPASSCC_845 is not set
 # CONFIG_SDX_GCC_75 is not set
 # CONFIG_SM_CAMCC_6350 is not set
-# CONFIG_SM_CAMCC_7150 is not set
 # CONFIG_SM_CAMCC_8250 is not set
 # CONFIG_SM_CAMCC_8450 is not set
 # CONFIG_SM_CAMCC_8550 is not set
-# CONFIG_SM_CAMCC_8650 is not set
 # CONFIG_SM_DISPCC_8650 is not set
 # CONFIG_SM_GCC_4450 is not set
 # CONFIG_SM_GCC_6115 is not set
@@ -5219,7 +5180,6 @@ CONFIG_MSM_GCC_8953=y
 # CONFIG_SM_GPUCC_8650 is not set
 # CONFIG_SM_TCSRCC_8550 is not set
 # CONFIG_SM_TCSRCC_8650 is not set
-# CONFIG_SM_VIDEOCC_7150 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
 # CONFIG_SM_VIDEOCC_8250 is not set
 # CONFIG_SM_VIDEOCC_8350 is not set
@@ -5256,7 +5216,6 @@ CONFIG_MAILBOX=y
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_QCOM_APCS_IPC=y
-# CONFIG_QCOM_CPUCP_MBOX is not set
 # CONFIG_QCOM_IPCC is not set
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
@@ -5367,13 +5326,11 @@ CONFIG_QCOM_COMMAND_DB=y
 # CONFIG_QCOM_GENI_SE is not set
 # CONFIG_QCOM_GSBI is not set
 # CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_KRYO_L2_ACCESSORS=y
 CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_MEMSHARE_QMI_SERVICE=m
 # CONFIG_QCOM_OCMEM is not set
-# CONFIG_QCOM_PD_MAPPER is not set
 CONFIG_QCOM_PDR_HELPERS=m
-CONFIG_QCOM_PDR_MSG=m
-# CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
 # CONFIG_QCOM_PMIC_GLINK is not set
 CONFIG_QCOM_PMIC_SEC_WRITE=y
 CONFIG_QCOM_QMI_HELPERS=m
@@ -5539,7 +5496,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
 # CONFIG_AD7298 is not set
-# CONFIG_AD7380 is not set
 # CONFIG_AD7476 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD7606_IFACE_SPI is not set
@@ -5554,6 +5510,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
 # CONFIG_AD9467 is not set
+# CONFIG_ADI_AXI_ADC is not set
 # CONFIG_AXP20X_ADC is not set
 # CONFIG_AXP288_ADC is not set
 # CONFIG_CC10001_ADC is not set
@@ -5596,7 +5553,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
 # CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_TI_ADS1298 is not set
@@ -5648,7 +5604,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
-# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
@@ -5692,6 +5647,7 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
 # CONFIG_AD9739A is not set
+# CONFIG_ADI_AXI_DAC is not set
 # CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
@@ -5883,7 +5839,6 @@ CONFIG_STK3310=m
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
-# CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -6036,7 +5991,6 @@ CONFIG_PWM=y
 # CONFIG_PWM_ATMEL_TCB is not set
 # CONFIG_PWM_CLK is not set
 # CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_GPIO is not set
 # CONFIG_PWM_PCA9685 is not set
 # CONFIG_PWM_XILINX is not set

@@ -6048,9 +6002,7 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
-# CONFIG_LAN966X_OIC is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_PARTITION_PERCPU=y
 # CONFIG_QCOM_PDC is not set
@@ -6136,7 +6088,6 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android

-CONFIG_TRACE_GPU_MEM=y
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
@@ -6213,15 +6164,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-CONFIG_XFS_SUPPORT_ASCII_CI=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m
@@ -6278,7 +6221,6 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=y
 # CONFIG_NETFS_STATS is not set
-# CONFIG_NETFS_DEBUG is not set
 # CONFIG_FSCACHE is not set
 # end of Caches

@@ -6286,7 +6228,7 @@ CONFIG_NETFS_SUPPORT=y
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
-CONFIG_UDF_FS=m
+# CONFIG_UDF_FS is not set
 # end of CD-ROM/DVD Filesystems

 #
@@ -6368,7 +6310,6 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 CONFIG_PSTORE_COMPRESS=y
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
-# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=y
 # CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
@@ -6549,8 +6490,6 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -6597,6 +6536,7 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
+# CONFIG_CRYPTO_SM2 is not set
 CONFIG_CRYPTO_CURVE25519=m
 # end of Public-key cryptography

@@ -6808,7 +6748,6 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
-# CONFIG_TRACE_MMIO_ACCESS is not set

 #
 # Crypto library routines
@@ -7035,7 +6974,6 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_TABLE_CHECK is not set
 # CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_ARCH_HAS_DEBUG_WX=y
 # CONFIG_DEBUG_WX is not set
@@ -7148,67 +7086,17 @@ CONFIG_RCU_TRACE=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_FUNCTION_GRAPH_RETVAL is not set
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
-CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_OSNOISE_TRACER is not set
-# CONFIG_TIMERLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_USER_EVENTS is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_VALIDATE_RCU_IS_WATCHING is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_RV is not set
+# CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
@@ -4,7 +4,7 @@
 _flavor="postmarketos-qcom-msm8996"
 pkgname=linux-$_flavor
 pkgver=6.3.1
-pkgrel=7
+pkgrel=5
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8996 devices"
 arch="aarch64"
 _carch="arm64"
@@ -52,5 +52,5 @@ package() {
 }
 sha512sums="
 3d842c6fa3e1f93875f9c8d4f51e66b267bbd6b0eabccc25b461cbc0616a632ee6f1f2001b77bef2aff6aa36a788277ab9fc930fcd6e71732e5cbffec2dcb269  linux-v6.3.1-msm8996.tar.gz
-f03ecc0a0656fc27ecaefd522567ea86ab934746069b5fc88ffea5be1e3f27ff79df3d063fd984a1159f9f4d5c5b99c396127ca75370a27a438190d175037905  config-postmarketos-qcom-msm8996.aarch64
+2d7000d659830691ce88b1062d9883e1f4a2fc92071f6f5c032b99eab26caf58f27efeb08c3829f042246e7279d69c547c7d5b1e133ef9b9e3da17d1d94cb0f0  config-postmarketos-qcom-msm8996.aarch64
 "
@@ -2,9 +2,9 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.3.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -97,7 +97,6 @@ CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
-# CONFIG_BPF_LSM is not set
 # end of BPF subsystem

 CONFIG_PREEMPT_BUILD=y
@@ -139,7 +138,6 @@ CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -267,7 +265,6 @@ CONFIG_PERF_EVENTS=y

 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
 # end of General setup

 CONFIG_ARM64=y
@@ -605,7 +602,6 @@ CONFIG_ARCH_HAS_SUBPAGE_FAULTS=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -713,8 +709,7 @@ CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_FUNCTION_ALIGNMENT_4B=y
-CONFIG_FUNCTION_ALIGNMENT_8B=y
-CONFIG_FUNCTION_ALIGNMENT=8
+CONFIG_FUNCTION_ALIGNMENT=4
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
@@ -1107,8 +1102,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -1354,7 +1349,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
 # end of Network testing
 # end of Networking options

@@ -2062,8 +2056,8 @@ CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_AUDIT=y
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_AUDIT is not set
 # CONFIG_TARGET_CORE is not set
 # CONFIG_FUSION is not set

@@ -2345,7 +2339,6 @@ CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_DEBUG=y
 CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K_SPECTRAL=y
-# CONFIG_ATH10K_TRACING is not set
 # CONFIG_WCN36XX is not set
 # CONFIG_WLAN_VENDOR_ATMEL is not set
 # CONFIG_WLAN_VENDOR_BROADCOM is not set
@@ -2459,37 +2452,7 @@ CONFIG_MOUSE_PS2_SMBUS=y
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
@@ -4788,7 +4751,7 @@ CONFIG_SONY_FF=y
 #
 CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
+# CONFIG_USB_HIDDEV is not set
 # end of USB HID support

 # CONFIG_I2C_HID is not set
@@ -5383,7 +5346,7 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-CONFIG_UDMABUF=y
+# CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
@@ -6587,14 +6550,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m
@@ -6658,7 +6614,7 @@ CONFIG_NETFS_SUPPORT=y
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
-CONFIG_UDF_FS=m
+# CONFIG_UDF_FS is not set
 # end of CD-ROM/DVD Filesystems

 #
@@ -6749,7 +6705,6 @@ CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
-# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=y
 # CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
@@ -6922,8 +6877,6 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -7194,7 +7147,6 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
-# CONFIG_TRACE_MMIO_ACCESS is not set

 #
 # Crypto library routines
@@ -7417,7 +7369,6 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_TABLE_CHECK is not set
 # CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_ARCH_HAS_DEBUG_WX=y
 # CONFIG_DEBUG_WX is not set
@@ -7527,61 +7478,16 @@ CONFIG_RCU_TRACE=y
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
-CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
-CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_OSNOISE_TRACER is not set
-# CONFIG_TIMERLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_RV is not set
+# CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_IO_STRICT_DEVMEM is not set
@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-qcom-sc7180
 pkgver=6.6.28
-pkgrel=6
+pkgrel=4
 pkgdesc="Mainline kernel fork for Qualcomm Snapdragon 7c devices"
 arch="aarch64"
 _carch="arm64"
@@ -101,5 +101,5 @@ a4d8bbf39575e61d228b3b66fa692b207c1ee011e6030fdd097936a1ad28b1d5b01816d989adcb80
 08c6cace24a207f4a64a85b17e97646f62a8590b502cd5b6945489d0aeded352e21f0e1b0ec541ae2e61ec7fd4f6bc1e5bf1d5d32f2c6616eb41d39d66f0bab5  0009-platform-arm64-Add-Acer-Aspire-1-embedded-controller.patch
 69cfb699990ea7994089016b29cc248cb03483ad3f7620cbba63a779b2ed8928e6fde68484d29b6b8dfd1a8a6fa8d84c441f30180c7a257520ced442dab33876  0010-arm64-dts-qcom-acer-aspire1-Add-embedded-controller.patch
 c5edcd74f898b08bc663766668632d351aea40426b3563d53a4b8c6856dd82627f4794d60450e41171c990ebb3649056b36ef432c14c8783168e8060a2e3b094  0011-HACK-clk-Delay-disabling-unused-clocks-by-10s.patch
-2afb66ab8144320eafe373e30df59996e04563fb141f157fd9ca4098cd7182b063bcf71432aae56ad2b104ad00174826f34c6261a0fd9ecf7420a96e910f7747  config-postmarketos-qcom-sc7180.aarch64
+45c7e7f95dc89beb7167a6b5906d45929c97ec5c1a56667ea9f4b3de45a57358ee11c519267f5d755ddc7d792879617314facede8468d2b322ca998f67c37121  config-postmarketos-qcom-sc7180.aarch64
 "
@@ -2,9 +2,9 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.6.28 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -13,6 +13,7 @@ CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -109,7 +110,6 @@ CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
-# CONFIG_BPF_LSM is not set
 # end of BPF subsystem

 CONFIG_PREEMPT_BUILD=y
@@ -150,7 +150,6 @@ CONFIG_PREEMPT_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -275,7 +274,6 @@ CONFIG_PERF_EVENTS=y

 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y

 #
 # Kexec and crash features
@@ -660,7 +658,6 @@ CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -771,8 +768,7 @@ CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_FUNCTION_ALIGNMENT_4B=y
-CONFIG_FUNCTION_ALIGNMENT_8B=y
-CONFIG_FUNCTION_ALIGNMENT=8
+CONFIG_FUNCTION_ALIGNMENT=4
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
@@ -1565,7 +1561,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
 # end of Network testing
 # end of Networking options

@@ -1590,6 +1585,7 @@ CONFIG_BT_LEDS=y
 # CONFIG_BT_AOSPEXT is not set
 # CONFIG_BT_DEBUGFS is not set
 # CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_FEATURE_DEBUG is not set

 #
 # Bluetooth device drivers
@@ -1832,7 +1828,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_DEBUG=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_FW_LOADER_SYSFS=y
 CONFIG_EXTRA_FIRMWARE=""
@@ -2473,8 +2468,8 @@ CONFIG_DM_ZERO=m
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_AUDIT=y
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_AUDIT is not set
 # CONFIG_TARGET_CORE is not set
 # CONFIG_FUSION is not set

@@ -2855,14 +2850,12 @@ CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SNOC=m
 # CONFIG_ATH10K_DEBUG is not set
 # CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_ATH11K=m
 CONFIG_ATH11K_AHB=m
 CONFIG_ATH11K_PCI=m
 # CONFIG_ATH11K_DEBUG is not set
-# CONFIG_ATH11K_TRACING is not set
 # CONFIG_ATH12K is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 # CONFIG_ATMEL is not set
@@ -3091,37 +3084,7 @@ CONFIG_MOUSE_ELAN_I2C_I2C=y
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
@@ -5549,7 +5512,7 @@ CONFIG_SND_VIRTIO=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_BATTERY_STRENGTH is not set
-CONFIG_HIDRAW=y
+# CONFIG_HIDRAW is not set
 CONFIG_UHID=m
 CONFIG_HID_GENERIC=y

@@ -5574,7 +5537,6 @@ CONFIG_HID_COUGAR=m
 CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
-# CONFIG_HID_CP2112 is not set
 CONFIG_HID_CREATIVE_SB0540=m
 CONFIG_HID_CYPRESS=m
 CONFIG_HID_DRAGONRISE=m
@@ -5585,7 +5547,6 @@ CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 # CONFIG_HID_EVISION is not set
 CONFIG_HID_EZKEY=m
-# CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
 CONFIG_HID_GFRM=m
 CONFIG_HID_GLORIOUS=m
@@ -5614,7 +5575,6 @@ CONFIG_HID_LED=m
 CONFIG_HID_LENOVO=m
 CONFIG_HID_LETSKETCH=m
 CONFIG_HID_LOGITECH=m
-# CONFIG_HID_LOGITECH_DJ is not set
 CONFIG_HID_LOGITECH_HIDPP=m
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -5690,7 +5650,6 @@ CONFIG_HID_MCP2221=m
 #
 # HID-BPF support
 #
-# CONFIG_HID_BPF is not set
 # end of HID-BPF support

 #
@@ -5698,7 +5657,7 @@ CONFIG_HID_MCP2221=m
 #
 CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
+# CONFIG_USB_HIDDEV is not set
 # end of USB HID support

 CONFIG_I2C_HID=y
@@ -5715,7 +5674,7 @@ CONFIG_USB_ULPI_BUS=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
 CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set

 #
 # Miscellaneous USB options
@@ -5762,7 +5721,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
 # USB Device Class drivers
 #
 CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
+# CONFIG_USB_PRINTER is not set
 # CONFIG_USB_WDM is not set
 # CONFIG_USB_TMC is not set

@@ -6398,7 +6357,7 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-CONFIG_UDMABUF=y
+# CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
@@ -7633,7 +7592,6 @@ CONFIG_STM=m
 # CONFIG_STM_DUMMY is not set
 # CONFIG_STM_SOURCE_CONSOLE is not set
 # CONFIG_STM_SOURCE_HEARTBEAT is not set
-# CONFIG_STM_SOURCE_FTRACE is not set
 # CONFIG_INTEL_TH is not set
 # CONFIG_HISI_PTT is not set
 # end of HW tracing support
@@ -7731,15 +7689,7 @@ CONFIG_JBD2=m
 CONFIG_FS_MBCACHE=m
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-CONFIG_XFS_SUPPORT_ASCII_CI=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m
@@ -7889,7 +7839,6 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 CONFIG_PSTORE_COMPRESS=y
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
-# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=y
 # CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
@@ -8075,8 +8024,6 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -8344,7 +8291,6 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 # CONFIG_INDIRECT_PIO is not set
-# CONFIG_TRACE_MMIO_ACCESS is not set

 #
 # Crypto library routines
@@ -8508,8 +8454,8 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DYNAMIC_DEBUG_CORE=y
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DYNAMIC_DEBUG_CORE is not set
 CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
@@ -8572,7 +8518,6 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_TABLE_CHECK is not set
 # CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_ARCH_HAS_DEBUG_WX=y
 # CONFIG_DEBUG_WX is not set
@@ -8683,66 +8628,17 @@ CONFIG_RCU_TRACE=y
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
-CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_FUNCTION_GRAPH_RETVAL is not set
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
-CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_OSNOISE_TRACER is not set
-# CONFIG_TIMERLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_USER_EVENTS is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_RV is not set
+# CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
@@ -5,7 +5,7 @@
 _flavor="postmarketos-qcom-sdm670"
 pkgname=linux-$_flavor
 pkgver=6.10.2
-pkgrel=2
+pkgrel=1
 pkgdesc="Mainline Kernel fork for SDM670 devices"
 arch="aarch64"
 _carch="arm64"
@@ -67,5 +67,5 @@ package() {

 sha512sums="
 b992e72c8a8f2186088afb427acb8b79760ddb6350087abe15c0ac6064d10bd77adb2c3e260cf3f2014f93dd4b9fafd3f5a9805e9905cf75907e53a1f672dc36  linux-sdm670-v6.10.2.tar.gz
-b42f289628a1e92f0939ceaf4a3a1a3c4832fb122bd35043190b8a12360257796e41c81ab2d5cc26b7c50201d15723069a37e9ad78b9ca32281ce83164abc172  config-postmarketos-qcom-sdm670.aarch64
+359464f0c844f86f5f14e15d86f99e340fec5d0694f26a0706e6c3c0f5afe1da39d159c9e813a96a9dfc38f838a4362533a9c0ace7909ffb818713f507043d63  config-postmarketos-qcom-sdm670.aarch64
 "
@@ -2,20 +2,22 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.10.2 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 14.1.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=140100
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=0
+CONFIG_PAHOLE_VERSION=127
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -97,7 +99,6 @@ CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
-# CONFIG_BPF_LSM is not set
 # end of BPF subsystem

 CONFIG_PREEMPT_BUILD=y
@@ -139,7 +140,6 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_NEED_TASKS_RCU=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -266,7 +266,6 @@ CONFIG_PERF_EVENTS=y

 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y

 #
 # Kexec and crash features
@@ -653,7 +652,6 @@ CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -770,8 +768,7 @@ CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_FUNCTION_ALIGNMENT_4B=y
-CONFIG_FUNCTION_ALIGNMENT_8B=y
-CONFIG_FUNCTION_ALIGNMENT=8
+CONFIG_FUNCTION_ALIGNMENT=4
 CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
 CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options
@@ -1204,8 +1201,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -1458,7 +1455,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
 # end of Network testing
 # end of Networking options

@@ -1479,6 +1475,7 @@ CONFIG_BT_LEDS=y
 # CONFIG_BT_AOSPEXT is not set
 # CONFIG_BT_DEBUGFS is not set
 # CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_FEATURE_DEBUG is not set

 #
 # Bluetooth device drivers
@@ -1617,7 +1614,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_DEBUG=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
@@ -1911,8 +1907,8 @@ CONFIG_DM_THIN_PROVISIONING=y
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_AUDIT=y
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_AUDIT is not set
 # CONFIG_DM_VDO is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
@@ -2203,7 +2199,6 @@ CONFIG_ATH10K_SNOC=m
 CONFIG_ATH10K_DEBUG=y
 CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K_SPECTRAL=y
-# CONFIG_ATH10K_TRACING is not set
 # CONFIG_WCN36XX is not set
 # CONFIG_ATH11K is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
@@ -2363,38 +2358,7 @@ CONFIG_MOUSE_ELAN_I2C_I2C=y
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
-# CONFIG_JOYSTICK_SEESAW is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
@@ -4658,7 +4622,6 @@ CONFIG_HID_RMI=m
 #
 # HID-BPF support
 #
-# CONFIG_HID_BPF is not set
 # end of HID-BPF support

 #
@@ -4666,7 +4629,7 @@ CONFIG_HID_RMI=m
 #
 CONFIG_USB_HID=m
 # CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
+# CONFIG_USB_HIDDEV is not set
 # end of USB HID support

 # CONFIG_I2C_HID is not set
@@ -4722,7 +4685,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
 # USB Device Class drivers
 #
 CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
+# CONFIG_USB_PRINTER is not set
 # CONFIG_USB_WDM is not set
 # CONFIG_USB_TMC is not set

@@ -5740,7 +5703,6 @@ CONFIG_QCOM_KRYO_L2_ACCESSORS=y
 CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_OCMEM=y
 CONFIG_QCOM_PDR_HELPERS=y
-# CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
 CONFIG_QCOM_PMIC_GLINK=m
 CONFIG_QCOM_QMI_HELPERS=y
 # CONFIG_QCOM_RAMP_CTRL is not set
@@ -6546,7 +6508,6 @@ CONFIG_STM=m
 # CONFIG_STM_DUMMY is not set
 # CONFIG_STM_SOURCE_CONSOLE is not set
 # CONFIG_STM_SOURCE_HEARTBEAT is not set
-# CONFIG_STM_SOURCE_FTRACE is not set
 # CONFIG_INTEL_TH is not set
 # end of HW tracing support

@@ -6636,15 +6597,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-CONFIG_XFS_SUPPORT_ASCII_CI=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y
@@ -6710,7 +6663,7 @@ CONFIG_NETFS_SUPPORT=y
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
-CONFIG_UDF_FS=m
+# CONFIG_UDF_FS is not set
 # end of CD-ROM/DVD Filesystems

 #
@@ -6792,7 +6745,6 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 CONFIG_PSTORE_COMPRESS=y
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
-# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=y
 # CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
@@ -6970,8 +6922,6 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -7237,7 +7187,6 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
-# CONFIG_TRACE_MMIO_ACCESS is not set

 #
 # Crypto library routines
@@ -7393,8 +7342,8 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DYNAMIC_DEBUG_CORE=y
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DYNAMIC_DEBUG_CORE is not set
 CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
@@ -7416,6 +7365,8 @@ CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
 # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
 # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=2048
 # CONFIG_STRIP_ASM_SYMS is not set
@@ -7464,7 +7415,6 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_TABLE_CHECK is not set
 # CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_ARCH_HAS_DEBUG_WX=y
 # CONFIG_DEBUG_WX is not set
@@ -7577,67 +7527,17 @@ CONFIG_RCU_TRACE=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_FUNCTION_GRAPH_RETVAL is not set
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
-CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_OSNOISE_TRACER is not set
-# CONFIG_TIMERLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_USER_EVENTS is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_VALIDATE_RCU_IS_WATCHING is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_RV is not set
+# CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
@@ -7708,7 +7608,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_TEST_DYNAMIC_DEBUG is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_MEMINIT is not set
@@ -6,7 +6,7 @@
 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
 pkgver=6.9.0
-pkgrel=4
+pkgrel=3
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
 _carch="arm64"
@@ -72,5 +72,5 @@ package() {

 sha512sums="
 45fb653328776a7b3687b9192979ada93c5ac7c321d54d4b72f47cddc10120982701d4990edc9103f6ec3ffcd2bc917b43ce7fea6ec15a3d3aded2279ecd9226  linux-sdm845-6.9.0-r2.tar.gz
-daf67730b0f8a1280a40ee595e477fd2c86679cd28160227d60821f1feee74de092cb6d2568167086e9edc3f12eafd42024b07cdbbd994f1e71adf6705626391  config-postmarketos-qcom-sdm845.aarch64
+46eb11008ba02072791b7f3fc0c1f9e5742edab3091172baaa7bdc3860712a2ef6fa25f531cb8c4a045e54c1f2ed29722ec4f8a2316fa7bb15b3a43be853c7bb  config-postmarketos-qcom-sdm845.aarch64
 "
@@ -2,9 +2,9 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.9.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -13,6 +13,7 @@ CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -150,7 +151,6 @@ CONFIG_PREEMPT_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -832,10 +832,7 @@ CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_FUNCTION_ALIGNMENT_4B=y
-CONFIG_FUNCTION_ALIGNMENT_8B=y
-CONFIG_FUNCTION_ALIGNMENT=8
-CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
-CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
+CONFIG_FUNCTION_ALIGNMENT=4
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
@@ -1267,8 +1264,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -2172,8 +2169,8 @@ CONFIG_DM_THIN_PROVISIONING=y
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_AUDIT=y
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_AUDIT is not set
 # CONFIG_DM_VDO is not set
 # CONFIG_TARGET_CORE is not set
 # CONFIG_FUSION is not set
@@ -2816,38 +2813,7 @@ CONFIG_MOUSE_ELAN_I2C_I2C=y
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
-# CONFIG_JOYSTICK_SEESAW is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_SMT_FTS_DOWNSTREAM is not set
@@ -5388,7 +5354,6 @@ CONFIG_HID_RMI=m
 #
 # HID-BPF support
 #
-# CONFIG_HID_BPF is not set
 # end of HID-BPF support

 #
@@ -5396,7 +5361,7 @@ CONFIG_HID_RMI=m
 #
 CONFIG_USB_HID=m
 # CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
+# CONFIG_USB_HIDDEV is not set
 # end of USB HID support

 CONFIG_I2C_HID=y
@@ -5463,7 +5428,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
 # USB Device Class drivers
 #
 CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
+# CONFIG_USB_PRINTER is not set
 # CONFIG_USB_WDM is not set
 # CONFIG_USB_TMC is not set

@@ -7509,15 +7474,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-CONFIG_XFS_SUPPORT_ASCII_CI=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y
@@ -7583,7 +7540,7 @@ CONFIG_NETFS_SUPPORT=y
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
-CONFIG_UDF_FS=m
+# CONFIG_UDF_FS is not set
 # end of CD-ROM/DVD Filesystems

 #
@@ -7666,7 +7623,6 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 CONFIG_PSTORE_COMPRESS=y
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
-# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=y
 # CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
@@ -7845,8 +7801,6 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -8479,8 +8433,6 @@ CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
@@ -8490,18 +8442,10 @@ CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 CONFIG_BOOTTIME_TRACING=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_FUNCTION_GRAPH_RETVAL is not set
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
-CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
-# CONFIG_FUNCTION_PROFILER is not set
+# CONFIG_FUNCTION_TRACER is not set
 # CONFIG_STACK_TRACER is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
@@ -8509,6 +8453,7 @@ CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
 # CONFIG_HWLAT_TRACER is not set
 # CONFIG_OSNOISE_TRACER is not set
 # CONFIG_TIMERLAT_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
 # CONFIG_FTRACE_SYSCALLS is not set
 # CONFIG_TRACER_SNAPSHOT is not set
 CONFIG_BRANCH_PROFILE_NONE=y
@@ -8519,8 +8464,6 @@ CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
 CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
 # CONFIG_SYNTH_EVENTS is not set
 # CONFIG_USER_EVENTS is not set
 # CONFIG_HIST_TRIGGERS is not set
@@ -8528,8 +8471,6 @@ CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
Author	SHA1	Message	Date
Luca Weiss	cbd02b31f9	main/postmarketos-ui-lomiri: new aport	2024-09-07 19:24:05 +02:00
Luca Weiss	45775808aa	fairphone-fp4: add lomiri subpackage	2024-09-07 19:24:01 +02:00