Hi, Small stupid errors and a 2.4.4 kernel made me think that doing a completely fresh release was a good idea. Changes since packet-0.0.2i: - (0.0.2i-b) Fix compile error, pkt_put_buffer from pkt_end_io_read - Fix linking when ide-cd/sr modular and pktcdvd builtin - Remove SCSI_DEBUG_QUEUES, leave sanity segment check to final request state instead (makes more sense anyway now) - Add/correct config help entries - Merge 2.4.4 final - Remove throttling (see msg in packet-writing archive) - Remove request_cachep export again (used for throttling only) - Correctly kill request on I/O on media - Don't clear BH_Uptodate on failed buffer write (this is only valid for reads, see comment in source) Get it from *.kernel.org/pub/linux/kernel/people/axboe/packet or the sourceforge page. -- Jens Axboe
does anyone else has errors with 2j not applying cleanly against 2.4.4 ? it seems that few files ( drivers/block/Makefile, drivers/block/pktcdvd.c, drivers/cdrom/Makefile, and include/linux/pktcdvd.h ) are dumped into root dir of sources instad of their respective sub-directory. Any ideas? [root@pepsi linux]# cat /usr/src/CD-RW/packet/packet-0.0.2j/packet-0.0.2j | patch -p4 patching file `Documentation/Configure.help' patching file `arch/sparc64/kernel/ioctl32.c' patching file `drivers/block/Config.in' patching file `Makefile' Hunk #1 FAILED at 10. Hunk #2 FAILED at 29. 2 out of 2 hunks FAILED -- saving rejects to Makefile.rej patching file `drivers/block/elevator.c' patching file `drivers/block/ll_rw_blk.c' patching file `pktcdvd.c' patching file `Makefile' Hunk #1 FAILED at 27. 1 out of 1 hunk FAILED -- saving rejects to Makefile.rej patching file `drivers/cdrom/cdrom.c' patching file `drivers/char/sysrq.c' patching file `drivers/ide/ide-cd.c' patching file `drivers/ide/ide-cd.h' patching file `drivers/scsi/Config.in' patching file `drivers/scsi/scsi_lib.c' patching file `drivers/scsi/scsi_merge.c' patching file `drivers/scsi/sr.c' patching file `drivers/scsi/sr.h' patching file `drivers/scsi/sr_ioctl.c' patching file `drivers/scsi/sr_vendor.c' patching file `fs/buffer.c' patching file `include/linux/blkdev.h' patching file `include/linux/cdrom.h' patching file `include/linux/major.h' patching file `pktcdvd.h' [root@pepsi linux]# [root@pepsi linux]# patch --version patch 2.5 -- Adam http://www.eax.com The Supreme Headquarters of the 32 bit registers
On Mon, 30 Apr 2001, Adam wrote:
[root@pepsi linux]# cat /usr/src/CD-RW/packet/packet-0.0.2j/packet-0.0.2j | patch -p4
-p4 ???? Whats this? cd /usr/src/linux cat ..../packet-0.0.2j | patch -p1 -p1 is the right level! -- ciao norb +-------------------------------------------------------------------+ | Norbert Preining http://www.logic.at/people/preining | | University of Technology Vienna, Austria preining@logic.at | | DSA: 0x09C5B094 (RSA: 0xCF1FA165) mail subject: get [DSA|RSA]-key | +-------------------------------------------------------------------+
On Mon, Apr 30 2001, Adam wrote:
does anyone else has errors with 2j not applying cleanly against 2.4.4 ?
it seems that few files ( drivers/block/Makefile, drivers/block/pktcdvd.c, drivers/cdrom/Makefile, and include/linux/pktcdvd.h ) are dumped into root dir of sources instad of their respective sub-directory. Any ideas?
[root@pepsi linux]# cat /usr/src/CD-RW/packet/packet-0.0.2j/packet-0.0.2j | patch -p4
s/p4/p1 -- Jens Axboe
[root@pepsi linux]# cat /usr/src/CD-RW/packet/packet-0.0.2j/packet-0.0.2j | patch -p4
s/p4/p1
ah, ok. thanks for all replies. changing p4 to p1 indeed worked. I got confused and was looking at source (?) and not destination for number of dirs to strip. -- Adam http://www.eax.com The Supreme Headquarters of the 32 bit registers
participants (3)
-
Adam
-
Jens Axboe
-
Norbert Preining