diff --git a/SOURCES/kernel-3.10.0-x86_64.config b/SOURCES/kernel-3.10.0-x86_64.config
index 93d1fec..4044041 100644
--- a/SOURCES/kernel-3.10.0-x86_64.config
+++ b/SOURCES/kernel-3.10.0-x86_64.config
@@ -1,8 +1,5 @@
 # x86_64
 #
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.10.0 Kernel Configuration
-#
 CONFIG_64BIT=y
 CONFIG_X86_64=y
 CONFIG_X86=y
@@ -373,7 +370,7 @@ CONFIG_SMP=y
 CONFIG_X86_X2APIC=y
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_EXTENDED_PLATFORM=y
-# CONFIG_X86_NUMACHIP is not set
+CONFIG_X86_NUMACHIP=y
 # CONFIG_X86_VSMP is not set
 CONFIG_X86_UV=y
 CONFIG_X86_INTEL_LPSS=y
@@ -1412,6 +1409,7 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
+# CONFIG_BT_WILINK is not set
 # CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
@@ -1447,7 +1445,10 @@ CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
 # CONFIG_RFKILL_GPIO is not set
-# CONFIG_NET_9P is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_RDMA is not set
+# CONFIG_NET_9P_DEBUG is not set
 # CONFIG_CAIF is not set
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
@@ -1670,7 +1671,7 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 #
 # Texas Instruments shared transport line discipline
 #
-# CONFIG_TI_ST is not set
+CONFIG_TI_ST=m
 CONFIG_SENSORS_LIS3_I2C=m
 
 #
@@ -1742,7 +1743,12 @@ CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_3W_SAS=m
 # CONFIG_SCSI_ACARD is not set
 CONFIG_SCSI_AACRAID=m
-# CONFIG_SCSI_AIC7XXX is not set
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=5000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 CONFIG_SCSI_AIC79XX=m
 CONFIG_AIC79XX_CMDS_PER_DEVICE=4
@@ -1770,7 +1776,7 @@ CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
 # CONFIG_SCSI_UFSHCD_PLATFORM is not set
 CONFIG_SCSI_HPTIOP=m
-# CONFIG_SCSI_BUSLOGIC is not set
+CONFIG_SCSI_BUSLOGIC=m
 CONFIG_VMWARE_PVSCSI=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_LIBFC=m
@@ -2009,7 +2015,44 @@ CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
 CONFIG_NLMON=m
 # CONFIG_ARCNET is not set
-# CONFIG_ATM_DRIVERS is not set
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+CONFIG_ATM_ENI_TUNE_BURST=y
+CONFIG_ATM_ENI_BURST_TX_16W=y
+CONFIG_ATM_ENI_BURST_TX_8W=y
+CONFIG_ATM_ENI_BURST_TX_4W=y
+CONFIG_ATM_ENI_BURST_TX_2W=y
+CONFIG_ATM_ENI_BURST_RX_16W=y
+CONFIG_ATM_ENI_BURST_RX_8W=y
+CONFIG_ATM_ENI_BURST_RX_4W=y
+CONFIG_ATM_ENI_BURST_RX_2W=y
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+CONFIG_ATM_IDT77252_RCV_ALL=y
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+CONFIG_ATM_IA_DEBUG=y
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
 
 #
 # CAIF transport drivers
@@ -2030,7 +2073,9 @@ CONFIG_VHOST=m
 # CONFIG_NET_DSA_MV88E6123_61_65 is not set
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
-# CONFIG_NET_VENDOR_3COM is not set
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
 # CONFIG_NET_VENDOR_ADAPTEC is not set
 # CONFIG_NET_VENDOR_ALTEON is not set
 # CONFIG_NET_VENDOR_AMD is not set
@@ -2091,7 +2136,7 @@ CONFIG_BE2NET_VXLAN=y
 # CONFIG_NET_VENDOR_EXAR is not set
 # CONFIG_NET_VENDOR_HP is not set
 CONFIG_NET_VENDOR_INTEL=y
-# CONFIG_E100 is not set
+CONFIG_E100=m
 CONFIG_E1000=m
 CONFIG_E1000E=m
 CONFIG_E1000E_HWTS=y
