arm updates for 5.3 part 3

21 files changed, 26 insertions, 34 deletions

diff --git a/configs/fedora/generic/arm/CONFIG_NET_VENDOR_MELLANOX b/configs/fedora/generic/CONFIG_NET_VENDOR_MELLANOX
index e33e9ccf9..e33e9ccf9 100644
--- a/configs/fedora/generic/arm/CONFIG_NET_VENDOR_MELLANOX
+++ b/configs/fedora/generic/CONFIG_NET_VENDOR_MELLANOX
diff --git a/configs/fedora/generic/CONFIG_QCOM_AOSS_QMP b/configs/fedora/generic/arm/CONFIG_QCOM_AOSS_QMP
index a51484e8f..a51484e8f 100644
--- a/configs/fedora/generic/CONFIG_QCOM_AOSS_QMP
+++ b/configs/fedora/generic/arm/CONFIG_QCOM_AOSS_QMP
diff --git a/configs/fedora/generic/arm/CONFIG_USB_OHCI_HCD_PCI b/configs/fedora/generic/arm/CONFIG_USB_OHCI_HCD_PCI
new file mode 100644
index 000000000..d3e6096dc
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_USB_OHCI_HCD_PCI
@@ -0,0 +1 @@
+CONFIG_USB_OHCI_HCD_PCI=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM_IMX_CPUFREQ_DT b/configs/fedora/generic/arm/aarch64/CONFIG_ARM_IMX_CPUFREQ_DT
new file mode 100644
index 000000000..c49b751f9
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM_IMX_CPUFREQ_DT
@@ -0,0 +1 @@
+CONFIG_ARM_IMX_CPUFREQ_DT=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_AOSS_QMP b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_AOSS_QMP
new file mode 100644
index 000000000..2532e57fc
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_AOSS_QMP
@@ -0,0 +1 @@
+CONFIG_QCOM_AOSS_QMP=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_NET_VENDOR_MELLANOX b/configs/fedora/generic/arm/armv7/CONFIG_NET_VENDOR_MELLANOX
new file mode 100644
index 000000000..7fd0cc94b
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_NET_VENDOR_MELLANOX
@@ -0,0 +1 @@
+# CONFIG_NET_VENDOR_MELLANOX is not set
diff --git a/configs/fedora/generic/CONFIG_NTB_MSI b/configs/fedora/generic/x86/x86_64/CONFIG_NTB_MSI
index 62a7410ff..62a7410ff 100644
--- a/configs/fedora/generic/CONFIG_NTB_MSI
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_NTB_MSI
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index dc3a17698..2e83fe713 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -350,7 +350,7 @@ CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GLOBAL_TIMER=y
 # CONFIG_ARM_IMX6Q_CPUFREQ is not set
-# CONFIG_ARM_IMX_CPUFREQ_DT is not set
+CONFIG_ARM_IMX_CPUFREQ_DT=m
 CONFIG_ARM_MHU=m
 CONFIG_ARM_PL172_MPMC=m
 CONFIG_ARM_PMU=y
@@ -4256,7 +4256,6 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=256
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
-# CONFIG_NTB_MSI is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -4754,7 +4753,7 @@ CONFIG_PWRSEQ_SIMPLE=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
 CONFIG_QCOM_A53PLL=m
-# CONFIG_QCOM_AOSS_QMP is not set
+CONFIG_QCOM_AOSS_QMP=m
 CONFIG_QCOM_APCS_IPC=m
 CONFIG_QCOM_APR=m
 CONFIG_QCOM_BAM_DMA=y
@@ -6849,7 +6848,7 @@ CONFIG_USB_NET_SMSC95XX=m
 CONFIG_USB_NET_SR9700=m
 # CONFIG_USB_NET_SR9800 is not set
 CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index c4d5e5092..d3ac53b6b 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -350,7 +350,7 @@ CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GLOBAL_TIMER=y
 # CONFIG_ARM_IMX6Q_CPUFREQ is not set
-# CONFIG_ARM_IMX_CPUFREQ_DT is not set
+CONFIG_ARM_IMX_CPUFREQ_DT=m
 CONFIG_ARM_MHU=m
 CONFIG_ARM_PL172_MPMC=m
 CONFIG_ARM_PMU=y
@@ -4236,7 +4236,6 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=256
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
-# CONFIG_NTB_MSI is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -4733,7 +4732,7 @@ CONFIG_PWRSEQ_SIMPLE=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
 CONFIG_QCOM_A53PLL=m
-# CONFIG_QCOM_AOSS_QMP is not set
+CONFIG_QCOM_AOSS_QMP=m
 CONFIG_QCOM_APCS_IPC=m
 CONFIG_QCOM_APR=m
 CONFIG_QCOM_BAM_DMA=y
@@ -6827,7 +6826,7 @@ CONFIG_USB_NET_SMSC95XX=m
 CONFIG_USB_NET_SR9700=m
 # CONFIG_USB_NET_SR9800 is not set
 CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index c79952f90..9445a179f 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4091,7 +4091,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_NET_VENDOR_MELLANOX=y
