From: Andy P. <at...@us...> - 2002-04-11 14:27:32
|
Update of /cvsroot/linux-vax/kernel-2.4 In directory usw-pr-cvs1:/tmp/cvs-serv26834 Modified Files: COPYING CREDITS MAINTAINERS Makefile README REPORTING-BUGS Rules.make Log Message: synch 2.4.15 commit 56 Index: COPYING =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/COPYING,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- COPYING 14 Jan 2001 16:24:25 -0000 1.1.1.1 +++ COPYING 11 Apr 2002 14:26:54 -0000 1.2 @@ -7,8 +7,8 @@ kernel) is copyrighted by me and others who actually wrote it. Also note that the only valid version of the GPL as far as the kernel - is concerned is _this_ license (ie v2), unless explicitly otherwise - stated. + is concerned is _this_ particular version of the license (ie v2, not + v2.2 or v3.x or whatever), unless explicitly otherwise stated. Linus Torvalds Index: CREDITS =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/CREDITS,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- CREDITS 25 Feb 2001 23:14:45 -0000 1.1.1.2 +++ CREDITS 11 Apr 2002 14:26:54 -0000 1.2 @@ -78,8 +78,8 @@ D: Unix98 pty support. D: APM update to 1.2 spec. D: /devfs hacking. -S: 322 N. Riverside Dr. -S: Neptune, NJ 07753 +S: 7 Kiwi Loop +S: Howell, NJ 07731 S: USA N: Erik Andersen @@ -221,6 +221,14 @@ S: 62-300 Wrzesnia S: Poland +N: Fred Barnes +E: fr...@uk... +D: Various parport/ppdev hacks and fixes +S: Computing Lab, The University +S: Canterbury, KENT +S: CT2 7NF +S: England + N: Paul Barton-Davis E: pb...@op... D: Driver for WaveFront soundcards (Turtle Beach Maui, Tropez, Tropez+) @@ -307,17 +315,14 @@ D: Original author of the Linux networking code N: Anton Blanchard -E: an...@li... -W: http://linuxcare.com.au/anton/ +E: an...@sa... +W: http://samba.org/~anton/ P: 1024/8462A731 4C 55 86 34 44 59 A7 99 2B 97 88 4A 88 9A 0D 97 D: sun4 port, Sparc hacker -S: 47 Robert Street -S: Marrickville NSW 2204 -S: Australia N: Hugh Blemings -E: hu...@li... -W: http://www.linuxcare.com.au/hugh/ +E: hu...@mi... +W: http://misc.nu/hugh/ D: Author and maintainer of the Keyspan USB to Serial drivers S: Po Box 234 S: Belconnen ACT 2616 @@ -395,13 +400,12 @@ S: USA N: Peter Braam -E: br...@cs... -W: http://coda.cs.cmu.edu/~braam -D: Coda Filesystem -S: Dept of Computer Science -S: 5000 Forbes Avenue -S: Pittsburgh, Pennsylvania 15213 -S: USA +E: br...@cl... +W: http://www.clusterfs.com/ +D: Coda & InterMezzo filesystems +S: 181 McNeil +S: Canmore, AB +S: Canada, T1W 2R9 N: Ryan Bradetich E: rbr...@us... @@ -449,6 +453,11 @@ E: xa...@ix... D: USB Serial Empeg Empeg-car Mark I/II Driver +N: Matthias Bruestle +E: m...@mb... +D: REINER SCT cyberJack pinpad/e-com USB chipcard reader driver +S: Germany + N: Ray Burr E: ry...@ni... D: Original author of Amiga FFS filesystem @@ -525,6 +534,12 @@ S: Stanford, California 94305 S: USA +N: Randolph Chung +E: ta...@de... +D: Linux/PA-RISC hacker +S: Fremont, CA 94538 +S: USA + N: Juan Jose Ciarlante W: http://juanjox.kernelnotes.org/ E: jjc...@ra... @@ -588,6 +603,13 @@ S: Guildford, GU1 3DA S: United Kingdom +N: Cristian Mihail Craciunescu +W: http://www.dnt.ro/~cristi/ +E: cr...@dn... +D: Support for Xircom PGSDB9 (firmware and host driver) +S: Bucharest +S: Romania + N: Laurence Culhane E: lo...@ho... D: Wrote the initial alpha SLIP code @@ -623,10 +645,11 @@ S: USA N: Frank Davis +E: fd...@si... E: fda...@ju... D: Various kernel patches S: 8 Lakeview Terr. -S: Kerhonskon, NY 12446 +S: Kerhonkson, NY 12446 S: USA N: Wayne Davison @@ -669,6 +692,25 @@ S: K1N 6Z9 S: CANADA +N: Jeff Dike +E: jd...@ka... +W: http://user-mode-linux.sourceforge.net +D: User mode kernel port +S: RR1 Box 67C +S: Deering NH 03244 +S: USA + +N: Matt Domsch +E: Mat...@de... +W: http://www.dell.com/linux +W: http://domsch.com/linux +D: Linux/IA-64 +D: Dell PowerEdge server, SCSI layer, misc drivers, and other patches +S: Dell Computer Corporation +S: One Dell Way +S: Round Rock, TX 78681 +S: USA + N: Eddie C. Dost E: ec...@sk... D: Linux/Sparc kernel hacker @@ -679,17 +721,13 @@ N: Cort Dougan E: co...@fs... -W: http://www.ppc.kernel.org/~cort/ +W: http://www.fsmlabs.com/linuxppcbk.html D: PowerPC -S: Finite State Machine Labs -S: P.O. 1829 -S: Socorro, New Mexico 87801 -S: USA N: Oleg Drokin E: gr...@cc... W: http://www.ccssu.crimea.ua/~green -D: Cleaning up sound drivers. +D: Cleaning up sound drivers, SA1100 Watchdog. S: Skvoznoy per., 14a S: Evpatoria S: Crimea @@ -718,14 +756,27 @@ S: USA N: Randy Dunlap -E: ran...@in... +E: rdd...@os... W: http://home.att.net/~randy.dunlap/ +W: http://home.att.net/~rddunlap/ W: http://www.linux-usb.org D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers -S: 5200 NE Elam Young Pkwy., M/S HF3-77 -S: Hillsboro, Oregon 97124 +D: x86 SMP, ACPI, bootflag hacking +S: 15275 SW Koll Parkway, Suite H +S: Beaverton, Oregon 97006 S: USA +N: Bob Dunlop +E: rj...@xy... +E: bob...@fa... +W: www.farsite.co.uk +D: FarSync card device driver +S: FarSite Communications Ltd +S: Tempus Business Centre +S: 60 Kingsclere Road +S: Basingstoke RG21 6XG +S: UK + N: Cyrus Durgin E: ci...@sp... W: http://www.speakeasy.org/~cider/ @@ -773,6 +824,11 @@ S: S-114 53 Stockholm S: Sweden +N: Michael Engel +E: en...@un... +D: DECstation framebuffer drivers +S: Germany + N: Paal-Kristian Engstad E: en...@in... D: Kernel smbfs (to mount WfW, NT and OS/2 network drives.) @@ -788,7 +844,6 @@ S: USA N: Johannes Erdfelt -E: jer...@va... E: joh...@er... D: Linux/IA-64 bootloader and kernel goop, USB S: 6350 Stoneridge Mall Road @@ -905,6 +960,15 @@ S: San Jose, California 95131 S: USA +N: Fernando Fuganti +E: fu...@co... +E: fu...@ne... +D: random kernel hacker, ZF MachZ Watchdog driver +S: Conectiva S.A. +S: R. Tocantins, 89 - Cristo Rei +S: 80050-430 - Curitiba - Paraná +S: Brazil + N: Nigel Gamble E: ni...@nr... E: ni...@sg... @@ -935,6 +999,11 @@ E: ph...@ra... D: Kernel / timekeeping stuff +N: Jan-Benedict Glaw +E: jb...@lu... +D: SRM environment driver (for Alpha systems) +P: 1024D/8399E1BB 250D 3BCF 7127 0D8C A444 A961 1DBD 5E75 8399 E1BB + N: Richard E. Gooch E: rg...@at... D: parent process death signal to children @@ -946,6 +1015,12 @@ S: New South Wales, 2121 S: Australia +N: Carlos E. Gorges +E: ca...@te... +D: fix smp support on cmpci driver +P: 2048G/EA3C4B19 FF31 33A6 0362 4915 B7EB E541 17D0 0379 EA3C 4B19 +S: Brazil + N: Dmitry S. Gorodchanin E: pg...@ib... D: RISCom/8 driver, misc kernel fixes. @@ -1026,11 +1101,11 @@ S: Canada N: Richard Günther -E: ric...@st... +E: rg...@ta... +W: http://www.tat.physik.uni-tuebingen.de/~rguenth P: 2048/2E829319 2F 83 FC 93 E9 E4 19 E2 93 7A 32 42 45 37 23 57 D: binfmt_misc -S: Fichtenweg 3/511 -S: 72076 Tübingen +S: 72074 Tübingen S: Germany N: Justin Guyett @@ -1045,6 +1120,11 @@ S: 2400 AG, Alphen aan den Rijn S: The Netherlands +N: Enver Haase +E: eh...@in... +W: http://www.inf.fu-berlin.de/~ehaase +D: Driver for the Commodore A2232 serial board + N: Bruno Haible E: ha...@ma... D: SysV FS, shm swapping, memory management fixes @@ -1084,7 +1164,7 @@ N: Andre Hedrick E: an...@li... -E: ahe...@at... +E: an...@as... E: an...@su... W: http://www.linux-ide.org/ D: Random SMP kernel hacker... @@ -1095,8 +1175,8 @@ D: ATA-Smart Kernel Daemon S: Linux ATA Development (LAD) S: Concord, CA -S: Atipa Linux Solutions -S: 6000 Connecticut Kansas City, MO 64120 +S: ASL, Inc. 1-877-ASL-3535 +S: 1757 Houret Court, Milpitas, CA 95035 S: SuSE Linux, Inc. S: 580 Second Street, Suite 210 Oakland, CA 94607 S: USA @@ -1113,8 +1193,10 @@ S: Germany N: Christoph Hellwig -E: chh...@gm... -D: Sound/OSS hacking +E: hc...@ca... +E: hc...@in... +D: misc driver & makefile hacking +D: freevxfs driver S: Triftstraße 26 S: 38644 Goslar S: Germany @@ -1123,18 +1205,16 @@ E: rt...@tw... E: rt...@cy... D: Alpha hacker, kernel and userland -S: 50 E. Middlefield #10 -S: Mountain View, California 94043 +S: 1668 California St. +S: Mountain View, California 94041 S: USA N: Benjamin Herrenschmidt -E: bh...@ca... +E: be...@ke... E: be...@mi... -D: PowerMac booter (BootX) -D: Additional PowerBook support -D: Apple "Core99" machines support (ibook,g4,...) -S: 22, rue des Marguettes -S: 75012 Paris +D: Various parts of PPC & PowerMac +S: 122, boulevard Baille +S: 13005 Marseille S: France N: Sebastian Hetze @@ -1227,13 +1307,12 @@ S: USA N: Harald Hoyer -E: Ha...@Ro... -W: http://hot.spotline.de/ -W: http://home.pages.de/~saturn +E: har...@pa... +W: http://parzelle.de/ D: ip_masq_quake D: md boot support -S: Alleenstrasse 27 -S: D-71679 Asperg +S: Hohe Strasse 30 +S: D-70176 Stuttgart S: Germany N: Jan Hubicka @@ -1259,12 +1338,11 @@ S: USA N: Gareth Hughes -E: ga...@va... -E: ga...@pr... +E: gar...@ac... D: Pentium III FXSR, SSE support -S: 11/187 West Street -S: Crows Nest NSW 2065 -S: Australia +D: Author/maintainer of most DRM drivers (especially ATI, MGA) +D: Core DRM templates, general DRM and 3D-related hacking +S: No fixed address N: Kenn Humborg E: ke...@wo... @@ -1347,17 +1425,17 @@ N: Dave Jones E: da...@su... -E: da...@po... -E: dj...@gl... -W: http://powertweak.sourceforge.net +W: http://www.suse.de/~davej D: Moved PCI bridge tuning to userspace (Powertweak). -D: Centaur/IDT Winchip/Winchip 2 tweaks. +D: Various x86 (& clones) setup code hacking. D: AFFS fixes for 2.3.x -D: Misc clean ups and other random hacking. -S: 28, Laura Street, -S: Treforest, Pontypridd, -S: Mid Glamorgan, CF37 1NW, -S: Wales, United Kingdom +D: Various Janitorial hacks. (kernel-janitor.sourceforge.net) +S: c/o SuSE Linux UK Ltd +S: The Kinetic Centre +S: Theobald Street +S: Borehamwood +S: Herts, WD6 4PJ +S: United Kingdom N: Ani Joshi E: aj...@sh... @@ -1488,8 +1566,9 @@ D: 6pack driver for AX.25 N: Harald Koerfgen -E: ha...@un... -D: DECstation port +E: hk...@we... +D: Linux/MIPS kernel hacks and fixes, +D: DECstation port, Sharp Mobilon port S: D-50931 Koeln S: Germany @@ -1512,6 +1591,17 @@ S: L3R 8B2 S: Canada +N: Maxim Krasnyansky +E: ma...@qu... +W: http://vtun.sf.net +W: http://bluez.sf.net +D: Author of the Universal TUN/TAP driver +D: Author of the Linux Bluetooth Subsystem (BlueZ) +D: Various other kernel patches, cleanups and fixes +S: 2213 La Terrace Circle +S: San Jose, CA 95123 +S: USA + N: Andreas S. Krebs E: ak...@al... D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards @@ -1521,8 +1611,10 @@ W: http://www.kroah.com/linux-usb/ D: USB Serial Converter driver framework, USB Handspring Visor driver D: ConnectTech WHITEHeat USB driver, Generic USB Serial driver -D: USB Bluetooth driver +D: USB I/O Edgeport driver, USB Serial IrDA driver +D: USB Bluetooth driver, USB Skeleton driver D: bits and pieces of USB core code. +D: PCI Hotplug core, PCI Hotplug Compaq driver modifications N: Russell Kroll E: rk...@ex... @@ -1667,6 +1759,7 @@ N: Jamie Lokier E: ja...@im... D: Reboot-through-BIOS for broken 486 motherboards +D: Some parport fixes S: 11 Goodson Walk S: Marston S: Oxford @@ -1734,12 +1827,10 @@ S: Czech Republic N: Paul Mackerras -E: pa...@li... +E: pa...@sa... +D: PPP driver +D: Linux for PowerPC D: Linux port for PCI Power Macintosh -S: Linuxcare, Inc. -S: 24 Marcus Clarke Street -S: Canberra ACT 2601 -S: Australia N: Pat Mackinlay E: pa...@it... @@ -1779,9 +1870,8 @@ S: Bulgaria N: Martin Mares -E: mj...@su... E: mj...@uc... -W: http://atrey.karlin.mff.cuni.cz/~mj/ +W: http://www.ucw.cz/~mj/ D: BIOS video mode handling code D: MOXA C-218 serial board driver D: Network autoconfiguration @@ -1877,10 +1967,13 @@ N: Arnaldo Carvalho de Melo E: ac...@co... -W: http://www.conectiva.com.br/~acme +E: ac...@gn... +W: http://bazar.conectiva.com.br/~acme +W: http://advogato.org/person/acme +P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01 D: wanrouter hacking -D: USB hacking -D: miscellaneous Makefile & Config.in fixes +D: misc Makefile, Config.in, drivers and network stacks fixes +D: IPX Maintainer D: Cyclom 2X synchronous card driver D: i18n for minicom, net-tools, util-linux, fetchmail, etc S: Conectiva S.A. @@ -1888,6 +1981,11 @@ S: 80050-430 - Curitiba - Paraná S: Brazil +N: Karsten Merker +E: me...@li... +D: DECstation framebuffer drivers +S: Germany + N: Michael Meskes E: me...@de... P: 1024/04B6E8F5 6C 77 33 CA CC D6 22 03 AB AB 15 A3 AE AD 39 7D @@ -1964,6 +2062,14 @@ S: Richardson, Texas 75081 S: USA +N: Patrick Mochel +E: pa...@os... +E: mo...@in... +D: PCI Power Management, ACPI work +S: 15275 SW Koll Parkway, Suite H +S: Beaverton, OR 97006 +S: USA + N: Eberhard Moenkeberg E: em...@gw... D: CDROM driver "sbpcd" (Matsushita/Panasonic/Soundblaster) @@ -2191,15 +2297,15 @@ S: USA N: Kai Petzke -E: wp...@ma... -W: http://physik.tu-berlin.de/~wpp -P: 1024/B42868C1 D9 59 B9 98 BB 93 05 38 2E 3E 31 79 C3 65 5D E1 +E: pe...@te... +W: http://www.teltarif.de/ +P: 1024/B42868C1 D9 59 B9 98 BB 93 05 38 2E 3E 31 79 C3 65 5D E1 D: Driver for Laser Magnetic Storage CD-ROM D: Some kernel bug fixes D: Port of the database Postgres -D: "Unix fuer Jedermann" a German introduction to linux (see my web page) -S: M"ullerstr. 69 -S: 13349 Berlin +D: Book: "Linux verstehen und anwenden" (Hanser-Verlag) +S: Triftstra=DFe 55 +S: 13353 Berlin S: Germany N: Emanuel Pirker @@ -2217,6 +2323,15 @@ E: ke...@ha... D: CDROM driver "sonycd535" (Sony CDU-535/531) +N: Stelian Pop +E: ste...@fr... +P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0 D3F7 7185 9E7A EDBB 6147 +D: sonypi, meye drivers, mct_u232 usb serial hacks +S: Alcôve +S: 153, bd. Anatole France +S: 93200 Saint Denis +S: France + N: Frederic Potter E: fp...@ci... D: Some PCI kernel support @@ -2313,14 +2428,15 @@ S: France N: Rik van Riel -E: ri...@nl... -W: http://www.nl.linux.org/~riel/ +E: ri...@co... +W: http://www.surriel.com/ D: Linux-MM site, Documentation/sysctl/*, swap/mm readaround D: clustering contributor, kswapd fixes, random kernel hacker, -D: nl.linux.org maintainer, minor scheduler additions -S: IJsselstraat 23a -S: 9725 GA Groningen -S: The Netherlands +D: nl.linux.org administrator, minor scheduler additions +S: Conectiva S.A. +S: R. Tocantins, 89 - Cristo Rei +S: 80050-430 - Curitiba - Paraná +S: Brazil N: Pekka Riikonen E: pri...@po... @@ -2368,8 +2484,8 @@ S: Brazil N: Stephen Rothwell -E: sf...@li... -W: http://linuxcare.com.au/sfr +E: sf...@ca... +W: http://www.canb.auug.org.au/~sfr P: 1024/BD8C7805 CD A4 9D 01 10 6E 7E 3B 91 88 FA D9 C8 40 AA 02 D: Boot/setup/build work for setup > 2K D: Author, APM driver @@ -2412,14 +2528,23 @@ S: Germany N: Paul `Rusty' Russell -E: ru...@li... +E: ru...@ru... W: http://www.samba.org/netfilter D: Ruggedly handsome. D: netfilter, ipchains with Michael Neuling. -S: 301/222 City Walk -S: Canberra ACT 2601 +S: 52 Moore St +S: Turner ACT 2612 S: Australia +N: Richard Russon (FlatCap) +E: ke...@fl... +W: http://www.flatcap.org +D: NTFS support +D: LDM support (Win2000/XP Logical Disk Manager/Dynamic Disks) +S: 50 Swansea Road +S: Reading +S: United Kingdom + N: Bill Ryder E: br...@sg... D: FTDI_SIO usb/serial converter driver @@ -2438,11 +2563,11 @@ S: Finland N: Thomas Sailer -E: sa...@if... +E: t.s...@al... E: HB...@HB... (packet radio) D: hfmodem, Baycom and sound card radio modem driver -S: Weinbergstrasse 76 -S: 8408 Winterthur +S: Markusstrasse 18 +S: 8006 Zuerich S: Switzerland N: Robert Sanders @@ -2525,6 +2650,14 @@ S: San Jose, California S: USA +N: Robert Siemer +E: Rob...@gm... +P: 2048/C99A4289 2F DC 17 2E 56 62 01 C8 3D F2 AC 09 F2 E5 DD EE +D: miroSOUND PCM20 radio RDS driver, ACI rewrite +S: Klosterweg 28 / i309 +S: 76131 Karlsruhe +S: Germany + N: Jaspreet Singh E: jas...@sa... W: www.sangoma.com @@ -2678,9 +2811,7 @@ N: Marcelo W. Tosatti E: ma...@co... W: http://bazar.conectiva.com.br/~marcelo/ -D: Miscellaneous kernel hacker -D: Cyclom 2X driver, drbd hacker -D: linuxconf apache & proftpd module maintainer +D: Miscellaneous kernel hacker (mostly VM/MM work) S: Conectiva S.A. S: R. Tocantins, 89 - Cristo Rei S: 80050-430 - Curitiba - Paraná @@ -2705,7 +2836,7 @@ N: Andrew Tridgell E: tr...@sa... -W: http://linuxcare.com.au/tridge/ +W: http://samba.org/tridge/ D: dosemu, networking, samba S: 3 Ballow Crescent S: MacGregor A.C.T 2615 @@ -2820,6 +2951,7 @@ N: Petr Vandrovec E: van...@vc... D: Small contributions to ncpfs +D: Matrox framebuffer driver S: Chudenicka 8 S: 10200 Prague 10, Hostivar S: Czech Republic @@ -2866,6 +2998,14 @@ S: 1098 VA Amsterdam S: The Netherlands +N: Jeroen Vreeken +E: pe...@am... +W: http://www.chello.nl/~j.vreeken/ +D: SE401 usb webcam driver +S: Maastrichterweg 63 +S: 5554 GG Valkenswaard +S: The Netherlands + N: Peter Shaobo Wang E: pw...@mm... W: http://www.mmdcorp.com/pw/linux @@ -2875,7 +3015,7 @@ S: USA N: Tim Waugh -E: ti...@cy... +E: ti...@cy... D: Co-architect of the parallel-port sharing system S: 17 Curling Vale S: GUILDFORD @@ -3006,8 +3146,8 @@ E: jw...@ph... W: http://www.physics.adelaide.edu.au/~jwoithe D: ALS-007 sound card extensions to Sound Blaster driver -S: 4/36 Trevelyan St -S: Wayville SA 5034 +S: 20 Jordan St +S: Valley View, SA 5093 S: Australia N: Clifford Wolf Index: MAINTAINERS =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/MAINTAINERS,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- MAINTAINERS 25 Feb 2001 23:14:45 -0000 1.1.1.2 +++ MAINTAINERS 11 Apr 2002 14:26:55 -0000 1.2 @@ -81,13 +81,24 @@ L: lin...@vg... S: Maintained +53C700 AND 53C700-66 SCSI DRIVER +P: James E.J. Bottomley +M: Jam...@Ha... +L: lin...@vg... +S: Maintained + 6PACK NETWORK DRIVER FOR AX.25 P: Andreas Koensgen [...1041 lines suppressed...] +L: lin...@vg... +S: Maintained + Z85230 SYNCHRONOUS DRIVER P: Alan Cox M: al...@re... @@ -1466,6 +1756,13 @@ W: http://yaina.de/jreuter/ W: http://www.qsl.net/dl1bke/ L: lin...@vg... +S: Maintained + +ZF MACHZ WATCHDOG +P: Fernando Fuganti +M: fu...@co... +M: fu...@ne... +W: http://cvs.conectiva.com.br/drivers/ZFL-watchdog/ S: Maintained ZR36120 VIDEO FOR LINUX DRIVER Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Makefile 13 Nov 2001 23:34:21 -0000 1.13 +++ Makefile 11 Apr 2002 14:26:55 -0000 1.14 @@ -1,17 +1,18 @@ VERSION = 2 PATCHLEVEL = 4 -SUBLEVEL = 2 -EXTRAVERSION = -20011113 +SUBLEVEL = 15 +EXTRAVERSION =-greased-turkey KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) #ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) ARCH=vax +KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//") CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ else if [ -x /bin/bash ]; then echo /bin/bash; \ else echo sh; fi ; fi) -TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) +TOPDIR := $(shell /bin/pwd) HPATH = $(TOPDIR)/include FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net @@ -89,7 +90,8 @@ CPPFLAGS := -D__KERNEL__ -I$(HPATH) -CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing +CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ + -fomit-frame-pointer -fno-strict-aliasing -fno-common AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS) # @@ -120,11 +122,7 @@ CORE_FILES =kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o NETWORKS =net/network.o -DRIVERS =drivers/block/block.o \ - drivers/char/char.o \ - drivers/misc/misc.o \ - drivers/net/net.o \ - drivers/media/media.o + LIBS =$(TOPDIR)/lib/lib.a SUBDIRS =kernel drivers mm fs net ipc lib @@ -133,7 +131,13 @@ DRIVERS-m := DRIVERS- := +DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o DRIVERS-$(CONFIG_PARPORT) += drivers/parport/driver.o +DRIVERS-y += drivers/char/char.o \ + drivers/block/block.o \ + drivers/misc/misc.o \ + drivers/net/net.o \ + drivers/media/media.o DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a @@ -145,7 +149,9 @@ DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnetdrv.o DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o +DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o +DRIVERS-$(CONFIG_FUSION_BOOT) += drivers/message/fusion/fusion.o DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR)$(CONFIG_PARIDE_PCD),) @@ -156,7 +162,8 @@ DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o -DRIVERS-$(CONFIG_PCMCIA_NETCARD) += drivers/net/pcmcia/pcmcia_net.o +DRIVERS-$(CONFIG_NET_PCMCIA) += drivers/net/pcmcia/pcmcia_net.o +DRIVERS-$(CONFIG_NET_WIRELESS) += drivers/net/wireless/wireless_net.o DRIVERS-$(CONFIG_PCMCIA_CHRDEV) += drivers/char/pcmcia/pcmcia_char.o DRIVERS-$(CONFIG_DIO) += drivers/dio/dio.a DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o @@ -172,15 +179,16 @@ DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o -DRIVERS-$(CONFIG_I2O) += drivers/i2o/i2o.o +DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.o DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o -DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o +DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o +DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o DRIVERS-$(CONFIG_VSBUS) += drivers/vsbus/vsbus.a -DRIVERS += $(DRIVERS-y) +DRIVERS := $(DRIVERS-y) # files removed with 'make clean' @@ -195,6 +203,11 @@ drivers/zorro/devlist.h drivers/zorro/gen-devlist \ drivers/sound/bin2hex drivers/sound/hex2hex \ drivers/atm/fore200e_mkfirm drivers/atm/{pca,sba}*{.bin,.bin1,.bin2} \ + drivers/scsi/aic7xxx/aicasm/aicasm_gram.c \ + drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \ + drivers/scsi/aic7xxx/aicasm/y.tab.h \ + drivers/scsi/aic7xxx/aicasm/aicasm \ + drivers/scsi/53c700-mem.c \ net/khttpd/make_times_h \ net/khttpd/times.h \ submenu* @@ -221,7 +234,9 @@ .menuconfig.log \ include/asm \ .hdepend scripts/mkdep scripts/split-include scripts/docproc \ - $(TOPDIR)/include/linux/modversions.h + $(TOPDIR)/include/linux/modversions.h \ + kernel.spec + # directories removed with 'make mrproper' MRPROPER_DIRS = \ include/config \ @@ -245,7 +260,7 @@ boot: vmlinux @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" -C arch/$(ARCH)/boot -vmlinux: $(CONFIGURATION) init/main.o init/version.o linuxsubdirs +vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o linuxsubdirs $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o \ --start-group \ $(CORE_FILES) \ @@ -290,11 +305,8 @@ $(TOPDIR)/include/linux/compile.h: include/linux/compile.h newversion: - @if [ ! -f .version ]; then \ - echo 1 > .version; \ - else \ - expr 0`cat .version` + 1 > .version; \ - fi + . scripts/mkversion > .tmpversion + @mv -f .tmpversion .version include/linux/compile.h: $(CONFIGURATION) include/linux/version.h newversion @echo -n \#define UTS_VERSION \"\#`cat .version` > .ver @@ -336,14 +348,14 @@ TAGS: dummy etags `find include/asm-$(ARCH) -name '*.h'` find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs etags -a - find $(SUBDIRS) init -name '*.c' | xargs etags -a + find $(SUBDIRS) init -name '*.[ch]' | xargs etags -a # Exuberant ctags works better with -I tags: dummy CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_NOVERS"`; \ ctags $$CTAGSF `find include/asm-$(ARCH) -name '*.h'` && \ find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs ctags $$CTAGSF -a && \ - find $(SUBDIRS) init -name '*.c' | xargs ctags $$CTAGSF -a + find $(SUBDIRS) init -name '*.[ch]' | xargs ctags $$CTAGSF -a ifdef CONFIG_MODULES ifdef CONFIG_MODVERSIONS @@ -420,9 +432,10 @@ $(MAKE) -C Documentation/DocBook mrproper distclean: mrproper - rm -f core `find . \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ + rm -f core `find . \( -not -type d \) -and \ + \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ - -o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -print` TAGS tags + -o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -type f -print` TAGS tags backup: mrproper cd .. && tar cf - linux/ | gzip -9 > backup.gz @@ -447,8 +460,8 @@ find . -type f -print | sort | xargs sum > .SUMS dep-files: scripts/mkdep archdep include/linux/version.h - scripts/mkdep init/*.c > .depend - scripts/mkdep `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend + scripts/mkdep -- init/*.c > .depend + scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend $(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)" ifdef CONFIG_MODVERSIONS $(MAKE) update-modverfile @@ -503,3 +516,30 @@ scripts/split-include: scripts/split-include.c $(HOSTCC) $(HOSTCFLAGS) -o scripts/split-include scripts/split-include.c + +# +# RPM target +# +# If you do a make spec before packing the tarball you can rpm -ta it +# +spec: + . scripts/mkspec >kernel.spec + +# +# Build a tar ball, generate an rpm from it and pack the result +# There arw two bits of magic here +# 1) The use of /. to avoid tar packing just the symlink +# 2) Removing the .dep files as they have source paths in them that +# will become invalid +# +rpm: clean spec + find . \( -size 0 -o -name .depend -o -name .hdepend \) -type f -print | xargs rm -f + set -e; \ + cd $(TOPDIR)/.. ; \ + ln -sf $(TOPDIR) $(KERNELPATH) ; \ + tar -cvz --exclude CVS -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \ + rm $(KERNELPATH) ; \ + cd $(TOPDIR) ; \ + . scripts/mkversion > .version ; \ + rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \ + rm $(TOPDIR)/../$(KERNELPATH).tar.gz Index: README =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- README 14 Jan 2001 16:24:27 -0000 1.1.1.1 +++ README 11 Apr 2002 14:26:55 -0000 1.2 @@ -40,6 +40,12 @@ contains information about the problems, which may result by upgrading your kernel. + - The Documentation/DocBook/ subdirectory contains several guides for + kernel developers and users. These guides can be rendered in a + number of formats: PostScript (.ps), PDF, and HTML, among others. + After installation, "make psdocs", "make pdfdocs", or "make htmldocs" + will render the documentation in the requested format. + INSTALLING the kernel: - If you install the full sources, put the kernel tarball in a @@ -186,11 +192,7 @@ to the place where your regular bootable kernel is found. For some, this is on a floppy disk, in which case you can copy the - kernel bzImage file to /dev/fd0 to make a bootable floppy. Please note - that you can not boot a kernel by directly dumping it to a 720k - double-density 3.5" floppy. In this case, it is highly recommended - that you install LILO on your double-density boot floppy or switch to - high-density floppies. + kernel bzImage file to /dev/fd0 to make a bootable floppy. If you boot Linux from the hard drive, chances are you use LILO which uses the kernel image as specified in the file /etc/lilo.conf. The Index: REPORTING-BUGS =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/REPORTING-BUGS,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- REPORTING-BUGS 14 Jan 2001 16:24:32 -0000 1.1.1.1 +++ REPORTING-BUGS 11 Apr 2002 14:26:55 -0000 1.2 @@ -25,10 +25,9 @@ overlook things, and easier for the developers to find the pieces of information they're really interested in. Don't feel you have to follow it. - First run the ver_linux script included as scripts/ver_linux or -at <URL:ftp://ftp.sai.msu.su/pub/Linux/ver_linux> It checks out -the version of some important subsystems. Run it with the command -"sh scripts/ver_linux" + First run the ver_linux script included as scripts/ver_linux, which +reports the version of some important subsystems. Run this script with +the command "sh scripts/ver_linux". Use that information to fill in all fields of the bug report form, and post it to the mailing list with a subject of "PROBLEM: <one line Index: Rules.make =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/Rules.make,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Rules.make 4 Mar 2001 23:42:52 -0000 1.3 +++ Rules.make 11 Apr 2002 14:26:55 -0000 1.4 @@ -124,7 +124,7 @@ # This make dependencies quickly # fastdep: dummy - $(TOPDIR)/scripts/mkdep $(wildcard *.[chS] local.h.master) > .depend + $(TOPDIR)/scripts/mkdep $(CFLAGS) $(EXTRA_CFLAGS) -- $(wildcard *.[chS]) > .depend ifdef ALL_SUB_DIRS $(MAKE) $(patsubst %,_sfdep_%,$(ALL_SUB_DIRS)) _FASTDEP_ALL_SUB_DIRS="$(ALL_SUB_DIRS)" endif @@ -151,7 +151,7 @@ # ALL_MOBJS = $(filter-out $(obj-y), $(obj-m)) ifneq "$(strip $(ALL_MOBJS))" "" -PDWN=$(shell $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh) +MOD_DESTDIR := $(shell $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh) endif unexport MOD_DIRS @@ -173,8 +173,8 @@ .PHONY: _modinst__ _modinst__: dummy ifneq "$(strip $(ALL_MOBJS))" "" - mkdir -p $(MODLIB)/kernel/$(PDWN) - cp $(ALL_MOBJS) $(MODLIB)/kernel/$(PDWN) + mkdir -p $(MODLIB)/kernel/$(MOD_DESTDIR) + cp $(ALL_MOBJS) $(MODLIB)/kernel/$(MOD_DESTDIR)$(MOD_TARGET) endif .PHONY: modules_install @@ -223,9 +223,9 @@ $(MODINCL)/%.ver: %.c @if [ ! -r $(MODINCL)/$*.stamp -o $(MODINCL)/$*.stamp -ot $< ]; then \ - echo '$(CC) $(CFLAGS) -E -D__GENKSYMS__ $<'; \ + echo '$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $<'; \ echo '| $(GENKSYMS) $(genksyms_smp_prefix) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) > $@.tmp'; \ - $(CC) $(CFLAGS) -E -D__GENKSYMS__ $< \ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $< \ | $(GENKSYMS) $(genksyms_smp_prefix) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) > $@.tmp; \ if [ -r $@ ] && cmp -s $@ $@.tmp; then echo $@ is unchanged; rm -f $@.tmp; \ else echo mv $@.tmp $@; mv -f $@.tmp $@; fi; \ |