linux merge requestshttps://gitlab.apertis.org/pkg/linux/-/merge_requests2024-03-20T12:42:23Zhttps://gitlab.apertis.org/pkg/linux/-/merge_requests/311Merge 6.6.x kernel updates to v20242024-03-20T12:42:23ZMartyn WelchMerge 6.6.x kernel updates to v2024The Apertis v2024 release is tracking the v6.6.x kernel releases. This branch is currently being tracked by Debian Trixie and has already been merged to v2025dev2. Merge these changes back to v2024.
Signed-off-by: Martyn Welch <martyn.w...The Apertis v2024 release is tracking the v6.6.x kernel releases. This branch is currently being tracked by Debian Trixie and has already been merged to v2025dev2. Merge these changes back to v2024.
Signed-off-by: Martyn Welch <martyn.welch@collabora.com>https://gitlab.apertis.org/pkg/linux/-/merge_requests/314Re-apply drop dependency on image to headers package2024-03-19T13:43:16ZWalter LozanoRe-apply drop dependency on image to headers packageRe-apply the changes in 2ae5d24e to avoid depend on kernel headers. This
change was dropped by mistake in 3a3b51884a.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>Re-apply the changes in 2ae5d24e to avoid depend on kernel headers. This
change was dropped by mistake in 3a3b51884a.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>Walter LozanoWalter Lozanohttps://gitlab.apertis.org/pkg/linux/-/merge_requests/312Update v2024-updates branch2024-03-18T14:49:29ZMartyn WelchUpdate v2024-updates branchThe v2024-updates branch is stale. The changes in v2024 need to be fast-forwarded onto the v2024-updates branch so that further MTs against this branch make sense.
Signed-off-by: Martyn Welch <martyn.welch@collabora.com>The v2024-updates branch is stale. The changes in v2024 need to be fast-forwarded onto the v2024-updates branch so that further MTs against this branch make sense.
Signed-off-by: Martyn Welch <martyn.welch@collabora.com>https://gitlab.apertis.org/pkg/linux/-/merge_requests/309Update from debian/trixie for apertis/v2025dev22024-03-15T19:41:03ZApertis CI robotUpdate from debian/trixie for apertis/v2025dev2Apertis CI robotApertis CI robothttps://gitlab.apertis.org/pkg/linux/-/merge_requests/307Release linux version 6.6.13-1+apertis42024-03-12T17:44:48ZMartyn WelchRelease linux version 6.6.13-1+apertis4Signed-off-by: Martyn Welch <martyn.welch@collabora.com>Signed-off-by: Martyn Welch <martyn.welch@collabora.com>https://gitlab.apertis.org/pkg/linux/-/merge_requests/304arm64: Include support for FF-A2024-03-12T10:49:38ZBoris Klintefjordarm64: Include support for FF-AArm released the first version of the Arm Firmware Framework for Arm
A-profile[1] (FF-A) in 2020. The framework provides, among other, a
generic transport protocol for communication between components at
different execution levels (EL) i...Arm released the first version of the Arm Firmware Framework for Arm
A-profile[1] (FF-A) in 2020. The framework provides, among other, a
generic transport protocol for communication between components at
different execution levels (EL) in the Arm-A architecture, including
between the secure execution environment and the normal execution
environment.
FF-A support exists in the Linux kernel, in OP-TEE and in Xen (tech
preview). This makes FF-A a viable and more modern approach for Apertis
when using OP-TEE and optionally Xen on an Arm-A platform. In this
context, FF-A replaces the OP-TEE specific transport protocol and
instead provides a more generic solution not tied to OP-TEE.
[1] https://developer.arm.com/documentation/den0077/latest/
Signed-off-by: Boris Klintefjord <fixed-term.Boris.Klintefjord@se.bosch.com>https://gitlab.apertis.org/pkg/linux/-/merge_requests/303Update from debian/bullseye-backports for apertis/v2023-updates2024-03-06T09:31:32ZApertis CI robotUpdate from debian/bullseye-backports for apertis/v2023-updatesMartyn WelchMartyn Welchhttps://gitlab.apertis.org/pkg/linux/-/merge_requests/301Release linux version 6.6.13-1+apertis22024-02-07T13:27:26ZDylan AïssiRelease linux version 6.6.13-1+apertis2- Inject -Wno-error=format-overflow -Wno-error=format-truncation:
In contrary to Debian, we use by default -Wformat-overflow=2 -Wformat-truncation=2
in Apertis, but kernel is built with -Werror which makes the kernel FTBFS with:
"cc1: al...- Inject -Wno-error=format-overflow -Wno-error=format-truncation:
In contrary to Debian, we use by default -Wformat-overflow=2 -Wformat-truncation=2
in Apertis, but kernel is built with -Werror which makes the kernel FTBFS with:
"cc1: all warnings being treated as errors". In order to avoid this error, we
don't treat these warnings as errors.
- Drop dependency on image to headers package:
This dependency was added in https://salsa.debian.org/kernel-team/linux/-/merge_requests/903 to avoid users using headers of a different version then the associated image. Unfortunately, this change has a side effect in Apertis because it is no longer possible to build a sysroot without pulling a kernel image which is not needed. Since the upstream change has no benefit for Apertis and leads to issue to generate sysroot, we revert it by dropping the dependency.https://gitlab.apertis.org/pkg/linux/-/merge_requests/294Backport v2024 <- v2025dev1: Release linux version 6.6.13-1+apertis12024-02-06T12:05:49ZDylan AïssiBackport v2024 <- v2025dev1: Release linux version 6.6.13-1+apertis1This MR depends on https://gitlab.apertis.org/pkg/kernel-wedge/-/merge_requests/7 which should be merged first.This MR depends on https://gitlab.apertis.org/pkg/kernel-wedge/-/merge_requests/7 which should be merged first.https://gitlab.apertis.org/pkg/linux/-/merge_requests/293Update from debian/sid for apertis/v2025dev12024-02-01T18:45:57ZApertis CI robotUpdate from debian/sid for apertis/v2025dev1Apertis CI robotApertis CI robothttps://gitlab.apertis.org/pkg/linux/-/merge_requests/298Fold v2022-updates into v20222024-01-31T17:14:51ZAndrej ShaduraFold v2022-updates into v2022https://gitlab.apertis.org/pkg/linux/-/merge_requests/297Regenerate debian/apertis/copyright2024-01-31T10:36:49ZAndrej ShaduraRegenerate debian/apertis/copyrightThe license compliance script insists on bumping copyright years because of this:
> [` * Copyright (C) 2019-present Lenovo`](https://gitlab.apertis.org/pkg/linux/-/blob/apertis/v2022/arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts#L5)The license compliance script insists on bumping copyright years because of this:
> [` * Copyright (C) 2019-present Lenovo`](https://gitlab.apertis.org/pkg/linux/-/blob/apertis/v2022/arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts#L5)https://gitlab.apertis.org/pkg/linux/-/merge_requests/296Merge changes from apertis/v2022-updates into apertis/v20222024-01-30T16:01:53ZAndrej ShaduraMerge changes from apertis/v2022-updates into apertis/v2022https://gitlab.apertis.org/pkg/linux/-/merge_requests/292d/patches: Further additions to patch status2024-01-22T15:27:36ZMartyn Welchd/patches: Further additions to patch statusMore patches we have added to Apertis have now been submitted upstream,
add status information to aid with patch management.
Signed-off-by: Martyn Welch <martyn.welch@collabora.com>More patches we have added to Apertis have now been submitted upstream,
add status information to aid with patch management.
Signed-off-by: Martyn Welch <martyn.welch@collabora.com>https://gitlab.apertis.org/pkg/linux/-/merge_requests/288Add patch status to upstreamed patches and remove redundant patch2024-01-17T17:23:29ZMartyn WelchAdd patch status to upstreamed patches and remove redundant patchSome patches we have added to Apertis have now been submitted upstream,
add status information to aid with patch management.
Signed-off-by: Martyn Welch <martyn.welch@collabora.com>Some patches we have added to Apertis have now been submitted upstream,
add status information to aid with patch management.
Signed-off-by: Martyn Welch <martyn.welch@collabora.com>https://gitlab.apertis.org/pkg/linux/-/merge_requests/290d/config: arm64: Disable signed builds2024-01-16T22:35:30ZMartyn Welchd/config: arm64: Disable signed buildsWe haven't been generating signed builds as is done in Debian, however
the config is defined and something has changed that has resulted in the
build system attempting to build them. As we don't them, disable this
config.
Signed-off-by:...We haven't been generating signed builds as is done in Debian, however
the config is defined and something has changed that has resulted in the
build system attempting to build them. As we don't them, disable this
config.
Signed-off-by: Martyn Welch <martyn.welch@collabora.com>https://gitlab.apertis.org/pkg/linux/-/merge_requests/289Update from debian/experimental for apertis/v2025dev12024-01-10T11:18:00ZApertis CI robotUpdate from debian/experimental for apertis/v2025dev1Apertis CI robotApertis CI robothttps://gitlab.apertis.org/pkg/linux/-/merge_requests/286Update v2025dev1 to 6.6.4-0+apertis12023-12-20T12:35:35ZMartyn WelchUpdate v2025dev1 to 6.6.4-0+apertis1https://gitlab.apertis.org/pkg/linux/-/merge_requests/287Update to 5.15.142-0+apertis12023-12-13T19:35:48ZMartyn WelchUpdate to 5.15.142-0+apertis1Signed-off-by: Martyn Welch <martyn.welch@collabora.com>Signed-off-by: Martyn Welch <martyn.welch@collabora.com>https://gitlab.apertis.org/pkg/linux/-/merge_requests/285am62x: Enable config require for HDMI output2023-12-13T12:28:19ZMartyn Welcham62x: Enable config require for HDMI outputSigned-off-by: Martyn Welch <martyn.welch@collabora.com>Signed-off-by: Martyn Welch <martyn.welch@collabora.com>