+# CONFIG_NET_VENDOR_MELLANOX is not set
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set 
@@ -4346,7 +4346,6 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=32
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
-# CONFIG_NTB_MSI is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NVEC_PAZ00=y
@@ -7143,7 +7142,7 @@ CONFIG_USB_NET_SR9700=m
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_EXYNOS=m
 CONFIG_USB_OHCI_HCD_OMAP3=m
-CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD_STI=m
 CONFIG_USB_OHCI_HCD=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index e37885b86..de1034f79 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3960,7 +3960,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_NET_VENDOR_MELLANOX=y
+# CONFIG_NET_VENDOR_MELLANOX is not set
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set 
@@ -4215,7 +4215,6 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=32
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
-# CONFIG_NTB_MSI is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NVME_FC=m
@@ -6788,7 +6787,7 @@ CONFIG_USB_NET_SR9700=m
 # CONFIG_USB_NET_SR9800 is not set
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_EXYNOS=m
-CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index bb1b2306b..bfe47843a 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3941,7 +3941,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_NET_VENDOR_MELLANOX=y
+# CONFIG_NET_VENDOR_MELLANOX is not set
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set 
@@ -4196,7 +4196,6 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=32
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
-# CONFIG_NTB_MSI is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NVME_FC=m
@@ -6767,7 +6766,7 @@ CONFIG_USB_NET_SR9700=m
 # CONFIG_USB_NET_SR9800 is not set
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_EXYNOS=m
-CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index e608b7e3d..1718f7775 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4072,7 +4072,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_NET_VENDOR_MELLANOX=y
+# CONFIG_NET_VENDOR_MELLANOX is not set
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set 
@@ -4327,7 +4327,6 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=32
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
-# CONFIG_NTB_MSI is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NVEC_PAZ00=y
@@ -7122,7 +7121,7 @@ CONFIG_USB_NET_SR9700=m
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_EXYNOS=m
 CONFIG_USB_OHCI_HCD_OMAP3=m
-CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD_STI=m
 CONFIG_USB_OHCI_HCD=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index faf44849b..d6c227081 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3714,6 +3714,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set 
@@ -3973,7 +3974,6 @@ CONFIG_NR_CPUS=32
 CONFIG_NS83820=m
 CONFIG_NSC_GPIO=m
 # CONFIG_NTB is not set
-# CONFIG_NTB_MSI is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 # CONFIG_NUMA is not set
@@ -4384,7 +4384,6 @@ CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
-# CONFIG_QCOM_AOSS_QMP is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 32e2c042d..fd9ae2f5b 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3695,6 +3695,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set 
@@ -3954,7 +3955,6 @@ CONFIG_NR_CPUS=32
 CONFIG_NS83820=m
 CONFIG_NSC_GPIO=m
 # CONFIG_NTB is not set
-# CONFIG_NTB_MSI is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 # CONFIG_NUMA is not set
@@ -4364,7 +4364,6 @@ CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
-# CONFIG_QCOM_AOSS_QMP is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 7dbf382b9..9791f6f1c 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3437,6 +3437,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 CONFIG_NET_VENDOR_IBM=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set 
@@ -3691,7 +3692,6 @@ CONFIG_NR_CPUS=1024
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
-# CONFIG_NTB_MSI is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -4083,7 +4083,6 @@ CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
-# CONFIG_QCOM_AOSS_QMP is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 45ea83465..9603e92d9 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3416,6 +3416,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 CONFIG_NET_VENDOR_IBM=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set 
@@ -3670,7 +3671,6 @@ CONFIG_NR_CPUS=1024
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
-# CONFIG_NTB_MSI is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -4061,7 +4061,6 @@ CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
-# CONFIG_QCOM_AOSS_QMP is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 20dbd8a7d..945dba589 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3407,6 +3407,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_NET_VENDOR_I825XX is not set
 # CONFIG_NET_VENDOR_INTEL is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
+CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set 
@@ -3660,7 +3661,6 @@ CONFIG_NOUVEAU_DEBUG_MMU=y
 CONFIG_NR_CPUS=64
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
-# CONFIG_NTB_MSI is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
@@ -4013,7 +4013,6 @@ CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
-# CONFIG_QCOM_AOSS_QMP is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 4f1d6f8e0..a52fa39e9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3386,6 +3386,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_NET_VENDOR_I825XX is not set
 # CONFIG_NET_VENDOR_INTEL is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
+CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set 
@@ -3639,7 +3640,6 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NR_CPUS=64
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
-# CONFIG_NTB_MSI is not set
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
@@ -3991,7 +3991,6 @@ CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
-# CONFIG_QCOM_AOSS_QMP is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 8ee0aa2ff..17c1b4641 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3760,6 +3760,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set 
@@ -4429,7 +4430,6 @@ CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
-# CONFIG_QCOM_AOSS_QMP is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index b2b22f988..82d548c60 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3741,6 +3741,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set 
@@ -4409,7 +4410,6 @@ CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
-# CONFIG_QCOM_AOSS_QMP is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set