aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Blank <waldi@debian.org>2012-03-28 09:15:14 +0000
committerBastian Blank <waldi@debian.org>2012-03-28 09:15:14 +0000
commit93720a39a6d7c1831718fcf2f73bf46edd0d2693 (patch)
tree734a77a98dab3d29e2434e1d4994477204679b8d
parent642568c7f8c5ad0a09e1eb6a46c0a7553c2cd9e5 (diff)
downloadkernel_replicant_linux-93720a39a6d7c1831718fcf2f73bf46edd0d2693.tar.gz
kernel_replicant_linux-93720a39a6d7c1831718fcf2f73bf46edd0d2693.tar.bz2
kernel_replicant_linux-93720a39a6d7c1831718fcf2f73bf46edd0d2693.zip
* debian/changelog: Update.
* debian/config/s390x/defines: Also ignore ABI change. svn path=/dists/sid/linux-2.6/; revision=18889
-rw-r--r--debian/changelog3
-rw-r--r--debian/config/s390x/defines5
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 7ff6ad058f27..01260f87dfac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ linux-2.6 (3.2.13-1) UNRELEASED; urgency=low
[ Uwe Kleine-König ]
* [rt] bump version to 3.2.12-rt22
+ [ Bastian Blank ]
+ * [s390x] Ignore ABI change.
+
-- Ben Hutchings <ben@decadent.org.uk> Wed, 21 Mar 2012 03:15:13 +0000
linux-2.6 (3.2.12-1) unstable; urgency=high
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index 9aacfe6b3c58..7adbe89ec6cb 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -1,3 +1,8 @@
+[abi]
+ignore-changes:
+# Seems to be exported by mistake; no other architecture does
+ arch_pick_mmap_layout
+
[base]
flavours:
s390x