UBUNTU: [Config] Enabled some networking options

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index f924f389bfeea382487c8f44a12c2ac54ec1b00f..de0e3e54f3eb2420070c3d3f67dd8ba22921922d 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -147,7 +147,6 @@ CONFIG_ATM_TCP=m
 # CONFIG_ATM_ZATM_DEBUG is not set
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_AUXDISPLAY is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
 CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43_SDIO=y
 CONFIG_B44=m
@@ -169,7 +168,6 @@ CONFIG_B44=m
 # CONFIG_BATTERY_MAX17042 is not set
 CONFIG_BATTERY_SBS=m
 CONFIG_BCH=m
-# CONFIG_BCM7XXX_PHY is not set
 # CONFIG_BCMA_DRIVER_GMAC_CMN is not set
 # CONFIG_BCMA_DRIVER_GPIO is not set
 # CONFIG_BCMA_HOST_SOC is not set
@@ -204,7 +202,6 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIVHCI=m
 # CONFIG_BT_LEDS is not set
 # CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_CAIF is not set
 # CONFIG_CAN_CC770 is not set
 # CONFIG_CAN_C_CAN is not set
 # CONFIG_CAN_IFI_CANFD is not set
@@ -278,7 +275,6 @@ CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_SET_MODULE_RONX=y
 CONFIG_DECNET=m
-# CONFIG_DECNET_ROUTER is not set
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
@@ -389,7 +385,7 @@ CONFIG_FDDI=y
 CONFIG_FEALNX=m
 # CONFIG_FIREWIRE_SERIAL is not set
 CONFIG_FIRMWARE_MEMMAP=y
-# CONFIG_FIXED_PHY is not set
+CONFIG_FIXED_PHY=m
 # CONFIG_FM10K is not set
 # CONFIG_FMC is not set
 CONFIG_FONT_SUPPORT=y
@@ -455,7 +451,6 @@ CONFIG_HPET=y
 # CONFIG_HPFS_FS is not set
 CONFIG_HP_ILO=m
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTU21 is not set
@@ -514,7 +509,6 @@ CONFIG_I6300ESB_WDT=m
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 # CONFIG_IMA is not set
 # CONFIG_INA2XX_ADC is not set
-# CONFIG_INET_DIAG_DESTROY is not set
 # CONFIG_INFINIBAND_I40IW is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
@@ -560,7 +554,6 @@ CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 # CONFIG_IPW2100 is not set
 CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
 CONFIG_IP_DCCP_CCID3=y
 CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 # CONFIG_IRDA_ULTRA is not set
@@ -659,14 +652,12 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 # CONFIG_MAX30100 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_MAY_USE_DEVLINK=y
 # CONFIG_MCB is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
 # CONFIG_MCP4531 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
@@ -839,13 +830,11 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 # CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_NET_ACT_IFE is not set
 CONFIG_NET_CLS_IND=y
-# CONFIG_NET_DEVLINK is not set
 CONFIG_NET_DROP_MONITOR=m
 CONFIG_NET_FC=y
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_MPLS_GSO=y
 CONFIG_NET_SB1000=m
-# CONFIG_NET_SWITCHDEV is not set
 # CONFIG_NET_TCPPROBE is not set
 CONFIG_NET_TULIP=y
 # CONFIG_NET_VENDOR_ARC is not set
@@ -1593,7 +1582,6 @@ CONFIG_WDTPCI=m
 # CONFIG_WIZNET_W5300 is not set
 # CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_X25 is not set
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_XFRM_MIGRATE=y
 # CONFIG_XFRM_STATISTICS is not set

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 06056ecfc2e8b18f3cf1ffb4010c9d24b97a33f9..56cb53b026b09a2e593da7a720826cbab49ecba7 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -173,7 +173,6 @@ CONFIG_B43_SDIO=y
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_SBS is not set
-# CONFIG_BCM7XXX_PHY is not set
 # CONFIG_BCMA_DRIVER_GMAC_CMN is not set
 # CONFIG_BCMA_DRIVER_GPIO is not set
 # CONFIG_BCMA_HOST_SOC is not set
@@ -206,7 +205,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_BT_LEDS is not set
 # CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_CAIF is not set
 # CONFIG_CAN_CC770 is not set
 # CONFIG_CAN_C_CAN is not set
 # CONFIG_CAN_GRCAN is not set
