From a4d734feb8020dbcc435a3278f59d2708b57cef5 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 09 2014 08:01:42 +0000
Subject: import kernel-3.10.0-123.el7


---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..68b8f59
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+SOURCES/linux-3.10.0-123.el7.tar.xz
+SOURCES/rheldup3.x509
+SOURCES/rhelkpatch1.x509
diff --git a/.kernel.metadata b/.kernel.metadata
index ba972c7..696b7b1 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,7 +1,3 @@
-4a07b56e28741884b86da6ac91f8f9929541a1e4 SOURCES/secureboot.cer
+a9c69f240cc89ea3c32fcb3b4a170f8d73b772fa SOURCES/linux-3.10.0-123.el7.tar.xz
 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
 d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
-cf9230e69000076727e5b784ec871d22716dc5da SOURCES/securebootca.cer
-da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/extra_certificates
-da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/linux-kernel-test.patch
-a51308717dd6b05b262e5edb2492860bad5e87bf SOURCES/linux-3.10.0-121.el7.tar.xz
diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common
index dad28ca..9fb2317 100644
--- a/SOURCES/Makefile.common
+++ b/SOURCES/Makefile.common
@@ -9,7 +9,7 @@ RPMVERSION:=3.10.0
 # marker is git tag which we base off of for exporting patches
 MARKER:=v3.10
 PREBUILD:=
-BUILD:=121
+BUILD:=123
 DIST:=.el7
 SPECFILE:=kernel.spec
 RPM:=$(REDHAT)/rpm
diff --git a/SOURCES/extra_certificates b/SOURCES/extra_certificates
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/SOURCES/extra_certificates
diff --git a/SOURCES/kernel-3.10.0-x86_64-debug.config b/SOURCES/kernel-3.10.0-x86_64-debug.config
index a6d1b0d..01651b7 100644
--- a/SOURCES/kernel-3.10.0-x86_64-debug.config
+++ b/SOURCES/kernel-3.10.0-x86_64-debug.config
@@ -1507,8 +1507,8 @@ CONFIG_SENSORS_LIS3_I2C=m
 # Altera FPGA firmware download module
 #
 CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=y
-CONFIG_INTEL_MEI_ME=y
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
 CONFIG_VMWARE_VMCI=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
diff --git a/SOURCES/kernel-3.10.0-x86_64.config b/SOURCES/kernel-3.10.0-x86_64.config
index 9b3a1aa..45dd232 100644
--- a/SOURCES/kernel-3.10.0-x86_64.config
+++ b/SOURCES/kernel-3.10.0-x86_64.config
@@ -1511,8 +1511,8 @@ CONFIG_SENSORS_LIS3_I2C=m
 # Altera FPGA firmware download module
 #
 CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=y
-CONFIG_INTEL_MEI_ME=y
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
 CONFIG_VMWARE_VMCI=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
diff --git a/SOURCES/linux-kernel-test.patch b/SOURCES/linux-kernel-test.patch
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/SOURCES/linux-kernel-test.patch
diff --git a/SOURCES/secureboot.cer b/SOURCES/secureboot.cer
new file mode 100644
index 0000000..4ff8b79
Binary files /dev/null and b/SOURCES/secureboot.cer differ
diff --git a/SOURCES/securebootca.cer b/SOURCES/securebootca.cer
new file mode 100644
index 0000000..b235400
Binary files /dev/null and b/SOURCES/securebootca.cer differ
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index bdd15d4..5e7e3c4 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -11,7 +11,7 @@ Summary: The Linux kernel
 %global released_kernel 1
 
 %define rpmversion 3.10.0
-%define pkgrelease 121.el7
+%define pkgrelease 123.el7
 
 %define pkg_release %{pkgrelease}%{?buildid}
 
@@ -1464,6 +1464,17 @@ fi
 %kernel_variant_files %{with_kdump} kdump
 
 %changelog
+* Mon May 05 2014 Jarod Wilson <jarod@redhat.com> [3.10.0-123.el7]
+- [mm] rmap: try_to_unmap_cluster() should lock_page() before mlocking (Larry Woodman) [1078349] {CVE-2014-3122}
+- [mm] huge_memory: Fix cpuset cgroups so all pages for a task remain on correct node (Larry Woodman) [1076613]
+- [mm] mprotect: fix oops in change_pmd_range called from task_numa_work (Rik van Riel) [1085050]
+
+* Thu May 01 2014 Jarod Wilson <jarod@redhat.com> [3.10.0-122.el7]
+- [security] device_cgroup: check if exception removal is allowed (Aristeu Rozanski) [1086057]
+- [security] device_cgroup: rework device access check and rule checking (Aristeu Rozanski) [1086057]
+- [fs] autofs: fix lockref lookup (Ian Kent) [1083815]
+- [mei] me: do not load the driver if the FW doesn't support MEI interface (Prarit Bhargava) [1082789]
+
 * Tue Apr 08 2014 Jarod Wilson <jarod@redhat.com> [3.10.0-121.el7]
 - [virt] vhost/net: fix total length when packets are too short ("Michael S. Tsirkin") [1064446] {CVE-2014-0077}
 - [virt] vhost/net: validate vhost_get_vq_desc return value ("Michael S. Tsirkin") [1070940] {CVE-2014-0055}