diff --git a/.gitignore b/.gitignore index 82a9c63..572d36e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/linux-4.5.0-15.2.1.el7.tar.xz +SOURCES/linux-4.5.0-15.4.2.el7.tar.xz diff --git a/.kernel-aarch64.metadata b/.kernel-aarch64.metadata index d396d7e..b1cb246 100644 --- a/.kernel-aarch64.metadata +++ b/.kernel-aarch64.metadata @@ -1 +1 @@ -fc2421c56a780bbaa7e0533afb937a73dce32992 SOURCES/linux-4.5.0-15.2.1.el7.tar.xz +ed1b27a155dd6e617c0fa7d857beb6fa82ea57bf SOURCES/linux-4.5.0-15.4.2.el7.tar.xz diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common index 7ffac23..9a03918 100644 --- a/SOURCES/Makefile.common +++ b/SOURCES/Makefile.common @@ -8,8 +8,8 @@ GITID:= $(shell git log --max-count=1 --pretty=format:%H) RPMVERSION:=4.5.0 # marker is git tag which we base off of for exporting patches MARKER:=v4.5.0 -PREBUILD:=15.2. -BUILD:=1 +PREBUILD:=15.4. +BUILD:=2 DIST:=.el7 SPECFILE:=kernel-aarch64.spec RPM:=$(REDHAT)/rpm diff --git a/SPECS/kernel-aarch64.spec b/SPECS/kernel-aarch64.spec index ee752f3..1dbc058 100644 --- a/SPECS/kernel-aarch64.spec +++ b/SPECS/kernel-aarch64.spec @@ -11,7 +11,7 @@ Summary: The Linux kernel %global released_kernel 1 %define rpmversion 4.5.0 -%define pkgrelease 15.2.1.el7 +%define pkgrelease 15.4.2.el7 # allow pkg_release to have configurable %{?dist} tag %define specrelease %%SPECRELEASE%% @@ -1412,6 +1412,12 @@ fi %kernel_variant_files %{with_debug} kernel-debug debug %changelog +* Wed Mar 22 2017 Mark Langsdorf [4.5.0-15.4.2.el7] +- [redhat] Release 7.3.4 z-stream (Mark Langsdorf) +- arm64: KVM: pmu: Fix AArch32 cycle counter access (Wei Huang) [1432549] +- tty: n_hdlc: get rid of racy n_hdlc.tbuf (Mark Langsdorf) [1431127] +- TTY: n_hdlc, fix lockdep false positive (Mark Langsdorf) [1431127] + * Thu Feb 16 2017 Mark Langsdorf [4.5.0-15.2.1.el7] - [redhat] Shift numbering to -15.2.X for RHELSA 7.3.2 z-stream (Mark Langsdorf) - redhat: config: arm64: Configure mlx5 for Ethernet (Christopher Covington) [1413108]