@@ -484,7 +482,6 @@ CONFIG_HIBERNATION=y
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTU21 is not set
 CONFIG_HUGETLB_PAGE=y
@@ -548,7 +545,6 @@ CONFIG_I2C_TEGRA=m
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 # CONFIG_IMA is not set
 # CONFIG_INA2XX_ADC is not set
-# CONFIG_INET_DIAG_DESTROY is not set
 # CONFIG_INFINIBAND_I40IW is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
@@ -695,14 +691,12 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_MAY_USE_DEVLINK=y
 # CONFIG_MCB is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
 # CONFIG_MCP4531 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
@@ -853,13 +847,11 @@ CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_NET_ACT_IFE is not set
 CONFIG_NET_CLS_IND=y
-# CONFIG_NET_DEVLINK is not set
 CONFIG_NET_DROP_MONITOR=m
 # CONFIG_NET_FC is not set
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_MPLS_GSO=y
 # CONFIG_NET_SB1000 is not set
-# CONFIG_NET_SWITCHDEV is not set
 # CONFIG_NET_TCPPROBE is not set
 CONFIG_NET_TULIP=y
 # CONFIG_NET_VENDOR_ARC is not set
@@ -1618,7 +1610,6 @@ CONFIG_WCN36XX=m
 # CONFIG_WIZNET_W5300 is not set
 # CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_X25 is not set
 CONFIG_XFRM_MIGRATE=y
 # CONFIG_XFRM_STATISTICS is not set
 CONFIG_XFRM_SUB_POLICY=y

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index aac73cd4033967be6a3627e923644be92895d1da..4df8738916f7311e0f2b3af15270f0caa814247c 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -163,7 +163,6 @@ CONFIG_BATTERY_BQ27XXX=m
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_BATTERY_TWL4030_MADC is not set
 CONFIG_BCH=y
-CONFIG_BCM7XXX_PHY=m
 # CONFIG_BCMA_DRIVER_GMAC_CMN is not set
 # CONFIG_BCMA_DRIVER_GPIO is not set
 # CONFIG_BCMA_HOST_SOC is not set
@@ -195,7 +194,6 @@ CONFIG_BRCMFMAC_SDIO=y
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_BT_LEDS is not set
 # CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_CAIF is not set
 # CONFIG_CAN_CC770 is not set
 # CONFIG_CAN_C_CAN is not set
 # CONFIG_CAN_FLEXCAN is not set
@@ -482,7 +480,6 @@ CONFIG_HIBERNATION=y
 # CONFIG_HP_ILO is not set
 CONFIG_HSI=m
 # CONFIG_HSI_CHAR is not set
-# CONFIG_HSR is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTU21 is not set
@@ -543,7 +540,6 @@ CONFIG_I2C_VERSATILE=m
 # CONFIG_IMA is not set
 # CONFIG_IMX_THERMAL is not set
 # CONFIG_INA2XX_ADC is not set
-# CONFIG_INET_DIAG_DESTROY is not set
 # CONFIG_INFINIBAND_I40IW is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
@@ -691,14 +687,12 @@ CONFIG_MAILBOX=y
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_MAY_USE_DEVLINK=y
 # CONFIG_MCB is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
 # CONFIG_MCP4531 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
-CONFIG_MDIO_BCM_UNIMAC=m
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
@@ -883,12 +877,10 @@ CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_NET_ACT_IFE is not set
 CONFIG_NET_CLS_IND=y
-# CONFIG_NET_DEVLINK is not set
 CONFIG_NET_DROP_MONITOR=m
 # CONFIG_NET_FC is not set
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_MPLS_GSO=y
-CONFIG_NET_SWITCHDEV=y
 # CONFIG_NET_TCPPROBE is not set
 CONFIG_NET_TULIP=y
 # CONFIG_NET_VENDOR_ARC is not set
@@ -1695,7 +1687,6 @@ CONFIG_VLSI_FIR=m
 # CONFIG_WIZNET_W5300 is not set
 CONFIG_WLAN_VENDOR_TI=y
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_X25 is not set
 CONFIG_XFRM_MIGRATE=y
 # CONFIG_XFRM_STATISTICS is not set
 CONFIG_XFRM_SUB_POLICY=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b5013f62e3b45474e4154588af8117c4246758c8..af7ff9f6935a984c55f5e157e861ea1bf4ab853b 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -618,6 +618,7 @@ CONFIG_AURORA_NB8800=m
 CONFIG_AUTOFS4_FS=m
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
 # CONFIG_AX88796 is not set
 # CONFIG_AXI_DMAC is not set
 CONFIG_AXON_MSI=y
