$ git diff --patch-with-stat --summary a9abbbcaec795c6d743ef919d5df778b4c3ca97e..aa74f0c1b596bba3de148c68a5f6413859318e74
.abf.yml | 2 +-
arm-common.config | 3 ++-
common-desktop.config | 2 +-
common-server.config | 1 +
common.config | 15 ++++++++++-----
kernel-release.spec | 53 +++++++++++++++++++++++++++++++++------------------
6 files changed, 49 insertions(+), 27 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index 52a80fd..f68cc4a 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -2,4 +2,4 @@ sources:
linux-4.15.tar.sign: 4ec662ae15c98e2342cdafedfa8ed4512fd69c5a
linux-4.15.tar.xz: 5cf2693d2c6bf1e69a9216dceca6183c60eb11d5
saa716x-driver.tar.xz: 603d6e561f6c09b19b05ca53b55458caad849c97
- patch-4.15.8.xz: 39cbd4184cf7e33f44cd1c41609c080ce9a980c1
+ patch-4.15.12.xz: e20a2a606934769ebaf4c5c349136e763edd113a
diff --git a/arm-common.config b/arm-common.config
index b358974..1716f3b 100644
--- a/arm-common.config
+++ b/arm-common.config
@@ -1363,10 +1363,11 @@ CONFIG_DOVE_THERMAL=m
CONFIG_DB8500_THERMAL=m
CONFIG_ARMADA_THERMAL=m
CONFIG_DB8500_CPUFREQ_COOLING=m
-
+
CONFIG_MTK_THERMAL=m
CONFIG_BCM2835_THERMAL=m
CONFIG_BCM_NS_THERMAL=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
#
# Texas Instruments thermal drivers
diff --git a/common-desktop.config b/common-desktop.config
index f91ed50..6b67a3d 100644
--- a/common-desktop.config
+++ b/common-desktop.config
@@ -26,5 +26,5 @@ CONFIG_UKSM=y
#
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
CONFIG_PREEMPT_COUNT=y
diff --git a/common-server.config b/common-server.config
index c2e9025..abaa56d 100644
--- a/common-server.config
+++ b/common-server.config
@@ -28,3 +28,4 @@ CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
# CONFIG_PREEMPT_COUNT is not set
+CONFIG_SLAB=y
diff --git a/common.config b/common.config
index c99f7b6..0ffe551 100644
--- a/common.config
+++ b/common.config
@@ -46,6 +46,8 @@ CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_DOMAIN_HIERARCHY=y
CONFIG_GENERIC_MSI_IRQ=y
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
# CONFIG_IRQ_DOMAIN_DEBUG is not set
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
@@ -103,6 +105,7 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
CONFIG_CGROUPS=y
CONFIG_PAGE_COUNTER=y
CONFIG_MEMCG=y
+CONFIG_MEMCG_KMEM=y
CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG_SWAP_ENABLED=y
CONFIG_BLK_CGROUP=y
@@ -111,7 +114,7 @@ CONFIG_CGROUP_WRITEBACK=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_RT_GROUP_SCHED=y
CONFIG_CGROUP_PIDS=y
CONFIG_CGROUP_RDMA=y
CONFIG_CGROUP_FREEZER=y
@@ -286,7 +289,7 @@ CONFIG_STRICT_MODULE_RWX=y
#
# CONFIG_GCOV_KERNEL is not set
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
+# CONFIG_SLABINFO is not set
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
CONFIG_MODULES=y
@@ -860,6 +863,7 @@ CONFIG_IPV6_PIMSM_V2=y
CONFIG_IPV6_SEG6_LWTUNNEL=y
CONFIG_IPV6_SEG6_INLINE=y
CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPVLAN=m
CONFIG_NETLABEL=y
CONFIG_NETWORK_SECMARK=y
CONFIG_NET_PTP_CLASSIFY=y
@@ -1343,7 +1347,7 @@ CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
CONFIG_NET_CLS_CGROUP=y
-CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_BPF=y
# CONFIG_NET_CLS_FLOWER is not set
CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_EMATCH=y
@@ -4395,7 +4399,7 @@ CONFIG_SENSORS_XGENE=m
CONFIG_SENSORS_ACPI_POWER=m
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=100
CONFIG_THERMAL_HWMON=y
CONFIG_THERMAL_WRITABLE_TRIPS=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
@@ -7957,6 +7961,7 @@ CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
CONFIG_EXT4_FS=y
@@ -8034,7 +8039,7 @@ CONFIG_QUOTACTL_COMPAT=y
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=m
CONFIG_CUSE=m
-CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS=y
CONFIG_OVERLAY_FS_REDIRECT_DIR=y
#
diff --git a/kernel-release.spec b/kernel-release.spec
index 7c9453f..8d8114a 100644
--- a/kernel-release.spec
+++ b/kernel-release.spec
@@ -6,7 +6,7 @@
# compose tar.xz name and release
%define kernelversion 4
%define patchlevel 15
-%define sublevel 8
+%define sublevel 12
%define relc 0
# Only ever wrong on x.0 releases...
%define previous %{kernelversion}.%(echo $((%{patchlevel}-1)))
@@ -348,8 +348,8 @@ very current hardware.
### Global Requires/Provides
-#%define requires2 dracut >= 026
-%define requires3 kmod >= 12
+%define requires2 dracut >= 026
+%define requires3 kmod >= 25
%define requires4 sysfsutils >= 2.1.0-12
%define requires5 kernel-firmware
@@ -357,9 +357,9 @@ very current hardware.
%define kprovides2 kernel = %{tar_ver}
%define kprovides_server drbd-api = 88
-%define kobsoletes1 dkms-r8192se <= 0019.1207.2010-2
-%define kobsoletes2 dkms-lzma <= 4.43-32
-%define kobsoletes3 dkms-psb <= 4.41.1-7
+%define kobsoletes1 dkms-r8192se <= 0019.1207.2010-2
+%define kobsoletes2 dkms-lzma <= 4.43-32
+%define kobsoletes3 dkms-psb <= 4.41.1-7
%define kconflicts1 dkms-broadcom-wl < 5.100.82.112-12
%define kconflicts2 dkms-fglrx < 13.200.5-1
@@ -375,13 +375,13 @@ BuildRequires: binutils
BuildRequires: gcc >= 7.2.1_2017.11-3
BuildRequires: gcc-plugin-devel >= 7.2.1_2017.11-3
BuildRequires: gcc-c++ >= 7.2.1_2017.11-3
-BuildRequires: openssl-devel
+BuildRequires: pkgconfig(libssl)
BuildRequires: diffutils
# For git apply
BuildRequires: git-core
# For power tools
BuildRequires: pkgconfig(ncurses)
-BuildRequires: kmod-devel
+BuildRequires: pkgconfig(libkmod)
%ifarch x86_64
BuildRequires: numa-devel
@@ -389,7 +389,7 @@ BuildRequires: numa-devel
# for cpupower
%if %{with build_cpupower}
-BuildRequires: pciutils-devel
+BuildRequires: pkgconfig(libpci)
%endif
# for docs
@@ -403,20 +403,20 @@ BuildRequires: pkgconfig(libelf)
# for perf
%if %{with build_perf}
BuildRequires: asciidoc
-BuildRequires: audit-devel
+BuildRequires: pkgconfig(audit)
BuildRequires: binutils-devel
BuildRequires: bison
# BuildRequires: docbook-style-xsl
BuildRequires: flex
# BuildRequires: gettext
# BuildRequires: gtk2-devel
-BuildRequires: libunwind-devel
-BuildRequires: newt-devel
+BuildRequires: pkgconfig(libunwind)
+BuildRequires: pkgconfig(libnewt)
BuildRequires: perl-devel
# BuildRequires: perl(ExtUtils::Embed)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(python2)
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
%endif
%ifarch %{arm}
@@ -454,14 +454,20 @@ Version: %{fakever} \
Release: %{fakerel} \
Provides: %kprovides1 %kprovides2 \
%{expand:%%{?kprovides_%{1}:Provides: %{kprovides_%{1}}}} \
-Provides: %{kname}-%{1} \
-Requires(pre): %requires2 %requires3 %requires4 \
+Provides: %{kname}-%{1} \
+Requires(pre): %requires2 %requires3 %requires4 \
Requires: %requires2 %requires5 \
Obsoletes: %kobsoletes1 %kobsoletes2 %kobsoletes3 \
Conflicts: %kconflicts1 %kconflicts2 %kconflicts3 \
Conflicts: %kconflicts4 %kconflicts5 \
Provides: should-restart = system \
Suggests: crda \
+Suggests: iw \
+%ifnarch %armx \
+Suggests: cpupower \
+Suggests: microcode-intel \
+Suggests: dracut >= 047 \
+%endif \
%ifarch %{ix86} \
Conflicts: arch(x86_64) \
%endif \
@@ -709,6 +715,7 @@ Summary: Devel files for cpupower
Group: Development/Kernel
Requires: cpupower = %{kversion}-%{rpmrel}
Conflicts: %{_lib}cpufreq-devel
+
%description -n cpupower-devel
This package contains the development files for cpupower.
%endif
@@ -720,7 +727,7 @@ Version: %{kversion}
Release: %{rpmrel}
%description -n bootsplash-packer
-Tool for packing bootsplash images
+Tool for packing bootsplash images.
%if %{with build_x86_energy_perf_policy}
%package -n x86_energy_perf_policy
@@ -968,7 +975,11 @@ BuildKernel() {
install -m 644 System.map %{temp_boot}/System.map-$KernelVer
install -m 644 .config %{temp_boot}/config-$KernelVer
%if %{with build_modxz}
- xz -6e -T0 -c Module.symvers > %{temp_boot}/symvers-$KernelVer.xz
+%ifarch %{ix86} %{armx}
+ xz -5 -T0 -c Module.symvers > %{temp_boot}/symvers-$KernelVer.xz
+%else
+ xz -7 -T0 -c Module.symvers > %{temp_boot}/symvers-$KernelVer.xz
+%endif
%else
gzip -9 -c Module.symvers > %{temp_boot}/symvers-$KernelVer.gz
%endif
@@ -1205,7 +1216,7 @@ ker="vmlinuz"
### Create the kernel_files.*
cat > $kernel_files <<EOF
%{_bootdir}/System.map-%{kversion}-$kernel_flavour-%{buildrpmrel}
-%{_bootdir}/symvers-%{kversion}-$kernel_flavour-%{buildrpmrel}.xz
+%{_bootdir}/symvers-%{kversion}-$kernel_flavour-%{buildrpmrel}.*z
%{_bootdir}/config-%{kversion}-$kernel_flavour-%{buildrpmrel}
%{_bootdir}/$ker-%{kversion}-$kernel_flavour-%{buildrpmrel}
# device tree binary
@@ -1514,7 +1525,11 @@ popd
# compressing modules
%if %{with build_modxz}
-find %{target_modules} -name "*.ko" | %kxargs xz -6e -T0
+%ifarch %{ix86} %{armx}
+find %{target_modules} -name "*.ko" | %kxargs xz -5 -T0
+%else
+find %{target_modules} -name "*.ko" | %kxargs xz -7 -T0
+%endif
%else
find %{target_modules} -name "*.ko" | %kxargs gzip -9
%endif