@@ -2099,7 +2144,7 @@ CONFIG_IGB=m
 CONFIG_IGB_HWMON=y
 CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
-# CONFIG_IXGB is not set
+CONFIG_IXGB=m
 CONFIG_IXGBE=m
 # CONFIG_IXGBE_VXLAN is not set
 CONFIG_IXGBE_HWMON=y
@@ -2140,13 +2185,14 @@ CONFIG_MYRI10GE=m
 CONFIG_MYRI10GE_DCA=y
 # CONFIG_FEALNX is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
 CONFIG_PCH_GBE=m
 CONFIG_ETHOC=m
 CONFIG_NET_PACKET_ENGINE=y
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
 CONFIG_NET_VENDOR_QLOGIC=y
 CONFIG_QLA3XXX=m
 CONFIG_QLCNIC=m
@@ -2187,7 +2233,10 @@ CONFIG_SMSC9420=m
 # CONFIG_NET_VENDOR_TEHUTI is not set
 CONFIG_NET_VENDOR_TI=y
 CONFIG_TLAN=m
-# CONFIG_NET_VENDOR_VIA is not set
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_VELOCITY=m
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -2611,8 +2660,8 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_GPIO_POLLED is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
 # CONFIG_KEYBOARD_TCA6416 is not set
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_MATRIX is not set
@@ -2860,7 +2909,15 @@ CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_MUX is not set
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+# CONFIG_I2C_MUX_PINCTRL is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -2937,7 +2994,7 @@ CONFIG_SPI_MASTER=y
 # SPI Master Controller Drivers
 #
 # CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_BITBANG is not set
+CONFIG_SPI_BITBANG=m
 # CONFIG_SPI_BUTTERFLY is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_LM70_LLP is not set
@@ -2953,7 +3010,7 @@ CONFIG_SPI_MASTER=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
 
 #
@@ -3002,6 +3059,7 @@ CONFIG_GPIO_DEVRES=y
 CONFIG_GPIO_ACPI=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX730X=m
 
 #
 # Memory mapped GPIO drivers:
@@ -3037,10 +3095,10 @@ CONFIG_GPIO_LANGWELL=y
 #
 # SPI GPIO expanders:
 #
-# CONFIG_GPIO_MAX7301 is not set
+CONFIG_GPIO_MAX7301=m
 # CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_74X164 is not set
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_74X164=m
 
 #
 # AC97 GPIO expanders:
@@ -4026,7 +4084,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_GOLDFISH is not set
 # CONFIG_FB_VIRTUAL is not set
-# CONFIG_XEN_FBDEV_FRONTEND is not set
+CONFIG_XEN_FBDEV_FRONTEND=m
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
@@ -4229,7 +4287,7 @@ CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_I915=y
 CONFIG_SND_HDA_EXT_CORE=m
 CONFIG_SND_HDA_PREALLOC_SIZE=512
-# CONFIG_SND_SPI is not set
+CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_UA101=m
@@ -4640,8 +4698,9 @@ CONFIG_LEDS_CLASS=y
 #
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM3642 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP55XX_COMMON=m
 CONFIG_LEDS_LP5521=m
@@ -4860,7 +4919,7 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO=m
 CONFIG_VFIO_NOIOMMU=y
 CONFIG_VFIO_PCI=m
-# CONFIG_VFIO_PCI_VGA is not set
+CONFIG_VFIO_PCI_VGA=y
 CONFIG_VFIO_PCI_MMAP=y
 CONFIG_VFIO_PCI_INTX=y
 CONFIG_IRQ_BYPASS_MANAGER=m
@@ -4922,7 +4981,8 @@ CONFIG_R8712U=m
 # CONFIG_RTS5139 is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_IDE_PHISON is not set
-# CONFIG_LINE6_USB is not set
+CONFIG_LINE6_USB=m
+CONFIG_LINE6_USB_IMPULSE_RESPONSE=y
 # CONFIG_USB_SERIAL_QUATECH2 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
@@ -5104,8 +5164,17 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_JBD2=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=m
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
 CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
