From e7a209a421ed05cf6f96076363d7f0ed9b30e1cf Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 10 2014 12:12:06 +0000
Subject: import kernel-3.10.0-123.1.2.el7


---

diff --git a/.gitignore b/.gitignore
index 68b8f59..e8e2a2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/linux-3.10.0-123.el7.tar.xz
+SOURCES/linux-3.10.0-123.1.2.el7.tar.xz
 SOURCES/rheldup3.x509
 SOURCES/rhelkpatch1.x509
diff --git a/.kernel.metadata b/.kernel.metadata
index 696b7b1..4230fd3 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,3 +1,3 @@
-a9c69f240cc89ea3c32fcb3b4a170f8d73b772fa SOURCES/linux-3.10.0-123.el7.tar.xz
+124299b482b4ab8184edee1923d131114c116067 SOURCES/linux-3.10.0-123.1.2.el7.tar.xz
 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
 d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common
index 9fb2317..56e2af2 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:=123
+BUILD:=123.1.2
 DIST:=.el7
 SPECFILE:=kernel.spec
 RPM:=$(REDHAT)/rpm
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 5e7e3c4..6891750 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 123.el7
+%define pkgrelease 123.1.2.el7
 
 %define pkg_release %{pkgrelease}%{?buildid}
 
@@ -1464,6 +1464,9 @@ fi
 %kernel_variant_files %{with_kdump} kdump
 
 %changelog
+* Wed Jun 4 2014 Phillip Lougher <plougher@redhat.com> [3.10.0-123.1.2.el7]
+- [tty] n_tty: Fix n_tty_write crash when echoing in raw mode (Aristeu Rozanski) [1094241 1094242] {CVE-2014-0196}
+
 * 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]