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

16 files changed, 18 insertions, 0 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 3a9a31500..5b33a26f6 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -6682,6 +6682,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 0092c7877..aa7f1a420 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -6658,6 +6658,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 ea0391f31..e4c770a9e 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -7150,6 +7150,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 12a25c380..c3607e895 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6717,6 +6717,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 529907957..70e7d6833 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6693,6 +6693,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 5f2c880de..ab8fccd81 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -7126,6 +7126,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 d2052bb41..00ec828b5 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -6267,6 +6267,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 e593d5e7b..259c14569 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -6242,6 +6242,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-ppc64le-debug.config b/kernel-ppc64le-debug.config
index df1995d9b..ae3b50f59 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5943,6 +5943,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 9ae64b1d7..90a3953f9 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5916,6 +5916,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 d413ec61c..a70e888b7 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5833,6 +5833,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 e072819a9..3fe15a6bd 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -5806,6 +5806,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 8bc77b750..8d1071ae6 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -6317,6 +6317,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 2bf9062ad..0833490cf 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -6292,6 +6292,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 8dd66e6c6..f7984c456 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1922,6 +1922,9 @@ fi
 #
 #
 %changelog
+* Wed Jan 09 2019 Jeremy Cline <jcline@redhat.com> - 4.19.14-300
+- Linux v4.19.14
+
 * Wed Jan 09 2019 Justin M. Forbes <jforbes@fedoraproject.org>
 - Fix CVE-2019-3701 (rhbz 1663729 1663730)