Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4 CREDITS,1.3,1.4 MAINTAINERS,1.3,1.4 Makefile,1.17,1.18 Rules.make,1.5,1.6
|
From: Dave A. <ai...@us...> - 2003-06-10 02:01:58
|
Update of /cvsroot/linux-vax/kernel-2.4 In directory sc8-pr-cvs1:/tmp/cvs-serv23180 Modified Files: CREDITS MAINTAINERS Makefile Rules.make Log Message: DA: sync to Marcelo 2.4.18 + remove init_mmap (no longer needed) Index: CREDITS =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/CREDITS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CREDITS 10 Jun 2003 01:13:10 -0000 1.3 +++ CREDITS 10 Jun 2003 01:45:42 -0000 1.4 @@ -525,6 +525,16 @@ S: Bellevue, Washington 98007 S: USA +N: Christopher L. Cheney +E: cc...@de... +E: cc...@ch... +W: http://www.cheney.cx +P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9 1BC5 D106 5AB3 8E38 4AF2 +D: Vista Imaging usb webcam driver +S: 314 Prince of Wales +S: Conroe, TX 77304 +S: USA + N: Stuart Cheshire E: che...@cs... D: Author of Starmode Radio IP (STRIP) driver @@ -1203,10 +1213,10 @@ S: Germany N: Christoph Hellwig -E: hc...@ca... E: hc...@in... D: misc driver & makefile hacking D: freevxfs driver +D: sysvfs maintainer S: Triftstraße 26 S: 38644 Goslar S: Germany @@ -1265,6 +1275,13 @@ D: bug toaster (A1 sauce makes all the difference) D: Random linux hacker +N: Tim Hockin +E: th...@ho... +W: http://www.hockin.org/~thockin +D: Natsemi ethernet +D: Cobalt Networks (x86) support +D: This-and-That + N: Dirk Hohndel E: ho...@su... D: The XFree86[tm] Project @@ -1951,9 +1968,10 @@ S: Germany N: Mark W. McClelland -E: mwm@i.am +E: mmc...@bi... E: ma...@al... W: http://alpha.dyndns.org/ov511/ +P: 1024D/357375CC 317C 58AC 1B39 2AB0 AB96 EB38 0B6F 731F 3573 75CC D: OV511 driver S: (address available on request) S: USA @@ -2633,6 +2651,16 @@ D: Linux-Support, -Mailbox, -Stammtisch D: several improvements to system programs S: Oldenburg +S: Germany + +N: Robert Schwebel +E: ro...@sc... +W: http://www.schwebel.de +D: Embedded hacker and book author, +D: AMD Elan support for Linux +S: Pengutronix +S: Braunschweiger Strasse 79 +S: 31134 Hildesheim S: Germany N: Darren Senn Index: MAINTAINERS =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/MAINTAINERS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- MAINTAINERS 10 Jun 2003 01:13:10 -0000 1.3 +++ MAINTAINERS 10 Jun 2003 01:45:42 -0000 1.4 @@ -582,7 +582,7 @@ FREEVXFS FILESYSTEM P: Christoph Hellwig -M: hc...@ca... +M: hc...@in... W: ftp://ftp.openlinux.org/pub/people/hch/vxfs S: Maintained @@ -1022,6 +1022,11 @@ M: and...@us... S: Maintained +NATSEMI ETHERNET DRIVER (DP8381x) +P: Tim Hockin +M: th...@ho... +S: Maintained + NCP FILESYSTEM P: Petr Vandrovec M: van...@vc... @@ -1045,9 +1050,10 @@ M: ja...@in... P: Harald Welte M: la...@gn... -W: http://netfilter.samba.org -W: http://netfilter.kernelnotes.org -W: http://netfilter.filewatcher.org +P: Jozsef Kadlecsik +M: ka...@bl... +W: http://www.netfilter.org/ +W: http://www.iptables.org/ L: net...@li... S: Supported @@ -1145,8 +1151,8 @@ S: Maintained OPL3-SA2, SA3, and SAx DRIVER -P: Scott Murray -M: sc...@sp... +P: Zwane Mwaikambo +M: zw...@co... L: lin...@vg... S: Maintained @@ -1172,9 +1178,9 @@ PERSONALITY HANDLING P: Christoph Hellwig -M: hc...@ca... +M: hc...@in... L: lin...@li... -S: Supported +S: Maintained PCI ID DATABASE P: Jens Maurer @@ -1255,6 +1261,12 @@ W: http://www.alarsen.net/linux/qnx4fs/ S: Maintained +RADEON FRAMEBUFFER DISPLAY DRIVER +P: Ani Joshi +M: aj...@sh... +L: lin...@li... +S: Maintained + RAGE128 FRAMEBUFFER DISPLAY DRIVER P: Ani Joshi M: aj...@sh... @@ -1462,7 +1474,7 @@ SYSV FILESYSTEM P: Christoph Hellwig -M: hc...@ca... +M: hc...@in... S: Maintained TLAN NETWORK DRIVER @@ -1606,7 +1618,7 @@ USB OV511 DRIVER P: Mark McClelland -M: mwm@i.am +M: mmc...@bi... L: lin...@li... L: lin...@li... W: http://alpha.dyndns.org/ov511/ Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/Makefile,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Makefile 10 Jun 2003 01:13:11 -0000 1.17 +++ Makefile 10 Jun 2003 01:45:42 -0000 1.18 @@ -1,13 +1,13 @@ VERSION = 2 PATCHLEVEL = 4 -SUBLEVEL = 17 +SUBLEVEL = 18 EXTRAVERSION = 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/-//") +KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g") CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ else if [ -x /bin/bash ]; then echo /bin/bash; \ @@ -41,7 +41,7 @@ MODFLAGS = -DMODULE CFLAGS_KERNEL = PERL = perl -MAKE = make -j3 +MAKE = make export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \ CONFIG_SHELL TOPDIR HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \ @@ -139,7 +139,8 @@ 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_DRM_NEW) += drivers/char/drm/drm.o +DRIVERS-$(CONFIG_DRM_OLD) += drivers/char/drm-4.0/drm.o DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a DRIVERS-$(CONFIG_ISDN) += drivers/isdn/isdn.a DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o @@ -211,7 +212,7 @@ drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \ drivers/scsi/aic7xxx/aicasm/y.tab.h \ drivers/scsi/aic7xxx/aicasm/aicasm \ - drivers/scsi/53c700-mem.c \ + drivers/scsi/53c700_d.h \ net/khttpd/make_times_h \ net/khttpd/times.h \ submenu* @@ -249,14 +250,14 @@ include arch/$(ARCH)/Makefile -export CPPFLAGS CFLAGS AFLAGS +export CPPFLAGS CFLAGS CFLAGS_KERNEL AFLAGS AFLAGS_KERNEL export NETWORKS DRIVERS LIBS HEAD LDFLAGS LINKFLAGS MAKEBOOT ASFLAGS .S.s: - $(CPP) $(AFLAGS) -traditional -o $*.s $< + $(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -traditional -o $*.s $< .S.o: - $(CC) $(AFLAGS) -traditional -c -o $*.o $< + $(CC) $(AFLAGS) $(AFLAGS_KERNEL) -traditional -c -o $*.o $< Version: dummy @rm -f include/linux/compile.h @@ -336,15 +337,17 @@ @echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' >>.ver @mv -f .ver $@ +comma := , + init/version.o: init/version.c include/linux/compile.h include/config/MARKER - $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -c -o init/version.o init/version.c + $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o init/version.o init/version.c # FIXME: GCC bug? using -g here (in order to get source in the assembly listing) # reduces the BogoMIPS rating. Examination of listing file shows that the compiler # optimizes less when we use -g (even though -O1 is in CFLAGS). This isn't supposed # to happen... init/main.o: init/main.c include/config/MARKER - $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -c -o $*.o $< # -Wa,-adnhls=$*.lst -g + $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $< # -Wa,-adnhls=$*.lst -g fs lib mm ipc kernel drivers net: dummy $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@) Index: Rules.make =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/Rules.make,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Rules.make 12 Feb 2003 03:19:45 -0000 1.5 +++ Rules.make 10 Jun 2003 01:45:43 -0000 1.6 @@ -31,6 +31,8 @@ unexport subdir-n unexport subdir- +comma := , + # # Get things started. # @@ -54,7 +56,7 @@ $(CPP) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) $< > $@ %.o: %.c - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -c -o $@ $< -g #-Wa,-adnhls=$*.lst -g + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) $(CFLAGS_$@) -c -o $@ $< -g #-Wa,-adnhls=$*.lst -g @ ( \ echo 'ifeq ($(strip $(subst $(comma),:,$(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@))),$$(strip $$(subst $$(comma),:,$$(CFLAGS) $$(EXTRA_CFLAGS) $$(CFLAGS_$@))))' ; \ echo 'FILES_FLAGS_UP_TO_DATE += $@' ; \ @@ -134,7 +136,7 @@ $(MAKE) -C $(patsubst _sfdep_%,%,$@) fastdep endif - + # # A rule to make subdirectories # @@ -230,7 +232,7 @@ if [ -r $@ ] && cmp -s $@ $@.tmp; then echo $@ is unchanged; rm -f $@.tmp; \ else echo mv $@.tmp $@; mv -f $@.tmp $@; fi; \ fi; touch $(MODINCL)/$*.stamp - + $(addprefix $(MODINCL)/,$(export-objs:.o=.ver)): $(TOPDIR)/include/linux/autoconf.h # updates .ver files but not modversions.h @@ -271,7 +273,7 @@ ifneq "$(strip $(export-objs))" "" $(export-objs): $(export-objs:.o=.c) $(TOPDIR)/include/linux/modversions.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -DEXPORT_SYMTAB -c $(@:.o=.c) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) $(CFLAGS_$@) -DEXPORT_SYMTAB -c $(@:.o=.c) @ ( \ echo 'ifeq ($(strip $(subst $(comma),:,$(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -DEXPORT_SYMTAB)),$$(strip $$(subst $$(comma),:,$$(CFLAGS) $$(EXTRA_CFLAGS) $$(CFLAGS_$@) -DEXPORT_SYMTAB)))' ; \ echo 'FILES_FLAGS_UP_TO_DATE += $@' ; \ |