@@ -709,6 +710,7 @@ CONFIG_BCH_CONST_T=4
 CONFIG_BCM2835_MBOX=y
 CONFIG_BCM2835_TIMER=y
 CONFIG_BCM2835_WDT=m
+CONFIG_BCM7XXX_PHY=m
 CONFIG_BCM87XX_PHY=m
 CONFIG_BCMA=m
 CONFIG_BCMA_BLOCKIO=y
@@ -912,6 +914,7 @@ CONFIG_CACHEFILES=m
 CONFIG_CACHE_FEROCEON_L2=y
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 CONFIG_CACHE_L2X0=y
+CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
 CONFIG_CAIF_HSI=m
 CONFIG_CAIF_NETDEV=m
@@ -1625,6 +1628,7 @@ CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 CONFIG_DEBUG_WX=y
 CONFIG_DECNET_NF_GRABULATOR=m
+CONFIG_DECNET_ROUTER=y
 CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_LZ4=y
@@ -2848,6 +2852,7 @@ CONFIG_HP_WIRELESS=m
 CONFIG_HP_WMI=m
 CONFIG_HSA_AMD=m
 CONFIG_HSI_BOARDINFO=y
+CONFIG_HSR=m
 # CONFIG_HTC_EGPIO is not set
 CONFIG_HT_IRQ=y
 CONFIG_HUGETLBFS=y
@@ -3073,6 +3078,7 @@ CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET_AH=m
 CONFIG_INET_DCCP_DIAG=m
 CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_SCTP_DIAG=m
@@ -3319,6 +3325,7 @@ CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
+CONFIG_IPX_INTERN=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_DCCP=m
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
@@ -3863,6 +3870,7 @@ CONFIG_MAX77620_WATCHDOG=m
 CONFIG_MAX8925_POWER=m
 # CONFIG_MAXSMP is not set
 CONFIG_MAX_RAW_DEVS=256
+CONFIG_MAY_USE_DEVLINK=m
 CONFIG_MCB_PCI=m
 CONFIG_MCE_AMD_INJ=m
 # CONFIG_MCORE2 is not set
@@ -3875,6 +3883,7 @@ CONFIG_MCS_FIR=m
 CONFIG_MD=y
 CONFIG_MDA_CONSOLE=m
 CONFIG_MDIO=m
+CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_CAVIUM=m
 CONFIG_MDIO_GPIO=m
@@ -4036,6 +4045,9 @@ CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_INFINIBAND=m
 CONFIG_MLXSW_CORE_HWMON=y
 CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_SPECTRUM=m
+CONFIG_MLXSW_SPECTRUM_DCB=y
+CONFIG_MLXSW_SWITCHX2=m
 CONFIG_MMA7455=m
 CONFIG_MMA7660=m
 CONFIG_MMA9551_CORE=m
@@ -4454,6 +4466,7 @@ CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_U32=m
 CONFIG_NET_CORE=y
 CONFIG_NET_DCCPPROBE=m
+CONFIG_NET_DEVLINK=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
@@ -4521,6 +4534,7 @@ CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCTPPROBE=m
+CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_TEAM=m
 CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
 CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -7804,6 +7818,7 @@ CONFIG_WM831X_WATCHDOG=m
 CONFIG_WM8350_POWER=m
 CONFIG_WM8350_WATCHDOG=m
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+CONFIG_X25=m
 CONFIG_X25_ASY=m
 CONFIG_X509_CERTIFICATE_PARSER=y
 CONFIG_X86=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index a2f50f1762932a5482eab97381ec0b14724d96ee..d97c02d87bd31d05a079d4a0f574b2fe03845829 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -144,7 +144,6 @@ CONFIG_ATM_TCP=m
 # CONFIG_ATM_ZATM_DEBUG is not set
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_AUXDISPLAY is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
 CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43_SDIO=y
 CONFIG_B44=m
