Linux v4.14-rc3

This commit is contained in:
Justin M. Forbes 2017-10-02 07:42:25 -05:00
parent f3c10873fb
commit f5a7ba1e9e
8 changed files with 11 additions and 36 deletions

View File

@ -0,0 +1 @@
# CONFIG_DRM_SUN4I_HDMI_CEC is not set

View File

@ -1,30 +0,0 @@
From 65d5d30ccebd555de9ad8fd2b5dfc50291922337 Mon Sep 17 00:00:00 2001
From: Thierry Reding <treding@nvidia.com>
Date: Wed, 23 Aug 2017 19:13:26 +0200
Subject: drm/tegra: trace: Fix path to include
The TRACE_INCLUDE_PATH macro needs to specify the path relative to the
define_trace.h header rather than relative to the file defining it.
Reported-by: Dmitry Osipenko <digetx@gmail.com>
Tested-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
drivers/gpu/drm/tegra/trace.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/tegra/trace.h b/drivers/gpu/drm/tegra/trace.h
index e9b7cdad..5a1ab40 100644
--- a/drivers/gpu/drm/tegra/trace.h
+++ b/drivers/gpu/drm/tegra/trace.h
@@ -63,6 +63,6 @@ DEFINE_EVENT(register_access, sor_readl,
/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/tegra
#define TRACE_INCLUDE_FILE trace
#include <trace/define_trace.h>
--
cgit v1.1

View File

@ -1436,6 +1436,7 @@ CONFIG_DRM_SIL_SII8620=m
CONFIG_DRM_STI=m CONFIG_DRM_STI=m
# CONFIG_DRM_STM is not set # CONFIG_DRM_STM is not set
CONFIG_DRM_SUN4I_BACKEND=m CONFIG_DRM_SUN4I_BACKEND=m
# CONFIG_DRM_SUN4I_HDMI_CEC is not set
CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN4I_HDMI=m
CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN4I=m
CONFIG_DRM_SUN8I_MIXER=m CONFIG_DRM_SUN8I_MIXER=m

View File

@ -1350,6 +1350,7 @@ CONFIG_DRM_SIL_SII8620=m
CONFIG_DRM_STI=m CONFIG_DRM_STI=m
# CONFIG_DRM_STM is not set # CONFIG_DRM_STM is not set
CONFIG_DRM_SUN4I_BACKEND=m CONFIG_DRM_SUN4I_BACKEND=m
# CONFIG_DRM_SUN4I_HDMI_CEC is not set
CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN4I_HDMI=m
CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN4I=m
CONFIG_DRM_SUN8I_MIXER=m CONFIG_DRM_SUN8I_MIXER=m

View File

@ -1340,6 +1340,7 @@ CONFIG_DRM_SIL_SII8620=m
CONFIG_DRM_STI=m CONFIG_DRM_STI=m
# CONFIG_DRM_STM is not set # CONFIG_DRM_STM is not set
CONFIG_DRM_SUN4I_BACKEND=m CONFIG_DRM_SUN4I_BACKEND=m
# CONFIG_DRM_SUN4I_HDMI_CEC is not set
CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN4I_HDMI=m
CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN4I=m
CONFIG_DRM_SUN8I_MIXER=m CONFIG_DRM_SUN8I_MIXER=m

View File

@ -1426,6 +1426,7 @@ CONFIG_DRM_SIL_SII8620=m
CONFIG_DRM_STI=m CONFIG_DRM_STI=m
# CONFIG_DRM_STM is not set # CONFIG_DRM_STM is not set
CONFIG_DRM_SUN4I_BACKEND=m CONFIG_DRM_SUN4I_BACKEND=m
# CONFIG_DRM_SUN4I_HDMI_CEC is not set
CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN4I_HDMI=m
CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN4I=m
CONFIG_DRM_SUN8I_MIXER=m CONFIG_DRM_SUN8I_MIXER=m

View File

@ -67,9 +67,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1) # The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1))) %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level # The rc snapshot level
%global rcrev 2 %global rcrev 3
# The git snapshot level # The git snapshot level
%define gitrev 4 %define gitrev 0
# Set rpm version accordingly # Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0 %define rpmversion 4.%{upstream_sublevel}.0
%endif %endif
@ -621,8 +621,6 @@ Patch323: bcm2837-bluetooth-support.patch
# 500 - Temp fixes/CVEs etc # 500 - Temp fixes/CVEs etc
Patch501: drm-tegra-trace-fix-patch.patch
# CVE-2017-7477 rhbz 1445207 1445208 # CVE-2017-7477 rhbz 1445207 1445208
Patch502: CVE-2017-7477.patch Patch502: CVE-2017-7477.patch
@ -2193,6 +2191,9 @@ fi
# #
# #
%changelog %changelog
* Mon Oct 02 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc3.git0.1
- Linux v4.14-rc3
* Mon Oct 02 2017 Justin M. Forbes <jforbes@fedoraproject.org> * Mon Oct 02 2017 Justin M. Forbes <jforbes@fedoraproject.org>
- Disable debugging options. - Disable debugging options.

View File

@ -1,4 +1,3 @@
SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03 SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03
SHA512 (patch-4.14-rc2.xz) = bfdf4ed88f7eeef35f723d886ea059a2fac69b7ea18313abe768d06674f6c36ca0579dd61170b9c91aeb7cc055af3c8330b15e092e8f4880ef6c8d93bd6cfa48 SHA512 (patch-4.14-rc3.xz) = 2bf9cdb90d4d143cb9e407cf7a469a48502f38db39be962f46a8dcbe2d84de15b60e1b82a0e3de42cc511d62953fc09749566857ed13b2a8a5a08d2187feb2f8
SHA512 (patch-4.14-rc2-git4.xz) = b47426edf6dbc246299ae80f5309e3be246a8728cb73a0dce65d222e4184ea0f84eedea4877d9b2ae684ebe601ae3f99af8edf4ce5a6de373e561f6a3b76af14