summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@open.eurogiciel.org>2014-10-22 19:28:38 +0200
committerStephane Desneux <stephane.desneux@open.eurogiciel.org>2015-02-04 11:23:28 +0100
commite5438b201633f83e7c2f85ed4e149d117d53b135 (patch)
tree0b8f7bf75ded6a427df73375a5918a5d0c453a10
parent5520c21662a671b162e2c329d9fc85431b0e95c1 (diff)
downloadkernel-common-e5438b201633f83e7c2f85ed4e149d117d53b135.tar.gz
kernel-common-e5438b201633f83e7c2f85ed4e149d117d53b135.tar.bz2
kernel-common-e5438b201633f83e7c2f85ed4e149d117d53b135.zip
packaging: bump to 3.14.22
Change-Id: I06136f052e75d4e8357ea099ae2d48e60c16c749 Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
-rw-r--r--packaging/README.update_linux-stable2
-rw-r--r--packaging/linux-stable.spec2
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/README.update_linux-stable b/packaging/README.update_linux-stable
index 7b24f1e6a60e..66fb25b588e2 100644
--- a/packaging/README.update_linux-stable
+++ b/packaging/README.update_linux-stable
@@ -31,7 +31,6 @@ Define variables:
# git checkout upstream
# git rebase kernel_org/${linux_branch}
-# git push origin HEAD:upstream
# git push --tags origin HEAD:upstream
@@ -46,6 +45,7 @@ Define variables:
-------------------------------------------
# sed -ri "s/^(%define upstream_version).*$/\1 $(make kernelversion)/" packaging/*.spec
+# git commit -sam "packaging: bump to $(make kernelversion)"
6. Push the tizen branch
diff --git a/packaging/linux-stable.spec b/packaging/linux-stable.spec
index f043dc36a61f..d13e21f78a08 100644
--- a/packaging/linux-stable.spec
+++ b/packaging/linux-stable.spec
@@ -3,7 +3,7 @@
# from MeeGo/Moblin/Fedora
#
-%define upstream_version 3.14.20
+%define upstream_version 3.14.22
%if !%{defined platform}
%define platform default