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

17 files changed, 23 insertions, 1 deletions

diff --git a/configs/fedora/generic/CONFIG_SENSIRION_SGP30 b/configs/fedora/generic/CONFIG_SENSIRION_SGP30
new file mode 100644
index 000000000..9d25e3dbb
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SENSIRION_SGP30
@@ -0,0 +1 @@
+# CONFIG_SENSIRION_SGP30 is not set
diff --git a/efi-secureboot.patch b/efi-secureboot.patch
index 99b6f25dd..f50169541 100644
--- a/efi-secureboot.patch
+++ b/efi-secureboot.patch
@@ -143,7 +143,8 @@ 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);
+ #endif
+ 
  extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
  extern unsigned long efi_call_virt_save_flags(void);
  
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 7c819d93d..792652a71 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5209,6 +5209,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 0137b5bce..561f7593b 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5188,6 +5188,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index f60131f0a..c5b40f970 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -5368,6 +5368,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index a98fc3f88..b270f66a5 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -5115,6 +5115,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 1a93fd9dc..2d0971e8e 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -5095,6 +5095,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index a5102e226..f3f5e6800 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -5348,6 +5348,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index f37c874b3..85caa22ac 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4748,6 +4748,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ACPI_POWER=m
diff --git a/kernel-i686.config b/kernel-i686.config
index a06009607..e74c27c67 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4728,6 +4728,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ACPI_POWER=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 21c7979d1..690940c46 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4448,6 +4448,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 6929cebb0..cb765094c 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4426,6 +4426,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 6b2c281c3..9e3584a22 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4396,6 +4396,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 79f15c2df..32ed1a01c 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4374,6 +4374,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 293fded55..7f6efeeee 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4793,6 +4793,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ACPI_POWER=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 7fc7762a6..7ee57456d 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4773,6 +4773,7 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_TOMOYO is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITY_YAMA=y
+# CONFIG_SENSIRION_SGP30 is not set
 CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ACPI_POWER=m
diff --git a/kernel.spec b/kernel.spec
index a0d7bf1f5..2c320fcf6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1878,6 +1878,12 @@ fi
 #
 #
 %changelog
+* Mon Apr 22 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc6.git0.1
+- Linux v5.1-rc6
+
+* Mon Apr 22 2019 Jeremy Cline <jcline@redhat.com>
+- Disable debugging options.
+
 * Wed Apr 17 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc5.git2.1
 - Linux v5.1-rc5-36-g444fe9913539