Package: patchutils
Severity: normal
Version: 0.3.2-2
The attatched patch is a reduced version (the original was massive) of a
patch generated from git. When trying to feed it to interdiff I get
errors like:
root@debian:/# interdiff test2.diff test2.diff
The next patch would create the file /tmp/interdiff-1.QMmyg0,
which already exists! Assume -R? [n]
In the middle of the file are the following two lines:
diff --git a/arch/arm/mach-bcm2708/bcm2708.h
b/arch/arm/mach-bcm2708/bcm2708.h
new file mode 100644
Which as I understand the patch format do not form a part of the actual
patch and should be ignored by toools.
However if I remove either of these two lines then interdiff accepts the
patch without errors.
Any idea what is going on?
--- /dev/null
+++ b/arch/arm/mach-bcm2708/armctrl.h
@@ -0,0 +1,27 @@
+/*
+ * linux/arch/arm/mach-bcm2708/armctrl.h
+ *
+ * Copyright (C) 2010 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __BCM2708_ARMCTRL_H
+#define __BCM2708_ARMCTRL_H
+
+extern int __init armctrl_init(void __iomem * base, unsigned int irq_start,
+ u32 armctrl_sources, u32 resume_sources);
+
+#endif
diff --git a/arch/arm/mach-bcm2708/bcm2708.h b/arch/arm/mach-bcm2708/bcm2708.h
new file mode 100644
--- /dev/null
+++ b/arch/arm/mach-bcm2708/bcm2708.c
@@ -0,0 +1,885 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.c
+ *
+ * Copyright (C) 2010 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include linux/init.h
+#include linux/device.h
+#include linux/dma-mapping.h
+#include linux/serial_8250.h
+#include linux/platform_device.h
+#include linux/syscore_ops.h
+#include linux/interrupt.h
+#include linux/amba/bus.h
+#include linux/amba/clcd.h
+#include linux/clockchips.h
+#include linux/cnt32_to_63.h
+#include linux/io.h
+#include linux/module.h
+#include linux/spi/spi.h
+#include linux/w1-gpio.h
+
+#include linux/version.h
+#include linux/clkdev.h
+#include asm/system.h
+#include mach/hardware.h
+#include asm/irq.h
+#include linux/leds.h
+#include asm/mach-types.h
+#include asm/sched_clock.h
+
+#include asm/mach/arch.h
+#include asm/mach/flash.h
+#include asm/mach/irq.h
+#include asm/mach/time.h
+#include asm/mach/map.h
+
+#include mach/timex.h
+#include mach/dma.h
+#include mach/vcio.h
+#include mach/system.h
+
+#include linux/delay.h
+
+#include bcm2708.h
+#include armctrl.h
+#include clock.h
+
+#ifdef CONFIG_BCM_VC_CMA
+#include linux/broadcom/vc_cma.h
+#endif
+
+
+/* Effectively we have an IOMMU (ARM-VideoCore map) that is set up to
+ * give us IO access only to 64Mbytes of physical memory (26 bits). We could
+ * represent this window by setting our dmamasks to 26 bits but, in fact
+ * we're not going to use addresses outside this range (they're not in real
+ * memory) so we don't bother.
+ *
+ * In the future we might include code to use this IOMMU to remap other
+ * physical addresses onto VideoCore memory then the use of 32-bits would be
+ * more legitimate.
+ */
+#define DMA_MASK_BITS_COMMON 32
+
+// use GPIO 4 for the one-wire GPIO pin, if enabled
+#define W1_GPIO 4
+
+/* command line parameters */
+static unsigned boardrev, serial;
+static unsigned uart_clock;
+
+static void __init bcm2708_init_led(void);
+
+void __init bcm2708_init_irq(void)
+{
+ armctrl_init(__io_address(ARMCTRL_IC_BASE), 0, 0, 0);
+}
+
+static struct map_desc bcm2708_io_desc[] __initdata = {
+ {
+ .virtual = IO_ADDRESS(ARMCTRL_BASE),
+ .pfn = __phys_to_pfn(ARMCTRL_BASE),
+ .length = SZ_4K,
+ .type = MT_DEVICE},
+ {
+ .virtual = IO_ADDRESS(UART0_BASE),
+ .pfn = __phys_to_pfn(UART0_BASE),
+ .length = SZ_4K,
+ .type =
