APPLIED: [SRU][J][PATCH 1/1] UBUNTU: [Config] update tracking bug for CONFIG_INTEL_IOMMU_DEFAULT_ON

[Roxana Nicolescu]

On 09/02/2024 09:52, Andrea Righi wrote:
> BugLink: https://bugs.launchpad.net/bugs/1971699
>
> In commit ("UBUNTU: [Config] disable Intel DMA remapping options by
> default") we disabled Intel IOMMU by default, but the entry in
> annotations is missing a direct reference to the tracking bug.
>
> Fix it by adding the tracker bug to the note.
>
> Signed-off-by: Andrea Righi <andrea.righi at canonical.com>
> ---
>   debian.master/config/annotations | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index f27bbeca498b..1a2eded51d47 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -289,7 +289,7 @@ CONFIG_INTEGRITY_PLATFORM_KEYRING               policy<{'amd64': 'y', 'arm64': '
>   CONFIG_INTEGRITY_PLATFORM_KEYRING               note<'Required for lockdown'>
>   
>   CONFIG_INTEL_IOMMU_DEFAULT_ON                   policy<{'amd64': 'n'}>
> -CONFIG_INTEL_IOMMU_DEFAULT_ON                   note<'the IOMMU can trigger boot failures'>
> +CONFIG_INTEL_IOMMU_DEFAULT_ON                   note<'LP: #1971699'>
>   
>   CONFIG_IOMMU_DEBUGFS                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
>   CONFIG_IOMMU_DEBUGFS                            note<'Should not be enabled in production, LP #1861057'>
Applied to jammy master-next branch. Thanks!