Do not remove these 3 following lines, they're used to patch Makefile ! ++ Kernel version 2.4.32-wt6 ++ Based on version 2.4.32 ++ and Changeset 2.4.33-rc2 # + = included # - = not included yet # > = doesn't apply # # = useless or comment # < = doesn't compile # This is to be applied on top of plain 2.4.32. # This should produce 19 rejects on 17 files when applied one by one. # These rejs are corrected when necessary, of course. All patches which # apply with a fuzz have been manually checked and must be checked for # each new version. # # 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. 1) 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...). + patch-2.4.33-rc2 (marcelo tosatti) + 0001-EXT3-ext3-block-bitmap-leakage.txt (kirill korotaev) + warnfix-2.4.26-rc1-agpgart.diff (willy tarreau) + warnfix-2.4.26-rc1-cardbus.diff (willy tarreau) + 2.4.32-emulated-scsi-wastes-dma-mem-1.diff (dan aloni) + 2.4.33-x86_64-fault-on-null-sig-handlers.diff (pax team) 2) core updates -> 7 rej ================= + patch-2.4.23-rc3-setuptime (willy tarreau) + vhz-j64-2.4.23.patch (robert love / tim schmielau) + vhz-j64-2.4.29-do_div-bug-workaround.diff (willy tarreau) + vhz-j64-2.4.27-alpha-userhz-compfix.diff (willy tarreau) + vhz-j64-2.4.27-sparc-userhz-compfix.diff (willy tarreau) + aslr-linux-2.4.32-200604281210.diff (extracted from PaX) + 2.4.32-3G-address-space-2 (andrea arcangeli, rediffed) + 2.4.33-pre1-strict-overcommit-1 (barry k.nathan, rediffed) + 2.4.33-pre1-overcommit-stats-1 (barry k.nathan) # kml_2.4.32_001.diff (toshiyuki maeda -> 1 rej) + epoll-lt-2.4.32-0.23.diff (davide libenzi) # epoll-lt-2.4.24-0.20-kml-rejfix.diff (willy tarreau) + epoll-lt-2.4.24-0.20-export-pollwait.diff (willy tarreau) + dm-2.4.26-1.00.07-1 (joe thornber) + netdev-random-core-rediffed-2.4.26pre5.diff (robert love, rediffed) + netdev-random-drivers-rediffed-2.4.31-1.diff (robert love, rediffed) + preempt-kernel-rml-2.4.29-1.rediff (robert love) + preempt-2.4.26-pre5-fix-task_struct.diff (willy tarreau) + patch-2.4.27-preempt-compat-fix3 (willy tarreau) < page_color-2.4.23-20040102.patch (Jason Papadopoulos) + ikconfig_2426pre6.rediff (randy dunlap, rediffed) + ikconfig.compfix (willy tarreau) + 2.4.28-pre1-low-latency.rediff (andrew morton, rediffed -> 1 rej) + lowlat-2.4.32-wt5.rejfix (willy tarreau) + lowlat-2.4.26-pre5-cfb16.compfix (willy tarreau) + patch-2.4.30-vs1.2.10.diff (jacques gelinas / herbert poetzl -> 6 rej) + 2.4.32-wt5-vs1.2.10.rejfix (willy tarreau) + 2.4.26-wt2-vs1.27.glue (willy tarreau) + 2.4.29-vs1.2.10-preempt-build-1.diff (willy tarreau) + 2.4.33-pre2-pax+oc-vs.rejfix (willy tarreau) + patch-2.4.26-pre6-badpage (marcelo tosatti) + 2.4.27-wt4-export-memchr.diff (willy tarreau) ## make it possible to pass variables to userspace from the boot loader + 2.4.32-proc_boot-2.diff (willy tarreau) + 2.4.32-proc_bootdev-3.diff (willy tarreau) + 2.4.32-proc_opmode-3.diff (willy tarreau) ## optimize poll() and epoll() timeout computation + 2.4.32-wt1-epoll-optim-jiffies-2.diff (willy tarreau) + 2.4.32-wt1-poll-optim-jiffies-2.diff (willy tarreau) 3) filesystem updates -> 6 rej ======================= Patches here can affect both VFS and any FS (proc...) > patch-2.4.23-proc-oops-fix (akinobu mita) + linux-2.4.28-pre1-ntfs-2.1.6b.rediff (anton altaparmakov, rediffed) + patch-2.4.27-bme0.05.diff (herbert poetzl -> 1 rej) + patch-2.4.33-bme-0.05-rejfix (willy tarreau) + patch-2.4.28-pre3-reiserfs-laptop-mode (micha feigin, rediffed) + squashfs3.0-patch (phillip lougher -> 1 rej) + squashfs1.3r3-vserver.rejfix (willy tarreau) + 2.4.32-squashfs2.2-doc.diff (willy tarreau) + patch-2.4.32-jffs2-uclinux (david woodhouse, from 2.4.32-uc0) + evfs-0.3-2.4.32-wt5.diff (http://hysteria.sk/evfs, rediffed) + evfs-0.2-kernel-truncate.diff (willy tarreau) + evfs-0.2-kernel-compfix.diff (willy tarreau) + evfs-0.2-kernel-notaint.diff (willy tarreau) + evfs-0.3-loop-aes-conflict.diff (willy tarreau) + linux-2.4.27-cifs-1.20c.diff (steve french) + patch-2.4.27-wt1-cdfs-2.4.20-a (Michiel Ronsse, rediffed) + 2.4.32-ramfs-limits-5 (david gibson + willy tarreau) # NFS fixes/updates that might never get into mainline + linux-2.4.26-01-fix_unlink.dif (trond myklebust) + linux-2.4.26-02-seekdir.dif (trond myklebust) + linux-2.4.26-03-access.dif (trond myklebust) + linux-2.4.26-04-pathconf.dif (trond myklebust) + linux-2.4.26-05-cto2.dif (trond myklebust) + linux-2.4.26-06-rdplus.dif (trond myklebust) + linux-2.4.26-07-sock_disconnect.dif (trond myklebust) + linux-2.4.27-08-umount-hangs.dif (trond myklebust) + linux-2.4.27-pre1-vs-nfs-compfix.diff (willy tarreau) # ACL + EA + ea-2.4.29-0.8.73.diff (acl.bestbits.at -> 1 rej) + patch-2.4.27-wt2-ea-0.8.71.rejfix (willy tarreau) + patch-2.4.27-wt2-ea-0.8.71.glue (willy tarreau) + acl-2.4.29-0.8.73.diff (acl.bestbits.at -> 2 rej) + patch-2.4.27-wt3-acl-0.8.71.rejfix (willy tarreau) + patch-2.4.27-wt2-acl-0.8.71.glue (willy tarreau) + 01-reiserfs-nesting-2.4.23-03 (jeff mahoney -> 1 rej) + 2.4.27-wt2-reiserfs-nesting-lowlat.rejfix (willy tarreau) + 02-reiserfs-xattrs-2.4.23-03 (jeff mahoney) + 03-reiserfs-acl-2.4.23-03 (jeff mahoney) + 03-reiserfs-acl-2.4.23-03.glue (willy tarreau) + 04-reiserfs-trusted-2.4.23-03 (jeff mahoney) 4) network core updates (2 rej) ========================= This only includes core networking, not network drivers + patch-2.4.29-backport-skb_header_pointer (willy tarreau) + 2.4.32-pom-ng+old-051202-1.diff (ftp.netfilter.org) + pom_ipset_2.2.8_ip_set_hash_add.diff (willy tarreau) + 2.4.32-ipt_route-build-no-nat.diff (willy tarreau) + linux-2.4.32-nf-log-6.diff (pom-ng, rediffed by roberto nibali) + linux-2.4.32-tcp-window-tracking-3.diff (pom-ng, rediffed by roberto nibali) + patch-2.4.30-pomng-ctstat (rediffed from pom-ng) + 2.4.32-ld3-ip_set-remove-all-1 (willy tarreau) + patch-2.4.23-wt1-tcp_tw-redef (willy tarreau) + patch-2.4.27-ip6route-compfix (willy tarreau) + patch-2.4.29-netfilter-mem-leak (dave jones) + patch-2.4.32-wt1-nc0.03.rediff (ingo molnar / herbert poetzl) + ebtables-brnf-11-2_vs_2.4.31.diff (http://ebtables.sf.net/) + ebtables-brnf-2.4.32-build-no-bridge-2.diff (willy tarreau) + kernel-2.4-layer7-1.5.patch (http://l7-filter.sf.net/ -> 1 rej) + kernel-2.4-layer7-1.5.rejfix (willy tarreau) ## backport of 2.6 IPSEC stack # patch-2.4.23-ipsec-ipv6-compfix (willy tarreau) # ipsec-2.4.25-20040222-1 (david miller/herbert xu) # patch-2.4.23-ipsec-compfix-1 (willy tarreau) # patch-pom-2.4.23-ipsec.compfix (willy tarreau) ## openswan's IPSEC stack + linux-2.4.32-openswan-1.0.10.diff (www.openswan.org) + 2.4.29-wt1-ipsec-libdes-buggy-as.diff (willy tarreau) + patch-2427p2-osw-1.0.4rc1-more-tun (willy tarreau) # linux-2.4.23-linkwatch.patch (alexandre cassen) + tux3-2.4.27-A3.rediff (ingo molnar, rediffed) + tux3-2.4.27-sys_write-sparc.diff (willy tarreau) + tux3-2.4.27-sys_tux-sparc.diff (willy tarreau) + tux3-2.4.23-A3-cflag-g.diff (willy tarreau) + tux3-2.4.28-pre3-A3-needed-exports.diff (willy tarreau) + tux3-2.4.23-A3-loop-AES.glue (willy tarreau) + tux3-2.4.23-A3-route-glue (willy tarreau) + tux3-2.4.23-A3-export-syscalls.diff (willy tarreau) + tux3-2.4.27-A3-vservers.glue (willy tarreau) + patch-2.4.29-wt1-mpls-1.172 (james leu, rediffed) + patch-2.4.27-wt6-mpls-missing-arg (willy tarreau) + patch-2.4.29-ja1.diff (julian anastasov) + linux-2.4.24-imq.diff (patrick mchardy -> 1 rej) + linux-2.4.27-qdisc-imq.rejfix (willy tarreau) + pspa-2.4.30-pre2-19.rediff (killa.net/infosec/acls/, rediffed) + pspa-2.4.27-19-af_packet-module.diff (willy tarreau) + iw249_we17-13.diff (jean tourrilhes) + iw240_we18-5.diff (jean tourrilhes) + 00_tcp-spurious-dupack-winup-streamers-1.txt (andrea arcangeli) + patch-2.4.28-pre3-netem-compfix (willy tarreau) + patch-2.4.32-smaller-timewait-15s (willy tarreau) + 2.4.32-config_ip_stealth-1.diff (madcamel, willy tarreau) + linux-2.4.32-al10.5-disable-tcp-debug.diff (willy tarreau) + 2.4.32-disable-netdebug-1.diff (willy tarreau) < ippersonality-20020427-2.4.26-rc1.diff (gael roualland / jean-marc saffroy -> 2 rej) < ippersonality-20020427-2.4.25-wt8.rejfix (willy tarreau) 5) crypto updates -> 2 rej =================== + loop-aes-3.1b-2.4.32.diff (jari ruusu -> 1 rej) + loop-aes-3.0c-2.4.31-wt1.rejfix (willy tarreau) + patch-aes-asm-2.4.22.0 (brian gladman / jari ruusu -> 1 rej) + patch-aes-asm-2.4.23-ipsec.rejfix (willy tarreau) + patch-aes-asm-2.4.23-ipsec.compfix (willy tarreau) 6) driver updates -> 1 rej =================== + linux-2.4.33-rc2-i2c-2.10.0.diff (www.lm-sensors.nu) + linux-2.4.33-pre2-sensors-2.10.0.diff (www.lm-sensors.nu) + sensors-2.10.0-build-without-f71805f.diff (willy tarreau) + patch-2.4.26-panel-0.9.3 (willy tarreau) + patch-2.4.32-nsawdt-0.2 (willy tarreau) + 2.4.32-libata1-highmem.diff (willy tarreau) + 2.4.32-libata-fixes-1.diff (jeff garzik) + 2.4.32-wt1-new-nvidia-device-ids-1 (andy currid, rediffed) + 2.4.29-iswraid-0.1.5.patch (martins krikis) + 2.4.29-iswraid-build.diff (willy tarreau) + patch-2.4.28-ide-via-vt610-support (mathias kretsch) + patch-2.4.26-atp867x (eric uhrhane) + linux-2.4.24_promise-sx6000-support1.patch (daniel baumann) + patch-2.4.28-mtd-write-multi-size (rainer weikusat) + patch-2.4.28-proc_stat-collects-cciss (mike miller) + patch-2.4.29-bond-zerocopy-transmit-support (radheka godse) + 2.4.32-bonding-return-link-status.diff (willy tarreau) + patch-2.4.28-tulip-support-uli_m526x (clear zhang) + 2.4.26-8139too-change-mtu.diff (willy tarreau) + 2.4.26-8139too-set-mtu.diff (willy tarreau) > 2.4.26-sis900-wake-on-lan.diff (david wilson) + 2.4.32-e1000-fix-mii-interface.diff (paul rolland) + sk98lin_v8.31.2.3_2.4.32-wt3.rediff (syskonnect, rediffed) + patch-2.4.28-usb-storage-auto-add-remove (erik andersen) + patch-2.4.29-usb-storage-add-pentax-id (miquel vidal) + orinoco-0.13d-0.13e.diff (david gibson, rediffed -> 1 rej) + orinoco-0.13d-0.13e-netdev.rejfix (willy tarreau) + patch-2.4.23-orinoco-0.13e-monitor (david gibson, rediffed) + orinoco-0.13e-monitor-dragorn3.diff (dragorn, rediffed) + hostap-0.2.1-2.4.27-pre3.diff (jouni malinen) + patch-2.4.29-sym53c8xx_2-use-correct-name (joshua kwan) + patch-2.4-megaraid-fixes (bjorn helgaas) + patch-2.4.27-rename-megaraid2 (denis vlasenko) + aic79xx-20040522-linux-2.4.30-pre3.rediff (justin gibbs, rediffed) + cmpci-2.4.27-6.82.rediff (chenli tien, rediffed) + cmpci-6.82-compfix.diff (willy tarreau) + patch-2.4.28-sound-ac97-quirks (john w. linville) + patch-2.4.28-pre1-pwc-8.12 (nemosoft) + patch-2.4.28-pre1-pwc-8.12-smpfix (willy tarreau) + 2.4.32-vmwarefb-0.7.0.rediff (rediffed from the directfb project) 7) architecture specific updates -> 1 rej ================================== + patch-2.4.23p6-kmsgdump-0.4.4 (willy tarreau) + patch-2.4.23-cpufreq-20031214 (dave jones -> 1 rej) + patch-2.4.23-wt3-cpufreq-20031214.rejfix (willy tarreau) + patch-2.4.25-wt3-cpufreq-20031214.compfix (willy tarreau) + patch-2.4.23-amd76x_pm-fix (alexander bogdashevsky) + patch-2.4.23-parisc-compfix (willy tarreau) + patch-2.4.25-wt2-emux86-0.3 (willy tarreau) + patch-2.4.25-gdt-fix (coywolf qi hunt) # placeholder for ACPI updates when already included in -pre. # acpi-20040326-2.4.29.diff (len brown) # fixes for stability problems on nforce2 motherboards + 2.4.22-apic-timer-rd-nforce2.patch (ross dickson) + 2.4.22-io-apic-rd-nforce2.patch (ross dickson) + patch-2.4.27-pci-express.rediff (greg kh, rediffed) + pci-express-02-2.4.27-pre3.patch (greg kh) + pci-express-no-acpi-compfix.diff (willy tarreau) + patch-2.4.27-wt6-optim-ultrasparc (willy tarreau) + patch-2.4.29-debug-reg-slows-signals (zachary amsden) 8) misc fixes =============== + 2.4.32-wt2-optim-size-1.diff (willy tarreau) + patch-2.4.26-config-date (randy dunlap) + 2.4.29-hf1-kbuild_add_options.patch (xose vazquez perez, rediffed) + patch-2.4.27-menuconfig-msgbox (joshua kwan) + patch-2.4.27-zlib-useless-check (dave jones) + 2.4.29-add-dontdiff-1 (randy dunlap) + 2.4.32-option-boot-logo.diff (willy tarreau) 9) end : automatically generate version and contents ====================================================== + patch-version (me) + patch-contents (me) INCLUDED : ========== - performance : variable-hz, jiffies64, low-latency, preempt, netdev-random, epoll - system mgt : emu486, netconsole, kmsgdump, ikconfig, i2c+sensors, cpufreq - system sec : vserver, aslr, pspa, bme (bind mount extensions), loop-aes, - file-systems: cdfs, ntfs, cifs, squashfs3, evfs, acl+ea for ext2/3/reiserfs - network : send-to-self & other -ja features, imq, mpls, tux3 - network sec : openswan, patch-o-matic-ng, ebtables - drivers : orinoco+monitor, aic7xxx, device mapper, promise-sx6000, libata1(serial ATA), pci express, hostap, lcdpanel, NSA watchdog, misc updates, marvell(sk98), vmware-fb TODO : ====== - raw table (roberto nibali) - patches - perfctr - swsusp-2.0 -> http://sourceforge.net/projects/swsusp - exec-shield / openwall ? / grsec ? - compressed cache < ippersonality > uml-2.4.24-1 / skas3 - linkwatch - page_color - merge ext2_div_zero/ext3_div_zero - kml - serial-closing-wait.diff - aacraid-1.1.5 - recheck firewall policy after reload : http://marc.theaimsgroup.com/?l=netfilter-devel&m=105975103717126&w=2 - check NFS patches on http://linux-nfs.org/Linux-2.4.x/ - e2compr - socket-race