Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora

16 files changed, 18 insertions, 15 deletions

diff --git a/configs/fedora/generic/CONFIG_REALTEK_PHY b/configs/fedora/generic/CONFIG_REALTEK_PHY
index 051e7cc45..366b69345 100644
--- a/configs/fedora/generic/CONFIG_REALTEK_PHY
+++ b/configs/fedora/generic/CONFIG_REALTEK_PHY
@@ -1 +1 @@
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 1443a5be3..f49750ea3 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4715,7 +4715,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPMI=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 0117f50f1..044206158 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4693,7 +4693,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPMI=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index b4ebb8edf..b00215e2b 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4957,7 +4957,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_IRQ=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 33c39472a..1a33a9468 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4690,7 +4690,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_IRQ=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 872b12b34..4a07ce45e 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4669,7 +4669,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_IRQ=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 034b9caf0..7337a5f08 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4936,7 +4936,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_IRQ=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index d1f7de368..1fda5690c 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4426,7 +4426,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP=y
diff --git a/kernel-i686.config b/kernel-i686.config
index b78ee9ab1..ac7b681e0 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4405,7 +4405,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 81c841c90..80f9a3497 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4165,7 +4165,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 588bf9998..46bdc125a 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4142,7 +4142,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 760ed6744..a4a200ec6 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4056,7 +4056,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 0e81e11e3..64d76fb9e 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4033,7 +4033,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 8a8bdaa4f..a741a996d 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4462,7 +4462,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index a57126c72..686d4dc66 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4441,7 +4441,7 @@ CONFIG_RDS_TCP=m
 CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP=y
diff --git a/kernel.spec b/kernel.spec
index b3a9dd8de..7e50bad99 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1910,6 +1910,9 @@ fi
 #
 #
 %changelog
+* Thu Dec 27 2018 Hans de Goede <hdegoede@redhat.com>
+- Set CONFIG_REALTEK_PHY=y to workaround realtek ethernet issues (rhbz 1650984)
+
 * Wed Dec 26 2018 Laura Abbott <labbott@redhat.com> - 4.21.0-0.rc0.git1.1
 - Linux v4.20-3117-ga5f2bd479f58