diff options
| author | Ben Hutchings <benh@debian.org> | 2011-12-31 23:19:41 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2011-12-31 23:19:41 +0000 |
| commit | 3cc9ce52b204c9dd802ea1c9a4f71c2f970f732a (patch) | |
| tree | 4270f476e4109dc6dfadc7afe6d32384c1db330c | |
| parent | 3206cefe4573a58f82f68d4be12004e15eb87945 (diff) | |
| download | kernel_replicant_linux-3cc9ce52b204c9dd802ea1c9a4f71c2f970f732a.tar.gz kernel_replicant_linux-3cc9ce52b204c9dd802ea1c9a4f71c2f970f732a.tar.bz2 kernel_replicant_linux-3cc9ce52b204c9dd802ea1c9a4f71c2f970f732a.zip | |
Revert "aufs: Do not refer to AUFS_NAME in pr_fmt (fixes FTBFS on m68k)"
This is not sufficient to fix the failure.
svn path=/dists/sid/linux-2.6/; revision=18444
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/bugfix/all/aufs-Do-not-refer-to-AUFS_NAME-in-pr_fmt.patch | 29 | ||||
| -rw-r--r-- | debian/patches/series/base | 1 |
3 files changed, 0 insertions, 31 deletions
diff --git a/debian/changelog b/debian/changelog index 109f28252356..590de2406de8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,6 @@ linux-2.6 (3.1.6-2) UNRELEASED; urgency=low (Closes: #653716) * Revert "clockevents: Set noop handler in clockevents_exchange_device()", included in stable update 3.1.5 (Closes: #653398) - * aufs: Do not refer to AUFS_NAME in pr_fmt (fixes FTBFS on m68k) [ Jonathan Nieder ] * prerm: Print an error message when aborting removal of the running diff --git a/debian/patches/bugfix/all/aufs-Do-not-refer-to-AUFS_NAME-in-pr_fmt.patch b/debian/patches/bugfix/all/aufs-Do-not-refer-to-AUFS_NAME-in-pr_fmt.patch deleted file mode 100644 index 7ad091fee7de..000000000000 --- a/debian/patches/bugfix/all/aufs-Do-not-refer-to-AUFS_NAME-in-pr_fmt.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7df99f5adbc370a6494cb68890dacff3227b0f04 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings <ben@decadent.org.uk> -Date: Fri, 30 Dec 2011 17:58:57 +0100 -Subject: [PATCH] aufs: Do not refer to AUFS_NAME in pr_fmt - -AUFS_NAME is only defined in aufs_type.h but pr_fmt may be used in -headers included before aufs_type.h. - -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> ---- - fs/aufs/Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/fs/aufs/Makefile b/fs/aufs/Makefile -index 58ad988..9594b8a 100644 ---- a/fs/aufs/Makefile -+++ b/fs/aufs/Makefile -@@ -5,7 +5,7 @@ include ${srctree}/${src}/magic.mk - # enable pr_debug - ccflags-y += -DDEBUG - # sparse doesn't allow spaces --ccflags-y += -D'pr_fmt(fmt)=AUFS_NAME"\040%s:%d:%s[%d]:\040"fmt,__func__,__LINE__,current->comm,current->pid' -+ccflags-y += -D'pr_fmt(fmt)="aufs\040%s:%d:%s[%d]:\040"fmt,__func__,__LINE__,current->comm,current->pid' - - obj-$(CONFIG_AUFS_FS) += aufs.o - aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o \ --- -1.7.7.3 - diff --git a/debian/patches/series/base b/debian/patches/series/base index d9feddbb3e92..8edf989321db 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -14,7 +14,6 @@ + features/all/aufs3/aufs3-add.patch # mark as staging/crap + features/all/aufs3/mark-as-staging.patch -+ bugfix/all/aufs-Do-not-refer-to-AUFS_NAME-in-pr_fmt.patch + bugfix/ia64/hardcode-arch-script-output.patch + bugfix/mips/disable-advansys.patch |