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

18 files changed, 22 insertions, 2 deletions

diff --git a/configs/fedora/generic/CONFIG_USB_ROLE_SWITCH b/configs/fedora/generic/CONFIG_USB_ROLE_SWITCH
new file mode 100644
index 000000000..f0e84d22f
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_USB_ROLE_SWITCH
@@ -0,0 +1 @@
+CONFIG_USB_ROLE_SWITCH=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 4d4f37098..04f9784c6 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -6683,6 +6683,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index a443b6044..b7a49a9dd 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -6659,6 +6659,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 10da72758..6337afdca 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -7156,6 +7156,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index a51f2f480..761d91085 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6726,6 +6726,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index bbb13e6dc..5c1415a4d 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6702,6 +6702,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index be980562e..44c2a85ff 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -7132,6 +7132,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index dacb3b50f..c6fd7d772 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -6280,6 +6280,7 @@ CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
 CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 545ce9641..5fa44e21f 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -6255,6 +6255,7 @@ CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
 CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index bdcdc4c83..eb8d8a4bb 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4335,7 +4335,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
@@ -6029,6 +6029,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index d36a877a3..e2eb41084 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -4309,7 +4309,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
@@ -6002,6 +6002,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 2d7b9391d..b22a1f9c0 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5956,6 +5956,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 9367e2199..101e8cc64 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5929,6 +5929,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 3cea193e6..ac7d83feb 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5845,6 +5845,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 7d21dec55..21017c064 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -5818,6 +5818,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index fb5e5c7f9..25ffbb0cb 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -6330,6 +6330,7 @@ CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
 CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index a7182a04c..94326bcbe 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -6305,6 +6305,7 @@ CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
 CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel.spec b/kernel.spec
index 2f8798e8d..099a5fb21 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1907,6 +1907,9 @@ fi
 #
 #
 %changelog
+* Wed Jan 09 2019 Jeremy Cline <jcline@redhat.com> - 4.19.14-200
+- Linux v4.19.14
+
 * Wed Jan 09 2019 Justin M. Forbes <jforbes@fedoraproject.org>
 - Fix CVE-2019-3701 (rhbz 1663729 1663730)