Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org --- kernel/config-arm32-generic | 1 + kernel/config-arm64-generic | 1 + kernel/config-generic | 2 +- kernel/kernel.nm | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic index 8618af2..3db7183 100644 --- a/kernel/config-arm32-generic +++ b/kernel/config-arm32-generic @@ -112,6 +112,7 @@ CONFIG_SOC_EXYNOS5260=y CONFIG_SOC_EXYNOS5410=y CONFIG_SOC_EXYNOS5420=y CONFIG_SOC_EXYNOS5800=y +CONFIG_EXYNOS_MCPM=y CONFIG_EXYNOS_CPU_SUSPEND=y CONFIG_PLAT_SAMSUNG=y
diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic index 215eb15..71f667f 100644 --- a/kernel/config-arm64-generic +++ b/kernel/config-arm64-generic @@ -180,6 +180,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ARM_SDE_INTERFACE is not set CONFIG_DMIID=y CONFIG_DMI_SYSFS=y +# CONFIG_ISCSI_IBFT is not set CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
diff --git a/kernel/config-generic b/kernel/config-generic index 1a80b8c..9118afc 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -4,7 +4,7 @@ # # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=90100 +CONFIG_GCC_VERSION=80200 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y diff --git a/kernel/kernel.nm b/kernel/kernel.nm index ea458a0..f90f512 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -4,7 +4,7 @@ ###############################################################################
name = kernel -version = 5.2.1 +version = 5.2.11 release = 1 thisapp = linux-%{version}
Thank you. Merged!
On 1 Sep 2019, at 11:32, Arne Fitzenreiter arne_f@ipfire.org wrote:
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
kernel/config-arm32-generic | 1 + kernel/config-arm64-generic | 1 + kernel/config-generic | 2 +- kernel/kernel.nm | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic index 8618af2..3db7183 100644 --- a/kernel/config-arm32-generic +++ b/kernel/config-arm32-generic @@ -112,6 +112,7 @@ CONFIG_SOC_EXYNOS5260=y CONFIG_SOC_EXYNOS5410=y CONFIG_SOC_EXYNOS5420=y CONFIG_SOC_EXYNOS5800=y +CONFIG_EXYNOS_MCPM=y CONFIG_EXYNOS_CPU_SUSPEND=y CONFIG_PLAT_SAMSUNG=y
diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic index 215eb15..71f667f 100644 --- a/kernel/config-arm64-generic +++ b/kernel/config-arm64-generic @@ -180,6 +180,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ARM_SDE_INTERFACE is not set CONFIG_DMIID=y CONFIG_DMI_SYSFS=y +# CONFIG_ISCSI_IBFT is not set CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
diff --git a/kernel/config-generic b/kernel/config-generic index 1a80b8c..9118afc 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -4,7 +4,7 @@ # # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=90100 +CONFIG_GCC_VERSION=80200 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y diff --git a/kernel/kernel.nm b/kernel/kernel.nm index ea458a0..f90f512 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -4,7 +4,7 @@ ###############################################################################
name = kernel -version = 5.2.1 +version = 5.2.11 release = 1 thisapp = linux-%{version}
-- 2.6.3