@@ -5195,7 +5264,8 @@ CONFIG_CONFIGFS_FS=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ECRYPT_FS is not set
+CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
@@ -5290,6 +5360,9 @@ CONFIG_CIFS_SMB2=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
@@ -5545,7 +5618,7 @@ CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
-# CONFIG_SECURITY_PATH is not set
+CONFIG_SECURITY_PATH=y
 CONFIG_SECURITY_SECURELEVEL=y
 CONFIG_INTEL_TXT=y
 CONFIG_LSM_MMAP_MIN_ADDR=65535
@@ -5558,7 +5631,12 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
 # CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_YAMA is not set
 CONFIG_INTEGRITY=y
@@ -5573,6 +5651,7 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_EVM=y
 CONFIG_EVM_HMAC_VERSION=2
 CONFIG_DEFAULT_SECURITY_SELINUX=y
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_DAC is not set
 CONFIG_DEFAULT_SECURITY="selinux"
 CONFIG_XOR_BLOCKS=m
@@ -5835,7 +5914,7 @@ CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_NLATTR=y
 CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-# CONFIG_AVERAGE is not set
+CONFIG_AVERAGE=y
 CONFIG_CLZ_TAB=y
 CONFIG_CORDIC=m
 # CONFIG_DDR is not set
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 604c444..c2af14d 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -3,9 +3,9 @@
 
 Summary: The Linux kernel
 
-%define dist .el7
+%define dist .el7.centos.plus
 
-# % define buildid .local
+# % define buildid 
 
 # For a kernel released for public testing, released_kernel should be 1.
 # For internal testing builds during development, it should be 0.
@@ -36,7 +36,8 @@ Summary: The Linux kernel
 # kernel
 %define with_default   %{?_without_default:   0} %{?!_without_default:   1}
 # kernel-debug
-%define with_debug     %{?_without_debug:     0} %{?!_without_debug:     1}
+# %define with_debug     %{?_without_debug:     0} %{?!_without_debug:     1}
+%define with_debug 0
 # kernel-doc
 %define with_doc       %{?_without_doc:       0} %{?!_without_doc:       1}
 # kernel-headers
@@ -153,6 +154,9 @@ Summary: The Linux kernel
 %ifarch i686
 %define asmarch x86
 %define hdrarch i386
+%define all_arch_configs kernel-%{version}-i?86*.config
+%define image_install_path boot
+%define kernel_image arch/x86/boot/bzImage
 %endif
 
 %ifarch x86_64
@@ -208,7 +212,7 @@ Summary: The Linux kernel
 # Which is a BadThing(tm).
 
 # We only build kernel-headers on the following...
-%define nobuildarches i686 s390 ppc
+%define nobuildarches s390 ppc
 
 %ifarch %nobuildarches
 %define with_default 0
@@ -220,7 +224,7 @@ Summary: The Linux kernel
 %endif
 
 # Architectures we build tools/cpupower on
-%define cpupowerarchs x86_64 ppc64 ppc64le
+%define cpupowerarchs i686 x86_64 ppc64 ppc64le
 
 #
 # Three sets of minimum package version requirements in the form of Conflicts:
@@ -345,7 +349,7 @@ Source10: sign-modules
 Source11: x509.genkey
 Source12: extra_certificates
 %if %{?released_kernel}
-Source13: centos.cer 
+Source13: centos.cer
 Source14: secureboot.cer
 %define pesign_name redhatsecureboot301
 %else
@@ -359,34 +363,112 @@ Source16: centos-kpatch.x509
 Source18: check-kabi
 
 Source20: Module.kabi_x86_64
-Source21: Module.kabi_ppc64
-Source22: Module.kabi_ppc64le
-Source23: Module.kabi_s390x
+#Source21: Module.kabi_ppc64
+#Source22: Module.kabi_ppc64le
+#Source23: Module.kabi_s390x
 
 Source25: kernel-abi-whitelists-%{distro_build}.tar.bz2
 
 Source50: kernel-%{version}-x86_64.config
-Source51: kernel-%{version}-x86_64-debug.config
+#Source51: kernel-%{version}-x86_64-debug.config
 
-Source60: kernel-%{version}-ppc64.config
-Source61: kernel-%{version}-ppc64-debug.config
-Source62: kernel-%{version}-ppc64le.config
-Source63: kernel-%{version}-ppc64le-debug.config
+#Source60: kernel-%{version}-ppc64.config
+#Source61: kernel-%{version}-ppc64-debug.config
+#Source62: kernel-%{version}-ppc64le.config
+#Source63: kernel-%{version}-ppc64le-debug.config
 
