summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-Add-Red-Hat-tainting.patch2
-rw-r--r--0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch2
-rw-r--r--0001-Add-support-for-deprecating-processors.patch2
-rw-r--r--0001-Drop-that-for-now.patch4
-rw-r--r--0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch2
-rw-r--r--0001-add-Red-Hat-specific-taint-flags.patch2
-rw-r--r--0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch2
-rw-r--r--0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch2
-rw-r--r--0001-bpf-Add-tech-preview-taint-for-syscall.patch4
-rw-r--r--0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch4
-rw-r--r--0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch2
-rw-r--r--0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch4
-rw-r--r--0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch2
-rw-r--r--0001-put-RHEL-info-into-generated-headers.patch4
-rw-r--r--0001-pwm-lpss-Fix-get_state-runtime-pm-reference-handling.patch100
-rw-r--r--0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch20
-rw-r--r--Patchlist1
-rw-r--r--kernel-aarch64-debug-fedora.config4
-rw-r--r--kernel-aarch64-debug-rhel.config2
-rw-r--r--kernel-aarch64-fedora.config4
-rw-r--r--kernel-aarch64-rhel.config2
-rw-r--r--kernel-armv7hl-debug-fedora.config4
-rw-r--r--kernel-armv7hl-fedora.config4
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config4
-rw-r--r--kernel-armv7hl-lpae-fedora.config4
-rw-r--r--kernel-i686-debug-fedora.config3
-rw-r--r--kernel-i686-fedora.config3
-rw-r--r--kernel-ppc64le-debug-fedora.config3
-rw-r--r--kernel-ppc64le-debug-rhel.config2
-rw-r--r--kernel-ppc64le-fedora.config3
-rw-r--r--kernel-ppc64le-rhel.config2
-rw-r--r--kernel-s390x-debug-fedora.config3
-rw-r--r--kernel-s390x-debug-rhel.config2
-rw-r--r--kernel-s390x-fedora.config3
-rw-r--r--kernel-s390x-rhel.config2
-rw-r--r--kernel-s390x-zfcpdump-rhel.config2
-rw-r--r--kernel-x86_64-debug-fedora.config3
-rw-r--r--kernel-x86_64-debug-rhel.config2
-rw-r--r--kernel-x86_64-fedora.config3
-rw-r--r--kernel-x86_64-rhel.config2
-rw-r--r--kernel.spec46
-rw-r--r--sources6
42 files changed, 124 insertions, 153 deletions
diff --git a/0001-Add-Red-Hat-tainting.patch b/0001-Add-Red-Hat-tainting.patch
index 4aa92bd9f..04ffd5df4 100644
--- a/0001-Add-Red-Hat-tainting.patch
+++ b/0001-Add-Red-Hat-tainting.patch
@@ -124,7 +124,7 @@ index 82d91547d122..b82db0c0caec 100644
+
#endif
diff --git a/kernel/Makefile b/kernel/Makefile
-index ce8716a04d0e..54c00c4719ab 100644
+index f3218bc5ec69..c0a4904413b5 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -12,6 +12,8 @@ obj-y = fork.o exec_domain.o panic.o \
diff --git a/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch b/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
index 33a7efb26..d086cecf2 100644
--- a/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
+++ b/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index cb73d398a2fe..2c2b7760c13c 100644
+index e60f9c74f41d..faa1105e528d 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1133,6 +1133,7 @@ config XEN
diff --git a/0001-Add-support-for-deprecating-processors.patch b/0001-Add-support-for-deprecating-processors.patch
index 60fb39191..420f6f6f6 100644
--- a/0001-Add-support-for-deprecating-processors.patch
+++ b/0001-Add-support-for-deprecating-processors.patch
@@ -130,7 +130,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 files changed, 132 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 8be042df12c3..a723808f4244 100644
+index 043d93cdcaad..178813fea2ec 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1236,6 +1236,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
diff --git a/0001-Drop-that-for-now.patch b/0001-Drop-that-for-now.patch
index acb3af04e..c705fced5 100644
--- a/0001-Drop-that-for-now.patch
+++ b/0001-Drop-that-for-now.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] Drop that for now
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 07e96d9ab020..e9d06886f99c 100644
+index ed7261e9158f..449cafd619cb 100644
--- a/Makefile
+++ b/Makefile
-@@ -510,7 +510,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
+@@ -496,7 +496,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \
-fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \
-Werror=implicit-function-declaration -Werror=implicit-int \
diff --git a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch
index ae1c85483..dd77c307a 100644
--- a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch
+++ b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch
@@ -64,7 +64,7 @@ index 0a0081b10edb..cfaaa6a234d4 100644
void mark_hardware_deprecated(const char *msg);
void mark_tech_preview(const char *msg, struct module *mod);
diff --git a/kernel/Makefile b/kernel/Makefile
-index 54c00c4719ab..d4e404913f2e 100644
+index c0a4904413b5..1a0c362cddfb 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -12,7 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \
diff --git a/0001-add-Red-Hat-specific-taint-flags.patch b/0001-add-Red-Hat-specific-taint-flags.patch
index a45526812..12d4809b9 100644
--- a/0001-add-Red-Hat-specific-taint-flags.patch
+++ b/0001-add-Red-Hat-specific-taint-flags.patch
@@ -54,7 +54,7 @@ index b82db0c0caec..28be75396242 100644
struct taint_flag {
diff --git a/kernel/panic.c b/kernel/panic.c
-index 85568bbfb12b..087392cd7dc8 100644
+index e2157ca387c8..534bc76e43da 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -386,6 +386,20 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
diff --git a/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch b/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch
index 63f9cc706..dd6cc6096 100644
--- a/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch
+++ b/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch
@@ -21,7 +21,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 8a46ed3ab429..cb73d398a2fe 100644
+index 31380da53689..e60f9c74f41d 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -861,7 +861,7 @@ endchoice
diff --git a/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch b/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch
index 711031703..498ffaf18 100644
--- a/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch
+++ b/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch
@@ -11,7 +11,7 @@ Signed-off-by: Jon Masters <jcm@redhat.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index bbac2867062d..5a50e9f5a485 100644
+index 2ac74904a3ce..f0094424f76a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1549,9 +1549,9 @@ config HIGHMEM
diff --git a/0001-bpf-Add-tech-preview-taint-for-syscall.patch b/0001-bpf-Add-tech-preview-taint-for-syscall.patch
index 9ec561ba5..7fbdadd8e 100644
--- a/0001-bpf-Add-tech-preview-taint-for-syscall.patch
+++ b/0001-bpf-Add-tech-preview-taint-for-syscall.patch
@@ -27,10 +27,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
1 file changed, 6 insertions(+)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index c629d286f540..547258659d42 100644
+index 8f5546ec2d1f..772054412fab 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
-@@ -4084,11 +4084,17 @@ static int bpf_iter_create(union bpf_attr *attr)
+@@ -4091,11 +4091,17 @@ static int bpf_iter_create(union bpf_attr *attr)
SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size)
{
union bpf_attr attr;
diff --git a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
index c3808a692..a5f4f93da 100644
--- a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
+++ b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
@@ -66,7 +66,7 @@ index 28be75396242..0a0081b10edb 100644
#define TAINT_FLAGS_COUNT 32
#define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 9693730833d2..c629d286f540 100644
+index 8da159936bab..8f5546ec2d1f 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -24,6 +24,7 @@
@@ -105,7 +105,7 @@ index 9693730833d2..c629d286f540 100644
static const struct bpf_map_ops * const bpf_map_types[] = {
#define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type)
diff --git a/kernel/panic.c b/kernel/panic.c
-index 087392cd7dc8..d4b2c5b197cb 100644
+index 534bc76e43da..e3bae852d92f 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -399,7 +399,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
diff --git a/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch b/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
index a492ea72c..abddb7742 100644
--- a/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
+++ b/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
@@ -24,7 +24,7 @@ Upstream Status: RHEL only
1 file changed, 4 insertions(+)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 1e9302e99d05..b903580d626f 100644
+index 81d0414e2117..a3c5be79a9cc 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \
diff --git a/0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch b/0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch
index 62c8a5278..fffc10bcc 100644
--- a/0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch
+++ b/0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch
@@ -14,8 +14,8 @@ index 3e4868a6498b..502f9a9a2806 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,9 @@ NAME = Bobtail Squid
- PHONY := __all
- __all:
+ PHONY := _all
+ _all:
+# Set RHEL variables
+include Makefile.rhelver
diff --git a/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch b/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch
index fb464c45d..05b0983d1 100644
--- a/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch
+++ b/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch
@@ -36,7 +36,7 @@ index cfaaa6a234d4..dab7302a3606 100644
#define TAINT_RESERVED28 28
#define TAINT_RESERVED29 29
diff --git a/kernel/panic.c b/kernel/panic.c
-index d4b2c5b197cb..bc296adbb93f 100644
+index e3bae852d92f..8ab004b0f846 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -395,7 +395,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
diff --git a/0001-put-RHEL-info-into-generated-headers.patch b/0001-put-RHEL-info-into-generated-headers.patch
index 8cc3ae7fb..3bed370ce 100644
--- a/0001-put-RHEL-info-into-generated-headers.patch
+++ b/0001-put-RHEL-info-into-generated-headers.patch
@@ -59,10 +59,10 @@ Acked-by: Prarit Bhargava <prarit@redhat.com>
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index f0c1a3a8d9e4..07e96d9ab020 100644
+index ae5d8220f431..ed7261e9158f 100644
--- a/Makefile
+++ b/Makefile
-@@ -1231,7 +1231,13 @@ endef
+@@ -1217,7 +1217,13 @@ endef
define filechk_version.h
echo \#define LINUX_VERSION_CODE $(shell \
expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \
diff --git a/0001-pwm-lpss-Fix-get_state-runtime-pm-reference-handling.patch b/0001-pwm-lpss-Fix-get_state-runtime-pm-reference-handling.patch
deleted file mode 100644
index 1e07d8e45..000000000
--- a/0001-pwm-lpss-Fix-get_state-runtime-pm-reference-handling.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 12 May 2020 00:39:24 +0200
-Subject: [PATCH] pwm: lpss: Fix get_state runtime-pm reference handling
-
-Before commit cfc4c189bc70 ("pwm: Read initial hardware state at request
-time"), a driver's get_state callback would get called once per PWM from
-pwmchip_add().
-
-pwm-lpss' runtime-pm code was relying on this, getting a runtime-pm ref for
-PWMs which are enabled at probe time from within its get_state callback,
-before enabling runtime-pm.
-
-The change to calling get_state at request time causes a number of
-problems:
-
-1. PWMs enabled at probe time may get runtime suspended before they are
-requested, causing e.g. a LCD backlight controlled by the PWM to turn off.
-
-2. When the request happens when the PWM has been runtime suspended, the
-ctrl register will read all 1 / 0xffffffff, causing get_state to store
-bogus values in the pwm_state.
-
-3. get_state was using an async pm_runtime_get() call, because it assumed
-that runtime-pm has not been enabled yet. If shortly after the request an
-apply call is made, then the pwm_lpss_is_updating() check may trigger
-because the resume triggered by the pm_runtime_get() call is not complete
-yet, so the ctrl register still reads all 1 / 0xffffffff.
-
-This commit fixes these issues by moving the initial pm_runtime_get() call
-for PWMs which are enabled at probe time to the pwm_lpss_probe() function;
-and by making get_state take a runtime-pm ref before reading the ctrl reg.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1828927
-Fixes: cfc4c189bc70 ("pwm: Read initial hardware state at request time")
-Cc: stable@vger.kernel.org
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Upstream Status: https://lore.kernel.org/linux-acpi/5f15f6bc-8650-d86e-893f-0d41557c57c7@redhat.com/
----
- drivers/pwm/pwm-lpss.c | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/pwm/pwm-lpss.c b/drivers/pwm/pwm-lpss.c
-index 75bbfe5f3bc2..9d965ffe66d1 100644
---- a/drivers/pwm/pwm-lpss.c
-+++ b/drivers/pwm/pwm-lpss.c
-@@ -158,7 +158,6 @@ static int pwm_lpss_apply(struct pwm_chip *chip, struct pwm_device *pwm,
- return 0;
- }
-
--/* This function gets called once from pwmchip_add to get the initial state */
- static void pwm_lpss_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
- struct pwm_state *state)
- {
-@@ -167,6 +166,8 @@ static void pwm_lpss_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
- unsigned long long base_unit, freq, on_time_div;
- u32 ctrl;
-
-+ pm_runtime_get_sync(chip->dev);
-+
- base_unit_range = BIT(lpwm->info->base_unit_bits);
-
- ctrl = pwm_lpss_read(pwm);
-@@ -187,8 +188,7 @@ static void pwm_lpss_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
- state->polarity = PWM_POLARITY_NORMAL;
- state->enabled = !!(ctrl & PWM_ENABLE);
-
-- if (state->enabled)
-- pm_runtime_get(chip->dev);
-+ pm_runtime_put(chip->dev);
- }
-
- static const struct pwm_ops pwm_lpss_ops = {
-@@ -202,7 +202,8 @@ struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r,
- {
- struct pwm_lpss_chip *lpwm;
- unsigned long c;
-- int ret;
-+ int i, ret;
-+ u32 ctrl;
-
- if (WARN_ON(info->npwm > MAX_PWMS))
- return ERR_PTR(-ENODEV);
-@@ -232,6 +233,12 @@ struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r,
- return ERR_PTR(ret);
- }
-
-+ for (i = 0; i < lpwm->info->npwm; i++) {
-+ ctrl = pwm_lpss_read(&lpwm->chip.pwms[i]);
-+ if (ctrl & PWM_ENABLE)
-+ pm_runtime_get(dev);
-+ }
-+
- return lpwm;
- }
- EXPORT_SYMBOL_GPL(pwm_lpss_probe);
---
-2.26.2
-
diff --git a/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch b/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch
index 85ec742e6..3b44f9801 100644
--- a/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch
+++ b/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch
@@ -17,10 +17,10 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
5 files changed, 20 insertions(+)
diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
-index fb3ce6cec997..a9dac118b66e 100644
+index 6791813cd439..501e14cff79c 100644
--- a/include/linux/lsm_hook_defs.h
+++ b/include/linux/lsm_hook_defs.h
-@@ -372,6 +372,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux)
+@@ -383,6 +383,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux)
#endif /* CONFIG_BPF_SYSCALL */
LSM_HOOK(int, 0, locked_down, enum lockdown_reason what)
@@ -30,10 +30,10 @@ index fb3ce6cec997..a9dac118b66e 100644
#ifdef CONFIG_PERF_EVENTS
LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type)
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
-index 3e62dab77699..1696345315e0 100644
+index 95b7c1d32062..dbacbb1fc129 100644
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
-@@ -1484,6 +1484,12 @@
+@@ -1507,6 +1507,12 @@
*
* @what: kernel feature being accessed
*
@@ -47,10 +47,10 @@ index 3e62dab77699..1696345315e0 100644
*
* @perf_event_open:
diff --git a/include/linux/security.h b/include/linux/security.h
-index b3f2cb21b4f2..5e54ba73c257 100644
+index 0a0a03b36a3b..26869f44416b 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -447,6 +447,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
+@@ -451,6 +451,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen);
int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen);
int security_locked_down(enum lockdown_reason what);
@@ -58,7 +58,7 @@ index b3f2cb21b4f2..5e54ba73c257 100644
#else /* CONFIG_SECURITY */
static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data)
-@@ -1280,6 +1281,10 @@ static inline int security_locked_down(enum lockdown_reason what)
+@@ -1291,6 +1292,10 @@ static inline int security_locked_down(enum lockdown_reason what)
{
return 0;
}
@@ -68,7 +68,7 @@ index b3f2cb21b4f2..5e54ba73c257 100644
+}
#endif /* CONFIG_SECURITY */
- #ifdef CONFIG_SECURITY_NETWORK
+ #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c
index 87cbdc64d272..18555cf18da7 100644
--- a/security/lockdown/lockdown.c
@@ -82,10 +82,10 @@ index 87cbdc64d272..18555cf18da7 100644
static int __init lockdown_lsm_init(void)
diff --git a/security/security.c b/security/security.c
-index e0290b7e6a08..124ecb15a291 100644
+index 0ce3e73edd42..8fe9a9911261 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -2479,6 +2479,12 @@ int security_locked_down(enum lockdown_reason what)
+@@ -2501,6 +2501,12 @@ int security_locked_down(enum lockdown_reason what)
}
EXPORT_SYMBOL(security_locked_down);
diff --git a/Patchlist b/Patchlist
index 9961e7b97..ccb5a4b89 100644
--- a/Patchlist
+++ b/Patchlist
@@ -67,7 +67,6 @@
0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch
0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch
0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
-0001-pwm-lpss-Fix-get_state-runtime-pm-reference-handling.patch
0001-x86-Fix-compile-issues-with-rh_check_supported.patch
0001-virt-vbox-Fix-VBGL_IOCTL_VMMDEV_REQUEST_BIG-and-_LOG.patch
0001-virt-vbox-Fix-guest-capabilities-mask-check.patch
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 293a449f7..f81a6c8bc 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2469,6 +2469,7 @@ CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_BRCMSTB=y
CONFIG_I2C_CADENCE=m
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2516,6 +2517,7 @@ CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_QCOM_CCI is not set
CONFIG_I2C_QCOM_GENI=m
CONFIG_I2C_QUP=m
CONFIG_I2C_RK3X=y
@@ -3168,6 +3170,7 @@ CONFIG_KEYBOARD_TEGRA=m
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_KEYS=y
CONFIG_KGDB_KDB=y
@@ -7755,6 +7758,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 5e3475f80..7ffd050e2 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2007,6 +2007,7 @@ CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_QCOM_CCI is not set
CONFIG_I2C_QUP=y
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
@@ -6155,6 +6156,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+# CONFIG_WATCH_QUEUE is not set
# CONFIG_WCN36XX is not set
# CONFIG_WDAT_WDT is not set
CONFIG_WDTPCI=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index f26881668..f6eb0812d 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2453,6 +2453,7 @@ CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_BRCMSTB=y
CONFIG_I2C_CADENCE=m
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2500,6 +2501,7 @@ CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_QCOM_CCI is not set
CONFIG_I2C_QCOM_GENI=m
CONFIG_I2C_QUP=m
CONFIG_I2C_RK3X=y
@@ -3150,6 +3152,7 @@ CONFIG_KEYBOARD_TEGRA=m
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_KEYS=y
# CONFIG_KGDB_KDB is not set
@@ -7734,6 +7737,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 4c9fbee19..05e5e953e 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1991,6 +1991,7 @@ CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_QCOM_CCI is not set
CONFIG_I2C_QUP=y
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
@@ -6134,6 +6135,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+# CONFIG_WATCH_QUEUE is not set
# CONFIG_WCN36XX is not set
# CONFIG_WDAT_WDT is not set
CONFIG_WDTPCI=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 759003704..764a2ddf6 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -2500,6 +2500,7 @@ CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_BRCMSTB=y
CONFIG_I2C_CADENCE=m
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2548,6 +2549,7 @@ CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_QCOM_CCI is not set
CONFIG_I2C_QUP=m
CONFIG_I2C_RK3X=y
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
@@ -3209,6 +3211,7 @@ CONFIG_KEYBOARD_TM2_TOUCHKEY=m
CONFIG_KEYBOARD_TWL4030=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
# CONFIG_KEYSTONE_REMOTEPROC is not set
CONFIG_KEYS=y
@@ -8059,6 +8062,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 8aa49def2..71f92b1b4 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -2485,6 +2485,7 @@ CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_BRCMSTB=y
CONFIG_I2C_CADENCE=m
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2533,6 +2534,7 @@ CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_QCOM_CCI is not set
CONFIG_I2C_QUP=m
CONFIG_I2C_RK3X=y
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
@@ -3192,6 +3194,7 @@ CONFIG_KEYBOARD_TM2_TOUCHKEY=m
CONFIG_KEYBOARD_TWL4030=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
# CONFIG_KEYSTONE_REMOTEPROC is not set
CONFIG_KEYS=y
@@ -8039,6 +8042,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index a47de25c3..96cf1ab1c 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2444,6 +2444,7 @@ CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_BRCMSTB=y
CONFIG_I2C_CADENCE=m
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2493,6 +2494,7 @@ CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_QCOM_CCI is not set
CONFIG_I2C_RK3X=y
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_S3C2410=m
@@ -3136,6 +3138,7 @@ CONFIG_KEYBOARD_TEGRA=m
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_KEYSTONE_IRQ=m
# CONFIG_KEYSTONE_REMOTEPROC is not set
@@ -7788,6 +7791,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 9ed55c066..2f42c34bc 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -2429,6 +2429,7 @@ CONFIG_I2C_AMD_MP2=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_BRCMSTB=y
CONFIG_I2C_CADENCE=m
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
@@ -2478,6 +2479,7 @@ CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_QCOM_CCI is not set
CONFIG_I2C_RK3X=y
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_S3C2410=m
@@ -3119,6 +3121,7 @@ CONFIG_KEYBOARD_TEGRA=m
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_KEYSTONE_IRQ=m
# CONFIG_KEYSTONE_REMOTEPROC is not set
@@ -7768,6 +7771,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 6725d2f71..48de06d7d 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -2245,6 +2245,7 @@ CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PIIX4=m
CONFIG_I2C_PXA=m
# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SCMI=m
@@ -2899,6 +2900,7 @@ CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_KEYS=y
CONFIG_KGDB_KDB=y
@@ -7018,6 +7020,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index e17241579..fc871a5de 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -2228,6 +2228,7 @@ CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PIIX4=m
CONFIG_I2C_PXA=m
# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SCMI=m
@@ -2880,6 +2881,7 @@ CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_KEYS=y
# CONFIG_KGDB_KDB is not set
@@ -6997,6 +6999,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index e1c064b42..8e285c346 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -2050,6 +2050,7 @@ CONFIG_I2C_NVIDIA_GPU=m
CONFIG_I2C_OPAL=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SI470X=m
@@ -2635,6 +2636,7 @@ CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_KEYS=y
CONFIG_KGDB_KDB=y
@@ -6582,6 +6584,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
CONFIG_WATCHDOG_RTAS=m
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index db97bf5bc..df4105af8 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1877,6 +1877,7 @@ CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SIMTEC=m
@@ -6003,6 +6004,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
CONFIG_WATCHDOG_RTAS=m
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+# CONFIG_WATCH_QUEUE is not set
# CONFIG_WCN36XX is not set
# CONFIG_WDAT_WDT is not set
CONFIG_WDTPCI=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index b62992291..b20b6c019 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -2033,6 +2033,7 @@ CONFIG_I2C_NVIDIA_GPU=m
CONFIG_I2C_OPAL=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SI470X=m
@@ -2616,6 +2617,7 @@ CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_KEYS=y
# CONFIG_KGDB_KDB is not set
@@ -6560,6 +6562,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
CONFIG_WATCHDOG_RTAS=m
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index b6503be31..c1fe1fc98 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1861,6 +1861,7 @@ CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SIMTEC=m
@@ -5985,6 +5986,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
CONFIG_WATCHDOG_RTAS=m
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+# CONFIG_WATCH_QUEUE is not set
# CONFIG_WCN36XX is not set
# CONFIG_WDAT_WDT is not set
CONFIG_WDTPCI=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 854083ff4..8ed6784d5 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2031,6 +2031,7 @@ CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SI470X=m
@@ -2613,6 +2614,7 @@ CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_KEYS=y
CONFIG_KGDB_KDB=y
@@ -6526,6 +6528,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 53518fe61..a4bf7d85f 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1861,6 +1861,7 @@ CONFIG_I2C_MUX_MLXCPLD=m
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
# CONFIG_I2C_SIMTEC is not set
@@ -5956,6 +5957,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+# CONFIG_WATCH_QUEUE is not set
# CONFIG_WCN36XX is not set
# CONFIG_WDAT_WDT is not set
# CONFIG_WDTPCI is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index cb0da576c..c15e35553 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2014,6 +2014,7 @@ CONFIG_I2C_NVIDIA_GPU=m
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SI470X=m
@@ -2594,6 +2595,7 @@ CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_KEYS=y
# CONFIG_KGDB_KDB is not set
@@ -6504,6 +6506,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 8fee7620d..928e00f52 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1845,6 +1845,7 @@ CONFIG_I2C_MUX_MLXCPLD=m
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
# CONFIG_I2C_SIMTEC is not set
@@ -5938,6 +5939,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+# CONFIG_WATCH_QUEUE is not set
# CONFIG_WCN36XX is not set
# CONFIG_WDAT_WDT is not set
# CONFIG_WDTPCI is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index f58f17a40..3c3b0925f 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1860,6 +1860,7 @@ CONFIG_I2C_MUX_MLXCPLD=m
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
# CONFIG_I2C_SIMTEC is not set
@@ -5974,6 +5975,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
+# CONFIG_WATCH_QUEUE is not set
# CONFIG_WCN36XX is not set
# CONFIG_WDAT_WDT is not set
# CONFIG_WDTPCI is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 41477da36..cae7409e2 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -2277,6 +2277,7 @@ CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PIIX4=m
CONFIG_I2C_PXA=m
# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SCMI=m
@@ -2950,6 +2951,7 @@ CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_KEYS=y
CONFIG_KGDB_KDB=y
@@ -7075,6 +7077,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 57fcee55d..d3a195515 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -2012,6 +2012,7 @@ CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PIIX4=m
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SCMI=m
@@ -6224,6 +6225,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+# CONFIG_WATCH_QUEUE is not set
# CONFIG_WCN36XX is not set
CONFIG_WDAT_WDT=m
CONFIG_WDTPCI=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 7e863f11c..6aabce093 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -2260,6 +2260,7 @@ CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PIIX4=m
CONFIG_I2C_PXA=m
# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SCMI=m
@@ -2931,6 +2932,7 @@ CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_TM2_TOUCHKEY=m
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
CONFIG_KEYS_REQUEST_CACHE=y
CONFIG_KEYS=y
# CONFIG_KGDB_KDB is not set
@@ -7054,6 +7056,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+CONFIG_WATCH_QUEUE=y
# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_WCN36XX=m
CONFIG_WDAT_WDT=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 110358aaf..14b687547 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1996,6 +1996,7 @@ CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PIIX4=m
+# CONFIG_I2C_QCOM_CCI is not set
# CONFIG_I2C_RK3X is not set
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
CONFIG_I2C_SCMI=m
@@ -6204,6 +6205,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG=y
+# CONFIG_WATCH_QUEUE is not set
# CONFIG_WCN36XX is not set
CONFIG_WDAT_WDT=m
CONFIG_WDTPCI=m
diff --git a/kernel.spec b/kernel.spec
index 96191cb43..8c17c8e2f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc0.20200612gitb791d1bdf921.1
+%global distro_build 0.rc1.1
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -69,13 +69,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.8.0
-%define pkgrelease 0.rc0.20200612gitb791d1bdf921.1
+%define pkgrelease 0.rc1.1
# This is needed to do merge window version magic
%define patchlevel 8
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20200612gitb791d1bdf921.1%{?buildid}%{?dist}
+%define specrelease 0.rc1.1%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -166,7 +166,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 0
+%define debugbuildsenabled 1
# The kernel tarball/base version
%define kversion 5.8
@@ -567,7 +567,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200612gitb791d1bdf921.tar.xz
+Source0: linux-5.8-rc1.tar.xz
Source1: Makefile.rhelver
@@ -775,16 +775,15 @@ Patch67: 0001-drm-panel-add-Xingbangda-XBD599-panel.patch
Patch68: 0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch
Patch69: 0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch
Patch70: 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
-Patch71: 0001-pwm-lpss-Fix-get_state-runtime-pm-reference-handling.patch
-Patch72: 0001-x86-Fix-compile-issues-with-rh_check_supported.patch
-Patch73: 0001-virt-vbox-Fix-VBGL_IOCTL_VMMDEV_REQUEST_BIG-and-_LOG.patch
-Patch74: 0001-virt-vbox-Fix-guest-capabilities-mask-check.patch
-Patch75: 0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch
-Patch76: 0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch
-Patch77: 0001-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch
-Patch78: 0001-virt-vbox-Add-a-few-new-vmmdev-request-types-to-the-.patch
-Patch79: 0001-virt-vbox-Log-unknown-ioctl-requests-as-error.patch
-Patch80: 0001-PCI-tegra-Revert-raw_violation_fixup-for-tegra124.patch
+Patch71: 0001-x86-Fix-compile-issues-with-rh_check_supported.patch
+Patch72: 0001-virt-vbox-Fix-VBGL_IOCTL_VMMDEV_REQUEST_BIG-and-_LOG.patch
+Patch73: 0001-virt-vbox-Fix-guest-capabilities-mask-check.patch
+Patch74: 0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch
+Patch75: 0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch
+Patch76: 0001-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch
+Patch77: 0001-virt-vbox-Add-a-few-new-vmmdev-request-types-to-the-.patch
+Patch78: 0001-virt-vbox-Log-unknown-ioctl-requests-as-error.patch
+Patch79: 0001-PCI-tegra-Revert-raw_violation_fixup-for-tegra124.patch
%endif
@@ -1280,8 +1279,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20200612gitb791d1bdf921 -c
-mv linux-20200612gitb791d1bdf921 linux-%{KVERREL}
+%setup -q -n kernel-5.8-rc1 -c
+mv linux-5.8-rc1 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -1357,7 +1356,6 @@ ApplyOptionalPatch 0001-drm-panel-add-Xingbangda-XBD599-panel.patch
ApplyOptionalPatch 0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch
ApplyOptionalPatch 0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch
ApplyOptionalPatch 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
-ApplyOptionalPatch 0001-pwm-lpss-Fix-get_state-runtime-pm-reference-handling.patch
ApplyOptionalPatch 0001-x86-Fix-compile-issues-with-rh_check_supported.patch
ApplyOptionalPatch 0001-virt-vbox-Fix-VBGL_IOCTL_VMMDEV_REQUEST_BIG-and-_LOG.patch
ApplyOptionalPatch 0001-virt-vbox-Fix-guest-capabilities-mask-check.patch
@@ -2787,8 +2785,16 @@ fi
#
#
%changelog
-* Fri Jun 12 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.8.0-0.rc0.20200612gitb791d1bdf921.1]
-- Fedora config updates ("Justin M. Forbes")
+* Sun Jun 14 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.8.0-0.rc1.1]
+- Fedora config update for rc1 ("Justin M. Forbes")
+
+* Sun Jun 14 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc1.1]
+- v5.8-rc1 rebase
+- Updated changelog for the release based on df2fbf5bfa0e (Fedora Kernel Team)
+
+* Sat Jun 13 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc0.20200613gitdf2fbf5bfa0e.1]
+- df2fbf5bfa0e rebase
+- Updated changelog for the release based on b791d1bdf921 (Fedora Kernel Team)
* Fri Jun 12 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc0.20200612gitb791d1bdf921.1]
- b791d1bdf921 rebase
diff --git a/sources b/sources
index b7e23d2a1..3cca92c98 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200612gitb791d1bdf921.tar.xz) = 3b57b00ab8352643f761b34f7e7c38398fc31d48b5705980c731606903db0780654914789b5149fab09f6dfe2a918844e31b93de4357bf2ddc4bc5e2aa5bf759
-SHA512 (kernel-abi-whitelists-5.8.0-0.rc0.20200612gitb791d1bdf921.1.tar.bz2) = 7151171a0e598a6f5e3cbc400790cfef25789a5a4d10d09aca121d5f28eeb0800a4cbcad0deb8dc34480c6ae816815f30e1e0a8c94c39321a79e186c6fdc5687
-SHA512 (kernel-kabi-dw-5.8.0-0.rc0.20200612gitb791d1bdf921.1.tar.bz2) = d989025cf7f50367bc9b7327cef7238f9cf7ecafaa6df4fa623624af23854892aefea754c7fd37523405a37179265d52167e7ae79bc1dc084319cc5f455c8eb2
+SHA512 (linux-5.8-rc1.tar.xz) = f4278f172814017679f2d069e2102c29c212f25af7b8cb9026512b2bba863fd437c110fbc2d5fef7b0be2f8ccad25ed7f14274426f2efbd45403c2d0b4f3aa2a
+SHA512 (kernel-abi-whitelists-5.8.0-0.rc1.1.tar.bz2) = cb52da810d84539be54f9394659d45674774a0ea9c7e72844b8ddaf3bd9217c64b38bd87172cc32e0c9e03f22ca9d7c394bc4c0ad74c4d7a93c28ed6e4b56e5d
+SHA512 (kernel-kabi-dw-5.8.0-0.rc1.1.tar.bz2) = 75f4fe33fccc21e22a92112b81bb4e48fb3013fc699895d52d8670567d2d7a992cabe6b954fb534e4da94092353b7b42136a05bdd5c3d9979503d17e50d1013e