summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-07-23 16:00:55 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2019-07-23 16:00:55 +0200
commit143fba628ff8cfeae54cd69d8dd401e9496ece37 (patch)
treedb78d8e1b7229bbbb382e07007632c05581502af
parent809cb8cdc376bd3152f727fd7a8c1722da749fe1 (diff)
parentb6bc920f00d9ae5a950dc44cf060df68001ca53c (diff)
downloadkernel-143fba628ff8cfeae54cd69d8dd401e9496ece37.tar.gz
kernel-143fba628ff8cfeae54cd69d8dd401e9496ece37.tar.xz
kernel-143fba628ff8cfeae54cd69d8dd401e9496ece37.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.3.0-0.rc1.git1.1.vanilla.knurd.1.fc30
-rw-r--r--configs/fedora/generic/CONFIG_DPAA2_CONSOLE1
-rw-r--r--configs/fedora/generic/CONFIG_FSL_ENETC1
-rw-r--r--configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING1
-rw-r--r--configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK1
-rw-r--r--configs/fedora/generic/CONFIG_FSL_ENETC_VF1
-rw-r--r--configs/fedora/generic/CONFIG_IMX_SCU_SOC1
-rw-r--r--configs/fedora/generic/CONFIG_NET_VENDOR_MELLANOX (renamed from configs/fedora/generic/arm/CONFIG_NET_VENDOR_MELLANOX)0
-rw-r--r--configs/fedora/generic/CONFIG_NF_TABLES_BRIDGE2
-rw-r--r--configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR (renamed from configs/fedora/generic/CONFIG_NVMEM_SNVS_LPGPR)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_QCOM_AOSS_QMP (renamed from configs/fedora/generic/CONFIG_QCOM_AOSS_QMP)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_USB_OHCI_HCD_PCI1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_AL_FIC1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_ARM_IMX_CPUFREQ_DT1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_DPAA2_CONSOLE1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_QCOM_AOSS_QMP1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_NET_VENDOR_MELLANOX1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR1
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_NTB_MSI (renamed from configs/fedora/generic/CONFIG_NTB_MSI)0
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config17
-rw-r--r--kernel-aarch64.config17
-rw-r--r--kernel-armv7hl-debug.config13
-rw-r--r--kernel-armv7hl-lpae-debug.config15
-rw-r--r--kernel-armv7hl-lpae.config15
-rw-r--r--kernel-armv7hl.config13
-rw-r--r--kernel-i686-debug.config12
-rw-r--r--kernel-i686.config12
-rw-r--r--kernel-ppc64le-debug.config12
-rw-r--r--kernel-ppc64le.config12
-rw-r--r--kernel-s390x-debug.config12
-rw-r--r--kernel-s390x.config12
-rw-r--r--kernel-x86_64-debug.config11
-rw-r--r--kernel-x86_64.config11
-rw-r--r--kernel.spec10
-rw-r--r--sources1
37 files changed, 66 insertions, 148 deletions
diff --git a/configs/fedora/generic/CONFIG_DPAA2_CONSOLE b/configs/fedora/generic/CONFIG_DPAA2_CONSOLE
deleted file mode 100644
index 474de46bf..000000000
--- a/configs/fedora/generic/CONFIG_DPAA2_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DPAA2_CONSOLE is not set
diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC b/configs/fedora/generic/CONFIG_FSL_ENETC
deleted file mode 100644
index cbb37c22c..000000000
--- a/configs/fedora/generic/CONFIG_FSL_ENETC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FSL_ENETC is not set
diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING b/configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING
deleted file mode 100644
index 21018ddd5..000000000
--- a/configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK b/configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK
deleted file mode 100644
index bbc51f2b6..000000000
--- a/configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FSL_ENETC_PTP_CLOCK is not set
diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_VF b/configs/fedora/generic/CONFIG_FSL_ENETC_VF
deleted file mode 100644
index 3501beeab..000000000
--- a/configs/fedora/generic/CONFIG_FSL_ENETC_VF
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FSL_ENETC_VF is not set
diff --git a/configs/fedora/generic/CONFIG_IMX_SCU_SOC b/configs/fedora/generic/CONFIG_IMX_SCU_SOC
deleted file mode 100644
index 88890780b..000000000
--- a/configs/fedora/generic/CONFIG_IMX_SCU_SOC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IMX_SCU_SOC is not set
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_NF_TABLES_BRIDGE b/configs/fedora/generic/CONFIG_NF_TABLES_BRIDGE
index b07933aab..bfdd62752 100644
--- a/configs/fedora/generic/CONFIG_NF_TABLES_BRIDGE
+++ b/configs/fedora/generic/CONFIG_NF_TABLES_BRIDGE
@@ -1 +1 @@
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
diff --git a/configs/fedora/generic/CONFIG_NVMEM_SNVS_LPGPR b/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR
index be81f38c4..be81f38c4 100644
--- a/configs/fedora/generic/CONFIG_NVMEM_SNVS_LPGPR
+++ b/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR
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_AL_FIC b/configs/fedora/generic/arm/aarch64/CONFIG_AL_FIC
new file mode 100644
index 000000000..b21161a4e
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_AL_FIC
@@ -0,0 +1 @@
+CONFIG_AL_FIC=y
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_DPAA2_CONSOLE b/configs/fedora/generic/arm/aarch64/CONFIG_DPAA2_CONSOLE
new file mode 100644
index 000000000..01930567e
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_DPAA2_CONSOLE
@@ -0,0 +1 @@
+CONFIG_DPAA2_CONSOLE=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING
new file mode 100644
index 000000000..3e18eab35
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING
@@ -0,0 +1 @@
+CONFIG_FSL_ENETC_HW_TIMESTAMPING=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC b/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC
new file mode 100644
index 000000000..57c96444a
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC
@@ -0,0 +1 @@
+CONFIG_IMX_SCU_SOC=y
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/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR b/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR
new file mode 100644
index 000000000..21803b106
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR
@@ -0,0 +1 @@
+CONFIG_NVMEM_SNVS_LPGPR=m
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/gitrev b/gitrev
index e533138e9..6e26b2145 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-22051d9c4a57d3b4a8b5a7407efc80c71c7bfb16
+7b5cf701ea9c395c792e2a7e3b7caf4c68b87721
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index dc3a17698..123e3b837 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -181,7 +181,7 @@ CONFIG_AIX_PARTITION=y
# CONFIG_AK8974 is not set
CONFIG_AK8975=m
# CONFIG_AL3320A is not set
-# CONFIG_AL_FIC is not set
+CONFIG_AL_FIC=y
CONFIG_ALIM1535_WDT=m
CONFIG_ALIM7101_WDT=m
CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
@@ -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
@@ -1422,7 +1422,7 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
CONFIG_DP83867_PHY=m
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
+CONFIG_DPAA2_CONSOLE=m
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
@@ -1905,7 +1905,7 @@ CONFIG_FSL_DPAA2=y
CONFIG_FSL_DPAA_ETH=m
CONFIG_FSL_DPAA=y
CONFIG_FSL_EDMA=m
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
+CONFIG_FSL_ENETC_HW_TIMESTAMPING=y
CONFIG_FSL_ENETC=m
CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_VF=m
@@ -2475,7 +2475,7 @@ CONFIG_IMX_GPCV2=y
CONFIG_IMX_MBOX=m
CONFIG_IMX_REMOTEPROC=m
CONFIG_IMX_SCU_PD=y
-# CONFIG_IMX_SCU_SOC is not set
+CONFIG_IMX_SCU_SOC=y
CONFIG_IMX_SCU=y
CONFIG_IMX_SC_WDT=m
CONFIG_IMX_SDMA=m
@@ -4139,7 +4139,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=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..399f1a665 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -181,7 +181,7 @@ CONFIG_AIX_PARTITION=y
# CONFIG_AK8974 is not set
CONFIG_AK8975=m
# CONFIG_AL3320A is not set
-# CONFIG_AL_FIC is not set
+CONFIG_AL_FIC=y
CONFIG_ALIM1535_WDT=m
CONFIG_ALIM7101_WDT=m
CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
@@ -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
@@ -1414,7 +1414,7 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
CONFIG_DP83867_PHY=m
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
+CONFIG_DPAA2_CONSOLE=m
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
@@ -1889,7 +1889,7 @@ CONFIG_FSL_DPAA2=y
CONFIG_FSL_DPAA_ETH=m
CONFIG_FSL_DPAA=y
CONFIG_FSL_EDMA=m
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
+CONFIG_FSL_ENETC_HW_TIMESTAMPING=y
CONFIG_FSL_ENETC=m
CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_VF=m
@@ -2459,7 +2459,7 @@ CONFIG_IMX_GPCV2=y
CONFIG_IMX_MBOX=m
CONFIG_IMX_REMOTEPROC=m
CONFIG_IMX_SCU_PD=y
-# CONFIG_IMX_SCU_SOC is not set
+CONFIG_IMX_SCU_SOC=y
CONFIG_IMX_SCU=y
CONFIG_IMX_SC_WDT=m
CONFIG_IMX_SDMA=m
@@ -4119,7 +4119,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=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..44ab56b90 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1423,7 +1423,6 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
@@ -1941,10 +1940,6 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_PTP_CLOCK is not set
-# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_IMX8_DDR_PMU is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
@@ -2510,7 +2505,6 @@ CONFIG_IMX_IPUV3_CORE=m
CONFIG_IMX_MBOX=m
CONFIG_IMX_REMOTEPROC=m
# CONFIG_IMX_SCU is not set
-# CONFIG_IMX_SCU_SOC is not set
CONFIG_IMX_SC_WDT=m
CONFIG_IMX_SDMA=m
CONFIG_IMX_THERMAL=m
@@ -4091,7 +4085,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
@@ -4230,7 +4224,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=y
@@ -4346,7 +4340,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 +7136,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..0e25abbd6 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1383,7 +1383,6 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
@@ -1874,10 +1873,6 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_PTP_CLOCK is not set
-# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_IMX8_DDR_PMU is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
@@ -2426,7 +2421,6 @@ CONFIG_IMX_GPCV2=y
# CONFIG_IMX_IRQSTEER is not set
CONFIG_IMX_MBOX=m
# CONFIG_IMX_SCU is not set
-# CONFIG_IMX_SCU_SOC is not set
CONFIG_IMX_SC_WDT=m
CONFIG_IMX_SDMA=m
# CONFIG_IMX_WEIM is not set
@@ -3960,7 +3954,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
@@ -4099,7 +4093,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=y
@@ -4215,14 +4209,13 @@ 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
CONFIG_NVMEM_IMX_IIM=m
CONFIG_NVMEM_IMX_OCOTP=m
# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
+CONFIG_NVMEM_SNVS_LPGPR=m
CONFIG_NVMEM_STM32_ROMEM=m
CONFIG_NVMEM_SUNXI_SID=m
CONFIG_NVMEM_SYSFS=y
@@ -6788,7 +6781,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..9dec01ae2 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1376,7 +1376,6 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
@@ -1859,10 +1858,6 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_PTP_CLOCK is not set
-# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_IMX8_DDR_PMU is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
@@ -2411,7 +2406,6 @@ CONFIG_IMX_GPCV2=y
# CONFIG_IMX_IRQSTEER is not set
CONFIG_IMX_MBOX=m
# CONFIG_IMX_SCU is not set
-# CONFIG_IMX_SCU_SOC is not set
CONFIG_IMX_SC_WDT=m
CONFIG_IMX_SDMA=m
# CONFIG_IMX_WEIM is not set
@@ -3941,7 +3935,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
@@ -4080,7 +4074,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=y
@@ -4196,14 +4190,13 @@ 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
CONFIG_NVMEM_IMX_IIM=m
CONFIG_NVMEM_IMX_OCOTP=m
# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
+CONFIG_NVMEM_SNVS_LPGPR=m
CONFIG_NVMEM_STM32_ROMEM=m
CONFIG_NVMEM_SUNXI_SID=m
CONFIG_NVMEM_SYSFS=y
@@ -6767,7 +6760,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..3b3109658 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1416,7 +1416,6 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
@@ -1926,10 +1925,6 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_PTP_CLOCK is not set
-# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_IMX8_DDR_PMU is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
@@ -2495,7 +2490,6 @@ CONFIG_IMX_IPUV3_CORE=m
CONFIG_IMX_MBOX=m
CONFIG_IMX_REMOTEPROC=m
# CONFIG_IMX_SCU is not set
-# CONFIG_IMX_SCU_SOC is not set
CONFIG_IMX_SC_WDT=m
CONFIG_IMX_SDMA=m
CONFIG_IMX_THERMAL=m
@@ -4072,7 +4066,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
@@ -4211,7 +4205,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=y
@@ -4327,7 +4321,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 +7115,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..28657ccee 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1200,7 +1200,6 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DPTF_POWER=m
@@ -1670,10 +1669,6 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_PTP_CLOCK is not set
-# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
@@ -2217,7 +2212,6 @@ CONFIG_IMA_READ_POLICY=y
CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_SCU_SOC is not set
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
@@ -3714,6 +3708,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
@@ -3855,7 +3850,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=y
@@ -3973,13 +3968,11 @@ 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
CONFIG_NVME_FC=m
# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -4384,7 +4377,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..5dd5cbbbd 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1191,7 +1191,6 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DPTF_POWER=m
@@ -1653,10 +1652,6 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_PTP_CLOCK is not set
-# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
@@ -2200,7 +2195,6 @@ CONFIG_IMA_READ_POLICY=y
CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_SCU_SOC is not set
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
@@ -3695,6 +3689,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
@@ -3836,7 +3831,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=y
@@ -3954,13 +3949,11 @@ 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
CONFIG_NVME_FC=m
# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -4364,7 +4357,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..713f99866 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1111,7 +1111,6 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
@@ -1518,10 +1517,6 @@ CONFIG_FSI_OCC=m
CONFIG_FSI_SBEFIFO=m
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_PTP_CLOCK is not set
-# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_LBC is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
@@ -2023,7 +2018,6 @@ CONFIG_IMA_READ_POLICY=y
# CONFIG_IMA_TEMPLATE is not set
CONFIG_IMA_WRITE_POLICY=y
# CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_SCU_SOC is not set
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
@@ -3437,6 +3431,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
@@ -3575,7 +3570,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=y
@@ -3691,7 +3686,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
@@ -3699,7 +3693,6 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVME_FC=m
# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -4083,7 +4076,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..2b9eb0614 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1102,7 +1102,6 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
@@ -1501,10 +1500,6 @@ CONFIG_FSI_OCC=m
CONFIG_FSI_SBEFIFO=m
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_PTP_CLOCK is not set
-# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_LBC is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
@@ -2006,7 +2001,6 @@ CONFIG_IMA_READ_POLICY=y
# CONFIG_IMA_TEMPLATE is not set
CONFIG_IMA_WRITE_POLICY=y
# CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_SCU_SOC is not set
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
@@ -3416,6 +3410,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
@@ -3554,7 +3549,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=y
@@ -3670,7 +3665,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
@@ -3678,7 +3672,6 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVME_FC=m
# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -4061,7 +4054,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..3c7256d4f 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1117,7 +1117,6 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
@@ -1517,10 +1516,6 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_PTP_CLOCK is not set
-# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
@@ -2001,7 +1996,6 @@ CONFIG_IMA_READ_POLICY=y
CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_SCU_SOC is not set
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
@@ -3407,6 +3401,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
@@ -3544,7 +3539,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=y
@@ -3660,7 +3655,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
@@ -3669,7 +3663,6 @@ CONFIG_NUMA_EMU=y
CONFIG_NUMA=y
CONFIG_NVME_FC=m
# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -4013,7 +4006,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..c19f68b8c 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1108,7 +1108,6 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
@@ -1500,10 +1499,6 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_PTP_CLOCK is not set
-# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
@@ -1984,7 +1979,6 @@ CONFIG_IMA_READ_POLICY=y
CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_SCU_SOC is not set
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
@@ -3386,6 +3380,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
@@ -3523,7 +3518,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=y
@@ -3639,7 +3634,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
@@ -3648,7 +3642,6 @@ CONFIG_NUMA_EMU=y
CONFIG_NUMA=y
CONFIG_NVME_FC=m
# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -3991,7 +3984,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..52868abf5 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1244,7 +1244,6 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DPTF_POWER=m
@@ -1712,10 +1711,6 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_PTP_CLOCK is not set
-# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
@@ -2262,7 +2257,6 @@ CONFIG_IMA_READ_POLICY=y
CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_SCU_SOC is not set
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
@@ -3760,6 +3754,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
@@ -3901,7 +3896,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=y
@@ -4038,7 +4033,6 @@ CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
CONFIG_NVME_FC=m
# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -4429,7 +4423,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..c0bd92850 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1235,7 +1235,6 @@ CONFIG_DP83822_PHY=m
CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DPAA2_CONSOLE is not set
CONFIG_DPOT_DAC=m
# CONFIG_DPS310 is not set
CONFIG_DPTF_POWER=m
@@ -1695,10 +1694,6 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_PTP_CLOCK is not set
-# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
@@ -2245,7 +2240,6 @@ CONFIG_IMA_READ_POLICY=y
CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_SCU_SOC is not set
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
@@ -3741,6 +3735,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
@@ -3882,7 +3877,7 @@ CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4=m
CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_IPV4=y
CONFIG_NF_TABLES_IPV6=y
@@ -4019,7 +4014,6 @@ CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
CONFIG_NVME_FC=m
# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -4409,7 +4403,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.spec b/kernel.spec
index 7aaae8dd9..98a290227 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -79,7 +79,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 1
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -132,7 +132,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
# Kernel headers are being split out into a separate package
%if 0%{?fedora}
@@ -1840,6 +1840,12 @@ fi
#
#
%changelog
+* Tue Jul 23 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc1.git1.1
+- Linux v5.3-rc1-56-g7b5cf701ea9c
+
+* Tue Jul 23 2019 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
* Sun Jul 21 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc1.git0.1
- Linux v5.3-rc1
diff --git a/sources b/sources
index 99cc1a0db..7d82bb3cc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (linux-5.2.tar.xz) = 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c
SHA512 (patch-5.3-rc1.xz) = 2516824ccc1da39a5b86a8c5fc5db6327e3d0ff71ba0d913b7b05ad145103bd92a0936f46adf49884ed78eed76c306b578f34596ceca2f2f0120fc4b119c1c96
+SHA512 (patch-5.3-rc1-git1.xz) = 3f9947f58597ec6bda3804656df7a4c137b0087b3eda617ed9fe0b6953399277531bb9b25f0e9162744bddff039bea5ee46068d1b3f4f2975a64108b7789ae89