-Source70: kernel-%{version}-s390x.config
-Source71: kernel-%{version}-s390x-debug.config
-Source72: kernel-%{version}-s390x-kdump.config
+#Source70: kernel-%{version}-s390x.config
+#Source71: kernel-%{version}-s390x-debug.config
+#Source72: kernel-%{version}-s390x-kdump.config
+Source80: kernel-%{version}-i686.config
+#Source81: kernel-%{version}-i686-debug.config
 
 # Sources for kernel-tools
 Source2000: cpupower.service
 Source2001: cpupower.config
 
-# empty final patch to facilitate testing of kernel patches
-Patch999999: linux-kernel-test.patch
+# centos patches
 Patch1000: debrand-single-cpu.patch
 Patch1001: debrand-rh_taint.patch
 Patch1002: debrand-rh-i686-cpu.patch
 
+# i686 mods
+#Patch1003: ignorewarnings.patch
+Patch1004: removejiffies.patch
+Patch1005: cpufreq.patch
+Patch1006: i386-audit-stop-scri-stack-frame.patch
+Patch1007: addmissing.patch
+Patch1008: undorhirqstat.patch
+# Patch1009: otherfixes.patch
+Patch1009: clear-32bit-Werror-warnings.patch
+Patch1010: upstream-32bit-fixes.patch
+Patch1011: morefixes.patch
+
+# centosplus patches
+Patch30010: centos-linux-3.10-hid-non-LogiTech-remote-bug5780.patch
+# Patch30050: centos-linux-3.10-ipc-fix-compat-msgrcv-bug7099.patch
+# Patch30051: centos-linux-3.10-fix-argument-list-too-long.patch
+# Patch30052: centos-linux-3.10-missing-Unifying-device-bug7340.patch
+# Patch30053: centos-linux-3.10-vxlan-fix-crash-when-interface-created-with-no-group-bug7454.patch
+# Patch30054: centos-linux-3.10-numa-remove-bugON-bug7474.patch
+# Patch30055: centos-linux-3.10-fix-wakingup-AMD-family-bug7645.patch
+# Patch30056: centos-linux-3.10-fix-nfs4_sequence_corruptor-bug7604.patch
+# Patch30057: centos-linux-3.10-tick-clear-broadcast-pending-bug7852.patch
+# Patch30058: centos-linux-3.10-bnx2x_fix_link_for_KR-bug7942.patch
+Patch30059: centos-linux-3.10-reiserfs-fix-redefine-error.patch
+Patch30060: centos-linux-3.10-fix-em28xx-cards-bug8285.patch
+# Patch30061: centos-linux-3.10-netfilter-nf_conntrack-fix-bug8341.patch
+Patch30062: centos-linux-3.10-fix-ecryptfs-error-bug7369.patch
+# Patch30063: centos-linux-3.10-fix-ioatdma-driver-bug8778.patch
+# Patch30064: centos-linux-3.10-fix-xfrm-input-bug9646.patch
+# Patch30065: centos-linux-3.10-3w-sas-fix-race-bug10073.patch
+# Patch20066: centos-linux-3.10-fix-dm-thin-metadata-bug10191.patch
+# Patch20067: centos-linux-3.10-namespaces-bug10320.patch
+# Patch20068: centos-linux-3.10-mpt3sas-SML-bug10516.patch
+# Patch20069: centos-linux-3.10-mpt3sas-fix-block-bug10516.patch
+Patch20070: centos-linux-3.10-support-MacBookPro-bug10447.patch
+# Patch20071: centos-linux-3.10-3w-xxxx-fix-race-bug10033.patch
+# Patch20072: centos-linux-3.10-3w-9xxx-fix-race-1of2-bug10033.patch
+# Patch20073: centos-linux-3.10-3w-9xxx-fix-race-2of2-bug10033.patch
+# Patch20074: centos-linux-3.10-e1000-Tx-fix-1-bug10767.patch
+# Patch20075: centos-linux-3.10-e1000-Tx-fix-2-bug10767.patch
+# Patch20076: centos-linux-3.10-fix-truncation-bug-EFI-bug10729.patch
+# Patch20077: centos-linux-3.10-md-fix-freeing-private-data-bug11184.patch
+#Patch20078: centos-linux-3.10-pci-fix-regression-mlx4-bug12277.patch
+# Patch20079: centos-linux-3.10-x86smp-fix-max_logical_packages_values-bug12466.patch
+Patch20080: centos-linux-3.10-ixgbe-force-VLNCTRL_VFE-bug12653.patch
+### mpt3sas patches bug12600 ###
+Patch20081: centos-linux-3.10-0001-scsi-mpt3sas-Fix-for-improper-info-displayed-in-var-.patch
+Patch20082: centos-linux-3.10-0002-scsi-mpt3sas-Fix-for-incorrect-numbers-for-MSIX-vect.patch
+Patch20083: centos-linux-3.10-0003-scsi-mpt3sas-Implement-device_remove_in_progress-che.patch
+Patch20084: centos-linux-3.10-0004-scsi-mpt3sas-Remove-unused-macro-MPT_DEVICE_TLR_ON.patch
+Patch20085: centos-linux-3.10-0005-scsi-mpt3sas-Bump-driver-version-as-14.100.00.00.patch
+Patch20086: centos-linux-3.10-0006-scsi-mpt3sas-Added-Device-ID-s-for-SAS35-devices-and.patch
+Patch20087: centos-linux-3.10-0007-scsi-mpt3sas-Increased-Additional-MSIX-support-for-S.patch
+Patch20088: centos-linux-3.10-0008-scsi-mpt3sas-set-EEDP-escape-flags-for-SAS35-devices.patch
+Patch20089: centos-linux-3.10-0009-scsi-mpt3sas-Use-the-new-MPI-2.6-32-bit-Atomic-Reque.patch
+Patch20090: centos-linux-3.10-0010-scsi-mpt3sas-Fix-for-Endianness-issue.patch
+Patch20091: centos-linux-3.10-0011-scsi-mpt3sas-Bump-driver-version-as-14.101.00.00.patch
+### megaraid patches bug12601 ###
+Patch20092: centos-linux-3.10-0001-scsi-megaraid_sas-Add-new-pci-device-Ids-for-SAS3.5-.patch
+Patch20093: centos-linux-3.10-0002-scsi-megaraid_sas-128-MSIX-Support.patch
+Patch20094: centos-linux-3.10-0003-scsi-megaraid_sas-EEDP-Escape-Mode-Support-for-SAS3..patch
+Patch20095: centos-linux-3.10-0004-scsi-megaraid_sas-SAS3.5-Generic-Megaraid-Controller.patch
+Patch20096: centos-linux-3.10-0005-scsi-megaraid_sas-SAS3.5-Generic-Megaraid-Controller.patch
+Patch20097: centos-linux-3.10-0006-scsi-megaraid_sas-Dynamic-Raid-Map-Changes-for-SAS3..patch
+Patch20098: centos-linux-3.10-0007-scsi-megaraid_sas-Add-the-Support-for-SAS3.5-Generic.patch
+Patch20099: centos-linux-3.10-0008-scsi-megaraid_sas-Enable-or-Disable-Fast-path-based-.patch
+Patch20100: centos-linux-3.10-0009-scsi-megaraid_sas-ldio_outstanding-variable-is-not-d.patch
+Patch20101: centos-linux-3.10-0010-scsi-megaraid_sas-Implement-the-PD-Map-support-for-S.patch
+Patch20102: centos-linux-3.10-0011-scsi-megaraid_sas-driver-version-upgrade.patch
+### end of mpt3sas and megaraid patches ###
+Patch20103: centos-linux-3.10-ipv6refcnt-bug12711.patch
+Patch20104: centos-linux-scsi-storvsc-fix-bug12841.patch
+Patch20105: centos-linux-x86-perf-uncore-Avoid-kernel-panic-on-missing-topolo-bug12818.patch
+
+# empty final patch to facilitate testing of kernel patches
+Patch999999: linux-kernel-test.patch
+
 BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
 
 %description