@@ -166,7 +165,6 @@ CONFIG_B44=m
 # CONFIG_BATTERY_MAX17042 is not set
 CONFIG_BATTERY_SBS=m
 CONFIG_BCH=m
-# CONFIG_BCM7XXX_PHY is not set
 # CONFIG_BCMA_DRIVER_GMAC_CMN is not set
 # CONFIG_BCMA_DRIVER_GPIO is not set
 # CONFIG_BCMA_HOST_SOC is not set
@@ -201,7 +199,6 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIVHCI=m
 # CONFIG_BT_LEDS is not set
 # CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_CAIF is not set
 CONFIG_CAN_CC770=m
 # CONFIG_CAN_CC770_PLATFORM is not set
 # CONFIG_CAN_C_CAN is not set
@@ -285,7 +282,6 @@ CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_SET_MODULE_RONX=y
 CONFIG_DECNET=m
-# CONFIG_DECNET_ROUTER is not set
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
@@ -484,7 +480,6 @@ CONFIG_HPET=y
 # CONFIG_HPFS_FS is not set
 CONFIG_HP_ILO=m
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTU21 is not set
@@ -545,7 +540,6 @@ CONFIG_I6300ESB_WDT=m
 CONFIG_ILLEGAL_POINTER_VALUE=0
 # CONFIG_IMA is not set
 # CONFIG_INA2XX_ADC is not set
-# CONFIG_INET_DIAG_DESTROY is not set
 # CONFIG_INFINIBAND_I40IW is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
@@ -590,7 +584,6 @@ CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_IPW2100=m
 CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
 CONFIG_IP_DCCP_CCID3=y
 CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 # CONFIG_IRDA_ULTRA is not set
@@ -697,14 +690,12 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_MAY_USE_DEVLINK=y
 # CONFIG_MCB is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
 # CONFIG_MCP4531 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
@@ -886,13 +877,11 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 # CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_NET_ACT_IFE is not set
 CONFIG_NET_CLS_IND=y
-# CONFIG_NET_DEVLINK is not set
 CONFIG_NET_DROP_MONITOR=m
 CONFIG_NET_FC=y
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_MPLS_GSO=y
 CONFIG_NET_SB1000=m
-# CONFIG_NET_SWITCHDEV is not set
 # CONFIG_NET_TCPPROBE is not set
 CONFIG_NET_TULIP=y
 # CONFIG_NET_VENDOR_ARC is not set
@@ -1657,7 +1646,6 @@ CONFIG_WDTPCI=m
 # CONFIG_WIZNET_W5300 is not set
 # CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_X25 is not set
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
 CONFIG_XFRM_MIGRATE=y
 # CONFIG_XFRM_STATISTICS is not set

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 899e08ae97e2b2441b55d08a49fe38f0ad5ebbdf..6c637d856e1ce5857ae24b054f72b6e83959b94c 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -34,7 +34,6 @@ CONFIG_ATM_IDT77252=m
 CONFIG_ATM_LANAI=m
 CONFIG_ATM_TCP=m
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AXP288_ADC=m
 CONFIG_AXP288_FUEL_GAUGE=m
 CONFIG_B44=m
@@ -326,7 +325,6 @@ CONFIG_MWIFIEX=m
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
 CONFIG_NET_FC=y
-# CONFIG_NET_SWITCHDEV is not set
 CONFIG_NET_TULIP=y
 CONFIG_NFC_SHDLC=y
 CONFIG_NFTL=m

diff --git a/debian.master/config/powerpc/config.flavour.generic b/debian.master/config/powerpc/config.flavour.generic
index d33f721c6ce06f29c19f0e347d30eb7bb5a22299..968cb8314c4e978ca502da8450d8b3529cc7c193 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.generic
+++ b/debian.master/config/powerpc/config.flavour.generic
@@ -123,7 +123,6 @@ CONFIG_B43_SDIO=y
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_SBS is not set
-# CONFIG_BCM7XXX_PHY is not set
 # CONFIG_BCMA_DRIVER_GMAC_CMN is not set
 # CONFIG_BCMA_HOST_SOC is not set
 # CONFIG_BCMGENET is not set
@@ -147,7 +146,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y
 # CONFIG_BT_HCIUART_AG6XX is not set
 # CONFIG_BT_LEDS is not set
 # CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_CAIF is not set
 # CONFIG_CAN_CC770 is not set
 # CONFIG_CAN_C_CAN is not set
 # CONFIG_CAN_FLEXCAN is not set
