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

18 files changed, 23 insertions, 6 deletions

diff --git a/configs/fedora/generic/CONFIG_KEYBOARD_SNVS_PWRKEY b/configs/fedora/generic/CONFIG_KEYBOARD_SNVS_PWRKEY
new file mode 100644
index 000000000..3819f656e
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_KEYBOARD_SNVS_PWRKEY
@@ -0,0 +1 @@
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_UNWINDER_FRMAE_POINTER b/configs/fedora/generic/arm/armv7/CONFIG_UNWINDER_FRMAE_POINTER
new file mode 100644
index 000000000..0938fde11
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_UNWINDER_FRMAE_POINTER
@@ -0,0 +1 @@
+CONFIG_UNWINDER_FRAME_POINTER=y
diff --git a/efi-secureboot.patch b/efi-secureboot.patch
index 5a3738a22..2ef2fd3be 100644
--- a/efi-secureboot.patch
+++ b/efi-secureboot.patch
@@ -183,7 +183,7 @@ index 100ce4a4aff6..62361b647a75 100644
  
  extern int efi_status_to_err(efi_status_t status);
 @@ -1577,12 +1589,6 @@ efi_status_t efi_setup_gop(efi_system_table_t *sys_table_arg,
- bool efi_runtime_disabled(void);
+ 
  extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
  
 -enum efi_secureboot_mode {
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index b141418d6..581b418c3 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2823,6 +2823,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUN4I_LRADC is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index b39fa28ba..06ff18b97 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2805,6 +2805,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUN4I_LRADC is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index be9635e80..5bedc7e5b 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6595,7 +6595,7 @@ CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_UNWINDER_ARM=y
-# CONFIG_UNWINDER_FRAME_POINTER is not set
+CONFIG_UNWINDER_FRAME_POINTER=y
 CONFIG_UPROBE_EVENTS=y
 # CONFIG_US5182D is not set
 CONFIG_USB_ACM=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 49fdd43aa..0d3d24dc8 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2776,6 +2776,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_KEYBOARD_SUN4I_LRADC=m
 # CONFIG_KEYBOARD_SUNKBD is not set
@@ -6213,7 +6214,7 @@ CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_UNWINDER_ARM=y
-# CONFIG_UNWINDER_FRAME_POINTER is not set
+CONFIG_UNWINDER_FRAME_POINTER=y
 CONFIG_UPROBE_EVENTS=y
 # CONFIG_US5182D is not set
 CONFIG_USB_ACM=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index d15161e23..4027dc81a 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2759,6 +2759,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_KEYBOARD_SUN4I_LRADC=m
 # CONFIG_KEYBOARD_SUNKBD is not set
@@ -6192,7 +6193,7 @@ CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_UNWINDER_ARM=y
-# CONFIG_UNWINDER_FRAME_POINTER is not set
+CONFIG_UNWINDER_FRAME_POINTER=y
 CONFIG_UPROBE_EVENTS=y
 # CONFIG_US5182D is not set
 CONFIG_USB_ACM=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index eabbc4e1c..e399350bb 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6574,7 +6574,7 @@ CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_UNWINDER_ARM=y
-# CONFIG_UNWINDER_FRAME_POINTER is not set
+CONFIG_UNWINDER_FRAME_POINTER=y
 CONFIG_UPROBE_EVENTS=y
 # CONFIG_US5182D is not set
 CONFIG_USB_ACM=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 12e824481..8ec2bf8fe 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2639,6 +2639,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 72b3f5d29..b18652e51 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2620,6 +2620,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index d30344da6..0df0afee3 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2401,6 +2401,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 352449a8e..05dcb0acb 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2382,6 +2382,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 975aa5463..6eec7e93a 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2380,6 +2380,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 11d73bd78..087867677 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2361,6 +2361,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index e284e6c6e..b93bc000c 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2685,6 +2685,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 982edb713..2cc33928d 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2666,6 +2666,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
diff --git a/kernel.spec b/kernel.spec
index cde85c45c..2858f00dd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1914,7 +1914,10 @@ fi
 #
 #
 %changelog
-* Tue May 14 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.0.16-300
+* Mon May 20 2019 Laura Abbott <labbott@redhat.com> - 5.0.17-200
+- Linux v5.0.17
+
+* Tue May 14 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.0.16-200
 - Linux v5.0.16
 - Fixes CVE-2018-12126 (rhbz 1646781 1709976)
 - Fixes CVE-2018-12127 (rhbz 1667782 1709978)