@@ -693,11 +775,91 @@ cd linux-%{KVRA}
 # Drop some necessary files from the source dir into the buildroot
 cp $RPM_SOURCE_DIR/kernel-%{version}-*.config .
 
-ApplyOptionalPatch linux-kernel-test.patch
-ApplyOptionalPatch debrand-single-cpu.patch
+# CentOS Modification
 ApplyOptionalPatch debrand-rh_taint.patch
+ApplyOptionalPatch debrand-single-cpu.patch
 ApplyOptionalPatch debrand-rh-i686-cpu.patch
 
+# i686 mods
+%ifarch %{ix86}
+#ApplyOptionalPatch ignorewarnings.patch
+ApplyOptionalPatch removejiffies.patch
+ApplyOptionalPatch cpufreq.patch
+ApplyOptionalPatch i386-audit-stop-scri-stack-frame.patch
+ApplyOptionalPatch addmissing.patch
+ApplyOptionalPatch morefixes.patch
+#ApplyOptionalPatch undorhirqstat.patch
+#ApplyOptionalPatch otherfixes.patch
+ApplyOptionalPatch clear-32bit-Werror-warnings.patch
+ApplyOptionalPatch upstream-32bit-fixes.patch
+%endif
+
+### plus mod
+ApplyOptionalPatch centos-linux-3.10-hid-non-LogiTech-remote-bug5780.patch
+#ApplyOptionalPatch centos-linux-3.10-ipc-fix-compat-msgrcv-bug7099.patch
+#ApplyOptionalPatch centos-linux-3.10-fix-argument-list-too-long.patch
+## ApplyOptionalPatch centos-linux-3.10-missing-Unifying-device-bug7340.patch
+#ApplyOptionalPatch centos-linux-3.10-vxlan-fix-crash-when-interface-created-with-no-group-bug7454.patch
+#ApplyOptionalPatch centos-linux-3.10-numa-remove-bugON-bug7474.patch
+## ApplyOptionalPatch centos-linux-3.10-fix-wakingup-AMD-family-bug7645.patch
+#ApplyOptionalPatch centos-linux-3.10-fix-nfs4_sequence_corruptor-bug7604.patch
+#ApplyOptionalPatch centos-linux-3.10-tick-clear-broadcast-pending-bug7852.patch
+#ApplyOptionalPatch centos-linux-3.10-bnx2x_fix_link_for_KR-bug7942.patch
+ApplyOptionalPatch centos-linux-3.10-reiserfs-fix-redefine-error.patch
+ApplyOptionalPatch centos-linux-3.10-fix-em28xx-cards-bug8285.patch
+#ApplyOptionalPatch centos-linux-3.10-netfilter-nf_conntrack-fix-bug8341.patch
+#ApplyOptionalPatch centos-linux-3.10-futex-Ensure-get_futex_key_refs-bug8803.patch
+ApplyOptionalPatch centos-linux-3.10-fix-ecryptfs-error-bug7369.patch
+#ApplyOptionalPatch centos-linux-3.10-fix-ioatdma-driver-bug8778.patch
+## ApplyOptionalPatch centos-linux-3.10-fix-xfrm-input-bug9646.patch
+#ApplyOptionalPatch centos-linux-3.10-3w-sas-fix-race-bug10073.patch
+#ApplyOptionalPatch centos-linux-3.10-fix-dm-thin-metadata-bug10191.patch 
+#ApplyOptionalPatch centos-linux-3.10-namespaces-bug10320.patch
+## ApplyOptionalPatch centos-linux-3.10-mpt3sas-SML-bug10516.patch
+## ApplyOptionalPatch centos-linux-3.10-mpt3sas-fix-block-bug10516.patch
+ApplyOptionalPatch centos-linux-3.10-support-MacBookPro-bug10447.patch
+#ApplyOptionalPatch centos-linux-3.10-3w-xxxx-fix-race-bug10033.patch
+#ApplyOptionalPatch centos-linux-3.10-3w-9xxx-fix-race-1of2-bug10033.patch
+#ApplyOptionalPatch centos-linux-3.10-3w-9xxx-fix-race-2of2-bug10033.patch
+#ApplyOptionalPatch centos-linux-3.10-e1000-Tx-fix-1-bug10767.patch
+#ApplyOptionalPatch centos-linux-3.10-e1000-Tx-fix-2-bug10767.patch
+## ApplyOptionalPatch centos-linux-3.10-fix-truncation-bug-EFI-bug10729.patch
+## ApplyOptionalPatch centos-linux-3.10-md-fix-freeing-private-data-bug11184.patch
+# ApplyOptionalPatch  centos-linux-3.10-pci-fix-regression-mlx4-bug12277.patch
+# ApplyOptionalPatch centos-linux-3.10-x86smp-fix-max_logical_packages_values-bug12466.patch 
+ApplyOptionalPatch centos-linux-3.10-ixgbe-force-VLNCTRL_VFE-bug12653.patch 
+### mpt3sas patches bug12600 ###
+ApplyOptionalPatch centos-linux-3.10-0001-scsi-mpt3sas-Fix-for-improper-info-displayed-in-var-.patch
+ApplyOptionalPatch centos-linux-3.10-0002-scsi-mpt3sas-Fix-for-incorrect-numbers-for-MSIX-vect.patch
+ApplyOptionalPatch centos-linux-3.10-0003-scsi-mpt3sas-Implement-device_remove_in_progress-che.patch
+ApplyOptionalPatch centos-linux-3.10-0004-scsi-mpt3sas-Remove-unused-macro-MPT_DEVICE_TLR_ON.patch
+ApplyOptionalPatch centos-linux-3.10-0005-scsi-mpt3sas-Bump-driver-version-as-14.100.00.00.patch
+ApplyOptionalPatch centos-linux-3.10-0006-scsi-mpt3sas-Added-Device-ID-s-for-SAS35-devices-and.patch
+ApplyOptionalPatch centos-linux-3.10-0007-scsi-mpt3sas-Increased-Additional-MSIX-support-for-S.patch
+ApplyOptionalPatch centos-linux-3.10-0008-scsi-mpt3sas-set-EEDP-escape-flags-for-SAS35-devices.patch
+ApplyOptionalPatch centos-linux-3.10-0009-scsi-mpt3sas-Use-the-new-MPI-2.6-32-bit-Atomic-Reque.patch
+ApplyOptionalPatch centos-linux-3.10-0010-scsi-mpt3sas-Fix-for-Endianness-issue.patch
+ApplyOptionalPatch centos-linux-3.10-0011-scsi-mpt3sas-Bump-driver-version-as-14.101.00.00.patch
+ApplyOptionalPatch centos-linux-3.10-0001-scsi-megaraid_sas-Add-new-pci-device-Ids-for-SAS3.5-.patch
+ApplyOptionalPatch centos-linux-3.10-0002-scsi-megaraid_sas-128-MSIX-Support.patch
+ApplyOptionalPatch centos-linux-3.10-0003-scsi-megaraid_sas-EEDP-Escape-Mode-Support-for-SAS3..patch
+ApplyOptionalPatch centos-linux-3.10-0004-scsi-megaraid_sas-SAS3.5-Generic-Megaraid-Controller.patch
+ApplyOptionalPatch centos-linux-3.10-0005-scsi-megaraid_sas-SAS3.5-Generic-Megaraid-Controller.patch
+ApplyOptionalPatch centos-linux-3.10-0006-scsi-megaraid_sas-Dynamic-Raid-Map-Changes-for-SAS3..patch
+ApplyOptionalPatch centos-linux-3.10-0007-scsi-megaraid_sas-Add-the-Support-for-SAS3.5-Generic.patch
+ApplyOptionalPatch centos-linux-3.10-0008-scsi-megaraid_sas-Enable-or-Disable-Fast-path-based-.patch
+ApplyOptionalPatch centos-linux-3.10-0009-scsi-megaraid_sas-ldio_outstanding-variable-is-not-d.patch
+ApplyOptionalPatch centos-linux-3.10-0010-scsi-megaraid_sas-Implement-the-PD-Map-support-for-S.patch
+ApplyOptionalPatch centos-linux-3.10-0011-scsi-megaraid_sas-driver-version-upgrade.patch
+ApplyOptionalPatch centos-linux-3.10-ipv6refcnt-bug12711.patch
+ApplyOptionalPatch centos-linux-scsi-storvsc-fix-bug12841.patch
+ApplyOptionalPatch centos-linux-x86-perf-uncore-Avoid-kernel-panic-on-missing-topolo-bug12818.patch
+
+### end of plus mod
+# End of CentOS Modification
+
+ApplyOptionalPatch linux-kernel-test.patch
+
 # Any further pre-build tree manipulations happen here.
 
 chmod +x scripts/checkpatch.pl
