diff -Nru lvm2-2.02.95/debian/changelog lvm2-2.02.95/debian/changelog --- lvm2-2.02.95/debian/changelog 2013-01-02 10:12:05.000000000 +0000 +++ lvm2-2.02.95/debian/changelog 2013-03-02 14:39:21.000000000 +0000 @@ -1,3 +1,9 @@ +lvm2 (2.02.95-6+rpi1) wheezy-staging; urgency=low + + * Add patch to hopefully fix compatibility with new 3.6 kernel (LP: 1096224) + + -- Peter Michael Green Sat, 02 Mar 2013 14:38:46 +0000 + lvm2 (2.02.95-6) unstable; urgency=low * Drop cluster (clvm) support. It never properly worked and is more dead diff -Nru lvm2-2.02.95/debian/patches/dm-event-api.patch lvm2-2.02.95/debian/patches/dm-event-api.patch --- lvm2-2.02.95/debian/patches/dm-event-api.patch 2012-05-27 13:17:24.000000000 +0100 +++ lvm2-2.02.95/debian/patches/dm-event-api.patch 2013-03-02 14:39:21.000000000 +0000 @@ -1,5 +1,7 @@ ---- a/daemons/dmeventd/libdevmapper-event.c -+++ b/daemons/dmeventd/libdevmapper-event.c +Index: lvm2-2.02.95/daemons/dmeventd/libdevmapper-event.c +=================================================================== +--- lvm2-2.02.95.orig/daemons/dmeventd/libdevmapper-event.c 2012-03-01 10:41:48.000000000 +0000 ++++ lvm2-2.02.95/daemons/dmeventd/libdevmapper-event.c 2013-02-23 21:44:34.000000000 +0000 @@ -344,7 +344,7 @@ return bytes == size; } @@ -60,8 +62,10 @@ return 0; p = msg.data; *version = 0; ---- a/daemons/dmeventd/.exported_symbols -+++ b/daemons/dmeventd/.exported_symbols +Index: lvm2-2.02.95/daemons/dmeventd/.exported_symbols +=================================================================== +--- lvm2-2.02.95.orig/daemons/dmeventd/.exported_symbols 2011-04-04 16:11:09.000000000 +0000 ++++ lvm2-2.02.95/daemons/dmeventd/.exported_symbols 2013-02-23 21:44:34.000000000 +0000 @@ -1,4 +1,4 @@ -init_fifos -fini_fifos @@ -70,9 +74,11 @@ +dm_event_daemon_fini_fifos +dm_event_daemon_talk dm_event_get_version ---- a/daemons/dmeventd/dmeventd.c -+++ b/daemons/dmeventd/dmeventd.c -@@ -1827,14 +1827,14 @@ +Index: lvm2-2.02.95/daemons/dmeventd/dmeventd.c +=================================================================== +--- lvm2-2.02.95.orig/daemons/dmeventd/dmeventd.c 2013-02-23 21:44:34.000000000 +0000 ++++ lvm2-2.02.95/daemons/dmeventd/dmeventd.c 2013-02-23 21:44:34.000000000 +0000 +@@ -1836,14 +1836,14 @@ /* Get the list of registrations from the running daemon. */ @@ -89,7 +95,7 @@ return; } -@@ -1845,7 +1845,7 @@ +@@ -1854,7 +1854,7 @@ exit(EXIT_FAILURE); } @@ -98,7 +104,7 @@ exit(EXIT_FAILURE); } -@@ -1874,12 +1874,12 @@ +@@ -1883,12 +1883,12 @@ } _initial_registrations[count] = 0; diff -Nru lvm2-2.02.95/debian/patches/series lvm2-2.02.95/debian/patches/series --- lvm2-2.02.95/debian/patches/series 2012-11-19 11:11:01.000000000 +0000 +++ lvm2-2.02.95/debian/patches/series 2013-03-02 14:39:58.000000000 +0000 @@ -10,3 +10,4 @@ upstream-fix-discard-2.patch upstream-fix-discard-3.patch missing-dmeventd.patch +skip-mlock-vector.patch diff -Nru lvm2-2.02.95/debian/patches/skip-mlock-vector.patch lvm2-2.02.95/debian/patches/skip-mlock-vector.patch --- lvm2-2.02.95/debian/patches/skip-mlock-vector.patch 1970-01-01 01:00:00.000000000 +0100 +++ lvm2-2.02.95/debian/patches/skip-mlock-vector.patch 2013-03-02 14:39:21.000000000 +0000 @@ -0,0 +1,33 @@ +Based on https://lists.fedorahosted.org/pipermail/lvm2-commits/2012-November/000391.html +per comment in https://bugs.launchpad.net/raspbian/+bug/1096224 + +Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d5697b29ee009104a4ed91f79543e22cc8c8d2c4 +Commit: d5697b29ee009104a4ed91f79543e22cc8c8d2c4 +Parent: 5ef6ca00b99e0a2ed83a00c4ddcb577dd3b52a7b +Author: Zdenek Kabelac +AuthorDate: Tue Nov 20 09:58:53 2012 +0100 +Committer: Zdenek Kabelac +CommitterDate: Tue Nov 20 10:02:51 2012 +0100 + +mm: skip mlocking [vectors] + +Somehow forgotten: +https://www.redhat.com/archives/linux-lvm/2012-June/msg00019.html +Need for arm architecture support. +--- + WHATS_NEW | 1 + + lib/mm/memlock.c | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +Index: lvm2-2.02.95/lib/mm/memlock.c +=================================================================== +--- lvm2-2.02.95.orig/lib/mm/memlock.c 2012-03-01 21:19:20.000000000 +0000 ++++ lvm2-2.02.95/lib/mm/memlock.c 2013-02-23 21:56:46.000000000 +0000 +@@ -84,6 +84,7 @@ + static const char * const _ignore_maps[] = { + "[vdso]", + "[vsyscall]", ++ "[vectors]", + }; + + /* default blacklist for maps */