--- linux/CONTENTS Thu Jan 1 01:00:00 1970 +++ linux/CONTENTS Thu Jan 1 01:00:00 1970 @@ -0,0 +1,218 @@ +Do not remove these 2 following lines, they're used to patch Makefile ! + + Kernel version 2.4.25-wt3 + Based on version 2.4.26-pre1 + ++ = included +- = not included yet +> = doesn't apply +# = useless or comment +< = doesn't compile + +# This is to be applied on top of plain 2.4.25. +# This should produce 13 rejects on 11 files when applied one by one. +# (these rejs are corrected when necessary, of course) + +# +# WARNING! Sometimes, some patches contain nasty ^M at end of lines, and prevent +# the resulting patch from compiling. These patches should be corrected before +# being integrated. +# + +# some patches need a bit of preliminary work. Please consult the 'doc' +# directory before changing anything. + + +100) base update +================ +This includes kernel updates with trivial fixes related to this exact +version, and very likely to be fixed in next one, if not already (missing +files, enormous bugs...). + ++ (101) patch-2.4.26-pre1 (marcelo tosatti) ++ (102) cset-20040305_1302.txt (marcelo tosatti) + + +200) core updates -> 4 rej +================= ++ (200) patch-2.4.23-rc3-setuptime (willy tarreau) ++ (201) vhz-j64-2.4.23.patch (robert love / tim schmielau) ++ (230) dm-2.4.24-1.00.07-1 (joe thornber) +>+ (240) netdev-random-core-rml-2.4.24-1.patch (robert love) +>+ (241) netdev-random-drivers-rml-2.4.24-1.patch (robert love) + +# now it's EITHER PAX OR UML OR host-skas3 (used by UML hosts only) ++ (210) pax-linux-2.4.25-200402250000.patch (http://pax.grsecurity.net/) +#+ (210) uml-patch-2.4.23-2 (jeff dike) +#+ (210) uml-patch-2.4.24-1 (jeff dike) +#+ (210) host-skas3.patch (jeff dike) + ++ (220) epoll-lt-2.4.24-0.20.diff (davide libenzi) +< (240) page_color-2.4.23-20040102.patch (Jason Papadopoulos) ++ (250) ikconfig_2422pre.patch (randy dunlap -> ignore 1 rej) ++ (251) patch-2423p6-ikconfig-compfix (willy tarreau) + ++ (252) 2.4.25-low-latency.patch (andrew morton -> 3 rej) ++ (253) lowlat-2.4.25-wt3.rejfix (willy tarreau) + + +300) filesystem updates -> 4 rej +======================= +Patches here can affect both VFS and any FS (proc...) ++ (300) patch-2.4.23-proc-oops-fix (akinobu mita) +#+ (313) patch-2.4.23-ext23-htree-index (theodore t'so) +>+ (320) linux-2.4.24-ntfs-2.1.6a.patch (anton altaparmakov) ++ (321) patch-2.4.22-rc2-bme0.03.diff (herbert potzl) ++ (330) patch-2.4-update-ext2-ctime (chris siebenmann) ++ (331) patch-2.4-reiserfs-laptop-mode (micha feigin) ++ (340) squashfs1.3r3-patch (phillip lougher -> 1 rej) ++ (341) squashfs1.3r3-2.4.25.rejfix (willy tarreau) ++ (342) evfs-0.3-kernel.diff (http://hysteria.sk/evfs, rediffed -> 3 rej) ++ (343) evfs-0.2-kernel-rejfix.diff (willy tarreau) ++ (344) evfs-0.2-kernel-truncate.diff (willy tarreau) ++ (345) evfs-0.2-kernel-compfix.diff (willy tarreau) ++ (346) evfs-0.2-kernel-notaint.diff (willy tarreau) ++ (350) linux-2.4.25-cifs-1.0.2b.diff (steve french) + + +400) network core updates -> 2 rej +========================= +This only includes core networking, not network drivers ++ (400) patch-2.4.25-pomng-20040229-hn (ftp.netfilter.org) ++ (401) patch-2.4.23-wt1-tcp_tw-redef (willy tarreau) ++ (402) patch-2425-ip6route-tristate (willy tarreau) + +# netconsole does not compile because of its redefinition of tg3_poll() +< (403) patch-2.4.24-nc0.01.diff (ingo molnar / herbert xu) + + +## backport of 2.6 IPSEC stack +#+ (410) patch-2.4.23-ipsec-ipv6-compfix (willy tarreau) +>+ (410) ipsec-2.4.25-20040222-1 (david miller/herbert xu) +>+ (411) patch-2.4.23-ipsec-compfix-1 (willy tarreau) +>+ (412) patch-pom-2.4.23-ipsec.compfix (willy tarreau) + +## openswan's IPSEC stack ++ (410) linux-2.4.25-openswan-1.0.1.diff (www.openswan.org, ignore 1 rej) ++ (411) patch-2423rc1-sfs-1.99.9c-more-tun (willy tarreau) +#+ (420) linux-2.4.23-linkwatch.patch (alexandre cassen) + ++ (430) tux3-2.4.23-A3 (ingo molnar -> 1 rej) ++ (431) tux3-2.4.23-A3-2.4.25-wt2.rejfix (willy tarreau) ++ (432) tux3-2.4.23-A3-loop-AES.glue (willy tarreau) + ++ (440) patch-2.4.25-wt2-mpls-1.172 (james leu, rediffed) + + +500) crypto updates -> 1 rej +=================== +> (501) patch-cryptoloop-jari-2.4.22.0 (jari ruusu) ++ (501) loop-aes-2.0f-2.4.24.diff (jari ruusu) ++ (502) patch-aes-asm-2.4.22.0 (brian gladman / jari ruusu -> 1 rej) ++ (503) patch-aes-asm-2.4.23-ipsec.rejfix (willy tarreau) ++ (504) patch-aes-asm-2.4.23-ipsec.compfix (willy tarreau) + + +600) driver updates -> 1 rej +=================== ++ (600) linux-2.4.25-i2c-2.8.4.patch (jean delvare -> 1 rej) ++ (601) linux-2.4.25-wt3-i2c-2.8.4.rejfix (willy tarreau) ++ (602) linux-2.4.25-sensors-2.8.4.diff (www.lm-sensors.nu) +> (603) patch-2423wt3-lm75-compfix (willy tarreau) ++ (603) patch-2.4.25-panel-0.8.1 (willy tarreau) ++ (604) 2.4.25-libata1.patch (jeff garzik) ++ (605) hpt366.c-2.4.23.patch (andre hedrick) ++ (606) linux-2.4.24_promise-sx6000-support1.patch (daniel baumann) + ++ (610) patch-2.4.23-ide-dma-oops (glenn wurster) ++ (612) patch-2.4.23-floppy-typo (jurgen quade) ++ (614) patch-2.4.23-rivafb.diff (pawel goleniowski) ++ (620) orinoco-0.13d-0.13e.diff (rediffed from david gibson's driver) ++ (621) patch-2.4.23-orinoco-0.13e-monitor (rediffed from david gibson's) ++ (622) orinoco-0.13e-monitor-dragorn3.diff (rediffed from dragorn's) + ++ (630) patch-2.4-megaraid-fixes (bjorn helgaas) ++ (640) aic79xx-linux-2.4-20040209.diff (justin gibbs) ++ (645) patch-2.4.22-wt1-usb-kyocera (benoit dolez) + + +700) architecture specific updates -> 1 rej +================================== ++ (700) patch-2.4.23p6-kmsgdump-0.4.4 (willy tarreau) ++ (701) patch-2.4.23-cpufreq-20031214 (dave jones -> 1 rej) ++ (702) patch-2.4.23-wt3-cpufreq-20031214.rejfix (willy tarreau) ++ (703) patch-2.4.25-wt3-cpufreq-20031214.compfix (willy tarreau) ++ (703) patch-2.4.23-amd76x_pm-fix (alexander bogdashevsky) ++ (704) patch-2.4.23-dual-xeon-detect (peter breitenlohner) ++ (705) patch-2.4.23-parisc-compfix (willy tarreau) ++ (706) patch-2.4.25-wt2-emux86-0.3 (willy tarreau) + ++ (710) acpi-20040220-2.4.26.diff (len brown) ++ (711) acpi-20040220-smp-poweroff.diff (shaohua/zwane mwaikambo/willy tarreau) ++ (712) acpi-20040220.warnfix (willy tarreau) + + +800) misc fixes +=============== ++ (800) patch-2.4.25-wt2-gcc-Os (willy tarreau) + + +900) end : automatically generate version and contents +====================================================== ++ (90a) patch-version (me) ++ (90b) patch-contents (me) + + +Not included +============ +To add later : + - grsecurity : now only one trivial makefile conflicts with pom. + Needs testing. Easier to apply before pom. PaX already merged. + - cdfs, evfs, squashfs, pspa + - profile,perfctr + - page_color + - epoll + +TODO : +====== + - ntfs-2.1.6a / 2.1.7 + - swsusp-2.0 + - cdfs + - pspa + - send-to-self (4 conflicts) + - exec-shield / openwall ? / grsec ? + - patches + > vserver + > uml-2.4.24-1 / skas3 + > netdev-random + * mpls + * tux-2.4.23-A3 + * emu486 + * low-latency + * openswan 1.0.1 + * i2c-2.8.4 + sensors-2.8.4 + * linkwatch + * promise + * orinoco 0.13e + monitor + * pom-031219 + * dm-2.4.24-1.00.07-1 + # megaraid-2.10.1 + * page_color + * epoll-lt-2.4.24-0.20 + * bme-2.4.23-0.0.3 + * netconsole (nc0) + * libata1 + * pax + * ikconfig + * kyocera + * vhz+jiffies64 + * bonding-cleanup + * kmsgdump + * cpufreq + * aes-asm + * aic79xx-20040209 + * squashfs + * evfs + * cifs + * loop-aes +