The patch titled
git-klibc-dash-fix
has been removed from the -mm tree. Its filename is
git-klibc-dash-fix.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Andrew Morton <akpm@xxxxxxxx>
In file included from usr/dash/arith_yylex.c:37:
usr/dash/expand.h: At top level:
usr/dash/expand.h:37: error: redefinition of `struct strlist'
usr/dash/expand.h:43: error: redefinition of `struct arglist'
In file included from usr/dash/arith_yylex.c:38:
usr/dash/error.h:59: error: redefinition of `struct jmploc'
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
usr/dash/error.h | 5 +++++
usr/dash/expand.h | 5 +++++
2 files changed, 10 insertions(+)
diff -puN usr/dash/expand.h~git-klibc-dash-fix usr/dash/expand.h
--- 25/usr/dash/expand.h~git-klibc-dash-fix Sat Apr 8 14:51:15 2006
+++ 25-akpm/usr/dash/expand.h Sat Apr 8 14:51:15 2006
@@ -34,6 +34,9 @@
* @(#)expand.h 8.2 (Berkeley) 5/4/95
*/
+#ifndef STRLIST_H_INCLUDED
+#define STRLIST_H_INCLUDED
+
struct strlist {
struct strlist *next;
char *text;
@@ -76,3 +79,5 @@ void arith_lex_reset(void);
#define arith_lex_reset()
#endif
int yylex(void);
+
+#endif /* STRLIST_H_INCLUDED */
diff -puN usr/dash/error.h~git-klibc-dash-fix usr/dash/error.h
--- 25/usr/dash/error.h~git-klibc-dash-fix Sat Apr 8 14:51:15 2006
+++ 25-akpm/usr/dash/error.h Sat Apr 8 14:51:15 2006
@@ -34,6 +34,9 @@
* @(#)error.h 8.2 (Berkeley) 5/4/95
*/
+#ifndef ERROR_H_INCLUDED
+#define ERROR_H_INCLUDED
+
#include <setjmp.h>
#include <signal.h>
@@ -138,3 +141,5 @@ void exerror(int, const char *, ...) __a
const char *errmsg(int, int);
void sh_warnx(const char *, ...);
+
+#endif /* ERROR_H_INCLUDED */
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
config_net=n-build-fix.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
acpi-memory-hotplug-cannot-manage-_crs-with-plural-resoureces.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
sony_apci-resume.patch
git-audit-master-fixup.patch
powernow-k8-crash-workaround.patch
git-drm.patch
git-dvb.patch
git-dvb-compat-build-fix.patch
bt866-build-fix.patch
connector-exports.patch
git-libata-all.patch
pci-error-recovery-e1000-network-device-driver.patch
git-pcmcia.patch
revert-pci-pci-cardbus-cards-hidden-needs-pci=assign-busses-to-fix.patch
megaraid-unused-variable.patch
git-sas-jg.patch
git-sas-jg-build-hack.patch
git-splice-fixup.patch
git-watchdog.patch
arm-add_memory-build-fix.patch
pg_uncached-is-ia64-only.patch
migration-remove-unnecessary-pageswapcache-checks-fix.patch
wait_table-and-zonelist-initializing-for-memory-hotadd-wait_table-initialization-fixes.patch
oom-kill-mm-locking-fix.patch
page_allocc-buddy-handling-cleanup.patch
acx1xx-wireless-driver.patch
prune_one_dentry-tweaks.patch
fix-cdrom-being-confused-on-using-kdump-tweaks.patch
mmput-might-sleep.patch
tpm-use-clear_bit-fix.patch
tpm-use-clear_bit-fix-fix.patch
tpm-use-clear_bit-fix-fix-fix-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
pi-futex-futex-code-cleanups-fix.patch
reiser4.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