@@ -876,7 +1038,6 @@ BuildKernel() {
 	# install gcov-needed files to $BUILDROOT/$BUILD/...:
 	#   gcov_info->filename is absolute path
 	#   gcno references to sources can use absolute paths (e.g. in out-of-tree builds)
-	#   sysfs symlink targets (set up at compile time) use absolute paths to BUILD dir
 	find . \( -name '*.gcno' -o -name '*.[chS]' \) -exec install -D '{}' "$RPM_BUILD_ROOT/$(pwd)/{}" \;
 %endif
     fi
@@ -1083,7 +1244,7 @@ make %{?cross_opts} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false
     make %{?_smp_mflags} centrino-decode powernow-k8-decode
     popd
 %endif
-%ifarch x86_64
+%ifarch x86_64 i686
    pushd tools/power/x86/x86_energy_perf_policy/
    make
    popd
@@ -1364,6 +1525,25 @@ then\
 fi\
 %{nil}
 
+### plus kernel mod ###
+### remove initramfs-xxxkdump.img upon kernel removal
+%postun
+# List out the initrds here, strip out version numbers
+# and search for corresponding kernel installs, if a kernel
+# is not found, remove the corresponding kdump initrd
+for i in `ls /boot/initramfs*kdump.img 2>/dev/null`
+do
+	KDVER=`echo $i | sed -e's/^.*initramfs-//' -e's/kdump.*$//'`
+	if [ ! -e /boot/vmlinuz-$KDVER ]
+	then
+		# We have found an initrd with no corresponding kernel
+		# so we should be able to remove it
+		rm -f $i
+	fi
+done
+
+### end of plus kernel mod ###
+
 %kernel_variant_preun
 %kernel_variant_post 
 
@@ -1550,8 +1730,36 @@ fi
 %kernel_variant_files %{with_kdump} kdump
 
 %changelog
-* Thu Mar  2 2017 Johnny Hughes <johnny@centos.org> [3.10.0-514.10.2.el7]
-- Manually debrand after auto debranding failed.
+* Thu Mar 02 2017 Akemi Yagi <toracat@centos.org> [3.10.0-514.10.2.el7.centos.plus]
+- Apply debranding changes
+- Roll in i686 mods
+- 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]
+- JFS enabled [bug#7350]
+- NUMACHIP enabled [bug#7498]
+- AIC7xxx enabled [bug#7552]
+- Enabled via_velocity [bug#7877]
+- Add in a patch that fixes em28xx-cards [bug#8285]
+- Enabled ECRYPT_FS with a patch to fix build error [bug#7369]
+- Enabled Keyboard GPIO [bug#9063]
+- Enabled XEN_FBDEV_FRONTEND [bug#9463]
+- Enabled LINE6_USB [bug#9569]
+- Enabled I2C_MUX [bug#9592]
+- Enabled spidev [bug#9955]
+- Add in patches from bug 10191 [bug#10191]
+- Add in a patch from bug 10320 [bug#10320]
+- Add a patch [bug#10447]
+- Enable ATM drivers [bug#10845]
+- Add 9pfs config options [bug#10849]
+- Enable VFIO_PCI_VGA [bug#12435]
+- Add in a patch [bug#12653]
+- Add mpt3sas patches [big#12600]
+- Add megaraid patches [bug#12601]
+- Rremove initramfs-xxxkdump.img upon kernel removal [bug#12703]
+- Add a patch from [bug#12711]
+- Add a patch from [bug#12841]
+- Add a patch from [bug#12818]
 
 * Mon Feb 20 2017 Frantisek Hrbata <fhrbata@hrbata.com> [3.10.0-514.10.2.el7]
 - [net] dccp: fix freeing skb too early for IPV6_RECVPKTINFO (Hannes Frederic Sowa) [1423462 1423463]