Andrew,
The patchset for 2.6.16-rc2-mm1 seems borked.
It contains patches in linus.patch that are already in 2.6.16-rc2.
Hence, this *-mm patch set cannot be applied on top of 2.6.16-rc2.
For example, consider the following.
Linus tagged v2.6.16-rc2 at this revision (hg log format):
changeset: 19933:6a79f5a2de38
tag: v2.6.16-rc2
user: Linus Torvalds <[email protected]>
date: Fri Feb 3 14:03:08 2006 +0800
summary: Linux v2.6.16-rc2
The following patch is included earlier in v2.6.16-rc2:
changeset: 19738:81ca7cda8d38
user: Lucas Correia Villa Real <[email protected]>
date: Wed Feb 1 21:24:23 2006 +0000
summary: [ARM] 3284/1: S3C2400 - adds support to GPIO
It affects a few files, including the following change, obtained using
the command hg diff -r 19737 -r 19738 arch/arm/mach-s3c2410/Makefile:
diff -r 03e77bf674ae -r 81ca7cda8d38 arch/arm/mach-s3c2410/Makefile
--- a/arch/arm/mach-s3c2410/Makefile Wed Feb 1 21:07:28 2006 +0000
+++ b/arch/arm/mach-s3c2410/Makefile Wed Feb 1 21:24:23 2006 +0000
@@ -10,9 +10,13 @@
obj-n :=
obj- :=
+# S3C2400 support files
+obj-$(CONFIG_CPU_S3C2400) += s3c2400-gpio.o
+
# S3C2410 support files
obj-$(CONFIG_CPU_S3C2410) += s3c2410.o
+obj-$(CONFIG_CPU_S3C2410) += s3c2410-gpio.o
obj-$(CONFIG_S3C2410_DMA) += dma.o
# Power Management support
@@ -25,6 +29,7 @@
obj-$(CONFIG_CPU_S3C2440) += s3c2440.o s3c2440-dsc.o
obj-$(CONFIG_CPU_S3C2440) += s3c2440-irq.o
obj-$(CONFIG_CPU_S3C2440) += s3c2440-clock.o
+obj-$(CONFIG_CPU_S3C2440) += s3c2410-gpio.o
# bast extras
The linus.patch in the broken out patch set:
2.6/2.6.16-rc2/2.6.16-rc2-mm1/2.6.16-rc2-mm1-broken-out.tar.bz2
from below:
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/
contains the lines:
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index b4f1e05..1217bf0 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -10,9 +10,13 @@ obj-m :=
obj-n :=
obj- :=
+# S3C2400 support files
+obj-$(CONFIG_CPU_S3C2400) += s3c2400-gpio.o
+
# S3C2410 support files
obj-$(CONFIG_CPU_S3C2410) += s3c2410.o
+obj-$(CONFIG_CPU_S3C2410) += s3c2410-gpio.o
obj-$(CONFIG_S3C2410_DMA) += dma.o
# Power Management support
@@ -25,6 +29,7 @@ obj-$(CONFIG_PM_SIMTEC) += pm-simtec.
obj-$(CONFIG_CPU_S3C2440) += s3c2440.o s3c2440-dsc.o
obj-$(CONFIG_CPU_S3C2440) += s3c2440-irq.o
obj-$(CONFIG_CPU_S3C2440) += s3c2440-clock.o
+obj-$(CONFIG_CPU_S3C2440) += s3c2410-gpio.o
# bast extras
Looks familiar, huh?
That's the same change, in both linus.patch of 2.6.16-rc2-mm1, and
in what Linus marked as 2.6.16-rc2.
I think that there are some more, perhaps dozens, of such
duplicated patches. See my earlier lkml post Message-Id:
<[email protected]> in response to Andrew's
2.6.16-rc2-mm1 announcement, for circumstantial evidence of more such
damage to this patch set.
--
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <[email protected]> 1.925.600.0401
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
