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

Stefan Bader stefan.bader at canonical.com
Tue Jul 2 13:02:17 UTC 2019 

On 25.06.19 08:36, 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
> And also update modules in debian.master/abi/*/*/*.modules files.

This change broke the s390x build indirectly as it did not ensure that the asix
module got removed from the abi. Adding modules is not critical but dropping
them is. And this counts as a drop because the usb asix never was build and
instead the phy driver being accounted for it.

-Stefan

> 
> Signed-off-by: AceLan Kao <acelan.kao at canonical.com>
> ---
>  debian.master/abi/5.0.0-19.20/amd64/generic.modules      | 1 +
>  debian.master/abi/5.0.0-19.20/amd64/lowlatency.modules   | 1 +
>  debian.master/abi/5.0.0-19.20/arm64/generic.modules      | 1 +
>  debian.master/abi/5.0.0-19.20/armhf/generic-lpae.modules | 1 +
>  debian.master/abi/5.0.0-19.20/armhf/generic.modules      | 1 +
>  debian.master/abi/5.0.0-19.20/i386/generic.modules       | 1 +
>  debian.master/abi/5.0.0-19.20/i386/lowlatency.modules    | 1 +
>  debian.master/abi/5.0.0-19.20/ppc64el/generic.modules    | 1 +
>  debian.master/abi/5.0.0-19.20/s390x/generic.modules      | 1 +
>  debian.master/config/annotations                         | 2 +-
>  debian.master/config/config.common.ubuntu                | 2 +-
>  11 files changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/debian.master/abi/5.0.0-19.20/amd64/generic.modules b/debian.master/abi/5.0.0-19.20/amd64/generic.modules
> index 45c0324faded..8b659ede0742 100644
> --- a/debian.master/abi/5.0.0-19.20/amd64/generic.modules
> +++ b/debian.master/abi/5.0.0-19.20/amd64/generic.modules
> @@ -449,6 +449,7 @@ avma1_cs
>  avmfritz
>  ax25
>  ax88179_178a
> +ax88796b
>  axnet_cs
>  axp20x
>  axp20x-i2c
> diff --git a/debian.master/abi/5.0.0-19.20/amd64/lowlatency.modules b/debian.master/abi/5.0.0-19.20/amd64/lowlatency.modules
> index 7adf155aab94..d3c6dc8f3ecf 100644
> --- a/debian.master/abi/5.0.0-19.20/amd64/lowlatency.modules
> +++ b/debian.master/abi/5.0.0-19.20/amd64/lowlatency.modules
> @@ -449,6 +449,7 @@ avma1_cs
>  avmfritz
>  ax25
>  ax88179_178a
> +ax88796b
>  axnet_cs
>  axp20x
>  axp20x-i2c
> diff --git a/debian.master/abi/5.0.0-19.20/arm64/generic.modules b/debian.master/abi/5.0.0-19.20/arm64/generic.modules
> index 4dd355cd676d..5909e6258aba 100644
> --- a/debian.master/abi/5.0.0-19.20/arm64/generic.modules
> +++ b/debian.master/abi/5.0.0-19.20/arm64/generic.modules
> @@ -432,6 +432,7 @@ autofs4
>  avmfritz
>  ax25
>  ax88179_178a
> +ax88796b
>  axis-fifo
>  axp20x
>  axp20x-i2c
> diff --git a/debian.master/abi/5.0.0-19.20/armhf/generic-lpae.modules b/debian.master/abi/5.0.0-19.20/armhf/generic-lpae.modules
> index a220950cde14..31a7e218985f 100644
> --- a/debian.master/abi/5.0.0-19.20/armhf/generic-lpae.modules
> +++ b/debian.master/abi/5.0.0-19.20/armhf/generic-lpae.modules
> @@ -428,6 +428,7 @@ avmfritz
>  ax25
>  ax88179_178a
>  ax88796
> +ax88796b
>  axis-fifo
>  axp20x
>  axp20x-i2c
> diff --git a/debian.master/abi/5.0.0-19.20/armhf/generic.modules b/debian.master/abi/5.0.0-19.20/armhf/generic.modules
> index c48c977909b9..defd22ef93b9 100644
> --- a/debian.master/abi/5.0.0-19.20/armhf/generic.modules
> +++ b/debian.master/abi/5.0.0-19.20/armhf/generic.modules
> @@ -429,6 +429,7 @@ avmfritz
>  ax25
>  ax88179_178a
>  ax88796
> +ax88796b
>  axis-fifo
>  axp20x
>  axp20x-i2c
> diff --git a/debian.master/abi/5.0.0-19.20/i386/generic.modules b/debian.master/abi/5.0.0-19.20/i386/generic.modules
> index fe4cce766110..8f5bff9ef6b9 100644
> --- a/debian.master/abi/5.0.0-19.20/i386/generic.modules
> +++ b/debian.master/abi/5.0.0-19.20/i386/generic.modules
> @@ -456,6 +456,7 @@ avma1_cs
>  avmfritz
>  ax25
>  ax88179_178a
> +ax88796b
>  axnet_cs
>  axp20x
>  axp20x-i2c
> diff --git a/debian.master/abi/5.0.0-19.20/i386/lowlatency.modules b/debian.master/abi/5.0.0-19.20/i386/lowlatency.modules
> index de88a5ae7b80..cdf5c2fa6127 100644
> --- a/debian.master/abi/5.0.0-19.20/i386/lowlatency.modules
> +++ b/debian.master/abi/5.0.0-19.20/i386/lowlatency.modules
> @@ -456,6 +456,7 @@ avma1_cs
>  avmfritz
>  ax25
>  ax88179_178a
> +ax88796b
>  axnet_cs
>  axp20x
>  axp20x-i2c
> diff --git a/debian.master/abi/5.0.0-19.20/ppc64el/generic.modules b/debian.master/abi/5.0.0-19.20/ppc64el/generic.modules
> index 84f9be593cef..c4f55724fbd2 100644
> --- a/debian.master/abi/5.0.0-19.20/ppc64el/generic.modules
> +++ b/debian.master/abi/5.0.0-19.20/ppc64el/generic.modules
> @@ -404,6 +404,7 @@ autofs4
>  avmfritz
>  ax25
>  ax88179_178a
> +ax88796b
>  axis-fifo
>  axp20x
>  axp20x-i2c
> diff --git a/debian.master/abi/5.0.0-19.20/s390x/generic.modules b/debian.master/abi/5.0.0-19.20/s390x/generic.modules
> index 6081d35c13eb..4411fe38e7fd 100644
> --- a/debian.master/abi/5.0.0-19.20/s390x/generic.modules
> +++ b/debian.master/abi/5.0.0-19.20/s390x/generic.modules
> @@ -62,6 +62,7 @@ aufs
>  auth_rpcgss
>  authenc
>  authencesn
> +ax88796b
>  bcache
>  bcm-phy-lib
>  bcm7xxx
> 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
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20190702/288564ca/attachment.sig>

More information about the kernel-team mailing list