From 2f004a47f18c1b49486cd5a07aca6cee493c9cb2 Mon Sep 17 00:00:00 2001 From: Andrea Righi Date: Fri, 9 Feb 2024 08:23:20 +0100 Subject: [PATCH] UBUNTU: [Config] update tracking bug for CONFIG_INTEL_IOMMU_DEFAULT_ON BugLink: https://bugs.launchpad.net/bugs/1971699 In commit 0c3c0650379e ("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 --- debian.master/config/annotations | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index ba0ac9639e31..4dc32cb882c4 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -321,11 +321,8 @@ CONFIG_INTEL_ATOMISP note<'LP: #2017444'> CONFIG_INTEL_ATOMISP2_PM policy<{'amd64': 'm'}> CONFIG_INTEL_ATOMISP2_PM note<'LP: #2017444'> -CONFIG_INTEL_IOMMU_DEFAULT_ON policy<{'amd64': 'y'}> -CONFIG_INTEL_IOMMU_DEFAULT_ON note<'LP: #1951440'> - -CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON policy<{'amd64': 'y'}> -CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON note<'LP: #1951440'> +CONFIG_INTEL_IOMMU_DEFAULT_ON policy<{'amd64': 'n'}> +CONFIG_INTEL_IOMMU_DEFAULT_ON note<'LP: #1971699'> CONFIG_IOMMU_DEBUGFS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_IOMMU_DEBUGFS note<'LP: #1861057'>