[PATCH 2/2][SRU][D][E] UBUNTU: [Config] update configs and annotations for ASIX renamed

[Tyler Hicks]

On 2019-06-25 10:25:48, AceLan Kao wrote:
> BugLink: https://bugs.launchpad.net/bugs/1834114
> 
> Below commit rename the asix.ko module in net/phy to ax88796b.ko,
> so update configs and annotations, too.
>    net: phy: rename Asix Electronics PHY driver
> 
> Signed-off-by: AceLan Kao <acelan.kao at canonical.com>
> ---
>  debian.master/config/annotations          | 2 +-
>  debian.master/config/config.common.ubuntu | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

The changes that are here look good but I think you're missing required
changes in the corresponding debian.master/abi/*/*/*.modules files. I
think you need to add "ax88796b" to the files that already contain
"asix" so that the PHY module is also shipped.

Tyler

> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index 008ead6f697c..fcd170365f01 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -5587,7 +5587,7 @@ CONFIG_LED_TRIGGER_PHY                          policy<{'amd64': 'y', 'arm64': '
>  CONFIG_SFP                                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
>  CONFIG_AMD_PHY                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_AQUANTIA_PHY                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> -CONFIG_ASIX_PHY                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> +CONFIG_AX88796B_PHY                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_AT803X_PHY                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_BCM7XXX_PHY                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_BCM87XX_PHY                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index df275aa4a69d..810d4fc3b18a 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -719,7 +719,6 @@ CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
>  CONFIG_ARM_VIRT_EXT=y
>  CONFIG_AS3935=m
>  CONFIG_ASHMEM=m
> -CONFIG_ASIX_PHY=m
>  CONFIG_ASN1=y
>  CONFIG_ASSOCIATIVE_ARRAY=y
>  CONFIG_ASUS_LAPTOP=m
> @@ -861,6 +860,7 @@ CONFIG_AUTO_ZRELADDR=y
>  CONFIG_AX25=m
>  CONFIG_AX25_DAMA_SLAVE=y
>  CONFIG_AX88796=m
> +CONFIG_AX88796B_PHY=m
>  # CONFIG_AX88796_93CX6 is not set
>  CONFIG_AXP20X_ADC=m
>  CONFIG_AXP20X_POWER=m
> -- 
> 2.17.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team