@@ -207,7 +205,6 @@ CONFIG_CXL_BASE=y
 # CONFIG_DE4X5 is not set
 CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DECNET_ROUTER=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
@@ -322,7 +319,6 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP100 is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTU21 is not set
 CONFIG_HUGETLB_PAGE=y
@@ -364,7 +360,6 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_IIO_SYSFS_TRIGGER is not set
 # CONFIG_IMA is not set
 # CONFIG_INA2XX_ADC is not set
-# CONFIG_INET_DIAG_DESTROY is not set
 # CONFIG_INFINIBAND_I40IW is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
@@ -395,7 +390,6 @@ CONFIG_IOMMU_HELPER=y
 CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 # CONFIG_IPW2100 is not set
-CONFIG_IPX_INTERN=y
 CONFIG_IP_DCCP_CCID3=y
 CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IRQ_ALL_CPUS=y
@@ -478,14 +472,12 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_MAY_USE_DEVLINK=y
 # CONFIG_MCB is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
 # CONFIG_MCP4531 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_OCTEON is not set
@@ -607,7 +599,6 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 # CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_NET_ACT_IFE is not set
 CONFIG_NET_CLS_IND=y
-# CONFIG_NET_DEVLINK is not set
 CONFIG_NET_DROP_MONITOR=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_MPLS_GSO=y
@@ -1081,7 +1072,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
 # CONFIG_WLAN_VENDOR_TI is not set
 CONFIG_WORD_SIZE=64
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_X25 is not set
 CONFIG_XFRM_MIGRATE=y
 # CONFIG_XFRM_STATISTICS is not set
 CONFIG_XFRM_SUB_POLICY=y

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
index 30339801bd1751bd55f745df8bfe14a0428d602d..96407e49d8d65ca652eb6bdfb9cfe87796aa357a 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc
+++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
@@ -124,7 +124,6 @@ CONFIG_BATTERY_GAUGE_LTC2941=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
 CONFIG_BATTERY_SBS=m
-CONFIG_BCM7XXX_PHY=m
 CONFIG_BCMA_DRIVER_GMAC_CMN=y
 CONFIG_BCMA_HOST_SOC=y
 CONFIG_BCMGENET=m
@@ -148,7 +147,6 @@ CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_LEDS=y
 CONFIG_CADENCE_WATCHDOG=m
-CONFIG_CAIF=m
 CONFIG_CAN_CC770=m
 CONFIG_CAN_C_CAN=m
 CONFIG_CAN_FLEXCAN=m
@@ -213,7 +211,6 @@ CONFIG_DDR=y
 CONFIG_DE4X5=m
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DECNET_ROUTER is not set
 # CONFIG_DEFAULT_CFQ is not set
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
@@ -333,7 +330,6 @@ CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HP100=m
 CONFIG_HPFS_FS=m
 CONFIG_HSI=m
-CONFIG_HSR=m
 CONFIG_HTC_PASIC3=m
 CONFIG_HTU21=m
 CONFIG_HUGETLB_PAGE=y
@@ -377,7 +373,6 @@ CONFIG_IIO_SW_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
 CONFIG_IMA=y
 CONFIG_INA2XX_ADC=m
-CONFIG_INET_DIAG_DESTROY=y
 CONFIG_INFINIBAND_I40IW=m
 # CONFIG_INFINIBAND_IPOIB_DEBUG is not set
 # CONFIG_INFINIBAND_MTHCA_DEBUG is not set
@@ -409,7 +404,6 @@ CONFIG_IPV6_ILA=m
 CONFIG_IPV6_MIP6=m
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
 CONFIG_IPW2100=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IP_DCCP_CCID3 is not set
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
 # CONFIG_IRQ_ALL_CPUS is not set
@@ -495,14 +489,12 @@ CONFIG_MAX30100=m
 CONFIG_MAX517=m
 CONFIG_MAX5821=m
 CONFIG_MAX63XX_WATCHDOG=m
-CONFIG_MAY_USE_DEVLINK=m
 CONFIG_MCB=m
 CONFIG_MCP320X=m
 CONFIG_MCP3422=m
 CONFIG_MCP4531=m
 CONFIG_MCP4725=m
 CONFIG_MCP4922=m
-CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_MD_CLUSTER=m
@@ -620,7 +612,6 @@ CONFIG_NAU7802=m
 CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m
 CONFIG_NET_ACT_IFE=m
 # CONFIG_NET_CLS_IND is not set
-CONFIG_NET_DEVLINK=m
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_NET_MPLS_GSO=m
@@ -1090,7 +1081,6 @@ CONFIG_WIZNET_W5300=m
 CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WORD_SIZE=32
 CONFIG_WQ_WATCHDOG=y
-CONFIG_X25=m
 # CONFIG_XFRM_MIGRATE is not set
 CONFIG_XFRM_STATISTICS=y
 # CONFIG_XFRM_SUB_POLICY is not set

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp
index e4090821bbff7c344b7be22eb1bc98ad1f9be964..cca6f446a1472aaf014c98d5f4bb227727f6aeca 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc-smp
@@ -124,7 +124,6 @@ CONFIG_B43_SDIO=y
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_SBS is not set
-# CONFIG_BCM7XXX_PHY is not set
 # CONFIG_BCMA_DRIVER_GMAC_CMN is not set
 # CONFIG_BCMA_HOST_SOC is not set
 # CONFIG_BCMGENET is not set
@@ -148,7 +147,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y
 # CONFIG_BT_HCIUART_AG6XX is not set
 # CONFIG_BT_LEDS is not set
 # CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_CAIF is not set
 # CONFIG_CAN_CC770 is not set
 # CONFIG_CAN_C_CAN is not set
 # CONFIG_CAN_FLEXCAN is not set
@@ -213,7 +211,6 @@ CONFIG_CRYPTO_RNG=m
 # CONFIG_DE4X5 is not set
 CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DECNET_ROUTER=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
@@ -332,7 +329,6 @@ CONFIG_HIPPI=y
 # CONFIG_HP100 is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTU21 is not set
 # CONFIG_HUGETLB_PAGE is not set
@@ -376,7 +372,6 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_IIO_SYSFS_TRIGGER is not set
 # CONFIG_IMA is not set
 # CONFIG_INA2XX_ADC is not set
-# CONFIG_INET_DIAG_DESTROY is not set
 # CONFIG_INFINIBAND_I40IW is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
@@ -408,7 +403,6 @@ CONFIG_INPUT_LEDS=y
 CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 # CONFIG_IPW2100 is not set
-CONFIG_IPX_INTERN=y
 CONFIG_IP_DCCP_CCID3=y
 CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 # CONFIG_IRQ_ALL_CPUS is not set
@@ -493,14 +487,12 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_MAY_USE_DEVLINK=y
 # CONFIG_MCB is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
 # CONFIG_MCP4531 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MD_CLUSTER is not set
@@ -618,7 +610,6 @@ CONFIG_MVMDIO=m
 # CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_NET_ACT_IFE is not set
 CONFIG_NET_CLS_IND=y
-# CONFIG_NET_DEVLINK is not set
 CONFIG_NET_DROP_MONITOR=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_MPLS_GSO=y
@@ -1090,7 +1081,6 @@ CONFIG_USB_SISUSBVGA_CON=y
 # CONFIG_WLAN_VENDOR_TI is not set
 CONFIG_WORD_SIZE=32
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_X25 is not set
 CONFIG_XFRM_MIGRATE=y
 # CONFIG_XFRM_STATISTICS is not set
 CONFIG_XFRM_SUB_POLICY=y

diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-emb b/debian.master/config/powerpc/config.flavour.powerpc64-emb
index d3aff83b42a906fa4475dfedc8c8118cfdaa2123..49a43b2ff02cf86a1269c271a4fcba0d2cc030e7 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc64-emb
+++ b/debian.master/config/powerpc/config.flavour.powerpc64-emb
@@ -123,7 +123,6 @@ CONFIG_BATTERY_GAUGE_LTC2941=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
 CONFIG_BATTERY_SBS=m
-CONFIG_BCM7XXX_PHY=m
 CONFIG_BCMA_DRIVER_GMAC_CMN=y
 CONFIG_BCMA_HOST_SOC=y
 CONFIG_BCMGENET=m
@@ -147,7 +146,6 @@ CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_LEDS=y
 CONFIG_CADENCE_WATCHDOG=m
