raid-2.2.14-B1.14 doesn't patch 2.2.14 properly

[Scott Thomson]

Am I missing something here?
The source has just been freshly untarred from linux-2.2.14.tgz
This is just the the first prompt. It goes on and on...

patching file `linux/init/main.c'
Hunk #1 FAILED at 19.
Hunk #2 FAILED at 488.
Hunk #3 FAILED at 928.
Hunk #4 FAILED at 1426.
4 out of 4 hunks FAILED -- saving rejects to linux/init/main.c.rej
The next patch would create the file `linux/include/linux/raid/linear.h',
which already exists! Assume -R? [n]

main.c.rej is as follows

***************
*** 19,24 ****
#include <linux/utsname.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/smp_lock.h>
#include <linux/blk.h>
#include <linux/hdreg.h>
--- 19,25 ----
#include <linux/utsname.h>
#include <linux/ioport.h>
#include <linux/init.h>
+ #include <linux/raid/md.h>
#include <linux/smp_lock.h>
#include <linux/blk.h>
#include <linux/hdreg.h>
***************
*** 487,493 ****
#ifdef CONFIG_BLK_DEV_FD
{ "fd", 0x0200 },
#endif
- #ifdef CONFIG_MD_BOOT
{ "md", 0x0900 },
#endif
#ifdef CONFIG_BLK_DEV_XD
--- 488,494 ----
#ifdef CONFIG_BLK_DEV_FD
{ "fd", 0x0200 },
#endif
+ #if CONFIG_MD_BOOT || CONFIG_AUTODETECT_RAID
{ "md", 0x0900 },
#endif
#ifdef CONFIG_BLK_DEV_XD
***************
*** 927,932 ****
#ifdef CONFIG_MD_BOOT
{ "md=", md_setup},
#endif
#ifdef CONFIG_ADBMOUSE
{ "adb_buttons=", adb_mouse_setup },
#endif
--- 928,936 ----
#ifdef CONFIG_MD_BOOT
{ "md=", md_setup},
#endif
+ #if CONFIG_BLK_DEV_MD
+ { "raid=", raid_setup},
+ #endif
#ifdef CONFIG_ADBMOUSE
{ "adb_buttons=", adb_mouse_setup },
#endif
***************
*** 1422,1427 ****
while (pid != wait(&i));
if (MAJOR(real_root_dev) != RAMDISK_MAJOR
|| MINOR(real_root_dev) != 0) {
error = change_root(real_root_dev,"/initrd");
if (error)
printk(KERN_ERR "Change root to /initrd: "
--- 1426,1434 ----
while (pid != wait(&i));
if (MAJOR(real_root_dev) != RAMDISK_MAJOR
|| MINOR(real_root_dev) != 0) {
+ #ifdef CONFIG_BLK_DEV_MD
+ autodetect_raid();
+ #endif
error = change_root(real_root_dev,"/initrd");
if (error)
printk(KERN_ERR "Change root to /initrd: "




Scott Thomson