Linux v5.4-rc2-96-gfb20da6af705

5 files changed, 6 insertions, 161 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
deleted file mode 100644
index 7df9f01f5..000000000
--- a/0001-mount-on-tmpfs-failing-to-parse-context-option.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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/gitrev b/gitrev
index 71e29dbce..ef5f41772 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-eda57a0e42998d1d403187844faa86c9a3ab2fd0
+fb20da6af705597cefcf05fc99e48d5c066dbdff
diff --git a/gpio-max77620-Use-correct-unit-for-debounce-times.patch b/gpio-max77620-Use-correct-unit-for-debounce-times.patch
index bcf575fb8..4d4b79d33 100644
--- a/gpio-max77620-Use-correct-unit-for-debounce-times.patch
+++ b/gpio-max77620-Use-correct-unit-for-debounce-times.patch
@@ -1,114 +1,3 @@
-From patchwork Wed Oct  2 12:28:23 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
-X-Patchwork-Id: 1170631
-Return-Path: <linux-gpio-owner@vger.kernel.org>
-X-Original-To: incoming@patchwork.ozlabs.org
-Delivered-To: patchwork-incoming@bilbo.ozlabs.org
-Authentication-Results: ozlabs.org;
- spf=none (mailfrom) smtp.mailfrom=vger.kernel.org
- (client-ip=209.132.180.67; helo=vger.kernel.org;
- envelope-from=linux-gpio-owner@vger.kernel.org;
- receiver=<UNKNOWN>)
-Authentication-Results: ozlabs.org;
- dmarc=pass (p=none dis=none) header.from=gmail.com
-Authentication-Results: ozlabs.org; dkim=pass (2048-bit key;
- unprotected) header.d=gmail.com header.i=@gmail.com
- header.b="Xe4ozWCs"; dkim-atps=neutral
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by ozlabs.org (Postfix) with ESMTP id 46jwR31mYjz9sPl
- for <incoming@patchwork.ozlabs.org>;
- Wed,  2 Oct 2019 22:28:31 +1000 (AEST)
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
- id S1725875AbfJBM2a (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
- Wed, 2 Oct 2019 08:28:30 -0400
-Received: from mail-wr1-f67.google.com ([209.85.221.67]:42402 "EHLO
- mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
- with ESMTP id S1725848AbfJBM23 (ORCPT
- <rfc822; linux-gpio@vger.kernel.org>); Wed, 2 Oct 2019 08:28:29 -0400
-Received: by mail-wr1-f67.google.com with SMTP id n14so19415351wrw.9;
- Wed, 02 Oct 2019 05:28:28 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
- h=from:to:cc:subject:date:message-id:mime-version
- :content-transfer-encoding;
- bh=qP9mbplmTy0EguziRYmdZKFvmKZpgiY1goXlhQxV0/8=;
- b=Xe4ozWCsxpb6DK1agUyM9eUxlP6G03BBFhI5g4JErak3F1hsMTKXmoyANoMKXxS+UF
- OWRiAkrVC3cQOJczX/+7HhZQ8bMC3apl96os1jO6/JWJEP2BHZpDAF0bRyJQdbd0lmMA
- afH1TDc/aCLYhrc6UF4IMSf4Noe9cSvoyQYpo0qgpxktdn7I/jv5ztIFWEVBOuEfDveP
- hKAmMRuOGlokBd9/+TirOM307HbJYDWAZ8Wko3G+bYcw41RSULf9eN0mQPLmeF/+J9tC
- XwaypBneeu3VeCmfU/DxP1duZ3pCcnwOu5nrzdHsS6ow28T2CVk8VvAAZGEU1cUIX4Z+
- +hkw==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=1e100.net; s=20161025;
- h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version
- :content-transfer-encoding;
- bh=qP9mbplmTy0EguziRYmdZKFvmKZpgiY1goXlhQxV0/8=;
- b=akVGfKDGN9KlaS7GfDnHx98C2QeedcAeu8RIoCS8uh0twWVOZMZKbUY6M/2HaZKsPI
- 38mOkZ2CRPyO1EzbpI9UU6hHXfohMTHuWX0pTdvkFXn+TfZPAxJa1fVRhHgOcknkhb/U
- JBzse/qoFFdlsRK3kY6I+0R1YyyAD2SDlzfax4U6ew8DL0icpWegiNEXnIno/7b6sIt2
- 9u9PEHk+1AdQkgS/tVRAFdVg6rrYMbUFkh1JAYsEED71D2IR38JmdUfjsW0Bi1aohXuz
- F8LOoB0G33BszHljgknOYlHF4tPGDitMVI+giV3UgwXEWHKFgimUJKOb1nyg+4fcVOLO
- 2g1g==
-X-Gm-Message-State: APjAAAX5YpK/Xf8BgNQ7EyD7TzARRLtN4fRfLcEXIT3fZkDHf5xGyxPi
- jnbTBpi+UDekDgGOQiVnsoo=
-X-Google-Smtp-Source: APXvYqw9HA6mSwE4O/MajE0OyTuT/xQaPqMRcrU+p/RXgMiP+Q297cH5ORneUFjHbOQpwrdgestsJw==
-X-Received: by 2002:adf:fe05:: with SMTP id n5mr2716992wrr.355.1570019307315; 
- Wed, 02 Oct 2019 05:28:27 -0700 (PDT)
-Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206])
- by smtp.gmail.com with ESMTPSA id
- e17sm5719759wma.15.2019.10.02.05.28.25
- (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
- Wed, 02 Oct 2019 05:28:26 -0700 (PDT)
-From: Thierry Reding <thierry.reding@gmail.com>
-To: Linus Walleij <linus.walleij@linaro.org>,
- Bartosz Golaszewski <bgolaszewski@baylibre.com>
-Cc: Timo Alho <talho@nvidia.com>, linux-gpio@vger.kernel.org,
- linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org
-Subject: [PATCH 1/3] gpio: max77620: Use correct unit for debounce times
-Date: Wed,  2 Oct 2019 14:28:23 +0200
-Message-Id: <20191002122825.3948322-1-thierry.reding@gmail.com>
-X-Mailer: git-send-email 2.23.0
-MIME-Version: 1.0
-Sender: linux-gpio-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-gpio.vger.kernel.org>
-X-Mailing-List: linux-gpio@vger.kernel.org
-
-From: Thierry Reding <treding@nvidia.com>
-
-The gpiod_set_debounce() function takes the debounce time in
-microseconds. Adjust the switch/case values in the MAX77620 GPIO to use
-the correct unit.
-
-Signed-off-by: Thierry Reding <treding@nvidia.com>
----
- drivers/gpio/gpio-max77620.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpio/gpio-max77620.c b/drivers/gpio/gpio-max77620.c
-index 47d05e357e61..faf86ea9c51a 100644
---- a/drivers/gpio/gpio-max77620.c
-+++ b/drivers/gpio/gpio-max77620.c
-@@ -192,13 +192,13 @@ static int max77620_gpio_set_debounce(struct max77620_gpio *mgpio,
- 	case 0:
- 		val = MAX77620_CNFG_GPIO_DBNC_None;
- 		break;
--	case 1 ... 8:
-+	case 1000 ... 8000:
- 		val = MAX77620_CNFG_GPIO_DBNC_8ms;
- 		break;
--	case 9 ... 16:
-+	case 9000 ... 16000:
- 		val = MAX77620_CNFG_GPIO_DBNC_16ms;
- 		break;
--	case 17 ... 32:
-+	case 17000 ... 32000:
- 		val = MAX77620_CNFG_GPIO_DBNC_32ms;
- 		break;
- 	default:
-
 From patchwork Wed Oct  2 12:28:24 2019
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
diff --git a/kernel.spec b/kernel.spec
index 5c90963fa..a0f8116fc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,7 +71,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 2
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -564,8 +564,6 @@ 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
@@ -1767,6 +1765,9 @@ fi
 #
 #
 %changelog
+* Thu Oct 10 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc2.git2.1
+- Linux v5.4-rc2-96-gfb20da6af705
+
 * Tue Oct 08 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc2.git1.1
 - Linux v5.4-rc2-20-geda57a0e4299
 
diff --git a/sources b/sources
index 3b13358db..84b3e6b84 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
 SHA512 (patch-5.4-rc2.xz) = c804d60eb778f6617da917c7bdefb2aec34837e213efda588748ab261941fa4aaf1be5e2850b722129900c6f1ffb6b9e285542ba5d772b28fa33c1e0119e0d88
-SHA512 (patch-5.4-rc2-git1.xz) = 211c9dca8cd2b20f4d24166a7a420068248416d4167ef62e180e7cd61e6c6113db3ce7f683ee466172f9a353e7dcc16ef783ae992413d96a32309d38ad527fad
+SHA512 (patch-5.4-rc2-git2.xz) = 8b6b3fc3836ccbdeea445fd61ec97cde2cc3aaf70b7910f050e79f4fcc38ad437c841ae022c59f3cb387756d8f9a484b51405b025a07a77fe3d6041e82f5e782