diff --git a/SOURCES/centos-linux-3.10-x86-perf-uncore-Avoid-kernel-panic-on-missing-topolo-7_8-bug12818.patch b/SOURCES/centos-linux-3.10-x86-perf-uncore-Avoid-kernel-panic-on-missing-topolo-7_8-bug12818.patch
new file mode 100644
index 0000000..e835240
--- /dev/null
+++ b/SOURCES/centos-linux-3.10-x86-perf-uncore-Avoid-kernel-panic-on-missing-topolo-7_8-bug12818.patch
@@ -0,0 +1,44 @@
+centosplus kernel patch [bug#12818]
+
+From ac68351410df683a149e7eea09df178884cf2419 Mon Sep 17 00:00:00 2001
+From: Marcus Sundberg <marcus.sundberg@aptilo.com>
+Date: Mon, 13 Feb 2017 22:57:11 +0100
+Subject: [PATCH] [x86] perf: uncore: Avoid kernel panic on missing topology
+
+The uncore code is heavily dependent on the CPU topology mapping code,
+so if we do not even have a working topology for the boot CPU we just
+give up.
+This happens for example on HPE DL360 Gen9 servers with x2APIC enabled
+in the firmware settings, where the kernel only finds a single core.
+---
+ arch/x86/events/intel/uncore.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
+index 77ec6c0..88d79f6 100644
+--- a/arch/x86/events/intel/uncore.c
++++ b/arch/x86/events/intel/uncore.c
+@@ -1394,6 +1394,20 @@ static int __init intel_uncore_init(void)
+ if (is_kdump_kernel())
+ return -ENODEV;
+
++ /* Sanity check - do not even try to proceed if we have no
++ working topology mapping for the boot CPU. */
++ if (rh_boot_cpu_data.logical_proc_id < 0 ||
++ topology_phys_to_logical_pkg(boot_cpu_data.phys_proc_id) < 0) {
++ printk(KERN_ERR
++ "no mapping between physical and logical CPU, "
++ "boot CPU phys: %d, logical: %d/%d\n",
++ (int)boot_cpu_data.phys_proc_id,
++ (int)rh_boot_cpu_data.logical_proc_id,
++ (int)topology_phys_to_logical_pkg(
++ boot_cpu_data.phys_proc_id));
++ return -ENODEV;
++ }
++
+ max_packages = topology_max_packages() * topology_max_die_per_package();
+
+ pret = uncore_pci_init();
+--
+2.5.0
+
diff --git a/SOURCES/kernel-3.10.0-i686.config b/SOURCES/kernel-3.10.0-i686.config
index 05ab439..b17a8f0 100644
--- a/SOURCES/kernel-3.10.0-i686.config
+++ b/SOURCES/kernel-3.10.0-i686.config
@@ -1,5 +1,8 @@
# x86
#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 3.10.0 Kernel Configuration
+#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
CONFIG_X86=y
@@ -541,6 +544,7 @@ CONFIG_ZSMALLOC=y
CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
CONFIG_IDLE_PAGE_TRACKING=y
+# CONFIG_PERCPU_STATS is not set
# CONFIG_HIGHPTE is not set
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
@@ -1494,8 +1498,6 @@ CONFIG_LIB80211=m
CONFIG_MAC80211=m
CONFIG_MAC80211_HAS_RC=y
CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_MAC80211_MESH is not set
@@ -1524,6 +1526,8 @@ CONFIG_LWTUNNEL=y
CONFIG_DST_CACHE=y
CONFIG_NET_DEVLINK=m
CONFIG_MAY_USE_DEVLINK=m
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
#
# Device Drivers
@@ -1673,7 +1677,6 @@ CONFIG_BLK_DEV_SX8=m
CONFIG_BLK_DEV_RAM=m
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_RAM_DAX=y
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -2222,6 +2225,8 @@ CONFIG_NET_VENDOR_EMULEX=y
CONFIG_BE2NET=m
CONFIG_BE2NET_HWMON=y
# CONFIG_NET_VENDOR_EXAR is not set
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=m
# CONFIG_NET_VENDOR_HP is not set
CONFIG_NET_VENDOR_INTEL=y
CONFIG_E100=m
@@ -2378,7 +2383,7 @@ CONFIG_SMSC_PHY=m
CONFIG_BROADCOM_PHY=m
CONFIG_BCM87XX_PHY=m
CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
CONFIG_NATIONAL_PHY=m
CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
@@ -2603,7 +2608,7 @@ CONFIG_RTW88_PCI=m
CONFIG_RTW88_8822BE=y
CONFIG_RTW88_8822CE=y
# CONFIG_RTW88_DEBUG is not set
-# CONFIG_RTW88_DEBUGFS is not set
+# CONFIG_RTW88_DEBUGFS is not set
# CONFIG_WL_TI is not set
# CONFIG_ZD1211RW is not set
@@ -2641,6 +2646,7 @@ CONFIG_VMXNET3=m
CONFIG_FUJITSU_ES=m
CONFIG_THUNDERBOLT_NET=m
CONFIG_HYPERV_NET=m
+CONFIG_NET_FAILOVER=m
CONFIG_ISDN=y
CONFIG_ISDN_I4L=m
CONFIG_ISDN_PPP=y
@@ -5064,7 +5070,6 @@ CONFIG_INFINIBAND_SRPT=m
CONFIG_INFINIBAND_ISER=m
CONFIG_INFINIBAND_ISERT=m
CONFIG_RDMA_RXE=m
-CONFIG_INFINIBAND_BNXT_RE=m
CONFIG_EDAC=y
CONFIG_EDAC_LEGACY_SYSFS=y
# CONFIG_EDAC_DEBUG is not set
@@ -5640,6 +5645,21 @@ CONFIG_PWM_LPSS=m
CONFIG_RAS=y
CONFIG_DAX=y
CONFIG_DEV_DAX=m
+CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_HEARTBEAT=m
+CONFIG_STM_SOURCE_FTRACE=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_ACPI=m
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
CONFIG_THUNDERBOLT=y
CONFIG_NVMEM=y
@@ -6008,7 +6028,6 @@ CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6038,7 +6057,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_LATENCYTOP is not set
CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-# CONFIG_PAGE_EXTENSION is not set
+CONFIG_PAGE_EXTENSION=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
diff --git a/SOURCES/kernel-3.10.0-x86_64.config b/SOURCES/kernel-3.10.0-x86_64.config
index 8b63101..7eb8336 100644
--- a/SOURCES/kernel-3.10.0-x86_64.config
+++ b/SOURCES/kernel-3.10.0-x86_64.config
@@ -568,6 +568,7 @@ CONFIG_IDLE_PAGE_TRACKING=y
CONFIG_ZONE_DEVICE=y
CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
CONFIG_ARCH_HAS_PKEYS=y
+# CONFIG_PERCPU_STATS is not set
CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=m
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -686,6 +687,7 @@ CONFIG_ACPI_APEI_EINJ=m
# CONFIG_DPTF_POWER is not set
CONFIG_ACPI_WATCHDOG=y
CONFIG_ACPI_EXTLOG=m
+CONFIG_ACPI_ADXL=y
CONFIG_SFI=y
#
@@ -1533,8 +1535,6 @@ CONFIG_LIB80211=m
CONFIG_MAC80211=m
CONFIG_MAC80211_HAS_RC=y
CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_MAC80211_MESH is not set
@@ -1564,6 +1564,7 @@ CONFIG_DST_CACHE=y
CONFIG_NET_DEVLINK=m
CONFIG_MAY_USE_DEVLINK=m
CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
CONFIG_HAVE_EBPF_JIT=y
#
@@ -1713,7 +1714,6 @@ CONFIG_BLK_DEV_SX8=m
CONFIG_BLK_DEV_RAM=m
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_RAM_DAX=y
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -2267,6 +2267,8 @@ CONFIG_NET_VENDOR_EMULEX=y
CONFIG_BE2NET=m
CONFIG_BE2NET_HWMON=y
# CONFIG_NET_VENDOR_EXAR is not set
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=m
# CONFIG_NET_VENDOR_HP is not set
CONFIG_NET_VENDOR_INTEL=y
CONFIG_E100=m
@@ -2424,7 +2426,7 @@ CONFIG_SMSC_PHY=m
CONFIG_BROADCOM_PHY=m
CONFIG_BCM87XX_PHY=m
CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
CONFIG_NATIONAL_PHY=m
CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
@@ -2688,6 +2690,7 @@ CONFIG_VMXNET3=m
CONFIG_FUJITSU_ES=m
CONFIG_THUNDERBOLT_NET=m
CONFIG_HYPERV_NET=m
+CONFIG_NET_FAILOVER=m
CONFIG_ISDN=y
CONFIG_ISDN_I4L=m
CONFIG_ISDN_PPP=y
@@ -5731,6 +5734,21 @@ CONFIG_DAX_DRIVER=y
CONFIG_DAX=y
CONFIG_DEV_DAX=m
CONFIG_DEV_DAX_PMEM=m
+CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_HEARTBEAT=m
+CONFIG_STM_SOURCE_FTRACE=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_ACPI=m
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
CONFIG_THUNDERBOLT=y
CONFIG_NVMEM=y
@@ -6102,7 +6120,6 @@ CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
# CONFIG_TEST_LIST_SORT is not set
@@ -6190,6 +6207,7 @@ CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
CONFIG_DYNAMIC_DEBUG=y
# CONFIG_DMA_API_DEBUG is not set
CONFIG_ATOMIC64_SELFTEST=y
+# CONFIG_TEST_LIVEPATCH is not set
CONFIG_ASYNC_RAID6_TEST=m
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
diff --git a/SOURCES/patch-i686-mce-7_8.patch b/SOURCES/patch-i686-mce-7_8.patch
new file mode 100644
index 0000000..defe51a
--- /dev/null
+++ b/SOURCES/patch-i686-mce-7_8.patch
@@ -0,0 +1,28 @@
+diff -aurp a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
+--- a/arch/x86/kernel/cpu/mcheck/mce.c 2019-10-05 05:27:35.000000000 -0300
++++ b/arch/x86/kernel/cpu/mcheck/mce.c 2020-03-30 12:06:36.546549480 -0300
+@@ -52,6 +52,13 @@
+
+ #include "mce-internal.h"
+
++#ifndef set_mce_nospec
++static inline int set_mce_nospec(unsigned long pfn)
++{
++ return 0;
++}
++#endif
++
+ static DEFINE_MUTEX(mce_chrdev_read_mutex);
+
+ #define mce_log_get_idx_check(p) \
+diff -aurp a/drivers/scsi/megaraid/megaraid_sas_debugfs.c b/drivers/scsi/megaraid/megaraid_sas_debugfs.c
+--- a/drivers/scsi/megaraid/megaraid_sas_debugfs.c 2019-10-05 05:27:35.000000000 -0300
++++ b/drivers/scsi/megaraid/megaraid_sas_debugfs.c 2020-03-30 13:20:30.225702075 -0300
+@@ -28,6 +28,7 @@
+ #include <linux/kernel.h>
+ #include <linux/types.h>
+ #include <linux/pci.h>
++#include <linux/uio.h>
+ #include <linux/interrupt.h>
+ #include <linux/compat.h>
+ #include <linux/irq_poll.h>
diff --git a/SOURCES/patch-i686-rate-7_8.patch b/SOURCES/patch-i686-rate-7_8.patch
new file mode 100644
index 0000000..2189d28
--- /dev/null
+++ b/SOURCES/patch-i686-rate-7_8.patch
@@ -0,0 +1,11 @@
+diff -aurp a/sound/core/oss/rate.c b/sound/core/oss/rate.c
+--- a/sound/core/oss/rate.c 2019-10-05 05:27:35.000000000 -0300
++++ b/sound/core/oss/rate.c 2020-03-30 17:08:39.702962016 -0300
+@@ -22,6 +22,7 @@
+ #include <linux/time.h>
+ #include <sound/core.h>
+ #include <sound/pcm.h>
++#include <linux/overflow.h>
+ #include "pcm_plugin.h"
+
+ #define SHIFT 11
diff --git a/SOURCES/upstream-32bit-fixes-7_8.patch b/SOURCES/upstream-32bit-fixes-7_8.patch
new file mode 100644
index 0000000..2c03889
--- /dev/null
+++ b/SOURCES/upstream-32bit-fixes-7_8.patch
@@ -0,0 +1,115 @@
+From b9469523631bd376a5f877d4e816f3a81c12b790 Mon Sep 17 00:00:00 2001
+From: Paul Bolle <pebolle@tiscali.nl>
+Date: Mon, 30 Jun 2014 16:32:29 +0200
+Subject: [PATCH] x86: Remove unused variable "polling"
+
+Compile tested. "polling" is unused since commit f80c5b39b80a
+("sched/idle, x86: Switch from TS_POLLING to TIF_POLLING_NRFLAG").
+
+Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
+Signed-off-by: Peter Zijlstra <peterz@infradead.org>
+Cc: Jiri Kosina <jkosina@suse.cz>
+Link: http://lkml.kernel.org/r/1404138749.2978.6.camel@x41
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+---
+ arch/x86/kernel/apm_32.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
+index 8fdcec6..66d3b1f 100644
+--- a/arch/x86/kernel/apm_32.c
++++ b/arch/x86/kernel/apm_32.c
+@@ -841,7 +841,6 @@ static int apm_do_idle(void)
+ u32 eax;
+ u8 ret = 0;
+ int idled = 0;
+- int polling;
+ int err = 0;
+
+ if (!need_resched()) {
+--
+1.8.3.1
+
+From 75c2e0e53d2fb5df66b8fe162d71930348ac0b96 Mon Sep 17 00:00:00 2001
+From: John Stultz <john.stultz@linaro.org>
+Date: Wed, 16 Jul 2014 21:03:56 +0000
+Subject: [PATCH] ktime: Change ktime_set() to take 64bit seconds value
+
+In order to support dates past 2038 on 32bit systems, ktime_set()
+needs to handle 64bit second values.
+
+[ tglx: Removed the BITS_PER_LONG check ]
+
+Signed-off-by: John Stultz <john.stultz@linaro.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: John Stultz <john.stultz@linaro.org>
+---
+ include/linux/ktime.h | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/include/linux/ktime.h b/include/linux/ktime.h
+index e4e9a9f..6950c96 100644
+--- a/include/linux/ktime.h
++++ b/include/linux/ktime.h
+@@ -71,13 +71,12 @@ typedef union ktime ktime_t; /* Kill this */
+ *
+ * Return the ktime_t representation of the value
+ */
+-static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
++static inline ktime_t ktime_set(const s64 secs, const unsigned long nsecs)
+ {
+-#if (BITS_PER_LONG == 64)
+ if (unlikely(secs >= KTIME_SEC_MAX))
+ return (ktime_t){ .tv64 = KTIME_MAX };
+-#endif
+- return (ktime_t) { .tv64 = (s64)secs * NSEC_PER_SEC + (s64)nsecs };
++
++ return (ktime_t) { .tv64 = secs * NSEC_PER_SEC + (s64)nsecs };
+ }
+
+ /* Subtract two ktime_t variables. rem = lhs -rhs: */
+--
+1.8.3.1
+
+From 80a667f7ab1beee42b31e263ba4681fdfe00a0b6 Mon Sep 17 00:00:00 2001
+From: Florian Westphal <fw@strlen.de>
+Date: Wed, 17 Jun 2015 23:58:28 +0200
+Subject: [PATCH] netfilter: xtables: fix warnings on 32bit platforms
+
+On 32bit archs gcc complains due to cast from void* to u64.
+Add intermediate casts to long to silence these warnings.
+
+include/linux/netfilter/x_tables.h:376:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
+include/linux/netfilter/x_tables.h:384:15: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
+include/linux/netfilter/x_tables.h:391:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
+include/linux/netfilter/x_tables.h:400:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
+
+Fixes: 71ae0dff02d756e ("netfilter: xtables: use percpu rule counters")
+Reported-by: kbuild test robot <fengguang.wu@intel.com>
+Signed-off-by: Florian Westphal <fw@strlen.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ include/linux/netfilter/x_tables.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff -up ./include/linux/netfilter/x_tables.h.int ./include/linux/netfilter/x_tables.h
+--- ./include/linux/netfilter/x_tables.h.int 2018-03-22 06:40:12.000000000 +0900
++++ ./include/linux/netfilter/x_tables.h 2018-04-15 23:09:40.000000000 +0900
+@@ -381,7 +381,7 @@ static inline struct xt_counters *
+ xt_get_this_cpu_counter(struct xt_counters *cnt)
+ {
+ if (nr_cpu_ids > 1)
+- return this_cpu_ptr((void __percpu *) cnt->pcnt);
++ return this_cpu_ptr((void __percpu *) (unsigned long) cnt->pcnt);
+
+ return cnt;
+ }
+@@ -390,7 +390,7 @@ static inline struct xt_counters *
+ xt_get_per_cpu_counter(struct xt_counters *cnt, unsigned int cpu)
+ {
+ if (nr_cpu_ids > 1)
+- return per_cpu_ptr((void __percpu *) cnt->pcnt, cpu);
++ return per_cpu_ptr((void __percpu *) (unsigned long) cnt->pcnt, cpu);
+
+ return cnt;
+ }
diff --git a/SPECS/kernel-plus.spec b/SPECS/kernel-plus.spec
index 5b12cdf..e9f8bbf 100644
--- a/SPECS/kernel-plus.spec
+++ b/SPECS/kernel-plus.spec
@@ -11,13 +11,13 @@ Summary: The Linux kernel
# For internal testing builds during development, it should be 0.
%global released_kernel 1
-%global distro_build 1062
+%global distro_build 1127
%define rpmversion 3.10.0
-%define pkgrelease 1062.18.1.el7
+%define pkgrelease 1127.el7
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 1062.18.1%{?dist}
+%define specrelease 1127%{?dist}
%define pkg_release %{specrelease}%{?buildid}
@@ -29,7 +29,6 @@ Summary: The Linux kernel
# All should default to 1 (enabled) and be flipped to 0 (disabled)
# by later arch-specific checks.
-%define _with_kabidupchk 1
# The following build options are enabled by default.
# Use either --without <opt> in your rpmbuild command or force values
# to 0 in here to disable them.
@@ -475,7 +474,7 @@ Patch1007: addmissing.patch
Patch1008: undorhirqstat.patch
# Patch1009: otherfixes.patch
Patch1009: clear-32bit-Werror-warnings.patch
-Patch1010: upstream-32bit-fixes-7_5.patch
+Patch1010: upstream-32bit-fixes-7_8.patch
Patch1011: morefixes.patch
Patch1012: qspinlock_types-32bit.patch
Patch1013: init_32.patch
@@ -525,6 +524,9 @@ Patch1307: patch-i686-nfp-2.patch
Patch1308: patch-i686-v7_7.2.patch
Patch1309: bmap-bug16610.patch
+Patch1310: patch-i686-rate-7_8.patch
+Patch1311: patch-i686-mce-7_8.patch
+
# end of i686 mods
# centosplus patches
@@ -534,7 +536,7 @@ Patch30060: centos-linux-3.10-fix-em28xx-cards-bug8285.patch
#Patch30062: centos-linux-3.10-fix-ecryptfs-error-bug7369.patch
Patch20070: centos-linux-3.10-support-MacBookPro-bug10447-v2.patch
Patch20104: centos-linux-3.10-scsi-storvsc-fix-bug12841.patch
-Patch20105: centos-linux-3.10-x86-perf-uncore-Avoid-kernel-panic-on-missing-topolo-bug12818.patch
+Patch20105: centos-linux-3.10-x86-perf-uncore-Avoid-kernel-panic-on-missing-topolo-7_8-bug12818.patch
#Patch20200: centos-linux-3.10-tcp_make_synack-el75-bug13583.patch
#Patch20201: centos-linux-3.10-xen-dont-copy-bogus-duplicate-entries-into-kernel-page-tables-bug13763.patch
Patch20203: centos-linux-3.10-openssl-correct-msg-bug13990.patch
@@ -1007,7 +1009,7 @@ ApplyOptionalPatch centos-linux-3.10-fix-em28xx-cards-bug8285.patch
#ApplyOptionalPatch centos-linux-3.10-fix-ecryptfs-error-bug7369.patch
ApplyOptionalPatch centos-linux-3.10-support-MacBookPro-bug10447-v2.patch
ApplyOptionalPatch centos-linux-3.10-scsi-storvsc-fix-bug12841.patch
-ApplyOptionalPatch centos-linux-3.10-x86-perf-uncore-Avoid-kernel-panic-on-missing-topolo-bug12818.patch
+ApplyOptionalPatch centos-linux-3.10-x86-perf-uncore-Avoid-kernel-panic-on-missing-topolo-7_8-bug12818.patch
#ApplyOptionalPatch centos-linux-3.10-tcp_make_synack-el75-bug13583.patch
#ApplyOptionalPatch centos-linux-3.10-xen-dont-copy-bogus-duplicate-entries-into-kernel-page-tables-bug13763.patch
ApplyOptionalPatch centos-linux-3.10-openssl-correct-msg-bug13990.patch
@@ -1045,6 +1047,9 @@ ApplyOptionalPatch centos-linux-3.10-acpi-ghes-bug16315.patch
ApplyOptionalPatch centos-linux-3.10-net-ICMP-report-fix-bug16521.patch
ApplyOptionalPatch centos-linux-3.10-cifs-fix-bug16824.patch
ApplyOptionalPatch centos-linux-3.10-r8169-fix-network-stalls.patch
+ApplyOptionalPatch upstream-32bit-fixes-7_8.patch
+ApplyOptionalPatch patch-i686-rate-7_8.patch
+ApplyOptionalPatch patch-i686-mce-7_8.patch
### end of plus mod
# End of CentOS Modification
@@ -2047,7 +2052,7 @@ fi
%kernel_variant_files %{with_kdump} kdump
%changelog
-* Tue Mar 17 2020 Akemi Yagi <toracat@centos.org> [3.10.0-1062.18.1.el7.centos.plus]
+* Tue Mar 31 2020 Akemi Yagi <toracat@centos.org> [3.10.0-1127.el7.centos.plus]
- Apply debranding changes
- Roll in i686 mods
addmissing.patch [puias]
@@ -2056,7 +2061,6 @@ fi
removejiffies.patch [puias]
undorhirqstat.patch [puias]
morefixes.patch [puias+bug#12412]
- upstream-32bit-fixes-7_5.patch [puias+bug#12412]
clear-32bit-Werror-warnings.patch [bug#12412]
qspinlock_types-32bit.patch [ay]
i686-7-4.patch [T.Kabe, bug#13890]
@@ -2068,6 +2072,9 @@ fi
Patches updated for 7.6 [kabe, bug#15428]
Patches for 7.7 [pgreco, bug#16324]
Patch bmap [pgreco bug#16610]
+ upstream-32bit-fixes-7_8.patch [puias+bug#12412]
+ patch-i686-rate-7_8.patch [pgreco]
+ patch-i686-mce-7_8.patch [pgreco]
- Modify config file for x86_64 with extra features turned on including
some network adapters, BusLogic, ReiserFS, TOMOYO
- Add in a patch that allows non-LogiTech remote to work [bug#5780]
diff --git a/kernel-abi-whitelists-4.18.0-187.tar.bz2 b/kernel-abi-whitelists-4.18.0-187.tar.bz2
new file mode 100644
index 0000000..8917d3e
Binary files /dev/null and b/kernel-abi-whitelists-4.18.0-187.tar.bz2 differ
diff --git a/kernel-kabi-dw-4.18.0-187.tar.bz2 b/kernel-kabi-dw-4.18.0-187.tar.bz2
new file mode 100644
index 0000000..bf4be24
Binary files /dev/null and b/kernel-kabi-dw-4.18.0-187.tar.bz2 differ
diff --git a/linux-4.18.0-187.el8.tar.xz b/linux-4.18.0-187.el8.tar.xz
new file mode 100644
index 0000000..11c1e97
Binary files /dev/null and b/linux-4.18.0-187.el8.tar.xz differ