Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.4.0-0.rc2.git1.1.vanilla.knurd.1.fc31

11 files changed, 70 insertions, 16 deletions

diff --git a/0001-mount-on-tmpfs-failing-to-parse-context-option.patch b/0001-mount-on-tmpfs-failing-to-parse-context-option.patch
new file mode 100644
index 000000000..7df9f01f5
--- /dev/null
+++ b/0001-mount-on-tmpfs-failing-to-parse-context-option.patch
@@ -0,0 +1,45 @@
+From db379c4b35d376201113a798aacb7e01a6f63375 Mon Sep 17 00:00:00 2001
+From: Al Viro <viro@zeniv.linux.org.uk>
+Date: Tue, 8 Oct 2019 02:26:22 +0100
+Subject: [PATCH] mount on tmpfs failing to parse context option
+
+On Mon, Oct 07, 2019 at 05:50:31PM -0700, Hugh Dickins wrote:
+
+[sorry for being MIA - had been sick through the last week, just digging
+myself from under piles of mail; my apologies]
+
+> (tmpfs, very tiresomely, supports a NUMA "mpol" mount option which can
+> have commas in it e.g "mpol=bind:0,2": which makes all its comma parsing
+> awkward.  I assume that where the new mount API commits bend over to
+> accommodate that peculiarity, they end up mishandling the comma in
+> the context string above.)
+
+	Dumber than that, I'm afraid.  mpol is the reason for having
+->parse_monolithic() in the first place, all right, but the problem is
+simply the lack of security_sb_eat_lsm_opts() call in it.
+
+	Could you check if the following fixes that one?
+---
+ mm/shmem.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/mm/shmem.c b/mm/shmem.c
+index cd570cc79c76..220be9fa2c41 100644
+--- a/mm/shmem.c
++++ b/mm/shmem.c
+@@ -3482,6 +3482,12 @@ static int shmem_parse_options(struct fs_context *fc, void *data)
+ {
+ 	char *options = data;
+ 
++	if (options) {
++		int err = security_sb_eat_lsm_opts(options, &fc->security);
++		if (err)
++			return err;
++	}
++
+ 	while (options != NULL) {
+ 		char *this_char = options;
+ 		for (;;) {
+-- 
+2.21.0
+
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP
index 98ff565f8..df6a929e2 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP
@@ -1 +1 @@
-CONFIG_CRYPTO_DEV_OMAP=m
+# CONFIG_CRYPTO_DEV_OMAP is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES
index 1b126b18e..eb6803b74 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_AES
@@ -1 +1 @@
-CONFIG_CRYPTO_DEV_OMAP_AES=m
+# CONFIG_CRYPTO_DEV_OMAP_AES is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES
index b359a5c3f..952a6e247 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_DES
@@ -1 +1 @@
-CONFIG_CRYPTO_DEV_OMAP_DES=m
+# CONFIG_CRYPTO_DEV_OMAP_DES is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM
index 58d162aba..2997e8fc1 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_OMAP_SHAM
@@ -1 +1 @@
-CONFIG_CRYPTO_DEV_OMAP_SHAM=m
+# CONFIG_CRYPTO_DEV_OMAP_SHAM is not set
diff --git a/efi-secureboot.patch b/efi-secureboot.patch
index de6f5eef9..ee5382029 100644
--- a/efi-secureboot.patch
+++ b/efi-secureboot.patch
@@ -63,7 +63,7 @@ index a8d59d612d27..467b9ccdf993 100644
  {
  	return 0;
  }
-+static inline int security_lock_kernel_down(const char *where, enum lockdown_reason level);
++static inline int security_lock_kernel_down(const char *where, enum lockdown_reason level)
 +{
 +	return 0;
 +}
diff --git a/gitrev b/gitrev
index 1294511fa..71e29dbce 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-cc3a7bfe62b947b423fcb2cfe89fcba92bf48fa3
+eda57a0e42998d1d403187844faa86c9a3ab2fd0
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 27a887ae9..f94f3971b 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1157,10 +1157,10 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_MXS_DCP=m
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
-CONFIG_CRYPTO_DEV_OMAP_AES=m
-CONFIG_CRYPTO_DEV_OMAP_DES=m
-CONFIG_CRYPTO_DEV_OMAP=m
-CONFIG_CRYPTO_DEV_OMAP_SHAM=m
+# CONFIG_CRYPTO_DEV_OMAP_AES is not set
+# CONFIG_CRYPTO_DEV_OMAP_DES is not set
+# CONFIG_CRYPTO_DEV_OMAP is not set
+# CONFIG_CRYPTO_DEV_OMAP_SHAM is not set
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 95cc93d01..6cc7b4137 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1157,10 +1157,10 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_MXS_DCP=m
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
-CONFIG_CRYPTO_DEV_OMAP_AES=m
-CONFIG_CRYPTO_DEV_OMAP_DES=m
-CONFIG_CRYPTO_DEV_OMAP=m
-CONFIG_CRYPTO_DEV_OMAP_SHAM=m
+# CONFIG_CRYPTO_DEV_OMAP_AES is not set
+# CONFIG_CRYPTO_DEV_OMAP_DES is not set
+# CONFIG_CRYPTO_DEV_OMAP is not set
+# CONFIG_CRYPTO_DEV_OMAP_SHAM is not set
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
diff --git a/kernel.spec b/kernel.spec
index caa334d57..2fd4d387c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -79,7 +79,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 2
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -132,7 +132,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Kernel headers are being split out into a separate package
 %if 0%{?fedora}
@@ -577,6 +577,8 @@ Patch503: KEYS-Make-use-of-platform-keyring-for-module-signature.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1756655
 Patch504: 0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch
 
+# rhbz 1757104
+Patch505: 0001-mount-on-tmpfs-failing-to-parse-context-option.patch
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1781,6 +1783,12 @@ fi
 #
 #
 %changelog
+* Tue Oct 08 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc2.git1.1
+- Linux v5.4-rc2-20-geda57a0e4299
+
+* Tue Oct 08 2019 Jeremy Cline <jcline@redhat.com>
+- Reenable debugging options.
+
 * Mon Oct 07 2019 Laura Abbott <labbott@redhat.com>
 - Enable a few NFT options (rhbz 1651813)
 
diff --git a/sources b/sources
index 435811ad1..3b13358db 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
 SHA512 (patch-5.4-rc2.xz) = c804d60eb778f6617da917c7bdefb2aec34837e213efda588748ab261941fa4aaf1be5e2850b722129900c6f1ffb6b9e285542ba5d772b28fa33c1e0119e0d88
+SHA512 (patch-5.4-rc2-git1.xz) = 211c9dca8cd2b20f4d24166a7a420068248416d4167ef62e180e7cd61e6c6113db3ce7f683ee466172f9a353e7dcc16ef783ae992413d96a32309d38ad527fad