-CONFIG_CAIF=m
 CONFIG_CAN_CC770=m
 CONFIG_CAN_C_CAN=m
 CONFIG_CAN_FLEXCAN=m
@@ -213,7 +211,6 @@ CONFIG_DDR=y
 CONFIG_DE4X5=m
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DECNET_ROUTER is not set
 # CONFIG_DEFAULT_CFQ is not set
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
@@ -334,7 +331,6 @@ CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HP100=m
 CONFIG_HPFS_FS=m
 CONFIG_HSI=m
-CONFIG_HSR=m
 CONFIG_HTC_PASIC3=m
 CONFIG_HTU21=m
 CONFIG_HUGETLB_PAGE=y
@@ -378,7 +374,6 @@ CONFIG_IIO_SW_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
 # CONFIG_IMA is not set
 CONFIG_INA2XX_ADC=m
-CONFIG_INET_DIAG_DESTROY=y
 CONFIG_INFINIBAND_I40IW=m
 # CONFIG_INFINIBAND_IPOIB_DEBUG is not set
 # CONFIG_INFINIBAND_MTHCA_DEBUG is not set
@@ -410,7 +405,6 @@ CONFIG_IPV6_ILA=m
 CONFIG_IPV6_MIP6=m
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
 CONFIG_IPW2100=m
-# CONFIG_IPX_INTERN is not set
 # CONFIG_IP_DCCP_CCID3 is not set
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
 # CONFIG_IRQ_ALL_CPUS is not set
@@ -496,14 +490,12 @@ CONFIG_MAX30100=m
 CONFIG_MAX517=m
 CONFIG_MAX5821=m
 CONFIG_MAX63XX_WATCHDOG=m
-CONFIG_MAY_USE_DEVLINK=m
 CONFIG_MCB=m
 CONFIG_MCP320X=m
 CONFIG_MCP3422=m
 CONFIG_MCP4531=m
 CONFIG_MCP4725=m
 CONFIG_MCP4922=m
-CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_MDIO_OCTEON=m
@@ -625,7 +617,6 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m
 CONFIG_NET_ACT_IFE=m
 # CONFIG_NET_CLS_IND is not set
-CONFIG_NET_DEVLINK=m
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_NET_MPLS_GSO=m
@@ -1101,7 +1092,6 @@ CONFIG_WIZNET_W5300=m
 CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WORD_SIZE=64
 CONFIG_WQ_WATCHDOG=y
-CONFIG_X25=m
 # CONFIG_XFRM_MIGRATE is not set
 CONFIG_XFRM_STATISTICS=y
 # CONFIG_XFRM_SUB_POLICY is not set

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index bc6aa0f02cdf37803369e0829c7e45f7d612f469..dc7c735cdd84d6de2586676353b033cb18a8eed2 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -136,7 +136,6 @@ CONFIG_ATM_NICSTAR_USE_SUNI=y
 CONFIG_ATM_TCP=m
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_AUXDISPLAY is not set
-CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43_SDIO=y
 CONFIG_B44=m
@@ -160,7 +159,6 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_SBS is not set
-# CONFIG_BCM7XXX_PHY is not set
 # CONFIG_BCMA_DRIVER_GMAC_CMN is not set
 # CONFIG_BCMA_DRIVER_GPIO is not set
 # CONFIG_BCMA_HOST_SOC is not set
@@ -195,7 +193,6 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIVHCI=m
 # CONFIG_BT_LEDS is not set
 # CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_CAIF is not set
 # CONFIG_CAN_CC770 is not set
 # CONFIG_CAN_C_CAN is not set
 # CONFIG_CAN_FLEXCAN is not set
@@ -270,7 +267,6 @@ CONFIG_DEBUG_INFO_DWARF4=y
 CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DECNET=m
-CONFIG_DECNET_ROUTER=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
@@ -463,7 +459,6 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HPFS_FS is not set
 CONFIG_HP_ILO=m
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTU21 is not set
@@ -527,7 +522,6 @@ CONFIG_I2C_VIAPRO=m
 # CONFIG_IIO_SYSFS_TRIGGER is not set
 # CONFIG_IMA is not set
 # CONFIG_INA2XX_ADC is not set
-# CONFIG_INET_DIAG_DESTROY is not set
 # CONFIG_INFINIBAND_I40IW is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
