summaryrefslogtreecommitdiffstats
path: root/0001-put-RHEL-info-into-generated-headers.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-08-13 12:44:32 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-08-13 12:44:32 -0500
commitf7a3bf654752fa0e92c7ab3e57e48d3415632852 (patch)
tree499e2cc107f4bff8b98bd676b494d51ae89dcb4a /0001-put-RHEL-info-into-generated-headers.patch
parent142d1dbc8748e066ce794a391416b045d570be71 (diff)
downloadkernel-f7a3bf654752fa0e92c7ab3e57e48d3415632852.tar.gz
kernel-f7a3bf654752fa0e92c7ab3e57e48d3415632852.tar.xz
kernel-f7a3bf654752fa0e92c7ab3e57e48d3415632852.zip
kernel-5.9.0-0.rc0.20200813gitdc06fe51d26e.1
* Thu Aug 13 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc0.20200813gitdc06fe51d26e.1] - dc06fe51d26e rebase - More mismatches ("Justin M. Forbes") - Fedora config change due to deps ("Justin M. Forbes") - CONFIG_SND_SOC_MAX98390 is now selected by SND_SOC_INTEL_DA7219_MAX98357A_GENERIC ("Justin M. Forbes") - Config change required for build part 2 ("Justin M. Forbes") - Config change required for build ("Justin M. Forbes") - Fedora config update ("Justin M. Forbes") - Revert "Merge branch 'make_configs_fix' into 'os-build'" (Justin Forbes) - redhat/configs/process_configs.sh: Remove *.config.orig files (Prarit Bhargava) - redhat/configs/process_configs.sh: Add process_configs_known_broken flag (Prarit Bhargava) - redhat/Makefile: Fix '*-configs' targets (Prarit Bhargava) - Updated changelog for the release based on v5.8 (Fedora Kernel Team) - Add ability to sync upstream through Makefile (Don Zickus) - Add master merge check (Don Zickus) - Replace hardcoded values 'os-build' and project id with variables (Don Zickus) - gitattributes: Remove unnecesary export restrictions (Prarit Bhargava) - redhat/Makefile.common: Fix MARKER (Prarit Bhargava) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-put-RHEL-info-into-generated-headers.patch')
-rw-r--r--0001-put-RHEL-info-into-generated-headers.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-put-RHEL-info-into-generated-headers.patch b/0001-put-RHEL-info-into-generated-headers.patch
index ee5fc2195..83ca60edb 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 24a4c1b97bb0..37cfb39d77af 100644
+index 254e80a96b23..7542f496ff1e 100644
--- a/Makefile
+++ b/Makefile
-@@ -1217,7 +1217,13 @@ endef
+@@ -1250,7 +1250,13 @@ endef
define filechk_version.h
echo \#define LINUX_VERSION_CODE $(shell \
expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \