[PATCH v2 2/2][SRU][C] UBUNTU: [Config] update configs and annotations for ASIX renamed
AceLan Kao
acelan.kao at canonical.com
Tue Jun 25 06:36:53 UTC 2019
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.
Signed-off-by: AceLan Kao <acelan.kao at canonical.com>
---
debian.master/abi/4.18.0-24.25/amd64/generic.modules | 1 +
debian.master/abi/4.18.0-24.25/amd64/lowlatency.modules | 1 +
debian.master/abi/4.18.0-24.25/arm64/generic.modules | 1 +
debian.master/abi/4.18.0-24.25/armhf/generic-lpae.modules | 1 +
debian.master/abi/4.18.0-24.25/armhf/generic.modules | 1 +
debian.master/abi/4.18.0-24.25/i386/generic.modules | 1 +
debian.master/abi/4.18.0-24.25/i386/lowlatency.modules | 1 +
debian.master/abi/4.18.0-24.25/ppc64el/generic.modules | 1 +
debian.master/abi/4.18.0-24.25/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/4.18.0-24.25/amd64/generic.modules b/debian.master/abi/4.18.0-24.25/amd64/generic.modules
index 288359877c79..7a3c390a2836 100644
--- a/debian.master/abi/4.18.0-24.25/amd64/generic.modules
+++ b/debian.master/abi/4.18.0-24.25/amd64/generic.modules
@@ -434,6 +434,7 @@ avma1_cs
avmfritz
ax25
ax88179_178a
+ax88796b
axnet_cs
axp20x
axp20x-i2c
diff --git a/debian.master/abi/4.18.0-24.25/amd64/lowlatency.modules b/debian.master/abi/4.18.0-24.25/amd64/lowlatency.modules
index 7547da9a402f..7a3d682e1eef 100644
--- a/debian.master/abi/4.18.0-24.25/amd64/lowlatency.modules
+++ b/debian.master/abi/4.18.0-24.25/amd64/lowlatency.modules
@@ -434,6 +434,7 @@ avma1_cs
avmfritz
ax25
ax88179_178a
+ax88796b
axnet_cs
axp20x
axp20x-i2c
diff --git a/debian.master/abi/4.18.0-24.25/arm64/generic.modules b/debian.master/abi/4.18.0-24.25/arm64/generic.modules
index b31e43f96c81..305a60f9c886 100644
--- a/debian.master/abi/4.18.0-24.25/arm64/generic.modules
+++ b/debian.master/abi/4.18.0-24.25/arm64/generic.modules
@@ -420,6 +420,7 @@ autofs4
avmfritz
ax25
ax88179_178a
+ax88796b
axp20x
axp20x-i2c
axp20x-pek
diff --git a/debian.master/abi/4.18.0-24.25/armhf/generic-lpae.modules b/debian.master/abi/4.18.0-24.25/armhf/generic-lpae.modules
index 27d003dfe984..d6beb956b350 100644
--- a/debian.master/abi/4.18.0-24.25/armhf/generic-lpae.modules
+++ b/debian.master/abi/4.18.0-24.25/armhf/generic-lpae.modules
@@ -416,6 +416,7 @@ avmfritz
ax25
ax88179_178a
ax88796
+ax88796b
axp20x
axp20x-i2c
axp20x-pek
diff --git a/debian.master/abi/4.18.0-24.25/armhf/generic.modules b/debian.master/abi/4.18.0-24.25/armhf/generic.modules
index 4754594071aa..b752ecf6fe00 100644
--- a/debian.master/abi/4.18.0-24.25/armhf/generic.modules
+++ b/debian.master/abi/4.18.0-24.25/armhf/generic.modules
@@ -417,6 +417,7 @@ avmfritz
ax25
ax88179_178a
ax88796
+ax88796b
axp20x
axp20x-i2c
axp20x-pek
diff --git a/debian.master/abi/4.18.0-24.25/i386/generic.modules b/debian.master/abi/4.18.0-24.25/i386/generic.modules
index e359e5eb513f..eb32ddb11756 100644
--- a/debian.master/abi/4.18.0-24.25/i386/generic.modules
+++ b/debian.master/abi/4.18.0-24.25/i386/generic.modules
@@ -444,6 +444,7 @@ avma1_cs
avmfritz
ax25
ax88179_178a
+ax88796b
axnet_cs
axp20x
axp20x-i2c
diff --git a/debian.master/abi/4.18.0-24.25/i386/lowlatency.modules b/debian.master/abi/4.18.0-24.25/i386/lowlatency.modules
index 35ace5cfacca..d7a1b2720ec4 100644
--- a/debian.master/abi/4.18.0-24.25/i386/lowlatency.modules
+++ b/debian.master/abi/4.18.0-24.25/i386/lowlatency.modules
@@ -444,6 +444,7 @@ avma1_cs
avmfritz
ax25
ax88179_178a
+ax88796b
axnet_cs
axp20x
axp20x-i2c
diff --git a/debian.master/abi/4.18.0-24.25/ppc64el/generic.modules b/debian.master/abi/4.18.0-24.25/ppc64el/generic.modules
index 175d221dd6f0..0ea59f7b9483 100644
--- a/debian.master/abi/4.18.0-24.25/ppc64el/generic.modules
+++ b/debian.master/abi/4.18.0-24.25/ppc64el/generic.modules
@@ -392,6 +392,7 @@ autofs4
avmfritz
ax25
ax88179_178a
+ax88796b
axp20x
axp20x-i2c
axp20x-pek
diff --git a/debian.master/abi/4.18.0-24.25/s390x/generic.modules b/debian.master/abi/4.18.0-24.25/s390x/generic.modules
index 859e5198a80a..35fa10bc79d6 100644
--- a/debian.master/abi/4.18.0-24.25/s390x/generic.modules
+++ b/debian.master/abi/4.18.0-24.25/s390x/generic.modules
@@ -60,6 +60,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 8ab8dc45cdcb..894004ef04be 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -5633,7 +5633,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 5ec75a9d680d..c673317afe5d 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -692,7 +692,6 @@ CONFIG_ARM_UNWIND=y
CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
CONFIG_ARM_VIRT_EXT=y
CONFIG_AS3935=m
-CONFIG_ASIX_PHY=m
CONFIG_ASN1=y
CONFIG_ASSOCIATIVE_ARRAY=y
CONFIG_ASUS_LAPTOP=m
@@ -835,6 +834,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
More information about the kernel-team
mailing list