@@ -571,7 +565,6 @@ CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 # CONFIG_IPW2100 is not set
 CONFIG_IPX=m
-CONFIG_IPX_INTERN=y
 CONFIG_IP_DCCP_CCID3=y
 CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IRDA_ULTRA=y
@@ -669,14 +662,12 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_MAY_USE_DEVLINK=y
 # CONFIG_MCB is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
 # CONFIG_MCP4531 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_BITBANG is not set
 CONFIG_MDIO_BUS_MUX_GPIO=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
@@ -829,12 +820,10 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 # CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_NET_ACT_IFE is not set
 CONFIG_NET_CLS_IND=y
-# CONFIG_NET_DEVLINK is not set
 CONFIG_NET_DROP_MONITOR=m
 CONFIG_NET_FC=y
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_MPLS_GSO=y
-# CONFIG_NET_SWITCHDEV is not set
 # CONFIG_NET_TCPPROBE is not set
 CONFIG_NET_TULIP=y
 # CONFIG_NET_VENDOR_ARC is not set
@@ -1498,7 +1487,6 @@ CONFIG_WDTPCI=m
 # CONFIG_WLAN_VENDOR_TI is not set
 CONFIG_WORD_SIZE=64
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_X25 is not set
 CONFIG_XFRM_MIGRATE=y
 # CONFIG_XFRM_STATISTICS is not set
 CONFIG_XFRM_SUB_POLICY=y

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index fc5ecf9648ee629dd4689107b515427943e262b0..7fefcb3930c7dfe1a17a425070ae0a15664b6c64 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -123,7 +123,6 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_SBS is not set
-# CONFIG_BCM7XXX_PHY is not set
 # CONFIG_BCMA_DRIVER_GMAC_CMN is not set
 # CONFIG_BCMA_DRIVER_GPIO is not set
 # CONFIG_BCMA_HOST_SOC is not set
@@ -149,7 +148,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y
 # CONFIG_BMP280 is not set
 CONFIG_BSD_DISKLABEL=y
 # CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_CAIF is not set
 # CONFIG_CAN_CC770 is not set
 # CONFIG_CAN_C_CAN is not set
 # CONFIG_CAN_IFI_CANFD is not set
@@ -249,7 +247,7 @@ CONFIG_FAT_FS=m
 # CONFIG_FDDI is not set
 # CONFIG_FEALNX is not set
 # CONFIG_FIREWIRE_SERIAL is not set
-# CONFIG_FIXED_PHY is not set
+CONFIG_FIXED_PHY=m
 # CONFIG_FM10K is not set
 # CONFIG_FMC is not set
 CONFIG_FONT_SUPPORT=m
@@ -306,7 +304,6 @@ CONFIG_HOTPLUG_PCI_PCIE=y
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTU21 is not set
 CONFIG_HUGETLB_PAGE=y
@@ -363,7 +360,6 @@ CONFIG_I2C_MUX=m
 # CONFIG_IIO_SYSFS_TRIGGER is not set
 # CONFIG_IMA is not set
 # CONFIG_INA2XX_ADC is not set
-# CONFIG_INET_DIAG_DESTROY is not set
 # CONFIG_INFINIBAND_I40IW is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
@@ -463,14 +459,12 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 # CONFIG_MAX30100 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_MAY_USE_DEVLINK=y
 # CONFIG_MCB is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
 # CONFIG_MCP4531 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
@@ -597,12 +591,10 @@ CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_NET_ACT_IFE is not set
 CONFIG_NET_CLS_IND=y
-# CONFIG_NET_DEVLINK is not set
 CONFIG_NET_DROP_MONITOR=m
 # CONFIG_NET_FC is not set
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_MPLS_GSO=y
-# CONFIG_NET_SWITCHDEV is not set
 # CONFIG_NET_TCPPROBE is not set
 # CONFIG_NET_TULIP is not set
 # CONFIG_NET_VENDOR_ARC is not set
@@ -1040,7 +1032,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
 # CONFIG_WIZNET_W5100 is not set
 # CONFIG_WIZNET_W5300 is not set
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_X25 is not set
 CONFIG_XFRM_MIGRATE=y
 # CONFIG_XFRM_STATISTICS is not set
 CONFIG_XFRM_SUB_POLICY=y