[PATCH 1/2 Yakkety SRU] UBUNTU: [Config] CONFIG_TIGON3=m for all arches

Tim Gardner tim.gardner at canonical.com
Thu Oct 27 21:11:44 UTC 2016


BugLink: http://bugs.launchpad.net/bugs/1637303

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 -
 debian.master/config/annotations                   | 4 +---
 debian.master/config/arm64/config.common.arm64     | 1 -
 debian.master/config/armhf/config.common.armhf     | 1 -
 debian.master/config/config.common.ubuntu          | 1 +
 debian.master/config/i386/config.common.i386       | 1 -
 debian.master/config/powerpc/config.common.powerpc | 1 -
 debian.master/config/ppc64el/config.common.ppc64el | 1 -
 debian.master/control.d/generic.inclusion-list     | 1 +
 9 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 6614ae0..4c1a50c 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -620,7 +620,6 @@ CONFIG_TEST_UDELAY=m
 CONFIG_THERMAL=y
 CONFIG_THUNDERBOLT=m
 CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=m
 CONFIG_TI_CPSW_ALE=m
 CONFIG_TPS6105X=m
 CONFIG_TPS6507X=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index e9b40fc..7b1665b 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -4153,13 +4153,11 @@ CONFIG_B44                                      policy<{'amd64': 'm', 'arm64': '
 CONFIG_BCMGENET                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_BNX2                                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_CNIC                                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
-CONFIG_TIGON3                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'y'}>
+CONFIG_TIGON3                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_BNX2X                                    policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_BNX2X_SRIOV                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
 CONFIG_BNX2X_VXLAN                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
 CONFIG_SYSTEMPORT                               policy<{'arm64': 'm', 'armhf': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
-#
-CONFIG_TIGON3                                   flag<REVIEW>
 
 # Menu: Device Drivers >> Network device support >> Ethernet driver support >> Cavium ethernet drivers
 CONFIG_NET_VENDOR_CAVIUM                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'n'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index a7e10eb..b8c1b4a 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -677,7 +677,6 @@ CONFIG_TEST_UDELAY=m
 CONFIG_THERMAL=y
 CONFIG_THUNDERBOLT=m
 CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=m
 CONFIG_TI_CPSW_ALE=m
 CONFIG_TPS6105X=m
 CONFIG_TPS6507X=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 263fb04..4ad4d05 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -650,7 +650,6 @@ CONFIG_TEST_UDELAY=m
 CONFIG_THERMAL=y
 CONFIG_THUNDERBOLT=m
 CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=m
 CONFIG_TI_CPSW_ALE=y
 CONFIG_TPS6105X=m
 CONFIG_TPS6507X=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 470e337..3d4153d 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8107,6 +8107,7 @@ CONFIG_THUNDER_NIC_VF=m
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_TIFM_7XX1=m
+CONFIG_TIGON3=m
 CONFIG_TIMB_DMA=m
 CONFIG_TIMERFD=y
 CONFIG_TIMER_STATS=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 6e01089..0a7c04d 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -612,7 +612,6 @@ CONFIG_TEST_UDELAY=m
 CONFIG_THERMAL=y
 CONFIG_THUNDERBOLT=m
 CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=m
 CONFIG_TI_CPSW_ALE=m
 CONFIG_TPS6105X=m
 CONFIG_TPS6507X=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 011e182..af88f55 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -589,7 +589,6 @@ CONFIG_TEST_UDELAY=m
 CONFIG_THERMAL=y
 CONFIG_THUNDERBOLT=m
 CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=m
 CONFIG_TI_CPSW_ALE=m
 CONFIG_TPS6105X=m
 CONFIG_TPS6507X=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index c4a37cd..f855d39 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -657,7 +657,6 @@ CONFIG_TEST_UDELAY=m
 CONFIG_THERMAL=y
 CONFIG_THUNDERBOLT=m
 CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=y
 CONFIG_TI_CPSW_ALE=m
 CONFIG_TPS6105X=m
 CONFIG_TPS6507X=m
diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
index 96c671e..6bcb174 100644
--- a/debian.master/control.d/generic.inclusion-list
+++ b/debian.master/control.d/generic.inclusion-list
@@ -59,6 +59,7 @@ drivers/misc/vmw_balloon.ko
 drivers/misc/vmw_vmci/vmw_vmci.ko
 drivers/net/caif/caif_virtio.ko
 drivers/net/mii.ko
+drivers/net/ethernet/broadcom/tg3.ko
 drivers/net/ethernet/8390/8390.ko
 drivers/net/ethernet/realtek/8139too.ko
 drivers/net/ethernet/realtek/8139cp.ko
-- 
2.7.4





More information about the kernel-team mailing list