APPLIED[F]: [{focal, groovy}:linux-azure][PATCH] UBUNTU: [Config] linux-azure: CONFIG_LOOPBACK_TARGET=m (tcm_loop)

[Ian May]

Applied to Azure Focal/master-next

Thanks!
Ian

On 2020-10-19 09:47:01 , Marcelo Henrique Cerri wrote:
> BugLink: http://bugs.launchpad.net/bugs/1791794
> 
> Enable the tcm_loop module, include it to the main modules package and
> enforce CONFIG_LOOPBACK_TARGET=m in the annotations file to avoid
> having it changed by mistake when updating the config options.
> 
> Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
> ---
>  debian.azure/config/annotations             | 3 +++
>  debian.azure/config/config.common.ubuntu    | 2 +-
>  debian.azure/control.d/azure.inclusion-list | 1 +
>  3 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
> index 3bc52607621a..7b45bc5f2e47 100644
> --- a/debian.azure/config/annotations
> +++ b/debian.azure/config/annotations
> @@ -183,6 +183,9 @@ CONFIG_SATA_ZPODD                                  mark<ENFORCED> note<modules r
>  CONFIG_HYPERV_IOMMU                                policy<{'amd64': 'y'}>
>  CONFIG_HYPERV_IOMMU                                mark<ENFORCED> note<LP:#1826447>
>  
> +CONFIG_LOOPBACK_TARGET                             policy<{'amd64': 'm'}>
> +CONFIG_LOOPBACK_TARGET                             mark<ENFORCED> note<LP#1791794>
> +
>  # Changes made to the generic kernel that are not necessary in the Azure kernel
>  
>  CONFIG_REGULATOR_TWL4030                           policy<{'amd64': '-'}>
> diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
> index a143e791d235..84c71bf1ca61 100644
> --- a/debian.azure/config/config.common.ubuntu
> +++ b/debian.azure/config/config.common.ubuntu
> @@ -2671,7 +2671,7 @@ CONFIG_LOCK_TORTURE_TEST=m
>  # CONFIG_LOGO is not set
>  CONFIG_LOG_BUF_SHIFT=18
>  CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
> -# CONFIG_LOOPBACK_TARGET is not set
> +CONFIG_LOOPBACK_TARGET=m
>  CONFIG_LPC_ICH=m
>  CONFIG_LPC_SCH=m
>  # CONFIG_LP_CONSOLE is not set
> diff --git a/debian.azure/control.d/azure.inclusion-list b/debian.azure/control.d/azure.inclusion-list
> index 4fa3797c2fb9..b12acff945c4 100644
> --- a/debian.azure/control.d/azure.inclusion-list
> +++ b/debian.azure/control.d/azure.inclusion-list
> @@ -174,6 +174,7 @@ drivers/scsi/sd_mod.ko
>  drivers/scsi/sr_mod.ko
>  drivers/scsi/virtio_scsi.ko
>  drivers/scsi/vmw_pvscsi.ko
> +drivers/target/loopback/tcm_loop.ko
>  drivers/target/target_core*.ko
>  drivers/tty/serial/jsm/*
>  drivers/uio/uio_hv_generic.ko
> -- 
> 2.25.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team