public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* Linux 2.4.20-pre1
@ 2002-08-05 22:40 Marcelo Tosatti
  2002-08-06  0:20 ` Ben Greear
                   ` (9 more replies)
  0 siblings, 10 replies; 39+ messages in thread
From: Marcelo Tosatti @ 2002-08-05 22:40 UTC (permalink / raw)
  To: lkml


So here goes -pre1, with a big -ac and x86-64 merges, plus other smaller
stuff.

2.4.20 will be a much faster release cycle than 2.4.19 was.




Summary of changes from v2.4.19 to v2.4.20-pre1
============================================

<jejb@mulgrave.(none)> (02/03/16 1.159.1.1)
	53c700

<achirica@ttd.net> (02/05/31 1.445.1.13)
	airo wireless net driver update:

<rob@osinvestor.com> (02/06/05 1.537.4.1)
	Sparc32 code cleanups.

<rob@osinvestor.com> (02/06/05 1.537.4.2)
	Sparc32 code cleanups.

<davem@nuts.ninka.net> (02/06/07 1.537.4.3)
	Sparc: Fix copy_{to,from}_user return value handling.

<davem@nuts.ninka.net> (02/06/07 1.537.4.4)
	Sparc64: readv/writev SuS compliance fix for sparc32 compat.

<baccala@vger.freesoft.org> (02/06/07 1.537.4.5)
	DBRI driver: Add T7903 doc URL.

<kanojsarcar@yahoo.com> (02/06/07 1.537.4.6)
	Sparc64: Fix module symbols when stack debugging is on.

<jejb@mulgrave.(none)> (02/06/09 1.159.1.2)
	[SCSI 53c700] bux fix in tag starvation, cosmetic cleanup of set_depth

<jejb@mulgrave.(none)> (02/06/09 1.159.1.3)
	[SCSI 53c700] update version to 2.8

<ak@muc.de> (02/06/12 1.537.1.8)
	RTNETLINK: Allow non-root to receive.

<davem@nuts.ninka.net> (02/06/12 1.537.1.9)
	MAINTAINERS: Remove Andi from networking as per his request.

<rusty@rustcorp.com.au> (02/06/12 1.537.1.10)
	ipv4/route.c: Cleanup ip_rt_acct_read

<jgarzik@rum.normnet.org> (02/06/14 1.537.7.1)
	net driver 8139cp updates:

<wstinson@infonie.fr> (02/06/14 1.537.9.1)
	[janitor] update the isicom.c multiport serial driver to

<wstinson@infonie.fr> (02/06/14 1.537.7.3)
	[janitor] update the ray_cs.c PCMCIA client driver for the Raylink wireless LAN card

<wstinson@infonie.fr> (02/06/14 1.537.7.4)
	[janitor] update the ni65 network driver to

<wstinson@infonie.fr> (02/06/14 1.537.7.5)
	[janitor] update the sdlamain Multiprotocol WAN Link Driver to

<wstinson@infonie.fr> (02/06/14 1.537.9.2)
	[janitor] update the DAC960 Driver for Mylex DAC960/AcceleRAID/eXtremeRAID PCI RAID Controllers

<wstinson@infonie.fr> (02/06/14 1.537.7.6)
	[janitor] update the eexpress.c net driver to

<wstinson@infonie.fr> (02/06/14 1.537.7.7)
	[janitor] update the comx-hw-comx wan driver to remove call to check_region and check the status of call to

<wstinson@infonie.fr> (02/06/14 1.537.7.8)
	[janitor] update the eepro Intel EtherExpress Pro/10 device driver to

<wstinson@infonie.fr> (02/06/14 1.537.7.9)
	[janitor] update the atarilance Ethernet driver for VME Lance cards on the Atari to check the result of request_irq and exit in case of error.

<wstinson@infonie.fr> (02/06/14 1.537.7.10)
	[janitor] update the yam hamradio driver to

<jgarzik@rum.normnet.org> (02/06/14 1.537.10.1)
	Support dumping NIC-specific stats in 8139cp net driver

<jes@wildopensource.com> (02/06/15 1.537.1.11)
	Tigon3: Use unsigned type for dest_idx_unmasked in tg3_recycle_rx.

<jes@wildopensource.com> (02/06/15 1.537.1.12)
	Tigon3: MAX_WAIT_CNT is too large.

<edward_peng@dlink.com.tw> (02/06/15 1.537.7.12)
	dl2k gige net driver updates:

<michaelw@foldr.org> (02/06/17 1.537.4.7)
	sparc64: Use SUNW,power-off to power off some Ultra systems.

<ctindel@cup.hp.com> (02/06/18 1.537.1.13)
	drivers/net/bonding.c: Check ethtool then mii ioctl to determine link status.

<davem@nuts.ninka.net> (02/06/18 1.537.1.14)
	NET: Backport 2.5.x NAPI infrastructure to 2.4.x

<davem@nuts.ninka.net> (02/06/19 1.537.1.15)
	Tigon3: On 32-bit just wrap low 32bits of stats if we overflow.

<jgarzik@mandrakesoft.com> (02/06/20 1.537.12.3)
	Add register dumping and NIC-specific stats to 8139too net driver

<jgarzik@mandrakesoft.com> (02/06/20 1.537.12.4)
	Fix 8139too net driver register dump

<wa@almesberger.net> (02/06/21 1.537.1.16)
	include/net/dsfield.h: Remove dead code.

<jmorris@intercode.com.au> (02/06/25 1.537.1.17)
	NETLINK: Add unicast release notifier.

<davem@nuts.ninka.net> (02/06/25 1.537.1.18)
	SunHME: Register IRQ with netdev->name as string.

<davem@nuts.ninka.net> (02/07/11 1.537.1.19)
	Add netif_receive_skb-like interface for VLAN hw accel.

<davem@nuts.ninka.net> (02/07/11 1.537.1.20)
	Tigon3: Add NAPI support.

<kiran@in.ibm.com> (02/07/12 1.537.1.21)
	net/core/dst.c: dst_total only needs to exist if RT_CACHE_DEBUG >= 2

<rml@tech9.net> (02/07/15 1.537.1.22)
	net/socket.c: Kill memory leak in sock_fasync

<uzi@uzix.org> (02/07/16 1.537.4.8)
	SunHME: Make module license visible when not-PCI.

<davem@nuts.ninka.net> (02/07/16 1.537.4.9)
	arch/sparc64/defconfig: Update.

<robert.olsson@data.slu.se> (02/07/18 1.537.1.23)
	PKTGEN: Updates to version 1.2, work mostly from Ben Greear.

<davem@nuts.ninka.net> (02/07/18 1.537.1.24)
	PKTGEN: Use htonl instead of __constant_htonl.

<kuznet@ms2.inr.ac.ru> (02/07/18 1.537.1.25)
	PKT SCHED: Add HTB scheduler by Martin Devera.

<ecd@skynet.be> (02/07/18 1.537.4.10)
	SPARC64: Fix bugs in ioctl32 registration.

<szepe@pinerecords.com> (02/07/18 1.537.4.11)
	SPARC: Dynamically size SRMMU nocache page pool.

<ebrower@resilience.com> (02/07/19 1.537.1.26)
	SK98LIN: Fix oops in procfs handling if no cards probed.

<rob@osinvestor.com> (02/07/19 1.537.4.12)
	SPARC: Minor header file cleanups.

<rob@osinvestor.com> (02/07/19 1.537.4.13)
	floppy.h: Remove unused empty virtual_dma_init.

<robert.olsson@data.slu.se> (02/07/19 1.537.1.27)
	PKTGEN: Update documentation.

<davem@nuts.ninka.net> (02/07/19 1.537.1.28)
	TIGON3: Finish up NAPI implementation.

<davem@nuts.ninka.net> (02/07/19 1.537.1.29)
	PKTGEN: u64 is not necessarily a long long

<davem@nuts.ninka.net> (02/07/19 1.537.1.30)
	HTB PKTSCHED: u64 is not necessarily a long long

<davem@nuts.ninka.net> (02/07/19 1.537.1.31)
	PKTGEN: Fix need_resched for 2.4.x, more u64 printf fixes.

<davem@nuts.ninka.net> (02/07/19 1.537.1.32)
	PKTGEN: More need_resched 2.4.x fixes

<davem@nuts.ninka.net> (02/07/22 1.537.1.33)
	net/ipv4/route.c: Handle large offsets properly in procfs read operation.

<davem@nuts.ninka.net> (02/07/22 1.537.4.14)
	drivers/sbus/char/openprom.c: Verify user len in copyin_string.

<rob@osinvestor.com> (02/07/22 1.537.4.15)
	arch/sparc/config.in: Remove commented out LVM bits.

<davem@nuts.ninka.net> (02/07/30 1.537.4.16)
	Openprom: Cast nagative tests properly.

<davem@nuts.ninka.net> (02/07/30 1.537.4.17)
	OpenPROM: Cast to ssize_t not int.

<davem@nuts.ninka.net> (02/07/30 1.537.4.18)
	OpenPROM: Kill len check, it is pointless.

<davem@nuts.ninka.net> (02/07/31 1.537.4.19)
	OpenPROM: Sigh, put the length overflow check back it is needed.

<rusty@rustcorp.com.au> (02/08/02 1.582.2.84)
	[PATCH] wan/sdla_chdlc.c oops fix

<mauelshagen@sistina.com> (02/08/02 1.582.2.85)
	[PATCH] LVM 1.0.5 driver update for 2.4.19-rc3

<hch@lst.de> (02/08/02 1.582.2.86)
	[PATCH] remove unused label in fs/dnotify.c

<rusty@rustcorp.com.au> (02/08/02 1.582.2.87)
	[PATCH] ip_nat_core.c - fix compiler warning

<rusty@rustcorp.com.au> (02/08/02 1.582.2.88)
	[PATCH] 3c509.c - 1_2

<rusty@rustcorp.com.au> (02/08/02 1.582.2.89)
	[PATCH] 2.4 i_size_high fixup

<rusty@rustcorp.com.au> (02/08/02 1.582.2.90)
	[PATCH] remove agpgart_be.c unused variables

<rusty@rustcorp.com.au> (02/08/02 1.582.2.91)
	[PATCH] namespace.c - compiler warning

<hch@infradead.org> (02/08/02 1.582.2.92)
	[PATCH] small inline assembly fix for gcc 3.1 (ffs)

<szepe@pinerecords.com> (02/08/02 1.582.2.93)
	[PATCH] reserve nocache based on RAM size

<flo@rfc822.org> (02/08/02 1.582.2.94)
	[PATCH] 2.4.19-rc5 cyclades.c one liner

<garloff@suse.de> (02/08/02 1.582.2.95)
	[PATCH] IDE: memset kmalloced gendisk structures

<agrover@groveronline.com> (02/08/02 1.582.2.96)
	[PATCH] Put Intel cache-detection descriptors in a table

<hch@infradead.org> (02/08/02 1.582.2.97)
	[PATCH] proper boot-time messages for P4 Xeon

<bunk@fs.tum.de> (02/08/02 1.582.2.98)
	[PATCH] document that cmd64x.c supports the CMD649 and CMD680

<jo-lkml@suckfuell.net> (02/08/02 1.592)
	[PATCH] Correct locking on IO stats accounting

<willy@w.ods.org> (02/08/03 1.594)
	[PATCH] Reorder TOSHIBA TC35815 in Config.in

<rob@osinvestor.com> (02/08/03 1.595)
	[PATCH] watchdog flags

<kaos@ocs.com.au> (02/08/03 1.596)
	[PATCH] 2.4.19 include/linux/vmalloc.h for highmem

<marcel@holtmann.org> (02/08/03 1.596.2.1)
	[PATCH] Bluetooth Subsystem PC Card drivers update

<felipewd@terra.com.br> (02/08/03 1.596.3.1)
	Add Wake-On-Lan support to 8139cp net driver

<jgarzik@mandrakesoft.com> (02/08/03 1.596.3.2)
	Temporarily disable MTU-change-while-active support in 8139cp

<felipewd@terra.com.br> (02/08/03 1.596.3.3)
	Update 8139cp net driver to enable legacy Rx/TX command register

<felipewd@terra.com.br> (02/08/03 1.596.3.4)
	Add suspend/resume support to 8139cp net driver

<davidm@hpl.hp.com> (02/08/03 1.596.3.5)
	Update eepro100 net drvr to enable rx DMA without causing

<jgarzik@mandrakesoft.com> (02/08/03 1.596.3.6)
	Add Intel e100 net driver.

<jgarzik@mandrakesoft.com> (02/08/03 1.596.3.7)
	Add e1000 gige net driver.

<jgarzik@mandrakesoft.com> (02/08/03 1.596.3.8)
	Move e100 net driver after eepro100, in kernel image link order.

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.601)
	[PATCH] PATCH: 2.4.20-pre1 - parisc specific include files

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.602)
	[PATCH] PATCH: 2.4.20pre1 - parisc gsc bus

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.603)
	[PATCH] PATCH: 2.4.20-pre1 HP HIL drivers

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.604)
	[PATCH] PATCH: Update the MPT fusion drivers to the vendors latest

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.605)
	[PATCH] PATCH: 2.4/2.5 - Fix endianness on 3c503

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.606)
	[PATCH] PATCH: remove unneeded parisc magic in acenic

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.607)
	[PATCH] PATCH: depca update

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.608)
	[PATCH] PATCH: 2.4/2.5 - Fix traps on alpha when using ewrk3

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.609)
	[PATCH] PATCH: fix gcc warnings in baycom_epp

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.610)
	[PATCH] PATCH: 2.4/2.5 Fix endianness in hp-plus

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.611)
	[PATCH] PATCH: fix multiple gcc 3.1 warnings in irda

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.612)
	[PATCH] PATCH: 2.4/2.5 fix endianness on smc boards

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.613)
	[PATCH] PATCH: 2.4/2.5 fix endianness in wd.c

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.614)
	[PATCH] PATCH: 2.4 - move nubus to static inline

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.615)
	[PATCH] PATCH: 2.4 update gsc parallel port - from maintainer

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.616)
	[PATCH] PATCH: update the aacraid driver

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.617)
	[PATCH] PATCH: fix aic7xxx build when PCI=n

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.618)
	[PATCH] PATCH: eata scsi - update from author

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.619)
	[PATCH] PATCH: fix typo in ncr53c8xx

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.620)
	[PATCH] PATCH: u14-34f scsi driver update from author

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.621)
	[PATCH] PATCH: driver for harmony audio

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.622)
	[PATCH] PATCH: trident audio updates

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.623)
	[PATCH] PATCH: fix undefined C in ixj driver

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.624)
	[PATCH] PATCH: fix gcc 3.1 warnings

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.625)
	[PATCH] PATCH: update sti frame buffer

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.626)
	[PATCH] PATCH: pull the rest of sti into a subdirectory and update it

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.627)
	[PATCH] PATCH: Beos file systems (befs)

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.628)
	[PATCH] PATCH: SOM binary load (parisc specific)

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.629)
	[PATCH] PATCH: Add EFI partition support

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.630)
	[PATCH] PATCH: more hp specific include files

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.631)
	[PATCH] PATCH: Fix gcc 3.1 warnings in vlan

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.632)
	[PATCH] PATCH: fix formatting

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.633)
	[PATCH] PATCH: gcc 3.1 warning fixes for generic_serial

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.634)
	[PATCH] PATCH: HP specific drivers

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.635)
	[PATCH] PATCH: fix compiler warning in mxser

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.636)
	[PATCH] PATCH: (resend for 2.4.20-pre1 as asked) synclink pcmcia

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.637)
	[PATCH] PATCH: PDC (parisc bios) console driver

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.638)
	[PATCH] PATCH: fix compiler warnings

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.639)
	[PATCH] PATCH: fix stallion failing to load

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.640)
	[PATCH] PATCH: fix sx driver compile warnings

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.641)
	[PATCH] PATCH: fix standards compliance bugs in the tty layer

<alan@irongate.swansea.linux.org.uk> (02/08/05 1.642)
	[PATCH] PATCH: clean up umem further

<marcelo@plucky.distro.conectiva> (02/08/05 1.643)
	Changed makefile to .20-pre1

<marcelo@plucky.distro.conectiva> (02/08/05 1.644)
	Import patch revert-acenic-change.patch

<ak@muc.de> (02/08/05 1.645)
	[PATCH] AMD 8111 PCI IDS

<ak@muc.de> (02/08/05 1.646)
	[PATCH] AMD 8111 sound support

<ak@muc.de> (02/08/05 1.647)
	[PATCH] x86-64 auto_fs support

<ak@muc.de> (02/08/05 1.648)
	[PATCH] bluetooth flags warning fixes

<ak@muc.de> (02/08/05 1.649)
	[PATCH] cciss interrupt flags warnings

<ak@muc.de> (02/08/05 1.650)
	[PATCH] CONFIG_ISA for drivers/char

<ak@muc.de> (02/08/05 1.651)
	[PATCH] CONFIG_ISA for IDE

<ak@muc.de> (02/08/05 1.652)
	[PATCH] CONFIG_ISA for radio drivers

<ak@muc.de> (02/08/05 1.653)
	[PATCH] Configuration fixes for net drivers

<ak@muc.de> (02/08/05 1.654)
	[PATCH] DRM 64bit fixes

<ak@muc.de> (02/08/05 1.655)
	[PATCH] Early console support for x86-64

<ak@muc.de> (02/08/05 1.656)
	[PATCH] x86-64 ELF format name

<ak@muc.de> (02/08/05 1.657)
	[PATCH] Ftape 64bit/x86-64 fixes

<ak@muc.de> (02/08/05 1.658)
	[PATCH] CONFIG_ISA for i386

<ak@muc.de> (02/08/05 1.659)
	[PATCH] Interrupt flags fixes for IEEE1394

<ak@muc.de> (02/08/05 1.660)
	[PATCH] x86-64 support in ipc/

<ak@muc.de> (02/08/05 1.661)
	[PATCH] 64bit fixes for drivers/isdn

<ak@muc.de> (02/08/05 1.662)
	[PATCH] 64bit fixes for the megaraid driver

<ak@muc.de> (02/08/05 1.663)
	[PATCH] paride interrupt flags fixes

<ak@muc.de> (02/08/05 1.664)
	[PATCH] 64bit warning fixes for PCI

<ak@muc.de> (02/08/05 1.665)
	[PATCH] synclink interrupt flag fixes

<ak@muc.de> (02/08/05 1.666)
	[PATCH] 64bit fixes for drivers/video

<ak@muc.de> (02/08/05 1.667)
	[PATCH] vsyscall/HPET support for x86-64

<ak@muc.de> (02/08/05 1.668)
	[PATCH] 64bit WAN driver fixes

<ak@muc.de> (02/08/05 1.669)
	[PATCH] wavelan 64bit warning

<ak@muc.de> (02/08/05 1.670)
	[PATCH] x86-64 core changes

<pkot@linuxnews.pl> (02/08/05 1.671)
	[PATCH] remove the warning from include/linux/dcache.h

<ak@muc.de> (02/08/05 1.673)
	[PATCH] 64bit dpt driver fixes

<elenstev@mesatop.com> (02/08/05 1.674)
	[PATCH] 2.4.19,

<maxk@qualcomm.com> (02/08/05 1.675)
	[PATCH] core fixes

<maxk@qualcomm.com> (02/08/05 1.676)
	[PATCH] L2CAP fixes

<maxk@qualcomm.com> (02/08/05 1.677)
	[PATCH] SCO fixes

<maxk@qualcomm.com> (02/08/05 1.678)
	[PATCH] HCI USB driver update

<maxk@qualcomm.com> (02/08/05 1.679)
	[PATCH] BNEP support

<Kai.Makisara@kolumbus.fi> (02/08/05 1.680)
	[PATCH] SCSI tape patch for 2.4.19

<marcelo@plucky.distro.conectiva> (02/08/05 1.681)
	Remove NAPI for now


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-05 22:40 Linux 2.4.20-pre1 Marcelo Tosatti
@ 2002-08-06  0:20 ` Ben Greear
  2002-08-06 11:32   ` Marcelo Tosatti
  2002-08-06 14:58 ` Linux 2.4.20-pre1 Jason Lunz
                   ` (8 subsequent siblings)
  9 siblings, 1 reply; 39+ messages in thread
From: Ben Greear @ 2002-08-06  0:20 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: lkml

Marcelo Tosatti wrote:
> So here goes -pre1, with a big -ac and x86-64 merges, plus other smaller
> stuff.
> 
> 2.4.20 will be a much faster release cycle than 2.4.19 was.

Two questions:  I see change logs about NAPI going in, and then
NAPI being removed.  I assume it is removed...but maybe it will
be back soon?

Second:  Where is the patch?  I looked on kernel.org and didn't
find it.  If it's going to be there shortly, that's fine, I'll
keep checking back.

Thanks,
Ben

-- 
Ben Greear <greearb@candelatech.com>       <Ben_Greear AT excite.com>
President of Candela Technologies Inc      http://www.candelatech.com
ScryMUD:  http://scry.wanfear.com     http://scry.wanfear.com/~greear



^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
@ 2002-08-06  0:21 Jean Tourrilhes
  2002-08-06 12:33 ` Marcelo Tosatti
  0 siblings, 1 reply; 39+ messages in thread
From: Jean Tourrilhes @ 2002-08-06  0:21 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: Linux kernel mailing list, Alan Cox

	Hi,

	Sorry to disturb, but it seems that kernel.org didn't pick up
2.4.20-pre1 (or I'm looking at the wrong places).

	I'm asking because I've just finished testing my IrDA update
for 2.4.20, and you've just included some useless IrDA change that
probably render my patch worthless. So, I need to check and see how
much more work I need to do (or if I should just give up).

	Regards,

	Jean

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-06  0:20 ` Ben Greear
@ 2002-08-06 11:32   ` Marcelo Tosatti
  2002-08-06 12:26     ` David S. Miller
                       ` (2 more replies)
  0 siblings, 3 replies; 39+ messages in thread
From: Marcelo Tosatti @ 2002-08-06 11:32 UTC (permalink / raw)
  To: Ben Greear; +Cc: lkml



On Mon, 5 Aug 2002, Ben Greear wrote:

> Marcelo Tosatti wrote:
> > So here goes -pre1, with a big -ac and x86-64 merges, plus other smaller
> > stuff.
> >
> > 2.4.20 will be a much faster release cycle than 2.4.19 was.
>
> Two questions:  I see change logs about NAPI going in, and then
> NAPI being removed.  I assume it is removed...but maybe it will
> be back soon?

I want arguments from Davem to include NAPI. Changing the drivers is a
reason for me to _not_ want it in.

But lets see if Davem can convince me ;)

> Second:  Where is the patch?  I looked on kernel.org and didn't
> find it.  If it's going to be there shortly, that's fine, I'll
> keep checking back.

Maybe at davem's CVS repo?


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-06 11:32   ` Marcelo Tosatti
@ 2002-08-06 12:26     ` David S. Miller
  2002-08-06 16:45     ` Ben Greear
  2002-08-06 17:12     ` NAPI (was Re: Linux 2.4.20-pre1) Jeff Garzik
  2 siblings, 0 replies; 39+ messages in thread
From: David S. Miller @ 2002-08-06 12:26 UTC (permalink / raw)
  To: marcelo; +Cc: greearb, linux-kernel

   From: Marcelo Tosatti <marcelo@conectiva.com.br>
   Date: Tue, 6 Aug 2002 08:32:59 -0300 (BRT)
   
   > Second:  Where is the patch?  I looked on kernel.org and didn't
   > find it.  If it's going to be there shortly, that's fine, I'll
   > keep checking back.
   
   Maybe at davem's CVS repo?

I don't use CVS anymore...

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-06  0:21 Jean Tourrilhes
@ 2002-08-06 12:33 ` Marcelo Tosatti
  2002-08-06 17:17   ` Jean Tourrilhes
  0 siblings, 1 reply; 39+ messages in thread
From: Marcelo Tosatti @ 2002-08-06 12:33 UTC (permalink / raw)
  To: jt; +Cc: Linux kernel mailing list, Alan Cox



On Mon, 5 Aug 2002, Jean Tourrilhes wrote:

> 	Hi,
>
> 	Sorry to disturb, but it seems that kernel.org didn't pick up
> 2.4.20-pre1 (or I'm looking at the wrong places).
>
> 	I'm asking because I've just finished testing my IrDA update
> for 2.4.20, and you've just included some useless IrDA change that
> probably render my patch worthless

What you mean I included some useless IrDA patch?

> So, I need to check and see how much more work I need to do (or if I
> should just give up).



^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-05 22:40 Linux 2.4.20-pre1 Marcelo Tosatti
  2002-08-06  0:20 ` Ben Greear
@ 2002-08-06 14:58 ` Jason Lunz
  2002-08-06 15:03   ` CaT
  2002-08-06 21:05 ` Adrian Bunk
                   ` (7 subsequent siblings)
  9 siblings, 1 reply; 39+ messages in thread
From: Jason Lunz @ 2002-08-06 14:58 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: linux-kernel


Will you consider using one of those perl scripts to condense the
changelogs a little bit?

Jason

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-06 14:58 ` Linux 2.4.20-pre1 Jason Lunz
@ 2002-08-06 15:03   ` CaT
  0 siblings, 0 replies; 39+ messages in thread
From: CaT @ 2002-08-06 15:03 UTC (permalink / raw)
  To: Jason Lunz; +Cc: Marcelo Tosatti, linux-kernel

On Tue, Aug 06, 2002 at 10:58:03AM -0400, Jason Lunz wrote:
> Will you consider using one of those perl scripts to condense the
> changelogs a little bit?

Please use them. -Please-...

-- 
| You wake up. The room is spinning very gently | >i
| round your head. Or at least it would be if   | You have:
| you could see it which you can't.             |   a splitting headache
|                                               |   no tea
| It is pitch black                             |

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-06 17:17   ` Jean Tourrilhes
@ 2002-08-06 16:31     ` Marcelo Tosatti
  2002-08-06 17:24       ` Jean Tourrilhes
  2002-08-06 17:13     ` David S. Miller
  2002-08-06 18:48     ` Alan Cox
  2 siblings, 1 reply; 39+ messages in thread
From: Marcelo Tosatti @ 2002-08-06 16:31 UTC (permalink / raw)
  To: jt; +Cc: Linux kernel mailing list, Alan Cox



On Tue, 6 Aug 2002, Jean Tourrilhes wrote:

> On Tue, Aug 06, 2002 at 09:33:45AM -0300, Marcelo Tosatti wrote:
> >
> >
> > On Mon, 5 Aug 2002, Jean Tourrilhes wrote:
> >
> > > 	Hi,
> > >
> > > 	Sorry to disturb, but it seems that kernel.org didn't pick up
> > > 2.4.20-pre1 (or I'm looking at the wrong places).
> > >
> > > 	I'm asking because I've just finished testing my IrDA update
> > > for 2.4.20, and you've just included some useless IrDA change that
> > > probably render my patch worthless
> >
> > What you mean I included some useless IrDA patch?
>
> 	Yep, tons of these :
> -----------------------------------------------
> -        IRDA_DEBUG(4, __FUNCTION__ "(), speed=%d (was %d)\n", speed,
> -		   self->speed);
> +        IRDA_DEBUG(4, "%s(), speed=%d (was %d)\n", __FUNCTION__,
> +        	speed, self->speed);
> -----------------------------------------------
> 	Between this and fixing a Oops or Deadlock, I'll take the
> second any day.
> 	I don't care on those patch in general, I'm not a control
> freak, except that being so pervasive they are guaranteed to screw up
> my own patches. That's why yesterday I *explicitely* asked you and
> Alan if anything was pending, so that I could avoid wasting my time
> and instead wait for the next release doing something else.
> 	I guess it's too late, I already wasted my afternoon.
>
> 	The second thing that bugs me is that because those patches
> pass behind my back, they won't get applied to *both* 2.4.X and
> 2.5.X. Because of that, keeping 2.4.X and 2.5.X in synch is an
> exercise in futility.
> 	But maybe you are finding that there is already too many IrDA
> maintainers.
>
> 	I'll send you the Wireless patches, and I'll try to respin the
> IrDA patches this afternoon (i.e. please screw me again !).

I can back out those patches if you want. Will that help you?


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-06 11:32   ` Marcelo Tosatti
  2002-08-06 12:26     ` David S. Miller
@ 2002-08-06 16:45     ` Ben Greear
  2002-08-06 17:12     ` NAPI (was Re: Linux 2.4.20-pre1) Jeff Garzik
  2 siblings, 0 replies; 39+ messages in thread
From: Ben Greear @ 2002-08-06 16:45 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: lkml

Marcelo Tosatti wrote:
> 
> On Mon, 5 Aug 2002, Ben Greear wrote:
> 
> 
>>Marcelo Tosatti wrote:
>>
>>>So here goes -pre1, with a big -ac and x86-64 merges, plus other smaller
>>>stuff.
>>>
>>>2.4.20 will be a much faster release cycle than 2.4.19 was.
>>
>>Two questions:  I see change logs about NAPI going in, and then
>>NAPI being removed.  I assume it is removed...but maybe it will
>>be back soon?
> 
> 
> I want arguments from Davem to include NAPI. Changing the drivers is a
> reason for me to _not_ want it in.
> 
> But lets see if Davem can convince me ;)

Well, I hope he does, and I hope it really works :)

The patch I was looking for was the pre-patch you put out.
I see it's on kernel.org now, so no problem there.

Ben
> 
> 
>>Second:  Where is the patch?  I looked on kernel.org and didn't
>>find it.  If it's going to be there shortly, that's fine, I'll
>>keep checking back.
> 
> 
> Maybe at davem's CVS repo?
> 


-- 
Ben Greear <greearb@candelatech.com>       <Ben_Greear AT excite.com>
President of Candela Technologies Inc      http://www.candelatech.com
ScryMUD:  http://scry.wanfear.com     http://scry.wanfear.com/~greear



^ permalink raw reply	[flat|nested] 39+ messages in thread

* NAPI (was Re: Linux 2.4.20-pre1)
  2002-08-06 11:32   ` Marcelo Tosatti
  2002-08-06 12:26     ` David S. Miller
  2002-08-06 16:45     ` Ben Greear
@ 2002-08-06 17:12     ` Jeff Garzik
  2002-08-07 14:09       ` Marcus Sundberg
  2 siblings, 1 reply; 39+ messages in thread
From: Jeff Garzik @ 2002-08-06 17:12 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: Ben Greear, lkml, David S. Miller

Marcelo Tosatti wrote:
> I want arguments from Davem to include NAPI. Changing the drivers is a
> reason for me to _not_ want it in.
> 
> But lets see if Davem can convince me ;)



8139too needs it for flood protection.  I also have a patch for sundance 
which fixes the issue with the quad port and implements RX polling for 
flood protection.

Basically, NAPI --should not-- affect any system that is not using a 
NAPI driver.  Think of NAPI as a net driver libary -- if your driver 
doesn't use it, you don't know it's there at all.  And currently tg3 is 
the only 2.4 driver using NAPI.

NAPI saves people manually implementing polling in each driver, for 
flood and DoS protection that is needed in 2.4.  The flood ceiling is 
much lower without NAPI, due to having the CPU overhead of interrupt 
handlers.  NAPI also eliminates the need for lots of code to support all 
sorts of NIC hardware interrupt mitigation variants.

	Jeff




^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-06 17:17   ` Jean Tourrilhes
  2002-08-06 16:31     ` Marcelo Tosatti
@ 2002-08-06 17:13     ` David S. Miller
  2002-08-06 18:48     ` Alan Cox
  2 siblings, 0 replies; 39+ messages in thread
From: David S. Miller @ 2002-08-06 17:13 UTC (permalink / raw)
  To: jt, jt; +Cc: marcelo, linux-kernel, alan

   From: Jean Tourrilhes <jt@bougret.hpl.hp.com>
   Date: Tue, 6 Aug 2002 10:17:36 -0700
   
   	The second thing that bugs me is that because those patches
   pass behind my back, they won't get applied to *both* 2.4.X and
   2.5.X. Because of that, keeping 2.4.X and 2.5.X in synch is an
   exercise in futility.

This is an old topic.  If cleanups get submitted they are going
to go in.  If this means that someone has to redo a patch, that
is just a part of life.

Nobody is "above the law", sort of speak, when it comes to these
things.  Cleanups and compile warning fixes are not required to
go through the maintainer of a piece of code.

About IRDA wrt. 2.4.x vs 2.5.x, it requires a partial rewrite in 2.5.x
anyways so don't get worked up over it :)

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-06 12:33 ` Marcelo Tosatti
@ 2002-08-06 17:17   ` Jean Tourrilhes
  2002-08-06 16:31     ` Marcelo Tosatti
                       ` (2 more replies)
  0 siblings, 3 replies; 39+ messages in thread
From: Jean Tourrilhes @ 2002-08-06 17:17 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: Linux kernel mailing list, Alan Cox

On Tue, Aug 06, 2002 at 09:33:45AM -0300, Marcelo Tosatti wrote:
> 
> 
> On Mon, 5 Aug 2002, Jean Tourrilhes wrote:
> 
> > 	Hi,
> >
> > 	Sorry to disturb, but it seems that kernel.org didn't pick up
> > 2.4.20-pre1 (or I'm looking at the wrong places).
> >
> > 	I'm asking because I've just finished testing my IrDA update
> > for 2.4.20, and you've just included some useless IrDA change that
> > probably render my patch worthless
> 
> What you mean I included some useless IrDA patch?

	Yep, tons of these :
-----------------------------------------------
-        IRDA_DEBUG(4, __FUNCTION__ "(), speed=%d (was %d)\n", speed, 
-		   self->speed);
+        IRDA_DEBUG(4, "%s(), speed=%d (was %d)\n", __FUNCTION__,
+        	speed, self->speed);
-----------------------------------------------
	Between this and fixing a Oops or Deadlock, I'll take the
second any day.
	I don't care on those patch in general, I'm not a control
freak, except that being so pervasive they are guaranteed to screw up
my own patches. That's why yesterday I *explicitely* asked you and
Alan if anything was pending, so that I could avoid wasting my time
and instead wait for the next release doing something else.
	I guess it's too late, I already wasted my afternoon.

	The second thing that bugs me is that because those patches
pass behind my back, they won't get applied to *both* 2.4.X and
2.5.X. Because of that, keeping 2.4.X and 2.5.X in synch is an
exercise in futility.
	But maybe you are finding that there is already too many IrDA
maintainers.

	I'll send you the Wireless patches, and I'll try to respin the
IrDA patches this afternoon (i.e. please screw me again !).

	Regards,

	Jean

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-06 16:31     ` Marcelo Tosatti
@ 2002-08-06 17:24       ` Jean Tourrilhes
  0 siblings, 0 replies; 39+ messages in thread
From: Jean Tourrilhes @ 2002-08-06 17:24 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: Linux kernel mailing list, Alan Cox

On Tue, Aug 06, 2002 at 01:31:56PM -0300, Marcelo Tosatti wrote:
> 
> > 	I'll send you the Wireless patches, and I'll try to respin the
> > IrDA patches this afternoon (i.e. please screw me again !).
> 
> I can back out those patches if you want. Will that help you?

	No point in going backward, what's done is done, I'm already
working on 2.4.20-pre1. And I'm starting to cool down.

	Jean

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-06 17:17   ` Jean Tourrilhes
  2002-08-06 16:31     ` Marcelo Tosatti
  2002-08-06 17:13     ` David S. Miller
@ 2002-08-06 18:48     ` Alan Cox
  2 siblings, 0 replies; 39+ messages in thread
From: Alan Cox @ 2002-08-06 18:48 UTC (permalink / raw)
  To: jt; +Cc: Marcelo Tosatti, Linux kernel mailing list

On Tue, 2002-08-06 at 18:17, Jean Tourrilhes wrote:
> 	Yep, tons of these :
> -----------------------------------------------
> -        IRDA_DEBUG(4, __FUNCTION__ "(), speed=%d (was %d)\n", speed, 
> -		   self->speed);
> +        IRDA_DEBUG(4, "%s(), speed=%d (was %d)\n", __FUNCTION__,
> +        	speed, self->speed);
> -----------------------------------------------
> 	Between this and fixing a Oops or Deadlock, I'll take the
> second any day.

I'd prefer to be able to read the errors too but yes.

> Alan if anything was pending, so that I could avoid wasting my time
> and instead wait for the next release doing something else.
> 	I guess it's too late, I already wasted my afternoon.

By the time you asked I'd sent them

> 	The second thing that bugs me is that because those patches
> pass behind my back, they won't get applied to *both* 2.4.X and
> 2.5.X. Because of that, keeping 2.4.X and 2.5.X in synch is an
> exercise in futility.

I sent them to the maintainer. 


IRDA SUBSYSTEM
P:      Dag Brattli
M:      Dag Brattli <dag@brattli.net>
L:      linux-irda@pasta.cs.uit.no
W:      http://irda.sourceforge.net/
S:      Maintained


If thats wrong, then thats why you never found out.


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-05 22:40 Linux 2.4.20-pre1 Marcelo Tosatti
  2002-08-06  0:20 ` Ben Greear
  2002-08-06 14:58 ` Linux 2.4.20-pre1 Jason Lunz
@ 2002-08-06 21:05 ` Adrian Bunk
  2002-08-07 11:09   ` David S. Miller
  2002-08-07  0:21 ` J.A. Magallon
                   ` (6 subsequent siblings)
  9 siblings, 1 reply; 39+ messages in thread
From: Adrian Bunk @ 2002-08-06 21:05 UTC (permalink / raw)
  To: Marcelo Tosatti, davem; +Cc: lkml


The changes to drivers/net/tg3.c in -pre1 broke the compilation:

<--  snip  -->

...
gcc -D__KERNEL__ -I/home/bunk/linux/kernel-2.4/linux-2.4.19-full/include
-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing
-fno-common -pipe -mpreferred-stack-boundary=2 -march=k6   -nostdinc -I
/usr/lib/gcc-lib/i386-linux/2.95.4/include -DKBUILD_BASENAME=tg3  -c -o
tg3.o tg3.c
In file included from tg3.c:25:
/home/bunk/linux/kernel-2.4/linux-2.4.19-full/include/linux/if_vlan.h: In
function `__vlan_hwaccel_rx':
/home/bunk/linux/kernel-2.4/linux-2.4.19-full/include/linux/if_vlan.h:186:
warning: implicit declaration of function `netif_receive_skb'
tg3.c: In function `tg3_poll':
tg3.c:1936: structure has no member named `quota'
tg3.c:1937: structure has no member named `quota'
tg3.c:1942: structure has no member named `quota'
tg3.c:1949: warning: implicit declaration of function `netif_rx_complete'
tg3.c: In function `tg3_interrupt_main_work':
tg3.c:1976: warning: implicit declaration of function
`netif_rx_schedule_prep'
tg3.c:1979: warning: implicit declaration of function
`__netif_rx_schedule'
tg3.c: In function `tg3_init_one':
tg3.c:5991: structure has no member named `poll'
tg3.c:5992: structure has no member named `weight'
make[3]: *** [tg3.o] Error 1
make[3]: Leaving directory `/home/bunk/linux/kernel-2.4/linux-2.4.19-full/drivers/net'

<--  snip  -->

cu
Adrian

-- 

You only think this is a free country. Like the US the UK spends a lot of
time explaining its a free country because its a police state.
								Alan Cox


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Linux 2.4.20-pre1
@ 2002-08-06 23:29 Alan Cox
  0 siblings, 0 replies; 39+ messages in thread
From: Alan Cox @ 2002-08-06 23:29 UTC (permalink / raw)
  To: linux-kernel

[+ indicates stuff that went to Marcelo, o stuff that has not,
 * indicates stuff that is merged in mainstream now, X stuff that proved
   bad and was dropped out, - indicates stuff not relevant to the main tree]

The HP merge is now down to 3937 lines pending

Current IDE mysteries to fix
-	Hang on at least one VIA/HPT combo
-	Still one report of a promise hang
-	IDE failure specific to Fujitsu laptop

Remaining IDE non mysteries to fix
-	No DMA on OSB4 IDE

Remaining IDE to check
-	Does Ali rev 0xC4 support LBA48, or is it > C4 that does


Linux 2.4.20-pre1-ac1
o	Merge with 2.4.20pre1
	- Drop broken isicom change
	- Fix formatting errors in x86_64 char/Config.in
	- Fix formatting errors in x86_64 isdn/Config.in
	- Fix formatting errors in x86_64  radio card Config.in
	- Fix formatting errors in x86_64 drivers/net/Config.in
	- Drop broken atarilance change
	- Fix wrong ioctl return in e100_ethtool_test, e100_ethtool_gstrings
	- Fix security hole in e100 ioctl handler
	- Fix identical hole in e1000 ioctl handler
	- Remove mess where x86_64 sticks its arse in all sorts of
	  config files and makes a mess of it. Other ports done because
	  the result sucks, x86_64 shouldnt either
	- Drop utterly bogus change todrivers/sound/Config.in
	- Revert uncompilable tg3 driver
o	Fix up the eepro100 mess from 20pre1		(Jeff Garzik)
o	Switch to Namesys __FUNCTION__ reiserfs fixes	(Oleg Drokin)
o	Fix eepro formatting on register
o	Fix radeon build on PPC				(Ben Herrenschmidt)
o	PPC scheduler, bitups, rwsem bits		(Ben Herrenschmidt)
o	Rework JFS indoe locking			(David Kleikamp)
o	Dynamically allocate JFS metapages		(David Kleikamp)
o	JFS rmdir/unlink d_delete removal		(David Kleikamp)
o	Add resize support to JFS			(David Kleikamp)
o	Rmemove unused code in aacraid			(Christoph Hellwig)
o	Export the new pci_enable function to modules	(Tomas Szepe)
o	Handle APM on armada laptops			(Samuel Thibault)
o	Fix further errors in depca
o	Fix a harmless physical/logical cpu confusion	(me)
	in the APM code
-	Fix migration to CPU 0 before poweroff		(me)
o	Make the APM on CPU 0 locking cover all of APM	(me)
	| idle on SMP needs work, but this seems to work for the rest
	| with my SMP boxes

Linux 2.4.19-ac4
o	Fix pci_enable_device bug I added in ac3	(Jeremy Fitzhardinge)
o	Don't program the ALi ISA bits when using a	(Go Taniguchi, 
	Non ALi Northbridge				 Bruce Howards, me)
*	E1000 Gigabit ethernet driver
o	Fix build for I/O debug MULTIQUAD I hope	(me)
	| Found by Willy Tarreau
*	Bluetooth core update/hot plug support		(Maksim Krasnyanskiy)
*	L2CAP lock fixes, datagram and shutdown		(Maksim Krasnyanskiy)
*	Fix locking in SCO bluetooth layer		(Maksim Krasnyanskiy)
*	Update hci_usb driver, fix refcounting		(Maksim Krasnyanskiy)
*	Add BNEP support to bluetooth			(Maksim Krasnyanskiy)
o	Fix iee1394 build failure			(me)
o	Fix BUZ_G_STATUS in zr36067			(me)
o	Fix warning in fdomain.c			(me)
o	Fix warning in pas16 driver			(me)
o	Fix warning in bin2hex.c			(me)
o	Fix warning in xirc2ps_cs			(me)

Linux 2.4.19-ac3
o	Rethink number one on the IDE stuff		(me)
	We go back to the old pci setup, and
	add the ability to enable devices with
	some BAR's left unassigned

Linux 2.4.19-ac2
o	Disable LBA48 on ALi IDE			(Andre Hedrick,
	revisions below 0xC4				 Daniela Engert)
o	Fix __FUNCTION__ warnings in reiserfs		(me)
*	Fix __FUNCTION__ in rest of irda drivers	(me)
o	Fix __FUNCTION__ in some more net/irda bits	(me)
o	Add sem_getcount abstraction from parisc tree
o	Merge some of the minor pcnet32 changes from
	the parisc tree
o	Fix __FUNCTION__ in the ldm partition code	(me)
o	Fix __FUNCTION__ in cycx_wan driver		(me)
X	Add full IDE reassignment based on description	(me)
	from Petr Vandrovec
o	Update defconfig for the -ac tree		(Niels Jensen)
*	Fix AGP warnings				(Niels Jensen)
o	Make rwlock_t not waste space on gcc 2.95/2.96	(Niels Jensen)

Linux 2.4.19-ac1
o	Merge with 2.4.19
o	Add identifiers for the 3Com AirConnect PCI	(Ingo Rohifs)
*	Fix typo in sym2 comments			(Grant Grundler)
*	Fix cyclades resource bug			(Florian Lohoff)
o	Fix address reporting on segv and friends for	(Aneesh Kumar)
	Alpha
o	Merge APM fixes for crashes on ASUS board	(Willy Tarreau)
o	Add module tags to toshiba smm driver		(Jonathan Buzzard)
*	Fix extern for init_rootfs			(Christoph Hellwig)
*	Make vmalloc.h include highmem.h to fix 	(Keith Owens)
	build errors on some setups
o	More __FUNCTION__ clean up for gcc 3.1		(me)

Linux 2.4.19rc5-ac1
o	Merge with 2.4.19rc5
o	Flush the right thing in ramdisk		(HP merge)
o	Merge further small hppa bits			(HP merge)
o	Fix ide option breakage				(Mikael Petterson)
o	Fix a JFFS2 oops case				(David Woodhouse)
o	Switch 'processor id' to 'physical id'		(me)
	| Keeps glibc happy until we sort out cpu numbers longer term
o	Fix incorrect marking of phys_proc_id init	(David Luyer)
o	Update the experimental amd76x_pm code		(Johnathan Hicks)
*	EEPro10 update				(Aristeu Sergio Rozanski Filho)
o	Fix missing prototype				(Christoph Hellwig)
o	Make mount hash size more sensible		(Christoph Hellwig)
o	Make i386 semaphore implementation gcc3 safe	(Christoph Hellwig)
o	Remove dead code in alim15x3 IDE code		(me)
o	Make the i8x0 audio power up more conservative	(me)
o	Enable EAPD on i8x0 audio devices		(me)
	| Hopefully this will fix some of the 'silent laptop' problems
*	Fix misordering in drivers/net/Config		(Willy Tarreau)
*	Fix undefined C usage in ixj			(me)
*	Fix undefined C usage in se401			(me)
o	Kill __FUNCTION__ in some usb drivers		(me)

Linux 2.4.19rc3-ac5
o	Fix the SMP compile problem			(me)
	| Better solutions preferred - suggestions anyone ?
o/*	Exterminate more of the __FUNCTION__ warnings	(me)
*	Fix warning in stallion and real loading bug	(me)
o/*	Fix various random gcc 3.1 warnings		(me)
o	Hopefully fix the DRM compile for gcc 2.95	(me)
*	Tighten multiple length checks in intermezzo	(Silvio Cesare, me)
*	Fix upper limit on stradis cliprects		(Silvio Cesare, me)
*	Fix proc_file_lseek				(me)
*	Fix drivers/s390/dasd write limit		(Silvio Cesare, me)
*	Fix ewrk3 and natsemi driver lengthchecks	(Silvio Cesare, me)
*	Openprom fixes					(Dave Miller)
*	Network procfs fixes				(Dave Miller)
o	Fix a couple of license tags			(Carl-Daniel Hailfinger)
o	Don't pad empty initializers with gcc 2.95+	(Christoph Hellwig)
o	Make better use of dentry inline space		(Andi Kleen)
o	Fix ffs asm for gcc 3.x				(Christoph Hellwig)
o	Remove last gcc3 warnings on ext3		(Christoph Hellwig)
o	Warn when mounting ext3 as ext2			(Andrew Morton)
*	Make umem useadd_gendisk			(Christoph Hellwig)
o	Fix cpqarray I/O accountinmg			(Christoph Hellwig)
*	Fix for TCSBRK standards compliance
	| LSB patch with further bugs fixed
*	Fix lots more __FUNCTION__ stuff		(me)
*	Fix warnings in hamradio drivers with gcc3	(me)

Linux 2.4.19rc3-ac4
o	Support "help" button Vaio PCG-NV105		(Frank Schusdziarra)
*	Clear AC on int in vm86 emulation		(Stas Sergeev)
*	Clean up stack handling macros in vm86		(Stas Sergeev)
*	Handle multiple prefixes on vm86 traps		(Stas Sergeev)
o	Use FIXMAP for f00f fixups			(Andrea Arcangeli,
							 Christoph Hellwig)
o	Cacheline align tlb state			(Andrea Arcangeli)
o	cmpxchg8 needs lock prefix			(Andrea Arcangeli)
o	Make O1 scheduler hyperthreading aware		(Intel)
	| Plus some cleanup, performance fix
o	make xconfig fix up				(Pete Zaitcev)
o	Fix a misidentification of Tualatin		(Dave Jones)
o	Update SiS IDE driver for ATA133		(Lui-Chen Chang,
							 Lionel Bouton)
o	Update procfs for inode sysctl changes		(James Antill)
o	Final fixups for summit support			(James Cleverdon)
*	Fix missing sign check in se401 driver		(Silvio Cesare)
*	Fix missing wrap check in usbvideo		(Silvio Cesare)
o	Fix netsyms includes				(Martin Uecker)
o	Penguin logo frame buffer fix			(Geert Uytterhoeven)
o	sym53c8xx_2 fixes for bugs tickled on hppa	(Grant Grundler)
o	Remove vm_unacct_vma				(Hugh Dickins)
o	Handle do_mmap_pgoff mask properly		(Hugh Dickins)
o	Update to rmap-13b				(Rik van Riel,
						Arjan van de Ven, Hugh Dickins)
*	Fix trident audio suspend/resume crash		(Muli Ben-Yehuda)
o	Give panic info in morse code on graphic oops	(Andrew Rodland)
o	Add a new kaweth usb ident			(Harm Verhagen)
o	Fix warnings from init_task.c			(Alex Riesen)
o	IRQ balancing fix backport from 2.5		(Zwane Mwaikambo)
o	Clean up LDM support				(Richard Russon)
*	Fix lib/rbtree mismerge				(Christoph Hellwig)
*	Endian fixes for 8390 drivers			(from HPPA merge)
o	Support tulip on the parisc platform		(from HPPA merge)
*	Update parport_gsc				(Helge Deller)
o	Merge fault handling changes for upward		(from HPPA merge)
	growing stacks
o	Fix undefined C in speakup			(me)
*	Fix umem undefined C				(me)
*	Fix a few other warnings			(me)
*	Lots of gcc 3.1 __FUNCTION__ warning fixes	(me)

Linux 2.4.19rc3-ac3
o	Hopefully fix the smp boot/apic problem		(James Cleverdon)
o	Tidy various VM bits up				(Christoph Hellwig)
o	Further quota updates		(Jan Kara, Al Viro, Christoph Hellwig)
*	Fix incorrect tristate in Config.in		(Keith Owens)
o	amd76x_pm compile fix				(Erik Andersen)
 
Linux 2.4.19rc3-ac2
o	Fix escaped iconfig makefile line		(Greg Louis)
*	Fix a dcache locking error			(Al Viro)
o	AMD native powermanagement			(Tony Lindgren,
							 Johnathan Hicks)
	| Replaces amd768_pm as its already far better
-	Remove dead tq_bdflush				(Christoph Hellwig)
-	Remove dead pg_nosave bits			(Christoph Hellwig)
-	Remove dead 8253x build script			(Christoph Hellwig)
o	Clean up speakup Makefile			(Christoph Hellwig)
o	Fix typo in drivers/net/Config.in		(Hans-Joachim Baader)
o	Update to new quota code with dual format	(Jan Kara)
	support
o	Add the XFS framework for quota into it		(Nathan Scott)
*	Fix unaligned access on ewrk3			(Martin Brulisauer)
o	Fix config breakage from mips merge		(Christoph Hellwig)
*	Recognize GPLv2 as a valid license		(Keith Owens)
o	Update ACPI hotplug driver			(Takayoshi KOCHI)
	| And fix posted shortly after
o	Remove ksyms.c debugging junk			(Khromy)
o	Remove limits.h use in speakup			(Adrian Bunk)
o	NFS lock daemon fixes				(Olaf Kirch)
	| Sign errors, Openserver interoperability
*	Further trident sound cleanup and fixes		(Muli Ben-Yehuda)
o	Change tcp_diag.h fix to keep DaveM happy	(me)
o	Add via apic to expected apic versions		(me)
o	Next batch of summit tweaks			(James Cleverdon)
	| Won't fix the existing APIC problem
o	Add Vaio C1MV mode lines to radeonfb		(James Mayer)
*	Fix sloppy sign handling in apm and rio500	(Silvio Cesare)
*	Reformat depca.c ready for some bugfixes	(me)

Linux 2.4.19rc3-a1
o	Merge with 2.4.19rc3

Linux 2.4.19rc2-ac2
o	Fix ide probe crash stupid bug in ac1		(me)
	| I mismerged Kurt's change

Linux 2.4.19rc2-ac1
o	Merge with 2.4.19-rc2
*	Minor HP merge fixup
o	Orinoco build fix				(Adrian Bunk)
o	Vaio C1VE/N frame buffer console mode		(Marcel Wijlaars)
o	Fix an inverted test in sym53c8xx_2		(Grant Grundler)
o	Fix aic7xxx build without PCI enabled		(me)
o	Clear allocated gendisk in IDE			(Kurt Garloff)

Linux 2.4.19rc1-ac7
*	Merge more HPPA bits
X	tcp_diag alignment fixup			(Richard Henderson)
	| Pending DaveM making a nicer fix Im sure
o	Hopefully fix the SMP APIC problems rc6		(James Cleverdon)
	gave some people
o	Fix incorrect __init in PCI core		(Takayoshi KOCHI)
	| Caused hotplug bugs
o	Update IBM PCI hotplug driver			(Greg Kroah-Hartmann)
*	Add SCSI blacklist entries for Centristor	(Robert Sertic)
o	Update Documentation/sysctl/vm.txt		(Steven Cole)
*	Fix kdev_val macro				(Steven Cole)
o	Allow a user to force dma 0 to be allowed	(Gerald Teschl)
	for ISAPnP [be nice to autodetect this ?]
o	Hopefully fix bogus config question bug		(me)
*	Fix hang on some boxes if you unload
	maestro audio then hit the volume buttons	(Samuel Thibault)
*	Fix aha152x scsi				(Juergen Fischer)
o	Bluetooth pcmcia drivers			(Marcel Holtmann)

Linux 2.4.19rc1-ac6
o	Update merge using bits from newer summit diff	(James Cleverdon)
o	Fix problems with non SMP but io-apic build	(me)
o	Socket error path memory leak fix		(Robert Love)
o	Fix sd_varyio masks for higher drives		(Kurt Garloff)
o	Fix tmpfs double kunmap				(Hugh Dickins)
o	VIA rhine cleanup/fixes				(Roger Luethi)
o	Fix typos in ncr/seagate scsi			(James Mayer)
*	MPT fusion update				(Pam Delaney)
*	Trident audio code cleanups and lock fixes	(Muli Ben-Yehuda)
o	Fix irq balancing for summit boxes with Ingo's	(James Cleverdon)
	PIV balancer

Linux 2.4.19rc1-ac5
o	Add additional promise chip names provided by	(me)
	Hank Yang
o	Fix promise 20277 misreporting			(me)
o	Remove extra argument from vm_enough_memory	(me)
	| Suggested by Hugh Dickins
*/+	Initial merge of main chunk of parisc-55 tree
	- fix scheduling of disabled kbd tasklet

Linux 2.4.19rc1-ac4
o	Tweak pnpbios permissions on escd file		(me)
	| We only want root able to see it
o	Merge first bits of Summit stuff		(me)
	| Working from ugly ibm patch for 2.4.9
o	Fix casting warnings in i830 DRM		(me)
*	Fix atp870u warning				(me)
o	Fix APM hang on resume with SMP kernel on up	(me)
	laptop
o	Change added proc/cpuinfo entries to fit format(me)
o	Fix PIV clockmod				(Peter Osterlund)
o	Re-order scsi disk structure to save space	(Kurt Garloff)
o	Fix CPU_FREQ build problem			(Peter Osterlund)
o	Clean up speakup_acntpc			(Arnaldo Carvalho de Melo)
o	Clean up speakup_acntsa			(Arnaldo Carvalho de Melo)
o	Clean up speakup_apolo			(Arnaldo Carvalho de Melo)
o	Basic speakup core cleanups		(Arnaldo Carvalho de Melo)
o	Fix a mishandling of PCIBIOS boxes that	do not	(Mark Lisher)
	use CONF1/CONF2
o	Fix promise skip for new supertrak		(Jan Schmidt)
o	Allocate nocache ram based on mem size for	(Tomas Szepe)
	sparc32
o	Fix incorrect zlib includes			(David Woodhouse)
o	Fix duplicated scsi host idents			(Itai Nahshon)
o	Update ALi5451 audio				(Lei Hu)
	| Sorry this took so long - it got lost
o	Handle radeon cards that report zero RAM	(James Mayer)
o	Blacklist H.01.09 megaraid firmware		(Jan Koop)
o	Initial ALi5455 audio support			(Lei Hu)

Linux 2.4.19rc1-ac3
*	Remove SWSUSPEND
	| With the IDE backport option and other general 2.5 improvements
	| its now best worked on in 2.5
*	Remove duplicate config options			(Steven Cole)	
o	Newer SX6000 has PDC20276 chips. Handle this	(me)
o	Don't use LBA48 hack on Promise 20262/3		(Hank Yang)
*	Switch to Promise namings for chips		(Hank Yang)
*	Update promise drive quirks			(Hank Yang)
o	Fix missing sem up on error in usb printer	(Oliver Neukum)
*	Correct FPU stack fault signal flag bits	(Dave Richards)
o	Resync with base JFS tree			(Dave Kleikamp)
o	Make it clear CMD64x drives CMD680		(Adrian Bunk)

Linux 2.4.19rc1-ac2
*	Update eata and u14/34f drivers			(Dario Ballabio)
o	Handle 3c556 transmitter enable bit		(Andrew Morton)
o	Make the DRM layer use the pci mapping api	(Arjan van de Ven)
o	Set pci dma masks on the i2o devices		(Frank Davis)
*	JFFS2 bug fixes					(Dave Woodhouse)
*	Fix i815 APSIZE masking				(Nicolas Aspert)
o	Remove junk pcxxdelay function			(Sergey Kononenko)
*	EFI partition updates				(Matt Domsch)
	- I took out the MSDOS check - if both are
	  present we should favour MSDOS for now
*	Fix ipc/shm locking				(Hugh Dickins)
*	Update Configure.help				(Steven Cole)
o	USB updates - cleanups				(Greg Kroah-Hartmann)
o	USB fix for intuos tablet			(Christer Nilsson)
o	USB scanner updates		(David Nelson, Henning Meier-Geinitz, 
					 Sergey Vlasov, Karl Heinz Kremer)
	| Note - new maintainer for USB scanner - Brian Beattie
o	Re-merge the ramfs limits code			(David Gibson)
	| * This needs good testing
	| + TODO - make ramfs homour vm_accounting
o	eepro100 warning fix				(Pavel Machek)
o	Report ok for nfs directory fsync       	(Trond Myklebust)
*	Promise 20268 raid should be called 20270	(Hank Yang)
	| Trivial item pulled out of the pending promise patches
o	Speakup HZ != 100 cleanup part 1		(Arjan van de Ven)
o	Report HT info in /proc/cpuinfo			(Arjan van de Ven)
o	PIV IRQ balancing fix				(Ingo Molnar)
o	Allow a non PGE PII optimised build		(Arjan van de Ven)
o	Elevator performance fixes			(Andrea Arcangeli)
o	Update cpufreq, add PIV throttling		(Robert Schwebel,
			Padraig Brady, Zwane Mwaikambo, Arjan van de Ven,
			Tora Engstad)
o	O(1) scheduler updates				(Ingo Molnar)
*	Fix 64bit random panic with 
	"I refuse to corrupt memory/swap"		(Bill Nottingham)
*	Fix compile with floppy disabled		(Adrian Bunk)
*	Quirk handler for Dunord I-3000	  (Dave Close, David Mosberger)
	| Plus I added real PCI idents for neatness
o	Fix another vm accounting corner case		(Robert Love)
o	Patch up XFree 4.1 back compat problems		(Arjan van de Ven)
	in DRM 4.2+

Linux 2.4.19rc1-ac1
o	Merge with 2.4.19-rc1
	- Drop out mm fixes
*	Shmem fixes for -ac 				(Hugh Dickins)
o	Fix vm accounting corner cases			(Hugh Dickins)
*	Fix utimes permission check error		(Stephen Rothwell)
	| It was overstrong
o	Fix JFS error handling down_write_trylock	(David Kleikamp)
o	Module loader off by 1 fix			(Peter Oberparleiter)
o	Allow irda modem bits to be arch set		(Grant Grundler)
*	ALI M1671 GART support				(Arjan van de Ven)
o	IDE scsi off by one transformation fix		(Mark Lord)
o	Printk fixes
o	USBserial semaphore fix				(Pete Zaitcev)
o	Alpha updates for O(1) scheduler		(Robert Love)

Linux 2.4.19pre10-ac2
o	Merge speakup support for blind users
o	CSB6 cable detect for Dell			(Matt Domsch)
o	Update pci ids for Intel i8xx			(Wim Van Sebroeck)
*	Add AMD766 PCI irq router support		(Wayne Whitney)
*	ACARD scsi update				(Matthew Chang)
*	Fix idle-period bug in APM parser		(Laurent Latil)
*	Printk levels for 3c501 ethernet		(Felipe Damasio)
o	AMD768 TCO watchdog driver - * needs testing *	(Zwane Mwaikambo)
*	Fix IDE port offset for pdc202xx		(Hang Yang)
	| should fix LBA48 drives on primary channel
o	Fix incorrect speedstep multiplier detect	(Dominik Brodowski)
*	Add support for Aptiva with Bose subwoofer	(Toshio Spoor, 
							 John Rood)
*	Autodetect SiS 745 AGP 				(Carsten Rietzschel)
*	More scsi sparselun entries			(Arjan van de Ven)
*	Fix possible crash on shutdown with AF_ROSE	(Jean-Paul Roubelat)
*	Intel 845G IDE support				(Andre Hedrick)
o	Further CPiA driver updates			(Duncan Haldane)
o	Fix DAC960 diff that went astray		(Juan Quintela)
o	Add HP arrays to the sparselun list		(Andrew Patterson)

Linux 2.4.19pre10-ac1
o	Merge with Linux 2.4.19-pre10

Linux 2.4.19pre9-ac3
o	Cpufreq updates			(Dominik Brodowski, Dave Jones0
	| Now includes some reverse engineered speedstep support 
o	JFS updates			(David Kleikamp, Christoph Hellwig)
o	CPiA updates/Intel microscope support		(Duncan Haldane)
*	Fix vm86 locking errors on SMP			(Ben LaHaise)
*	Remove dead vm86mode field			(Ben LaHaise)
*	Fix make clean for cl2llc			(Keith Owens)
o	Fix loop errors with highmem			(Ben LaHaise)
*	Fix ipc/sem.c SuS/LSB compliance		(Christopher Yeoh)
X	Update swsuspend maintainer info		(Pavel Machek)
*	Add another drive quirk for the promise		(Hank Yang)
	drivers
o	Merge external journal support for jfs		(David Kleikamp)
o	Add documentation about O(1) scheduler		(Robert Love)
o	O(1) scheduler tidy ups				(Robert Love)
o	Fix remaining extern inline users		(Christoph Hellwig)
o	Cache alignment cleanups for SMP apic timers	(Ravikiran Thirumalai)
o	Ext3 file system updates			(Stephen Tweedie)
o	Fix 'dump corrupts live fs bug'			(Stephen Tweedie)
o	Add DAC960 devices to init table		(Oliver Pitzeier)
	| Lilo doesn't care but grub does ..

Linux 2.4.19pre9-ac2
*	Clean up after SIGURG properly			(David Weinehall)
	| Needed to match the other SuS compliance fix for it
*	Fixed wrong elf section in neofb		(Thomas Mirlacher,
							 Andrey Panin)
*	Don't write to reserved bits on 815 gart	(Nicolas Aspert)
*	Make fcntl locking POSIX 2001 compliant		(Andries Brouwer)
*	Fix an mmap corner case 			(Raúl)
*	Merge 3c59x vlan support			(Paul Komkoff)
*	Update URLS for LDP documentation		(John Kacur)
*	Fix rmem setting for low memory			(J A Magallon)
*	Reparent scsi error thread to init		(J A Magallon)
*	Backport FPU init fixes				(J A Magallon)
*	Fix AGPgart crash on I830M/I845G when using
	8Mb/8Mb split					(Jeff Hartmann)
*	Fix phy masking on 8139too			(Jeff Garzik)
*	Fix link state reporting on generic phy code	(Jeff Garzik)
*	Tulip phy handling fix				(Jeff Garzik)
*	Update 8139too docs				(Jeff Garzik)
*	cs89x0 update					(Jeff Garzik)
*	VIA rhine fixes					(Jeff Garzik)
*	Hamachi quick fixup for 2.4.19			(Keith Underwood)
*	Revert escaped procfs debug code		(Todd Eigenschink)
*	Merge the 2.5 additions to ethtool		(Jeff Garzik)
*	Update dl2k driver				(Jeff Garzik)
*	Fix kernel api docs to reflect fb changes	(Juan Quintela)
*	Fix problems with pcnet32 workaround for x250	(Go Taniguchi)
*	De4x5 cleanups					(Jeff Garzik)


Linux 2.4.19pre9-ac1
o	Merge with 2.4.19pre9
*	Fix SuS violation on readv/writev		(me)
	| I believe this one is correct, please double check

Linux 2.4.19pre8-ac5
*	Fix various audio copy*user			(Rusty Russell)
o	Update to rmap 13		(Rik van Riel, Christoph Hellwig)
*	Fix joystick copy_user bugs			(Robert Johnson)
*	Document the i2o_pci module			(me)
*	Switch i2o_block back to direct pointers	(me)
	to avoid promise firmware bugs
*	Remove cache error paths from i2o_block		(me)
	| new code doesnt trip that bug
*	Reduce the i2o queue depth per device		(me)
	| pending tuning - might need more yet
*	Set i2o default limit at 48K a write		(me)
	| more firmware bug stuff
*	Clean up i2o cache strategy, add tuning ioctl	(me)
*	Allow users to force dpt cards to use base i2o	(me)
	| tested i2o_block on DPT with my cards
*	Remove duplicate ac97_codec inclusion		(Keith Owens)
X	Tidy up patch for swsuspend			(Pavel Machek)
*	Fix wrong __init in 3c509			(Kasper Dupont)
o	Fix mm/bootmem.c build on cris			(Johan Adolfsson)
*	Remove config tools for 8253x from kernel tree	(Keith Owens)
*	Rename files in aacraid ready for merge		(me)
	of updates
*	Merge bridge specific changes in aac code	(Deanna Bonds)
*	Merge most of the fixups/cleanups for aacraid	(Deanna Bonds)
*	Set PCI masks for the 64 and 32bit aacraids	(me)
*	Don't program up the ali secondary codec for	(me)
	6 channel if you don't have one fitted
*	Block layer copy*user fixups		(Arnaldo Carvalho de Melo)
*	Fix missing intermezzo include		(Marc-Christian Petersen)
o	Slab cache for iobufs		(Andrea Arcangeli, Chuck Lever,
						Christoph Hellwig)
*	Fix intermezzo copy*user		(Arnaldo Carvalho de Melo)
o	down_trylock					(Christoph Hellwig)
*	Fix video compile for split module		(Michal Jaegermann)
	and compiled in
*	Kill 3c59x debug bits				(Andrew Morton)
*	Char fixes for copy*user		(Arnaldo Carvalho de Melo)
*	Fix a few errors in the janitor copy* fixes	(me)

Linux 2.4.19pre8-ac4
o	Fix warnings in pc_keyb.c			(Christoph Hellwig)
*	Fix undefined C in rivafb			(Christoph Hellwig)
*	Fix dnotify warnings				(Christoph Hellwig)
o	Remove unused nfs label				(Christoph Hellwig)
o	Fix vm_validate_enough prototypes		(Christoph Hellwig)
*	Fix wrong comment in agpgart			(Nicolas Aspert)
*	JFFS2 fixes					(David Woodhouse)
o	Hopefully fix zisofs breakage			(David Woodhouse)
*	Remove a defunct soc_probe call			(Christoph Hellwig)
o	Update initrd documentation			(Mark Post)
-	Fix SMP build					(Robert Love)
o	Numa-Q apic timer update			(Martin Bligh)

Linux 2.4.19pre8-ac3
o	Kbuild fixes					(Keith Owens)
*	Fix eepro100 bug/typo				(Michael Rozhavsky)
*	Intel 845G GART support				(Graeme Fisher)
*	Fix tasklet disable/kill in pppoatm		(Luca Barbier)
*	Add another PCI ident to the acenic driver	(Eric Smith)
o	Major IDE updates				(Andre Hedrick)

Linux 2.4.19pre8-ac2
*	Fix more compile problems			(me)
*	Fix a possible hang on shutdown in 3270 tty	(Martin Schwidefsky)
*	Make "make rpm" sane for non x86		(Cesar Cardoso)
*	Two new AC97 codec entries			(Lei Hu)
*	Thread exit race fix				(Dave McCracken)
*	Further sg buffer clearing fix			(Douglas Gilbert)
*	Fix do_mounts printk				(Al Viro)
*	Umembp fixups					(Neil Brown)
*	Umembp shift bug fixup				(me)
o	Kbuild fixes and improvements			(Keith Owens)
*	Add a new tulip clone pci ident entry		(Ohta Kyuma)
*	Fix url on via pci fixups			(Erich Schubert)
*	koi8-ru handling fixes				(Petr Vandrovec)
o	Clean up remaining code to use yield		(Robert Love)
o	Clean up migration_init as per 2.5		(Erich Focht)
o	Clean up maximum real time priorities		(Robert Love)
*	Kill unused variable in bpck6			(Adrian Bunk)
*	Fix dnotify/process exit handling		(Stephen Rothwell)
*	Add another vaio bios to the table		(Yves Lafon)
*	Allow users to disable hyperthreading		(Hugh Dickins)

Linux 2.4.19pre8-ac1
o	Merge with Linux 2.4.19pre8
	-	Fix some compile problems

Linux 2.4.19pre7-ac4
*	Test AMD768 IRQ router support			(me)
*	Fix ext2 build error
*	Improve i810 audio documentation		(Johannes Feigl)
*	Ensure UTS data is in C locale			(Martin Dalecki)
*	Add the Intel ICH4 to the i810 audio driver	(Wang Jun)
*	Fix qlogicfc crash under load			(Dave Miller)
*	Fix snprintf return values in some cases	(Ben LaHaise)
*	Fix a bug that got into the iph5526 code when	(Vineet Abraham)
	networking
*	Add more scanners that respond to all LUNs	(Frank Zago)
*	Synclink PCMCIA wan driver			(Paul Fulghum)
*	Fix sparc64/ppc64 bluetooth ioctl build		(Martin Eriksson)
*	Change 5/6bit codec resolution detect for	(Wan Tat Chee)
	AC97 
*	Fix v4l compile bug in one option case		(Iain Stevenson)
o	Clean up powernow initcalls			("CaT")
o	Add PIO mode support for the Pacific Digital	(Mark Lord)
	ADMA-100i card

Linux 2.4.19pre7-ac3
*       Back merge some documentation fixes      	(Daniel Dickman)
*       Update sisfb driver                     	(Thomas Winischhofer)
o       Remove sync wakeups now O(1) handles it 	(Robert Love)
o       Abstract away need_resched              	(Robert Love)
o       Fix scheduler deadlock during switch_mm 	(Dave Miller)
        on sparc etc
o       Optimise sched_yield                    	(Robert Love)
o       Handle tasks becoming runnable during   	(Robert Love)
        schedule
o       Clean up assumptions about MAX_RT_PRIO  	(Robert Love)
o       Backport of migration fixes/irq off     	(Robert Love
        fixes and migration_init                	 William Irwin)
o       Cleanups from 2.5->2.4 O(1) backport    	(Robert Love)
        | The entire O(1) block above is a backport
        | of all the fixes from Ingo, Robert and others
X       Swsuspend fix crash on boot add cleanups       	(Pavel Machek)
*       Scsi generic buffer tidy up             	(Douglas Gilbert)
*       Correct kd.h definitions                	(Andrej Lajovic)
X       Fix missing include for swsuspend       	(Mauricio Zambrano)
*       Configure.help typo fixes               (Arnaldo Carvalho de Melo)
o       Identify PIV Xeon in mptable            	(James Bourne)
o       Fix "skip_ioapc_setup" compile problem  	(Mikael Pettersson)
o       Additional ext2/ext3 sanity checker     	(Andreas Dilger)
*       Handle very old misconfigured
        NCR53c810 on DECpc XL etc               	(Graham Cobb)
o       Core of support for jfs external log    	(Christoph Hellwig,
                                                	 Dave Kleikamp)
o       Clean up jfs_mknod a little             	(Christoph Hellwig)
o       Sync up 2.4/2.5 jfs changes             	(Christoph Hellwig)
*       PPC compile fixes                       	(Paul Mackerras)
*       Next stage of vm86 fixing               	(Kasper Dupont)
o       Clean up drivers to use vmalloc_to_page 	(Hugh Dickins)
*       Fix missing release in opl3sa2          	(Zwane Mwaikambo)
*       Fix flag type error in rtl8150          	(Rusty Russell)
*       Fix various missing CONFIG_PCI checks   	(me)

Linux 2.4.19pre7-ac2
*	Limit default i2o_block to 64K writes		(me)
	| Several controllers can't handle larger single requests
*	Add power management control to i2o_block	(me)
X	Use chained sg list for i2o_block		(me)
	| Need to load first 8 entries into message for performance still
*	Updated i2o documentation			(me)
*	Fix make xconfig
*	Fix bios reboot sequence			(Robert Hentosh)
*	Kees Cook changed email address			(Kees Cook)
*	Fix a minor SuSv3 violation in SIGURG		(Christopher Yeoh)
o	Make htmldocs fixups				(Erik van Konijnenburg)
o	Make all the slab caches use the "_" convention	(Ryan Mack)
o	Fix flow control problems with TCP over NFS	(Neil Brown)
o	Removepage hooks as per old -ac			(Christoph Rohland)
	| This lets shmfs/ramfs keep accounting straight
	| ramfs needs someone to drop in the other old -ac bits stil
o	Fix via-rhine PCI idents			(Shing Chuang)
*	Backport of 2.5 aha152x update by		(Juergen Fischer)
o	Loop fixups					(Arjan van de Ven)
o	Add HP tachyon idents to cpqfc driver		(Jes Sorensen)
*	Clean up mpu401 failure handling paths		(Zwane Mwaikambo)
*	Ad1848 pnp scanning fixes			(Zwane Mwaikambo)
o	Kill dead URL in maintainers			(Joe Perches)
-	Back out problem bridge update			(Mike Fedyk)
*	Fix sound on Compaq Presario 700		(Santiago Nullo)
o	Fix restore_flags handling in cmd640 probe	(Justin Gibbs)
o	Fix oops from mptable impaired bioses		(Arjan van de Ven)
o	Fix 8139cp/8139too big endian multicast setup	(Naoki Hamada)
*	Fix missing newline in i810 audio printk	(???)
*	Put syscall table back for now			(Steven Hirsch)
*	Fix ips build for some combinations		(Steven Hirsch)
o	NLS makefile tidy				(Urban Widmark)
o	Fix radeonfb build				(Peter Horton)
*	Update poll_out fixes on tty devices		(Sapan Bhatia)
o	32bit uids in acct data				(Chris Wing)

Linux 2.4.19pre7-ac1
o	Merge CPU speed control framework and support (Dave Jones, Russell King
	for VIA processors and AMD K6		Arjan van de Ven, Janne Pänkälä)
o	Merge with 2.4.19pre7
	-	drop out keyb changes (breaks some setups)
*	Lots more i2o debugging work 			(me)
	| I2O now seems to be working again and works
	| for the first time on the AMI Megaraid

Linux 2.4.19pre5-ac3
X	Software suspend initial patch 		(Pavel Machek, Gabor Kuti,..)
	| Don't enable this idly. Its here to get exposure and so
	| people can bring the rest of the code up to meet its needs as
	| well as fix it.
	| Read the docs first!
*	Small fix for the radeonfb			(Peter Horton)
*	Fix highmem truncation on DMA mapping bug	(Dave Miller)
X	Modules are not supposed to hack the syscall	(Arjan van de Ven)
	table so remove the export
*	Add ite sound configuration help		(Steven Cole)

Linux 2.4.19pre5-ac2
*	Fix compile error when using initrd		(Jeff Nguyen)
*	Make the KL133 onboard video happy again	(Andre Pang)
	| and a lot of people working to figure out the right bits
*	Reparent jdb to init and drop lock on exit	(Ishan Jayawardena)
*	Fix radeon corner case				(Arjan van de Ven)
o	Cache more group descriptors on ext2/ext3	(Arjan van de Ven)
*	SAB8253 series wan drivers			(Joachim Martillo)
*	Add more idents for PIIX IDE controllers	(Arjan van de Ven)
*	Lock signals in procfs				(Andrea Arcangeli)
*	Backport of 2.5 BUG_ON() functionality		(Robert Love)
-	Drop -O1 on sched.c - turns out its a CPU
	microcode bug on early Xeon not Linux
*	Fix Radeon fb reset problems as X11 did		(Peter Horton)
*	Radeon acceleration/mtrr updates		(Peter Horton)
o	JFS flushpage updates				(Christoph Hellwig)
*	BeOS file system support			(Will Dyson)
	| original work by Makoto Kato
*	Fix w83877 watchdog SMP compile failure		(Paul Komkoff, me)
*	Fix pty/tty POLL_OUT reporting			(Sapan Bhatia)
*	Update berkshire watchdog driver	(Lindsay Harris, Rob Radez)
o	Clean up duplicated path_init and __user_walk	(Hanna Linder)
	code
*	Enable MMX extensions on Geode GXm		(Zwane Mwaikambo)
o	O(1) scsi free command block finder		(Mark Hemment)
*	Updated IBM serveraid driver			(Jack Hammer)
*	S/390 makefile cross compile fixups		(Pete Zaitcev)

Linux 2.4.19pre5-ac1
o	Merge with 2.4.19pre5

Linux 2.4.19pre4-ac4
o	Fix an additional vm86 case			(Stas Sergeev)
	| Check DOSemu again and this code wants some good review
o	Do sanity checking to avoid mispoking PCI on	(me)
	the CMD640 [noted by Justin Gibbs]
o	Fix promise IDE error recovery			(Manfred Spraul)
o	Ali IDE hang fixes				(Sen Dong)
	| Extracts from a bigger ALi update
*	Ext3 balloc locking fix 			(Andrew Morton)
*	Fix escaped MWAVE configuration			(Thomas Hood)
*	Fix nls_utf8 problems				(Liyang Hu)
*	Fix mmx_memcpy over-prefetching on Athlon	(me)
o	Fix an error return the vm accounting code broke(Andrew Morton)
*	Fix bpck6 build on the powerpc platform		(Jens Schmalzing)
*	Fix bpck6 64bit cleanness and other minor bits	(me)
*	Fix sound Configure.help thinko			(Per von Zweigbergk)
*	Backport the 2.5 wireless driver stuff		(Jean Tourrilhes)
	| So 2.5 driver fix back merging is sane

Linux 2.4.19pre4-ac3
o	Fix NFS pathconf problem			(Neil Brown)
o	IBM memory key ident for usb_storage		(Alexander Inyukhin)
*	Add byte counters to mkiss driver		(Ken Koster)
*	Add more entries to the scsi scan lists		(Arjan van de Ven)
*	More eepro100 variants				(Arjan van de Ven)
*	Update wolfson codec initialisers		(Randolph Bentson)
+	USB serial oops fixes				(Greg Kroah Hartmann)
*	Mad16 register gameport with input layer	(Michael Haardt)
*	Update specialix driver to handle SI v1.x board	(Ismo Salonen)
*	Fix a wdt285 EFAULT return, remove crud		(Ron Gage, me)
*	Fix ioctl return errors on several sound cards	(Ron Gage)

Linux 2.4.19pre4-ac2
*	Hopefully correctly fix the vm86 problems	(Stas Sergeev)
	| Please test wine 16bit/dosemu/XFree stuff
*	Fix panic when writing 0 length ucode chunk	(Tigran Aivazian)
*	Fix incorrect use of hwif->index in ALI IDE	(Martin Dalecki)
*	Fix mmap rbtree corruption bug			(Ben LaHaise)
o	Fix incorrect 10 to 6 byte scsi command switch	(Jens Axboe)
*	TCP correctness fix				(Dave Miller)
*	Correct mwi acronym in docs			(Geert Uytterhoeven)
*	Merge the rest of Promise 20271 support		(YAMAWAKI Teruo)
*	Fix open/close races in indydog			(Dave Hansen)
*	Fix compile problem with ibm hotplug		(Greg Kroah-Hartmann)
*	Save the .config file in make rpm		(Kelly French)
*	Add another vaio with swapped minutes		(Michael Piotrowski)
o	Further atm fixes				(Maksim Krasnyanskiy 
							 Marcell Gal)
o	Even more atm fixes				(Francois Romieu)
*	USB support for palm m130			(Udo Eisenbarth)
*	USB fix for pegasus hotplug crash		(Petko Manolov)
* 	USB request sense help for some scanners	(Oliver ?)
*	USB support for Optus@home 			(Oliver ?)
*	USB printer updates			(David Paschal, Pete Zaitcev)
*	Work around USB ATEN keyboard switches		(Vojtech Pavlik)
*	PWC usb camera updates				("Nemosoft")
*	Small updates to the USB hub code		(Itai Nahshon)
*	Fix spinlock handling bugs in ipaq USB		(Ganesh Varadarajan)
*	OHCI fixes					(David Brownell)
*	USB docs update					(David Brownell)
*	UHCI fixes					(Johannes Erdfelt)
*	Quieten a USB message to debug			(Greg Kroah-Hartmann)
*	USB bandwidth reporting				(David Brownell)
*	Fix msync SuS v3 compliance			(Chris Yeoh)
*	CS8900 fixes (need testing)			(Paul Komkoff)
*	Adapt HP100 driver to pci api			(Jeff Garzik)
*	Acenic updates - fix leak and Tigon1		(Jes Sorensen)
*	DE620 region handling fixes			(K Kasprzak)
*	DLink DL2K gige updates			(Edward Peng, Jeff Garzik)
*	pcnet32 leak fix				(Jeff Garzik)
*	pcnet32 types fixes for non x86			(Anton Blanchard)
*	pcnet32 assorted fixes				(Dave Engebretsen)
*	pcnet32 fixes					(Paul Mackerras)
*	Fix missing linux/delay.h from eepro100		(me)
*	Further pcnet32 cleanup and probe fixes		(Go Taniguchi)
*	Merge gcc3 warning fixes for copy/csum		(Jeff Garzik)
*	Fix bmac build					(Joshua Uziel)
*	DE4x5 slight tidy up				(Jeff Garzik)
*	More AC97 ident strings				(Peter Christy)

Linux 2.4.19pre4-ac1
o	Merge 2.4.19pre4
*	Add PCI idents for mobility parallel port	(me)
o	Fix crash on boot with LLC if no devices present(me)

Linux 2.4.19pre3-ac6
o	Fix the oops initialising the CD-ROM		(Andre Hedrick)
*	Add devexit_p() to the wdt_pci watchdog		(Adrian Bunk)
o	Fix lm_sensors compile				(Eyal Lebedinsky)
o	Remove some dead JFS oddments			(Christoph Hellwig)
*	SCSI generic update			(Doug Gilbert, Travers Carter)
o	VM86 exception fixups			(Kasper Dupont, Manfred Spraul)
*	Fix an fcntl error corner case to match SuS	(Christopher Yeoh)

Linux 2.4.19pre3-ac5
*	Further IDE updates				(Andre Hedrick)
*	Reduce ide tape debug noise			(Alfredo Sanjuán)
*	Sync devices on final close not each close	(Miquel van Smoorenburg)
*	Make max busses/irqs dynamic on x86		(James Cleverdon)
	| Needed for big IBM boxen
*	Remove exp_find in NFS (never used)		(Al Viro)
*	Fix read locking on NFS export_table		(Erik Habbinga)
*	Fix possible NFS error path mnt/dentry leak	(Al Viro)
*	Use MKDEV macro in NFS device create		(GOTO Masanori)
*	Clean up stale fh stats				(Neil Brown)
o	Tidy nfsd_lookup				(Al Viro)
o	nfsd_setattr fixes				(Neil Brown)
o	Tidy up nfsd vfs calls				(Neil Brown)
o	Clean up nfsd syscall interface			(Neil Brown)
o	Fix fat NFS handle interfaces			(Neil Brown)
o	Tidy up export list handling for NFS		(Al Viro)
o	Use seq_file for NFS exports proc file		(Al Viro)
o	Support for deviceless file system exports	(Steven Whitehouse)
o	Remove big kernel lock use for most of nfsd	(Neil Brown)
o	Convert sunrpc code to use generic linux lists	(Neil Brown)
o	Tidy up svc_sock NFS locking on SMP		(Neil Brown)
o	Improve tcp error/close handling		(Neil Brown)
o	Close down idle NFS tcp sockets			(Neil Brown)
o	NFS TCP fixes for buffer space tracking		(Neil Brown)
o	Handle TCP RPC service flooding			(Neil Brown)
o	Enable NFS over TCP via config options		(Neil Brown)

Linux 2.4.19pre3-ac4
o	Ensure jfs readdir doesn't spin on bad metadata	(Dave Kleikamp)
o	Fix iconfig with no modules			(Randy Dunlap)
*	Don't enfore rlimit on block device files	(Peter Hartley)
*	Add belkin wireless card idents			(Brendan McAdams)
*	Add HP VA7400 to the scsi blacklist quirks	(Alar Aun)
o	JFS race fix					(Dave Kleikamp)
*	Fix wafer5823 watchdog merge error I made	(Justin Cormack)
*	Fix Config rule for phonejack pcmcia card	(Eyal Lebedinsky)
o	Test improved OOM handler for rmap		(Rik van Riel)
*	Update defconfig/experimental bits		(Neils Jensen)
*	The incredible shrinking kernel patch		(Andrew Morton)
*	Clean up BUG() implementation			(Andrew Morton)

Linux 2.4.19pre3-ac3
*	Doh fixed the SYSVIPC build problem		(Everyone...)
o	Added 802.2LLC support			(Arnaldo Carvalho de Melo)
	| Based on 2.0 code contributed by Procom
*	Fix i2o build as module				(Mark Cooke)
*	Blacklist for machines where local apic fails	(Mikael Pettersson)
*	Clean up wdt_pci				(Zwane Mwaikambo)

Linux 2.4.19pre3-ac2
o	Hopefully fixed all the as accounting bugs	(me)
o	Bit more LS220 work (nothing useful yet)	(me)
o	Change should be long not int in shmem acct	(me)
o	Ignore MAP_NORESERVE in mode 2/3 accounting	(me)
*	Fix pci bar flag parsing			(Russell King)
*	Handle ELF setup_arg_pages failure		(Russell King)
*	AT1700 filter fix				(Sawa)
o	S/390 fix for O(1) scheduler			(Pete Zaitcev)
o	Fix /proc/kcore for non zero memory start	(Russell King)
*	Update USB config files				(Greg Kroah-Hartmann)
*	TCP minisocks fixes				(Dave Miller)
*	dnotify fixes					(Stephen Rothwell)
*	Remove pointles sysrq-L				(Russell King)
*	Reparent khubd to init				(Andrew Morton)
*	EEpro100 test updates				(Arjan van de Ven)
*	Use named initializers in hwc_con		(Pete Zaitcev)
*	SHM ipc fix					(Paul Larson)
*	Further printk level fixes			(Denis Vlasenko)
*	Revert epic100 changes - reports of problems	(me)
*	Wafer WDT watchdog driver			(Justin Cormack)
	| I did some cleanup - Justin please double check it
*	ITE8330G PIRQ map support			(Tobias Diedrich)
*	Trivial khttpd logging bug fix			(Rogier Wolff)
*	Stop module autoloader making user /proc/pid	(Andreas Ferber)
	dir root owned
*	Handle TF flag properly on debug trap		(Christoph Hellwig,
					Arjan van de Ven, Stephan Springl)
*	ALi M1701 watchdog driver			(Stve Hill)
	| I tidied/fixed this one too so please check
o	Add iconfig  (save/extract config from kernel	(Randy Dunlap)
	image file)
*	Add mk712 touchscreen driver			(Daniel Quinlan)
	| Fixed various bugs in it - Dan please check

Linux 2.4.19pre3-ac1
o	Merge with 2.4.19pre3
	-	Revert buggy bluesmoke change
	-	Add missing pppox header change
*	Next SIS ide update				(Lionel Bouton)
*	Only try the flush and recycle trick for 	(me)
	known buggy I2O controllers.
*	Clean up module junk and use new init style	(me)
	for I2O.
*	Don't use cache hints on dim i2o controllers	(me)
*	Add vmalloc_to_page to 2.4 from 2.5		(Gerd Knorr)
o	JFS updates			(Christoph Hellwig, Dave Kleikamp)
*	Fix boot_cpu_data corruption bug		(Mikael Pettersson)
*	Clean up ppp vfree paths			(David Woodhouse)
*	Emagic EMI usb driver				(Tapio Laxström)
*	Edgeport fixes for multiple device case	 	(Greg Kroah-Hartmann)	
*	Ethtool support for catc usb			(Brad Hards)
*	Update to pegasus driver in base tree		(Petko Manolov)
*	Update USB maintainers				(Greg Kroah-Hartmann)
*	IPAQ usb driver fixup				(Ganesh Varadarajan)
*	Allow usbfs name for 2.5 compatibility		(Greg Kroah-Hartmann)
o	Committed_AS without a space in procfs		(Andy Dustman)
*	Fix an NFS file creation problem		(Trond Myklebust)
*	Fix a missing ksym				(Greg Kroah-Hartmann)
*	Increase init delay on ALI5451 audio setup	(Harald Jenny)
	| Needed for Acer Travelmate 521TE
*	Fix printk message levels in pci code		(Denis Vlasenko)
*	Add another laptop to the buggy APM tables	(Mihnea-Costin Grigore)
*	Fix an obscure acct race			(Bob Miller)
*	Sonypi driver update				(Stelian Pop)
*	Fix devfs glitch with namespace stuff		(Paul Komkoff, Al Viro)

Linux 2.4.19pre2-ac4
*	Initial Ricoh ZVbus support			(Marcus Metzler)
o	PnPBIOS fixes					(Brian Gerst)
*	Fix a case where sync_one might not start an	(Ben LaHaise)
	inode writeout
*	Corrected atm locking fix			(Maksim Krasnyanskiy)
*	mp table parsing corner case fix		(James Cleverdon)
o	NFS over JFS directory offset fix		(Christoph Hellwig)
*	Update reisefsprogs version			(Paul Komkoff)
*	RME Hammerfall driver update			(Günter Geiger)
*	Fix an off by one in the bluesmoke reporting	(Dave Jones)
*	Make irnet disconnect hang up ppp		(Jean Tourrilhes)
*	Fix abuse of cli() in irda socket connect	(Jean Tourrilhes)
*	Add help text to patch-kernel script		(Damjan Lango)
*	USB irda updates				(Jean Tourrilhes)
*	IRDA link layer updates				(Jean Tourrilhes)
*	Add WD xd signature to 2.4 (from 2.2)		(Jim Freeman)
*	Update sc1200 watchdog				(Zwane Mwaikambo)
*	Switch wdt501 watchdog driver to bitops		(me)
*	Much updated LSI logic MPT fusion drivers	(Pam Delaney)
*	Wavelan driver updates				(Jean Tourrilhes)
*	Fix a race where we could hit init_idle after	(Kip Walker)
	freeing it (from rest_init)
*	Raylink driver bugfixes				(Jean Tourrilhes)
o	Switch 2.4 to using a shared zlib		(David Woodhouse)
*	Fix w83877 SMP deadlock, clean up locking	(me)
*	IBM lanstreamer update				(Kent Yoder)
*	Fix 32bitism in the PM code			(Pavel Machek)
*	Make irqsave use unsigned long for consistency	(Pavel Machek)
	| Just fixes a few exceptions
*	Make i2o_block fallback to blkpg for ioctls	(me)
*	All pids in use handling			(Paul Larson)
*	IDE code wasn't using ide_free_irq		(William Jhun)
*	Fix non procfs build				(Eric Sandeen)
*	Cyberjack bug fix				(Greg Kroah-Hartmann)
*	USB vicam fixes					(Oliver Neukum)
*	Add another device to the ftdi driver		(Greg Kroah-Hartmann)
*	UHCI performance fixes				(Johannes Erdfelt)
*	STV680 bug fixes				(Kevin Sisson)
*	Kaweth bug fixes				(Oliver Neukum)
*	Update hpusbscsi driver				(Oliver Neukum)
*	Update OV511 driver				(Mark McClelland)
*	Update usb-ipaq driver to support journada	(Ganesh Varadarajan)
*	Fix a bug in the USB skeleton driver		(Holger Waechtler)
*	Further SiS IDE updates				(Lionel Bouton)
*	Fix ufs mount failure bug			(Andries Brouwer)
*	Allow the max user frequency for the rtc to	(Mike Shaver)
	be configurable
*	HPT37x crash on init fixups			(Vojtech Pavlik)

Linux 2.4.19pre2-ac3
o	Fix quota deadlock and extreme load corruption	(Jan Kara, Chris Mason)
*	MIPS config fix					(Ralf Baechle)
*	Update AGP config entry				(Daniele Venzano)
*	SMBfs NLS oops fix				(Urban Widmark)
*	Fix expand_stack locking hang on OOM		(Kevin Buhr)
*	Restore 10Mbit half duplex eepro100 fix		(me)
*	3c509 full duplex and documentation		(David Ruggiero)
*	3c509 power management				(Zwane Mwaikambo)
*	Remove more surplus llseek methods		(Robert Love)
X	ATM locking fix					(Frode Isaksen)
*	Merge extra sound help texts			(Steven Cole)
	| plus one typo fix
*	Add help for IXJ pcmcia configuration		(Steven Cole, me)
	| Rewrote the text somewhat

Linux 2.4.19pre2-ac2
-	Fix a mismerge (may explain the patch weirdo)
*	Fix highmem + sblive				(Daniel Bertrand)
*	Reiserfs updates				(Oleg Drokin)
*	Auto enable HT on HT capable systems		(Arjan van de Ven)
-	Fix init/do_mounts O(1) scheduler merge glitch	(Greg Louis)
o	Fix drm build problem on CPU=386		(Mark Cooke)
*	Fix incorrect sleep in ZR36067 driver		(me)
*	Add missing cpu_relax to iph5526 driver		(me)

Linux 2.4.19pre2-ac1
*	Merge aic7xxx update				(Justin Gibbs)
*	Fix handling of scsi 'medium error: recovered'	(Justin Gibbs)
*	Further request region fixups			(Marcus Alanen)
*	Add interlace/doublescan to voodoo1/2 fb driver	(Urs Ganse)
	| interlace is always handy with 3d glasses..
o	Merge O(1) scheduler				(Ingo Molnar)
	| Thanks to Martin Knoblauch for doing the merge work
	| Non x86 ports may need to clean up their mm/fault.c
*	Lseek usage cleanup				(Robert Love)
o	Merge with 2.4.19pre2
	-	Fixed bogus sysctl definitions
	-	Fixed incorrect MODULE_LICENSE backout
	-	Fixed gratuitous supercede spelling change
	-	Fixed double patches from mips people
	-	Fixed incorrect link order from mips people
	-	Fixed broken config rules from mips people
	-	Made cciss build
	-	Remove half written "meth.c" driver
*	Fix up some of the watchdog api text		(me)
	| Janitor job - go through that and make all the drivers
	| support all the things ('V' NOWAYOUT and ioctl core)
*	Fix wrong order in MAINTAINERS			(me)
*	Remove roadrunner reference from MAINTAINERS	(me)

Linux 2.4.19pre1-ac2
*	Fix chown/chmod on shmemfs			(me)
*	Fix accounting error in the shm code		(me)
o	Turn on mode2/mode3 overcommit protection	(me)
*	w83877f watchdog fix compile for SMP		(Mark Cooke)
*	Fix ide=nodma for serverworks			(Ken Brownfield)
*	USB2 controller support				(Greg Kroah-Hartmann)
*	Add more devices to the visor driver (m515,clie)(Greg Kroah-Hartmann)
*	IBM USB camera driver updates			(Greg Kroah-Hartmann)
*	USB auerswald driver				(Wolfgang Muees)
*	Trivial random match up with 2.2		(Marco Colombo)
*	Spelling fixes					(Jim Freeman)
*	Next batch of time_*() fixups			(Tim Schmielau)
*	Update video4linux API docs			(Gerd Knorr)
*	Merge some comment fixups			(John Kim)
*	ymfpci sync					(Pete Zaitcev)
*	Update maintainers to add pm3fb			(Romain DOLBEAU)
*	Hotplug updates (docs, fs, compaq driver)	(Greg Kroah-Hartmann)
*	IBM hotplug support	(Irene Zubarev, Tong Yu, Jyoti Shah, Chuck Cole)
*	ACPI hotplug driver support		(Hiroshi Aono, Takayoshi Kochi)
*	Blink keyboard lights on x86 panic		(Andi Kleen)
*	Further Configure.help changes			(Steven Cole)
o	Merge a version of the sard I/O accounting	(Stephen Tweedie,
							 Christoph Hellwig)
*	SC1200 watchdog driver				(Zwane Mwaikambo)
*	Fix address ordering for 36bit MCE on x86	(Dave Jones)

Linux 2.4.19pre1-ac1
o	Merge with 2.4.19-pre1

Linux 2.4.18-ac1
o	Merge with 2.4.18 proper
o	Add missing -rc4 diff
o	Use attribute notifiers to account shmemfs	(me)
o	Initial luxsonor LS220/LS240 driver code	(me)
	| This is just setup code and only in the tree because
	| its where I keep my hacks in progress

Linux 2.4.18rc2-ac2
o	Fix a corruption problem in the jfs dir table	(Dave Kleikamp)
o	Fix trap when extending a single extent of	(Dave Kleikamp)
	over 64Gb in JFS
*	NBD deadlock fix				(Steven Whitehouse)
*	Fix device ref counting in netrom stack		(Tomi Manninen)
*	Fix shmemfs link counting			(Christoph Rohland)
*	Fix potential scsi disk oops			(Peter Wong)
*	eepro100 carrier init fix			(Jeff Garzik)
*	Fix wrong kfree in netrom stack			(Tomi Manninen)
*	Add TI1250 inits to ZV bus support		(me)
	| Zoom video now works on the IBM TP600 at least..
*	Fix off by one on loop devices limit		(Heinz Mauelshagen)
X	Improve handling of psaux open with no mouse	(Christoph Hellwig)
	present
*	3COM 3c359 token ring driver			(Mike Phillips)
*	Fix a case where hpfs didnt set block size	(Chris Mason)
	early enough
*	Remove use of lock_kernel in softdog driver	(me)
*	Make olympic driver use spinlocks not 		(Mike Phillips)
	lock_kernel
+	Fix type of detected devices in md.c		(Jakob Kemi)
*	Changes and defconfig update			(Niels Jensen)
o	PNP BIOS driver updates				(Thomas Hood)
*	Turn off excess printks in pnp quirk reporting	(Andrey Panin)
*	Add documentation for ITE I2C			(Steven Cole)
*	Add documentation for other zoran cards		(Steven Cole)
*	Add an SC520 watchdog, and enable wd8387ff 	(Scott Jennings)
*	Cleaned up and fixed some SC520 watchdog bugs	(me)
	| Scott - can you double check these
*	Fix return on generic lib/string.c memcmp	(Georg Nikodym)
*	Further zoom video cleanups			(me)

Linux 2.4.18rc2-ac1
o	Merge with 2.4.18rc2
*	Ignore i810 modem codecs			(me)
o	Core of address space accounting code		(me)
	| Enforcement, ptrace and some shmem corner bits to do
*	Fix security hole in shmfs			(me)
o	Fix various bits of 64bit file I/O in shmem	(me)
o	Merge with rmap12f				(Rik van Riel and co)

Linux 2.4.18pre9-ac4
*	SIS IDE driver update (handle with care)	(Lionel Bouton)
*	First set of I2O endian cleanups		(me)
*	Make i2o_pci.c 64bit/BE clean			(me)
*	Maybe fix crash on i2o scsi abort/reset paths	(me)
*	Make i2o use the passed scsi direction flag	(me)
*	Fix awk failure path in menuconfig		(Andrew Church)
*	Merge varies doc updates			(Steven Cole)
*	Add serial support for the Lava Octopus-550	(Jim Treadway)
*	OPL3SA2 cleanup					(Zwane Mwaikambo)
o	Add missing blkdev_varyio export		(Todd Roy)
*	Update Changes file, config and experimental	(Niels Jensen)
	checks
*	Fix highmem warning in aacraid			(Andrew Morton)
*	Make tpqic02 use new style request region	(Marcus Alanen)
*	Only turn off mediagx/geode TSC on 5510/5520	(me)
	| From information provided by Hiroshi MIURA
*	Massively clean up the AGP enable and bugfix it	(Bjorn Helgaas)
*	Fix oops if you try to use the RW wq locks	(Bob Miller)
*	Remove FPU usage in neomagic fb			(Denis Kropp)
o	Merge IBM JFS			(Steve Best, Dave Kleikamp, 
					 Barry Arndt, Christoph Hellwig, ..)
*	Updated sis frame buffer driver			(Thomas Winischhofer)

Linux 2.4.18pre9-ac3
*	Clean up various macros and misuse of ;		(Timothy Ball)
*	Correct procfs locking fixup			(Al Viro)
o	Speed up ext2/ext3 synchronous mounts		(Andrew Morton)
*	Update IDE DMA blacklist			(Jonathan Kamens)
o	Update to XFree86 DRM 4.2 (compatible to 4.1)	(Rik Faith, 
	and adds I830 DRM				 Jeff Hartmann,
							 Keith Whitwell,
							 Abraham vd Merwe
							 and others)
*	IBM Lanstreamer updates				(Mike Phillips)
*	Fix acct rlimit problem (I hope)		(me)
	| Problem noted by Ian Allen
o	Automatically set file limits based on mem size	(Andi Kleen)
*	Correct scsi reservation conflict handling	(James Bottomley)
	and add the scsi reset api code
o	Add further kernel docs				(me)
o	Merge to rmap-12e				(Rik van Riel and co)
	|merge patch from Nick Orlov
*	Small fix to the eata driver update		(Dario Ballabio)


Linux 2.4.18pre9-ac2
*	Nat Semi now use their own ident on the Geode	(Hiroshi Miura)
*	Put #error in two files that need FPU fixups	(me)
*	Correct a specific mmap return to match posix	(Christopher Yeoh)
*	Add Eepro100/VE ident				(Hanno Boeck)
*	Add provides for DRM to the kernel make rpm	(Alexander Hoogerhuis)
*	Fix a problem where vm86 irq releasing could be	(Stas Sergeev)
	missed
*	EATA and U14/34F driver updates			(Dario Ballabio)
*	Handle EMC storage arrays that report SCSI-2 	(Kurt Garloff)
	but want REPORT_LUNs
*	Update README, defconfig, remove autogen files	(Niels Jensen)
*	Add AFAVLAB PCI serial support			(Harald Welte)
*	Fix incorrect resource free in eexpress		(Gianluca Anzolin)
o	Variable size rawio optimisations		(Badari Pulavarty)
*	Add AT's compatible 8139 cardbus chip		(Go Taniguchi)
*	Fix crash with newest hpt ide chips		(Arjan van de Ven)
*	Fix tiny SMP race in pid selection		(Erik Hendriks)
o	Hopefully fix pnpbios crash caused by early	(me)
	kernel_thread creation

Linux 2.4.18pre9-ac1
o	Initial merge of DVD card driver  (Christian Wolff,Marcus Metzler)
	| This is just an initial testing piece. DVB needs merging
	| properly and this is only a first bit of testing
*	Random number generator support for AMD768	(me)
*	Add AMD768 to i810 driver pci ident list	(me)
o	Initial AMD768 power management work		(me)
	| Unfinished pending some docs clarifications
*	Fix bugbuf mishandling for modular es1370	(me)
*	Fix up i2o readl abuse, post_wait race, and	(me, Arjan van de Ven)
	some deadlock cases
*	Added cpu_relax to yam driver 			(me)
*	Fixup AMD762 if the BIOS apparently got it wrong(me)
	(eg ASUS boards)
*	MP1.4 alignment fixup
*	pcwd cleanup, backport of fixes from 2.5	(Rob Radez)
*	Add support for more Moxa cards to mxser	(Damian Wrobel)
*	Add remaining missing MODULE_LICENSE tags	(Hubert Mantel)
*	Fix floppy reservation ranges			(Anton Altaparmakov)
*	Fix max file size setup				(Andi Kleen)

Linux 2.4.18pre7-ac3
*	Fix a wrong error return in the megaraid driver	(Arjan van de Ven)
*	FreeVXFS update					(Christoph Hellwig)
*	Qnxfs update					(Anders Larsen)
o	Fix non compile with PCI=n			(Adrian Bunk)
-	Fix DRM 4.0 non compile in i810			(me)
*	Drop out now dead CLONE thread/parent fixup	(Dave McCracken)
*	Make NetROM incoming frame check stricter	(Tomi Manninen)
*	Use sock_orphan in AX.25/NetROM			(Jeroen PE1RXQ)
*	Pegasus update					(Petko Manolov)
o	Make reparent_to_init and exec_usermodehelper	(Andrew Morton)
	use set_user, fix a tiny set_user SMP race
*	Mark framebuffer mappings VM_IO			(Andrew Morton)
*	Neomagic frame buffer driver			(Denis Kropp)
	- Needs FPU code fixing before it can be merged
*	Hyperthreading awareness for MTRR driver
*	Correct NR_IRQ with no apic support		(Brian Gerst)
*	Fix missing includes in sound drivers		(Michal Jaegermann)

Linux 2.4.18pre7-ac2
*	i810 audio driver update			(Doug Ledford)
*	Early ioremap for x86 specific code		(Mikael Pettersson)
	| This is needed to do things like apic/dmi detect early enough
*	Pentium IV APIC/NMI watchdog			(Mikael Pettersson)
*	Add C1MRX support to sonypi driver		(Junichi Morita)
*	Fix "make rpm" with two '-' in extraversion	(Gerald Britton)
*	Fix aacraid hang/irq storm on i960 boards	(Chris Pascoe)
*	Fix isdn audio compiler behaviour dependancy	(Urs Thuermann)
*	YAM driver fixes				(Jean-Paul Roubelat)
*	ROSE protocol stack update/fixes		(Jean-Paul Roubelat)
*	Fix UFS/CDROM oops				(Zwane Mwaikambo)
*	Fix nm256 hang on Dell Latitude			(origin unknown)
	| Please test this tree with other NM256 based boxes and check
	| those still work...
o	Merge PnPBIOS patch		(Thomas Hood, David Hinds, Tom Lees,
					 Christian Schmidt, ..)
*	Merge new sis frame buffer drivers		(Thomas Winischhofer)
*	cs46xx oops fix					(Mike Gorse)
*	Fix a second cs46xx bug related to this		(me)
*	Fix acpitable oopses on boot and other problems	(James Cleverdon)
*	Fix io port type on the hpt366 driver		(Pete Popov)
*	Updated matrox drivers				(Petr Vandrovec)
*	IPchains fixes needed for 2.4.18pre7
*	IDE config text updates for the IDE patches	(Anton Altaparmakov)
*	Merge the first bits of ZV support		(Marcus Metzler)
*	Add initial ZV support to yenta socket driver	(me)
	for TI cards
*	Fix pirq routing on the CS5530 			(me)
	| Finally the palmax pcmcia/cardbus works properly

Linux 2.4.18pre7-ac1
o	Merge with 2.4.18pre7				(Arjan van de Ven)
	| + some quota fixups redone by me
	| several 18pre7 netfilter bugs left unfixed for now
o	Rmap-12a					(Rik van Riel and co)

Linux 2.4.18pre3-ac2

*	Re-merge the IDE patches			(Andre Hedrick and co)
*	Fix check/request region in ali_ircc and lowcomx(Steven Walter)
	com90xx, sealevel, sb1000
*	Remove unused message from 6pack driver		(Adrian Bunk)
*	Fix unused variable warning in i60scsi		(Adrian Bunk)
*	Fix off by one floppy oops			(Keith Owens)
*	Fix i2o_config use of undefined C		(Andreas Dilger)
*	Fix fdomain scsi oopses				(Per Larsson)
*	Fix sf16fmi hang on boot			(me)
+	Add bridge resources to the resource tree	(Ivan Kokshaysky)
*	Fix iphase ATM oops on close in on case	   (Till Immanuel Patzschke)
*	Enable OOSTORE on winchip processors		(Dave Jones, me)
	| Worth about 10-20% performance 
*	Code Page 1250 support				(Petr Titera)
*	Fix sdla and hpfs doc typos			(Sven Vermeulen)
o	Document /proc/stat				(Sven Heinicke)
*	Update cs4281 drivers				(Tom Woller)
	| Fixes xmms stutter, remove wrapper code
	| handle tosh boxes, allow record device change
	| trigger wakeups on ioctl triggered changes
+/o/X	Fix locking of file struct stuff found by ibm	(Dipankar Sarma)
	audit
o	Use spin_lock_init in serial.c			(Dave Miller)
*	Fix AF_UNIX shutdown bug			(Dave Miller)

Linux 2.4.18pre3-ac1

o	32bit uid quota
o	rmap-11b VM					(Rik van Riel,
							 William Irwin etc)
*	Make scsi printer visible			(Stefan Wieseckel)
*	Report Hercules Fortissimo card			(Minya Sorakinu)
*	Fix O_NDELAY close mishandling on the following	(me)
	sound cards: cmpci, cs46xx, es1370, es1371,
	esssolo1, sonicvibes
*	tdfx pixclock handling fix			(Jurriaan)
*	Fix mishandling of file system size limiting	(Andrea Arcangeli)
*	generic_serial cleanups				(Rasmus Andersen)
o	serial.c locking fixes for SMP - move from cli	(Kees)
	too
*	Truncate fixes from old -ac tree		(Andrew Morton)
*	Hopefully fix the i2o oops			(me)
	| Not the right fix but it'll do till I rewrite this
*	Fix non blocking tty blocking bug		(Peter Benie)
o	IRQ routing workaround for problem HP laptops	(Cory Bell)
*	Fix the rcpci driver				(Pete Popov)
*	Fix documentation of aedsp location		(Adrian Bunk)
*	Fix the worst of the APM ate my cpu problems	(Andreas Steinmetz)
*	Correct icmp documentation			(Pierre Lombard)
*	Multiple mxser crash on boot fix	(Stephan von Krawczynski)
o	ldm header fix					(Anton Altaparmakov)
*	Fix unchecked kmalloc in i2c_proc	(Ragnar Hojland Espinosa)
*	Fix unchecked kmalloc in airo_cs	(Ragnar Hojland Espinosa)
*	Fix unchecked kmalloc in btaudio	(Ragnar Hojland Espinosa)
*	Fix unchecked kmalloc in qnx4/inode.c	(Ragnar Hojland Espinosa)
*	Disable DRM4.1 GMX2000 driver (4.0 required)	(me)
*	Fix sb16 lower speed limit bug			(Jori Liesenborgs)
*	Fix compilation of orinoco driver		(Ben Herrenschmidt)
*	ISAPnP init fix					(Chris Rankin)
o	Export release_console_sem			(Andrew Morton)
*	Output nat crash fix				(Rusty Russell)
*	Fix PLIP					(Niels Jensen)
*	Natsemi driver hang fix				(Manfred Spraul)
*	Add mono/stereo reporting to gemtek pci radio	(Jonathan Hudson)


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-05 22:40 Linux 2.4.20-pre1 Marcelo Tosatti
                   ` (2 preceding siblings ...)
  2002-08-06 21:05 ` Adrian Bunk
@ 2002-08-07  0:21 ` J.A. Magallon
  2002-08-07  1:08 ` J.A. Magallon
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 39+ messages in thread
From: J.A. Magallon @ 2002-08-07  0:21 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: lkml

[-- Attachment #1: Type: text/plain, Size: 662 bytes --]


On 2002.08.06 Marcelo Tosatti wrote:
>
>So here goes -pre1, with a big -ac and x86-64 merges, plus other smaller
>stuff.
>
>
><jgarzik@mandrakesoft.com> (02/08/03 1.596.3.6)
>	Add Intel e100 net driver.
>
><jgarzik@mandrakesoft.com> (02/08/03 1.596.3.7)
>	Add e1000 gige net driver.
>

Configure.help missing for those. Attached.

btw, I don't like this also, but is the official one...

-- 
J.A. Magallon             \   Software is like sex: It's better when it's free
mailto:jamagallon@able.es  \                    -- Linus Torvalds, FSF T-shirt
Linux werewolf 2.4.19-jam0, Mandrake Linux 9.0 (Cooker) for i586
gcc (GCC) 3.2 (Mandrake Linux 9.0 3.2-0.2mdk)

[-- Attachment #2: intel-eth-help.diff.gz --]
[-- Type: application/x-gzip, Size: 1475 bytes --]

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-05 22:40 Linux 2.4.20-pre1 Marcelo Tosatti
                   ` (3 preceding siblings ...)
  2002-08-07  0:21 ` J.A. Magallon
@ 2002-08-07  1:08 ` J.A. Magallon
  2002-08-07  1:56 ` Bryan Whitehead
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 39+ messages in thread
From: J.A. Magallon @ 2002-08-07  1:08 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: lkml


On 2002.08.06 Marcelo Tosatti wrote:
>
>So here goes -pre1, with a big -ac and x86-64 merges, plus other smaller
>stuff.
>

Something is missing in the network merge:

werewolf:/usr/src/linux# grep -r netif_receive_skb *
drivers/net/tg3.c:                      netif_receive_skb(skb);
Binary file drivers/net/e1000/e1000_main.o matches
Binary file drivers/net/e1000/e1000.o matches
include/linux/if_vlan.h:        //return (polling ? netif_receive_skb(skb) : netif_rx(skb));

So I had to:

--- linux/include/linux/if_vlan.h.orig	2002-08-07 02:57:36.000000000 +0200
+++ linux/include/linux/if_vlan.h	2002-08-07 02:58:07.000000000 +0200
@@ -183,7 +183,8 @@
 		break;
 	};
 
-	return (polling ? netif_receive_skb(skb) : netif_rx(skb));
+	//return (polling ? netif_receive_skb(skb) : netif_rx(skb));
+	return netif_rx(skb);
 }
 
 static inline int vlan_hwaccel_rx(struct sk_buff *skb,

To make e1000 build. But tg3 uses n_r_skb directly, so it is not useful for
that.

-- 
J.A. Magallon             \   Software is like sex: It's better when it's free
mailto:jamagallon@able.es  \                    -- Linus Torvalds, FSF T-shirt
Linux werewolf 2.4.19-jam0, Mandrake Linux 9.0 (Cooker) for i586
gcc (GCC) 3.2 (Mandrake Linux 9.0 3.2-0.2mdk)

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-05 22:40 Linux 2.4.20-pre1 Marcelo Tosatti
                   ` (4 preceding siblings ...)
  2002-08-07  1:08 ` J.A. Magallon
@ 2002-08-07  1:56 ` Bryan Whitehead
  2002-08-07  3:35   ` Tim Hockin
  2002-08-11  8:57 ` Erik Andersen
                   ` (3 subsequent siblings)
  9 siblings, 1 reply; 39+ messages in thread
From: Bryan Whitehead @ 2002-08-07  1:56 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: lkml, thockin

[-- Attachment #1: Type: text/plain, Size: 435 bytes --]

Marcelo Tosatti wrote:
> So here goes -pre1, with a big -ac and x86-64 merges, plus other smaller
> stuff.
> 
> 2.4.20 will be a much faster release cycle than 2.4.19 was.
> 
> 

This didn't make 2.4.19. Just a spelling error. I tried the maintainer 
but got no reply...

(yea yea... i just like clean logs... ) :)

;)

-- 
Bryan Whitehead
SysAdmin - JPL - Interferometry Systems and Technology
Phone: 818 354 2903
driver@jpl.nasa.gov

[-- Attachment #2: natsemi.patch --]
[-- Type: text/plain, Size: 400 bytes --]

--- linux/drivers/net/natsemi.c.orig	Tue Aug  6 18:50:13 2002
+++ linux/drivers/net/natsemi.c	Tue Aug  6 18:50:38 2002
@@ -1685,7 +1685,7 @@
 			np->tx_config += 2;
 		if (netif_msg_tx_err(np))
 			printk(KERN_NOTICE 
-				"%s: increased Tx theshold, txcfg %#08x.\n",
+				"%s: increased Tx threshold, txcfg %#08x.\n",
 				dev->name, np->tx_config);
 		writel(np->tx_config, ioaddr + TxConfig);
 	}

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-07  1:56 ` Bryan Whitehead
@ 2002-08-07  3:35   ` Tim Hockin
  0 siblings, 0 replies; 39+ messages in thread
From: Tim Hockin @ 2002-08-07  3:35 UTC (permalink / raw)
  To: Bryan Whitehead; +Cc: Marcelo Tosatti, lkml, thockin

> This didn't make 2.4.19. Just a spelling error. I tried the maintainer 
> but got no reply...
> 
> (yea yea... i just like clean logs... ) :)
> 
> ;)

ok, ok, It's going into my bk tree...sheesh :)

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
       [not found] <200208062329.g76NTqP30962@devserv.devel.redhat.com.suse.lists.linux.kernel>
@ 2002-08-07 10:01 ` Andi Kleen
  2002-08-07 11:50   ` Alan Cox
  0 siblings, 1 reply; 39+ messages in thread
From: Andi Kleen @ 2002-08-07 10:01 UTC (permalink / raw)
  To: Alan Cox; +Cc: linux-kernel

Alan Cox <alan@redhat.com> writes:

> 	- Remove mess where x86_64 sticks its arse in all sorts of
> 	  config files and makes a mess of it. Other ports done because
> 	  the result sucks, x86_64 shouldnt either

Can you explain this further. How else do you propose to get rid of 
unmaintained-and-absolutely-hopeless-on-64bit drivers in the configuration? 
I definitely do not want to get bug reports about these not working on x86-64.

If you think CONFIG_X86_64 is too ugly, perhaps an generic CONFIG_64BIT would 
be preferable for you? I personally would prefer CONFIG_UNMAINTAINED_AND_BROKEN and telling users they are on their own when they enable it, but that is 
probably just me.

> 	- Drop utterly bogus change todrivers/sound/Config.in

Given that one was bogus. Must have been a merge mistake on my part.

-Andi


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-06 21:05 ` Adrian Bunk
@ 2002-08-07 11:09   ` David S. Miller
  0 siblings, 0 replies; 39+ messages in thread
From: David S. Miller @ 2002-08-07 11:09 UTC (permalink / raw)
  To: bunk; +Cc: marcelo, linux-kernel

   Date: Tue, 6 Aug 2002 23:05:44 +0200 (CEST)
   From: Adrian Bunk <bunk@fs.tum.de>

   The changes to drivers/net/tg3.c in -pre1 broke the compilation:
 ...
   /home/bunk/linux/kernel-2.4/linux-2.4.19-full/include/linux/if_vlan.h:186:
   warning: implicit declaration of function `netif_receive_skb'
   tg3.c: In function `tg3_poll':

Because Marcelo took the tg3 NAPI changes but not the NAPI
infrastructure. :-)

I'm hoping since he's decided to take the generic NAPI changes
this compile failure will go away in -pre2

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-07 10:01 ` Andi Kleen
@ 2002-08-07 11:50   ` Alan Cox
  0 siblings, 0 replies; 39+ messages in thread
From: Alan Cox @ 2002-08-07 11:50 UTC (permalink / raw)
  To: Andi Kleen; +Cc: Alan Cox, linux-kernel

On Wed, 2002-08-07 at 11:01, Andi Kleen wrote:
> Can you explain this further. How else do you propose to get rid of 
> unmaintained-and-absolutely-hopeless-on-64bit drivers in the configuration? 
> I definitely do not want to get bug reports about these not working on x86-64.

I don't want a tree where every driver has seventeen lines of if IBM and
not 64bit || parisc || x86 || !x86_64 || ia64) && (!wednesdayafternoon)

Its *unmaintainable*.

The sparc64 people don't do it, the mips people don't do it, the ia64
people don't do it, wtf should you get to fill config.in with crap

The _ISA stuff makes sense, thats sensible, but the rest - when people
moan we tell em to fix the drivers.


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: NAPI (was Re: Linux 2.4.20-pre1)
  2002-08-06 17:12     ` NAPI (was Re: Linux 2.4.20-pre1) Jeff Garzik
@ 2002-08-07 14:09       ` Marcus Sundberg
  0 siblings, 0 replies; 39+ messages in thread
From: Marcus Sundberg @ 2002-08-07 14:09 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: lkml

Jeff Garzik <jgarzik@mandrakesoft.com> writes:

> I also have a patch for sundance which fixes the issue with
> the quad port

Which issue are you referring to?
The DFE-580-doesn't-work-without-USE_IO_OPS-defined, or the
drops-packets-even-under-moderate-load? If the latter I would
be very interrested in testing that code.

//Marcus
-- 
---------------------------------------+--------------------------
  Marcus Sundberg <marcus@ingate.com>  | Firewalls with SIP & NAT
 Firewall Developer, Ingate Systems AB |  http://www.ingate.com/

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-05 22:40 Linux 2.4.20-pre1 Marcelo Tosatti
                   ` (5 preceding siblings ...)
  2002-08-07  1:56 ` Bryan Whitehead
@ 2002-08-11  8:57 ` Erik Andersen
  2002-08-11  9:16   ` Christoph Hellwig
  2002-08-11 19:46   ` Alan Cox
  2002-08-11 10:56 ` Erik Andersen
                   ` (2 subsequent siblings)
  9 siblings, 2 replies; 39+ messages in thread
From: Erik Andersen @ 2002-08-11  8:57 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: lkml

On Mon Aug 05, 2002 at 07:40:56PM -0300, Marcelo Tosatti wrote:
> 
> So here goes -pre1, with a big -ac and x86-64 merges, plus other smaller
> stuff.
[------------snip------------]
> <alan@irongate.swansea.linux.org.uk> (02/08/05 1.629)
> 	[PATCH] PATCH: Add EFI partition support

Needs this to compile....

--- linux/include/asm-ia64/efi.h.orig	Sun Aug 11 01:41:10 2002
+++ linux/include/asm-ia64/efi.h	Sun Aug 11 01:43:38 2002
@@ -166,6 +166,9 @@
  *  EFI Configuration Table and GUID definitions
  */
 
+#define NULL_GUID    \
+    ((efi_guid_t) { 0x00000000, 0x0000, 0x0000, { 0x00, 0x00, 0x0, 0x00, 0x00, 0x00, 0x00, 0x00 }})
+
 #define MPS_TABLE_GUID    \
     ((efi_guid_t) { 0xeb9d2d2f, 0x2d88, 0x11d3, { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }})
 

> <rusty@rustcorp.com.au> (02/08/02 1.582.2.91)
> 	[PATCH] namespace.c - compiler warning

This patch is wrong....

--- linux/fs/namespace.c.orig	Sun Aug 11 01:50:52 2002
+++ linux/fs/namespace.c	Sun Aug 11 01:51:04 2002
@@ -29,8 +29,6 @@
 static int hash_mask, hash_bits;
 static kmem_cache_t *mnt_cache; 
 
-extern void init_rootfs(void);
-
 static inline unsigned long hash(struct vfsmount *mnt, struct dentry *dentry)
 {
 	unsigned long tmp = ((unsigned long) mnt / L1_CACHE_BYTES);
--- linux/include/linux/namespace.h.orig	Sat Aug  3 17:14:31 2002
+++ linux/include/linux/namespace.h	Sat Aug  3 18:46:43 2002
@@ -38,5 +38,6 @@
 	atomic_inc(&namespace->count);
 }
 
+int __init init_rootfs(void);
 #endif
 #endif


 -Erik

--
Erik B. Andersen             http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-11  8:57 ` Erik Andersen
@ 2002-08-11  9:16   ` Christoph Hellwig
  2002-08-11  9:40     ` Erik Andersen
  2002-08-11  9:46     ` Erik Andersen
  2002-08-11 19:46   ` Alan Cox
  1 sibling, 2 replies; 39+ messages in thread
From: Christoph Hellwig @ 2002-08-11  9:16 UTC (permalink / raw)
  To: Erik Andersen, Marcelo Tosatti, lkml

On Sun, Aug 11, 2002 at 02:57:17AM -0600, Erik Andersen wrote:
> > 	[PATCH] namespace.c - compiler warning
> 
> This patch is wrong....

Why?


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-11  9:16   ` Christoph Hellwig
@ 2002-08-11  9:40     ` Erik Andersen
  2002-08-11  9:46     ` Erik Andersen
  1 sibling, 0 replies; 39+ messages in thread
From: Erik Andersen @ 2002-08-11  9:40 UTC (permalink / raw)
  To: Christoph Hellwig, Marcelo Tosatti, lkml

On Sun Aug 11, 2002 at 10:16:17AM +0100, Christoph Hellwig wrote:
> On Sun, Aug 11, 2002 at 02:57:17AM -0600, Erik Andersen wrote:
> > > 	[PATCH] namespace.c - compiler warning
> > 
> > This patch is wrong....
> 
> Why?

Because it adds function prototype that doesn't match the
actual function....  

 -Erik

--
Erik B. Andersen             http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-11  9:16   ` Christoph Hellwig
  2002-08-11  9:40     ` Erik Andersen
@ 2002-08-11  9:46     ` Erik Andersen
  1 sibling, 0 replies; 39+ messages in thread
From: Erik Andersen @ 2002-08-11  9:46 UTC (permalink / raw)
  To: Christoph Hellwig, Marcelo Tosatti, lkml

On Sun Aug 11, 2002 at 10:16:17AM +0100, Christoph Hellwig wrote:
> On Sun, Aug 11, 2002 at 02:57:17AM -0600, Erik Andersen wrote:
> > > 	[PATCH] namespace.c - compiler warning
> > 
> > This patch is wrong....
> 
> Why?

I guess it would be more clear if I had said that namespace.c
in 2.4.20-pre1 was broken my the above mentioned patch, and
my patch fixes the problem...

 -Erik

--
Erik B. Andersen             http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-05 22:40 Linux 2.4.20-pre1 Marcelo Tosatti
                   ` (6 preceding siblings ...)
  2002-08-11  8:57 ` Erik Andersen
@ 2002-08-11 10:56 ` Erik Andersen
  2002-08-11 21:22 ` [PATCH] radeonfb update vs 2.4.20-pre1 Erik Andersen
  2002-08-17 19:51 ` Linux 2.4.20-pre1 Adrian Bunk
  9 siblings, 0 replies; 39+ messages in thread
From: Erik Andersen @ 2002-08-11 10:56 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: lkml

On Mon Aug 05, 2002 at 07:40:56PM -0300, Marcelo Tosatti wrote:
> <achirica@ttd.net> (02/05/31 1.445.1.13)
> 	airo wireless net driver update:

Doesn't this make more sense?

--- linux/drivers/net/wireless/airo.c.orig	Sun Aug 11 03:59:28 2002
+++ linux/drivers/net/wireless/airo.c	Sun Aug 11 03:59:46 2002
@@ -191,12 +191,6 @@
 #ifndef RUN_AT
 #define RUN_AT(x) (jiffies+(x))
 #endif
-#ifndef PDE
-static inline struct proc_dir_entry *PDE(const struct inode *inode)
-{
-	return inode->u.generic_ip;
-}
-#endif
 
 
 /* These variables are for insmod, since it seems that the rates

diff -urN linux-2.4.19.orig/include/linux/proc_fs.h linux-2.4.19/include/linux/proc_fs.h
--- linux-2.4.19.orig/include/linux/proc_fs.h	Fri Aug  2 18:39:45 2002
+++ linux-2.4.19/include/linux/proc_fs.h	Sun Aug 11 00:23:55 2002
@@ -209,4 +209,9 @@
 
 #endif /* CONFIG_PROC_FS */
 
+static inline struct proc_dir_entry *PDE(const struct inode *inode)
+{
+	return (struct proc_dir_entry *)inode->u.generic_ip;
+}
+

 -Erik

--
Erik B. Andersen             http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-11 19:46   ` Alan Cox
@ 2002-08-11 18:49     ` Erik Andersen
  2002-08-12 19:29     ` Paul P Komkoff Jr
  1 sibling, 0 replies; 39+ messages in thread
From: Erik Andersen @ 2002-08-11 18:49 UTC (permalink / raw)
  To: Alan Cox; +Cc: Marcelo Tosatti, lkml

On Sun Aug 11, 2002 at 08:46:19PM +0100, Alan Cox wrote:
> On Sun, 2002-08-11 at 09:57, Erik Andersen wrote:
> > On Mon Aug 05, 2002 at 07:40:56PM -0300, Marcelo Tosatti wrote:
> > > 
> > > So here goes -pre1, with a big -ac and x86-64 merges, plus other smaller
> > > stuff.
> > [------------snip------------]
> > > <alan@irongate.swansea.linux.org.uk> (02/08/05 1.629)
> > > 	[PATCH] PATCH: Add EFI partition support
> > 
> > Needs this to compile....
> > 
> > --- linux/include/asm-ia64/efi.h.orig	Sun Aug 11 01:41:10 2002
> > +++ linux/include/asm-ia64/efi.h	Sun Aug 11 01:43:38 2002
> > @@ -166,6 +166,9 @@
> >   *  EFI Configuration Table and GUID definitions
> >   */
> >  
> > +#define NULL_GUID    \
> > +    ((efi_guid_t) { 0x00000000, 0x0000, 0x0000, { 0x00, 0x00, 0x0, 0x00, 0x00, 0x00, 0x00, 0x00 }})
> > +
> 
> Not a good plan. EFI can be used on non ia64 so NULL_GUID belongs
> somewhere else


I know.  But if you look at the source, the generic stuff is
directly including asm-ia64/efi.h, so this makes it compile.  I
agree having the generic stuff include asm-ia64 code is really
stupid, but changing that seemed far more invasive and frankly, I
don't even know what an "EFI" is, so I didn't want to mess with
it beyond making it compile per how it is currently doing things,

 -Erik

--
Erik B. Andersen             http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-11  8:57 ` Erik Andersen
  2002-08-11  9:16   ` Christoph Hellwig
@ 2002-08-11 19:46   ` Alan Cox
  2002-08-11 18:49     ` Erik Andersen
  2002-08-12 19:29     ` Paul P Komkoff Jr
  1 sibling, 2 replies; 39+ messages in thread
From: Alan Cox @ 2002-08-11 19:46 UTC (permalink / raw)
  To: andersen; +Cc: Marcelo Tosatti, lkml

On Sun, 2002-08-11 at 09:57, Erik Andersen wrote:
> On Mon Aug 05, 2002 at 07:40:56PM -0300, Marcelo Tosatti wrote:
> > 
> > So here goes -pre1, with a big -ac and x86-64 merges, plus other smaller
> > stuff.
> [------------snip------------]
> > <alan@irongate.swansea.linux.org.uk> (02/08/05 1.629)
> > 	[PATCH] PATCH: Add EFI partition support
> 
> Needs this to compile....
> 
> --- linux/include/asm-ia64/efi.h.orig	Sun Aug 11 01:41:10 2002
> +++ linux/include/asm-ia64/efi.h	Sun Aug 11 01:43:38 2002
> @@ -166,6 +166,9 @@
>   *  EFI Configuration Table and GUID definitions
>   */
>  
> +#define NULL_GUID    \
> +    ((efi_guid_t) { 0x00000000, 0x0000, 0x0000, { 0x00, 0x00, 0x0, 0x00, 0x00, 0x00, 0x00, 0x00 }})
> +

Not a good plan. EFI can be used on non ia64 so NULL_GUID belongs
somewhere else


^ permalink raw reply	[flat|nested] 39+ messages in thread

* RE: Linux 2.4.20-pre1
@ 2002-08-11 21:12 Matt_Domsch
  0 siblings, 0 replies; 39+ messages in thread
From: Matt_Domsch @ 2002-08-11 21:12 UTC (permalink / raw)
  To: andersen, alan; +Cc: marcelo, linux-kernel

> > > > <alan@irongate.swansea.linux.org.uk> (02/08/05 1.629)
> > > > 	[PATCH] PATCH: Add EFI partition support
> > > 
> > > Needs this to compile....
> > > 
> > > --- linux/include/asm-ia64/efi.h.orig	Sun Aug 11 01:41:10 2002
> > > +++ linux/include/asm-ia64/efi.h	Sun Aug 11 01:43:38 2002
> > > @@ -166,6 +166,9 @@
> > >   *  EFI Configuration Table and GUID definitions
> > >   */e
56> > >  
> > > +#define NULL_GUID    \
> > > +    ((efi_guid_t) { 0x00000000, 0x0000, 0x0000, { 0x00, 
> 0x00, 0x0, 0x00, 0x00, 0x00, 0x00, 0x00 }})
> > > +
> > 
> > Not a good plan. EFI can be used on non ia64 so NULL_GUID belongs
> > somewhere else

Two things:
1) there is an accompanying patch to the EFI patch which adds NULL_GUID and
changes the definition of GUIDs to use the helper macro EFI_GUID to solve
endianness issues.  David Mosberger has blessed my submission of this, and
it's been in the ia64 port patch for many months.  Patch or cset:

http://domsch.com/linux/patches/gpt/linux-2.4.19-rc1-efiguidt.patch
http://domsch.com/linux/patches/gpt/linux-2.4-gpt-efiguidt.cset


2) Yes, it's ugly that fs/partitions/efi.c includes asm-ia64/efi.h to pick
up the definitions.  David told me 12-18 months ago that Linus didn't want
an include/linux/efi.h because only IA64 today uses it, even though nothing
in it is IA-64 specific - it *could* be made generic.  So, I had three
choices:
a) include asm-ia64/efi.h and comment (taken)
b) Move asm-ia64/efi.h to linux/efi.h (believed rejected)
c) Duplicate typedefs.

I'd be happy to submit a patch moving asm-ia64/efi.h into include/linux/ if
it would be accepted.

Thanks,
Matt

--
Matt Domsch
Sr. Software Engineer, Lead Engineer, Architect
Dell Linux Solutions www.dell.com/linux
Linux on Dell mailing lists @ http://lists.us.dell.com
#1 US Linux Server provider for 2001 and Q1/2002! (IDC May 2002)


^ permalink raw reply	[flat|nested] 39+ messages in thread

* [PATCH] radeonfb update vs 2.4.20-pre1
  2002-08-05 22:40 Linux 2.4.20-pre1 Marcelo Tosatti
                   ` (7 preceding siblings ...)
  2002-08-11 10:56 ` Erik Andersen
@ 2002-08-11 21:22 ` Erik Andersen
  2002-08-12 10:18   ` Ani Joshi
  2002-08-17 19:51 ` Linux 2.4.20-pre1 Adrian Bunk
  9 siblings, 1 reply; 39+ messages in thread
From: Erik Andersen @ 2002-08-11 21:22 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: lkml, Ani Joshi

Here is an update to the radeonfb.  This is based on a patch 
from Peter Horton that was posted to the lkml back in April
    http://www.uwsg.indiana.edu/hypermail/linux/kernel/0204.1/0364.html

I have been carrying this patch along in my own tree since April
and I find it a huge improvement.  Using this patch, I find that
the radeonfb is quite fast, and colors are correct.

I have updated the patch to fit into 2.4.20-pre1, fixed a few
obvious little things, and reworked the mtrr handling so it
matches the behavior of the other framebuffers.  Any chance 
we could get this into 2.4.20?

 -Erik

--
Erik B. Andersen             http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--


--- drivers/video/radeonfb.c.orig	Sun Aug 11 03:43:12 2002
+++ drivers/video/radeonfb.c	Sun Aug 11 03:43:18 2002
@@ -22,6 +22,13 @@
  *
  *	Special thanks to ATI DevRel team for their hardware donations.
  *
+ * 	2002-04-02	Added MTRR support. Fixed 8bpp acceleration. Added
+ * 			acceleration for 16/32bpp. Applied fix from XFree86
+ * 			for hard crash on accelerator reset. Fixed up the
+ * 			colour stuff. Peter Horton <pdh@colonel-panic.org>
+ * 	2002-04-10	Make ypan work. More colour fixes, all modes >8bpp
+ * 			now DIRECTCOLOR. Match up CRTC and accelerator
+ * 			pitch.
  */
 
 
@@ -73,18 +80,24 @@
 #include <video/fbcon.h> 
 #include <video/fbcon-cfb8.h>
 #include <video/fbcon-cfb16.h>
-#include <video/fbcon-cfb24.h>
 #include <video/fbcon-cfb32.h>
+#ifdef CONFIG_MTRR
+#include <asm/mtrr.h>
+#endif
 
 #include "radeon.h"
 
 
-#define DEBUG	0
+#define FIX_DEPTH_15		1
+
+#define DEBUG			0
+
+#define _RTRACE(f,a...)		do{printk("radeonfb: " f "\n", ##a);}while(0)
 
 #if DEBUG
-#define RTRACE		printk
+#define RTRACE(f,a...)		_RTRACE(f,##a)
 #else
-#define RTRACE		if(0) printk
+#define RTRACE(f,a...)
 #endif
 
 
@@ -299,17 +312,16 @@
 
 	struct ram_info ram;
 
+#if 0
         u32 hack_crtc_ext_cntl;
         u32 hack_crtc_v_sync_strt_wid;
+#endif
 
 #if defined(FBCON_HAS_CFB16) || defined(FBCON_HAS_CFB32)
         union {
 #if defined(FBCON_HAS_CFB16)
                 u_int16_t cfb16[16];
 #endif
-#if defined(FBCON_HAS_CFB24)
-                u_int32_t cfb24[16];
-#endif  
 #if defined(FBCON_HAS_CFB32)
                 u_int32_t cfb32[16];
 #endif  
@@ -474,11 +486,10 @@
 }
 
 
-static inline int var_to_depth(const struct fb_var_screeninfo *var)
+static __inline__ int var_to_depth(const struct fb_var_screeninfo *var)
 {
-	if (var->bits_per_pixel != 16)
-		return var->bits_per_pixel;
-	return (var->green.length == 6) ? 16 : 15;
+	return (var->bits_per_pixel == 16 && var->green.length == 5)? 
+	    15 : var->bits_per_pixel;
 }
 
 
@@ -531,6 +542,7 @@
 #define radeon_engine_reset()		_radeon_engine_reset(rinfo)
 
 
+#if 0
 static __inline__ u8 radeon_get_post_div_bitval(int post_div)
 {
         switch (post_div) {
@@ -552,6 +564,7 @@
                         return 0x02;
         }
 }
+#endif
 
 
 
@@ -594,14 +607,25 @@
         
 static char fontname[40] __initdata;
 static char *mode_option __initdata;
-static char noaccel __initdata = 0;
+static char noaccel /*__initdata*/ = 0;
+static char fb16fix = 0;
 static int panel_yres __initdata = 0;
 static char force_dfp __initdata = 0;
 static struct radeonfb_info *board_list = NULL;
+#ifdef CONFIG_MTRR
+static int enable_mtrr = 1;
+static int mtrr_handle;
+#endif
 
 #ifdef FBCON_HAS_CFB8
 static struct display_switch fbcon_radeon8;
 #endif
+#ifdef FBCON_HAS_CFB16
+static struct display_switch fbcon_radeon16;
+#endif
+#ifdef FBCON_HAS_CFB32
+static struct display_switch fbcon_radeon32;
+#endif
 
 
 /*
@@ -731,6 +755,12 @@
 			force_dfp = 1;
 		} else if (!strncmp(this_opt, "panel_yres:", 11)) {
 			panel_yres = simple_strtoul((this_opt+11), NULL, 0);
+		} else if (!strncmp(this_opt, "fb16fix", 7)) {
+			fb16fix = 1;
+#ifdef CONFIG_MTRR
+		} else if (!strncmp(this_opt, "nomtrr", 6)) {
+			enable_mtrr = 0;
+#endif
                 } else
 			mode_option = this_opt;
         }
@@ -755,7 +785,7 @@
 	u32 tmp;
 	int i, j;
 
-	RTRACE("radeonfb_pci_register BEGIN\n");
+	RTRACE("radeonfb_pci_register BEGIN");
 
 	rinfo = kmalloc (sizeof (struct radeonfb_info), GFP_KERNEL);
 	if (!rinfo) {
@@ -915,7 +945,7 @@
 	rinfo->bios_seg = radeon_find_rom(rinfo);
 	radeon_get_pllinfo(rinfo, rinfo->bios_seg);
 
-	RTRACE("radeonfb: probed %s %dk videoram\n", (rinfo->ram_type), (rinfo->video_ram/1024));
+	RTRACE("probed %s %dk videoram", (rinfo->ram_type), (rinfo->video_ram/1024));
 
 #if !defined(__powerpc__)
 	radeon_get_moninfo(rinfo);
@@ -998,6 +1028,15 @@
 		return -ENODEV;
 	}
 
+#ifdef CONFIG_MTRR
+	if (enable_mtrr) {
+	    mtrr_handle = mtrr_add(rinfo->fb_base_phys, rinfo->video_ram, MTRR_TYPE_WRCOMB, 1);
+	    printk("radeonfb: MTRR enabled\n");
+	}
+#endif
+
+	/* XXX look at this re pitch :pdh */
+
 	if (!noaccel) {
 		/* initialize the engine */
 		radeon_engine_init (rinfo);
@@ -1029,7 +1068,7 @@
 			GET_MON_NAME(rinfo->crtDisp_type));
 	}
 
-	RTRACE("radeonfb_pci_register END\n");
+	RTRACE("radeonfb_pci_register END");
 
 	return 0;
 }
@@ -1046,6 +1085,12 @@
 	/* restore original state */
         radeon_write_mode (rinfo, &rinfo->init_state);
  
+#ifdef CONFIG_MTRR
+	if (enable_mtrr) {
+	    mtrr_del(mtrr_handle, rinfo->fb_base_phys, rinfo->video_ram);
+	    printk("radeonfb: MTRR disabled\n");
+	}
+#endif
         unregister_framebuffer ((struct fb_info *) rinfo);
                 
         iounmap ((void*)rinfo->mmio_base);
@@ -1157,7 +1202,7 @@
         	rinfo->pll.ppll_min = pll.PCLK_min_freq;
         	rinfo->pll.ppll_max = pll.PCLK_max_freq;
 
-		printk("radeonfb: ref_clk=%d, ref_div=%d, xclk=%d from BIOS\n",
+		_RTRACE("ref_clk=%d, ref_div=%d, xclk=%d from BIOS",
 			rinfo->pll.ref_clk, rinfo->pll.ref_div, rinfo->pll.xclk);
 	} else {
 #ifdef CONFIG_ALL_PPC
@@ -1177,7 +1222,7 @@
 			rinfo->pll.ppll_min = 12000;
 			rinfo->pll.ppll_max = 35000;
 
-			printk("radeonfb: ref_clk=%d, ref_div=%d, xclk=%d from OF\n",
+			_RTRACE("ref_clk=%d, ref_div=%d, xclk=%d from OF",
 				rinfo->pll.ref_clk, rinfo->pll.ref_div, rinfo->pll.xclk);
 
 			return;
@@ -1212,7 +1257,7 @@
 				break;
 		}
 
-		printk("radeonfb: ref_clk=%d, ref_div=%d, xclk=%d defaults\n",
+		_RTRACE("ref_clk=%d, ref_div=%d, xclk=%d defaults",
 			rinfo->pll.ref_clk, rinfo->pll.ref_div, rinfo->pll.xclk);
 	}
 }
@@ -1271,7 +1316,7 @@
 {
 #ifdef CONFIG_ALL_PPC
 	if (!radeon_get_EDID_OF(rinfo))
-		RTRACE("radeonfb: could not retrieve EDID from OF\n");
+		RTRACE("radeonfb: could not retrieve EDID from OF");
 #else
 	/* XXX use other methods later */
 #endif
@@ -1503,6 +1548,8 @@
 		rinfo->vSync_width = (unsigned short) ((tmp & FP_V_SYNC_WID_MASK) >>
 					FP_V_SYNC_WID_SHIFT);
 
+		/* XXX some more stuff needs to go here :pdh */
+
 		return 1;
 	}
 
@@ -1542,13 +1589,10 @@
 	radeon_fifo_wait (1);
 	OUTREG(DSTCACHE_MODE, 0);
 
-	/* XXX */
-	rinfo->pitch = ((rinfo->xres * (rinfo->bpp / 8) + 0x3f)) >> 6;
-
 	radeon_fifo_wait (1);
 	temp = INREG(DEFAULT_PITCH_OFFSET);
 	OUTREG(DEFAULT_PITCH_OFFSET, ((temp & 0xc0000000) | 
-				      (rinfo->pitch << 0x16)));
+				      (rinfo->pitch << 16)));
 
 	radeon_fifo_wait (1);
 	OUTREGP(DP_DATATYPE, 0, ~HOST_BIG_ENDIAN_EN);
@@ -1703,30 +1747,22 @@
         switch (disp->var.bits_per_pixel) {
 #ifdef FBCON_HAS_CFB8
                 case 8:
-                        disp->dispsw = &fbcon_cfb8;
+                        disp->dispsw = accel ? &fbcon_radeon8 : &fbcon_cfb8;
                         disp->visual = FB_VISUAL_PSEUDOCOLOR;
                         disp->line_length = disp->var.xres_virtual;
                         break;
 #endif
 #ifdef FBCON_HAS_CFB16
                 case 16:
-                        disp->dispsw = &fbcon_cfb16;
+                        disp->dispsw = accel ? &fbcon_radeon16 : &fbcon_cfb16;
                         disp->dispsw_data = &rinfo->con_cmap.cfb16;
                         disp->visual = FB_VISUAL_DIRECTCOLOR;
                         disp->line_length = disp->var.xres_virtual * 2;
                         break;
 #endif  
-#ifdef FBCON_HAS_CFB32       
-                case 24:
-                        disp->dispsw = &fbcon_cfb24;
-                        disp->dispsw_data = &rinfo->con_cmap.cfb24;
-                        disp->visual = FB_VISUAL_DIRECTCOLOR;
-                        disp->line_length = disp->var.xres_virtual * 4;
-                        break;
-#endif
 #ifdef FBCON_HAS_CFB32
                 case 32:
-                        disp->dispsw = &fbcon_cfb32;
+                        disp->dispsw = accel ? &fbcon_radeon32 : &fbcon_cfb32;
                         disp->dispsw_data = &rinfo->con_cmap.cfb32;
                         disp->visual = FB_VISUAL_DIRECTCOLOR;
                         disp->line_length = disp->var.xres_virtual * 4;
@@ -1736,8 +1772,6 @@
                         printk ("radeonfb: setting fbcon_dummy renderer\n");
                         disp->dispsw = &fbcon_dummy;
         }
-                
-        return;
 }
                         
 
@@ -1759,6 +1793,7 @@
 
 
 
+#if 0
 static int radeonfb_do_maximize(struct radeonfb_info *rinfo,
                                 struct fb_var_screeninfo *var,
                                 struct fb_var_screeninfo *v,
@@ -1819,9 +1854,18 @@
                                 
         return 0;
 }
+#endif
                         
 
 
+static void set_palette_entry(struct radeonfb_info *rinfo, unsigned idx, unsigned red, unsigned grn, unsigned blu)
+{
+	OUTREG(PALETTE_INDEX, idx);
+	OUTREG(PALETTE_DATA, (red << 16) | (grn << 8) | blu);
+
+	udelay(1);	/* is this necessary ? */
+}
+
 /*
  * fb ops
  */
@@ -1844,7 +1888,7 @@
         fix->type_aux = disp->type_aux;
         fix->visual = disp->visual;
 
-        fix->xpanstep = 8;
+        fix->xpanstep = 0;
         fix->ypanstep = 1;
         fix->ywrapstep = 0;
         
@@ -1880,7 +1924,7 @@
         struct radeonfb_info *rinfo = (struct radeonfb_info *) info;
         struct display *disp;
         struct fb_var_screeninfo v;
-        int nom, den, accel;
+        int accel, bytpp, pitch;
         unsigned chgvar = 0;
 
         disp = (con < 0) ? rinfo->info.disp : &fb_display[con];
@@ -1903,110 +1947,97 @@
         switch (v.bits_per_pixel) {
 		case 0 ... 8:
 			v.bits_per_pixel = 8;
-			break;
-		case 9 ... 16:
-			v.bits_per_pixel = 16;
-			break;
-		case 17 ... 24:
-			v.bits_per_pixel = 24;
-			break;
-		case 25 ... 32:
-			v.bits_per_pixel = 32;
-			break;
-		default:
-			return -EINVAL;
-	}
-
-	switch (var_to_depth(&v)) {
-#ifdef FBCON_HAS_CFB8
-                case 8:
-                        nom = den = 1;
-                        disp->line_length = v.xres_virtual;
-                        disp->visual = FB_VISUAL_PSEUDOCOLOR; 
                         v.red.offset = v.green.offset = v.blue.offset = 0;
                         v.red.length = v.green.length = v.blue.length = 8;
                         v.transp.offset = v.transp.length = 0;
-                        break;
-#endif
-                        
-#ifdef FBCON_HAS_CFB16
-		case 15:
-			nom = 2;
-			den = 1;
-			disp->line_length = v.xres_virtual * 2;
-			disp->visual = FB_VISUAL_DIRECTCOLOR;
-			v.red.offset = 10;
-			v.green.offset = 5;
-			v.red.offset = 0;
-			v.red.length = v.green.length = v.blue.length = 5;
-			v.transp.offset = v.transp.length = 0;
 			break;
-                case 16:
-                        nom = 2;
-                        den = 1;
-                        disp->line_length = v.xres_virtual * 2;
-                        disp->visual = FB_VISUAL_DIRECTCOLOR;
-                        v.red.offset = 11;
+		case 9 ... 16:
+#if FIX_DEPTH_15
+			if(v.bits_per_pixel < 16)
+				v.green.length = 5;
+#endif
+			if(v.green.length != 5 && v.green.length != 6)
+				v.green.length = 5;
+			v.bits_per_pixel = 16;
+                        v.red.offset = v.green.length + 5;
                         v.green.offset = 5;
                         v.blue.offset = 0;
                         v.red.length = 5;
-                        v.green.length = 6;
                         v.blue.length = 5;
                         v.transp.offset = v.transp.length = 0;
-                        break;  
-#endif
-                        
-#ifdef FBCON_HAS_CFB24
-                case 24:
-                        nom = 4;
-                        den = 1;
-                        disp->line_length = v.xres_virtual * 3;
-                        disp->visual = FB_VISUAL_DIRECTCOLOR;
+			break;
+		case 17 ... 32:
+			v.bits_per_pixel = 32;
                         v.red.offset = 16;
                         v.green.offset = 8;
                         v.blue.offset = 0;
                         v.red.length = v.blue.length = v.green.length = 8;
+                        /* v.transp.offset = 24; v.transp.length = 8; */
                         v.transp.offset = v.transp.length = 0;
-                        break;
-#endif
-#ifdef FBCON_HAS_CFB32
-                case 32:
-                        nom = 4;
-                        den = 1;
-                        disp->line_length = v.xres_virtual * 4;
-                        disp->visual = FB_VISUAL_DIRECTCOLOR;
-                        v.red.offset = 16;
-                        v.green.offset = 8;
-                        v.blue.offset = 0;
-                        v.red.length = v.blue.length = v.green.length = 8;
-                        v.transp.offset = 24;
-                        v.transp.length = 8;
-                        break;
-#endif
-                default:
-                        printk ("radeonfb: mode %dx%dx%d rejected, color depth invalid\n",
-                                var->xres, var->yres, var->bits_per_pixel);
-                        return -EINVAL;
-        }
+			break;
+		default:
+			return -EINVAL;
+	}
+
+        v.red.msb_right = v.green.msb_right = v.blue.msb_right = v.transp.msb_right = 0;
+
+	bytpp = v.bits_per_pixel >> 3;
+
+	if(v.xres > v.xres_virtual)
+		v.xres_virtual = v.xres;
+	if(v.yres > v.yres_virtual)
+		v.yres_virtual = v.yres;
+
+	/* XXX this is probably wrong for 24bpp, if we ever get it working :pdh */
+
+	pitch = (v.xres_virtual * bytpp + 63) & ~63;
+
+	if(pitch >= 8192)
+		return -EINVAL;
+
+	v.xres_virtual = pitch / bytpp;
+
+	if(v.xres_virtual < v.xres)
+		v.xres = v.xres_virtual;
+	
+	v.yres_virtual = rinfo->video_ram / pitch;
+
+	/* XXX there is some limit here, I chose 8192 :pdh */
 
+	if(v.yres_virtual >= 8192)
+		v.yres_virtual = 8191;
+
+	if(v.yres_virtual < v.yres)
+		v.yres = v.yres_virtual;
+
+#if 0
         if (radeonfb_do_maximize(rinfo, var, &v, nom, den) < 0)
                 return -EINVAL;  
+#endif
                 
+	if(v.xoffset)
+		return -EINVAL;
+
         if (v.xoffset < 0)
                 v.xoffset = 0;
         if (v.yoffset < 0)
                 v.yoffset = 0;
          
         if (v.xoffset > v.xres_virtual - v.xres)
-                v.xoffset = v.xres_virtual - v.xres - 1;
+		return -EINVAL;
                         
         if (v.yoffset > v.yres_virtual - v.yres)
-                v.yoffset = v.yres_virtual - v.yres - 1;
-         
-        v.red.msb_right = v.green.msb_right = v.blue.msb_right =
-                          v.transp.offset = v.transp.length =
-                          v.transp.msb_right = 0;
+		return -EINVAL;
                         
+	/* XXX this shouldn't be here :pdh */
+
+	disp->visual = (v.bits_per_pixel == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_DIRECTCOLOR);
+	disp->line_length = v.xres_virtual * bytpp;
+	disp->ypanstep = 1;
+	disp->ywrapstep = 0;
+	disp->var.yres_virtual = v.yres_virtual;
+
+
         switch (v.activate & FB_ACTIVATE_MASK) {
                 case FB_ACTIVATE_TEST:
                         return 0;
@@ -2018,15 +2049,13 @@
         }
         
         memcpy (&disp->var, &v, sizeof (v));
-        
+
         if (chgvar) {     
-                radeon_set_dispsw(rinfo, disp);
 
-                if (noaccel)
-                        disp->scrollmode = SCROLL_YREDRAW;
-                else
-                        disp->scrollmode = 0;
-                
+		disp->scrollmode = accel ? 0 : SCROLL_YREDRAW;
+
+		radeon_set_dispsw(rinfo, disp);
+
                 if (info && info->changevar)
                         info->changevar(con);
         }
@@ -2093,6 +2122,8 @@
                                  struct fb_info *info)
 {
         struct radeonfb_info *rinfo = (struct radeonfb_info *) info;
+
+#if 0
         u32 offset, xoffset, yoffset;
                 
         xoffset = (var->xoffset + 7) & ~7;
@@ -2105,7 +2136,18 @@
         offset = ((yoffset * var->xres + xoffset) * var->bits_per_pixel) >> 6;
          
         OUTREG(CRTC_OFFSET, offset);
+#endif
+
+	/* XXX no X pan for the moment :pdh */
+
+	if(var->xoffset)
+		return -EINVAL;
         
+	if(var->yoffset + var->yres > var->yres_virtual)
+		return -EINVAL;
+
+	OUTREG(CRTC_OFFSET, var->yoffset * rinfo->pitch);
+
         return 0;
 }
 
@@ -2144,12 +2186,14 @@
                 do_install_cmap(con, info);
         }       
 
+#if 0
         /* XXX absurd hack for X to restore console */
         {   
 		OUTREGP(CRTC_EXT_CNTL, rinfo->hack_crtc_ext_cntl,
 			CRTC_HSYNC_DIS | CRTC_VSYNC_DIS | CRTC_DISPLAY_DIS);
                 OUTREG(CRTC_V_SYNC_STRT_WID, rinfo->hack_crtc_v_sync_strt_wid);
         }
+#endif
 
         return 0;
 }
@@ -2214,18 +2258,7 @@
 
 static int radeon_get_cmap_len (const struct fb_var_screeninfo *var)
 {
-        int rc = 256;            /* reasonable default */
-        
-        switch (var_to_depth(var)) {
-                case 15:
-                        rc = 32;
-                        break;
-		case 16:
-			rc = 64;
-			break;
-        }
-                
-        return rc;
+	return var->bits_per_pixel == 8 ? 256 : 16;
 }
 
 
@@ -2239,10 +2272,9 @@
 	if (regno > 255)
 		return 1;
      
- 	*red = (rinfo->palette[regno].red<<8) | rinfo->palette[regno].red; 
-    	*green = (rinfo->palette[regno].green<<8) | rinfo->palette[regno].green;
-    	*blue = (rinfo->palette[regno].blue<<8) | rinfo->palette[regno].blue;
-    	*transp = 0;
+ 	*red	= (unsigned) rinfo->palette[regno].red << 8;
+    	*green	= (unsigned) rinfo->palette[regno].green << 8;
+    	*blue	= (unsigned) rinfo->palette[regno].blue << 8;
 
 	return 0;
 }                            
@@ -2250,79 +2282,95 @@
 
 
 static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
-                             unsigned blue, unsigned transp, struct fb_info *info)
+                             unsigned blue, unsigned alpha, struct fb_info *info)
 {
         struct radeonfb_info *rinfo = (struct radeonfb_info *) info;
-	u32 pindex;
 
-	if (regno > 255)
+	if(regno > 255)
 		return 1;
 
-	red >>= 8;
-	green >>= 8;
-	blue >>= 8;
-	rinfo->palette[regno].red = red;
-	rinfo->palette[regno].green = green;
-	rinfo->palette[regno].blue = blue;
+	red	>>= 8;
+	green	>>= 8;
+	blue	>>= 8;
+	alpha	>>= 8;
+
+	rinfo->palette[regno].red	= red;
+	rinfo->palette[regno].green	= green;
+	rinfo->palette[regno].blue	= blue;
+
+	/* ugly hack so that the software cursor works */
+
+	if(regno == 0) {
+		switch(rinfo->depth) {
+
+			case 16:
+				radeon_setcolreg(63, ~0, ~0, ~0, 0, info);
+				/* */
 
-        /* default */
-        pindex = regno;
-        
-	if (rinfo->bpp == 16) {
-		pindex = regno * 8;
+			case 15:
+				radeon_setcolreg(31, ~0, ~0, ~0, 0, info);
+				break;
 
-		if (rinfo->depth == 16 && regno > 63)
-			return 1;
-		if (rinfo->depth == 15 && regno > 31)
-			return 1;
+			case 32:
+				radeon_setcolreg(255, ~0, ~0, ~0, 0, info);
+				break;
+		}
+	}
 
-		/* For 565, the green component is mixed one order below */
-		if (rinfo->depth == 16) {
-	                OUTREG(PALETTE_INDEX, pindex>>1);
-       	         	OUTREG(PALETTE_DATA, (rinfo->palette[regno>>1].red << 16) |
-                        	(green << 8) | (rinfo->palette[regno>>1].blue));
-                	green = rinfo->palette[regno<<1].green;
-        	}
-	}
-
-	if (rinfo->depth != 16 || regno < 32) {
-		OUTREG(PALETTE_INDEX, pindex);
-		OUTREG(PALETTE_DATA, (red << 16) | (green << 8) | blue);
+	switch(rinfo->depth) {
+
+		case 15:
+			if(regno > 31)
+				return 1;
+			if(regno < 16)
+				rinfo->con_cmap.cfb16[regno] = (regno << 10) | (regno << 5) | regno;
+			regno <<= 3;
+			break;
+
+		case 16:
+
+			if(fb16fix) {
+
+				/* this is just another format of 15 bit mode, the LSB of the   *
+				 * green pixel data is ignored. this is required for "fbtv" and *
+				 * other apps to work correctly at 16bpp, but it means you land *
+				 * up with a sick looking boot logo. the real fix is to run at  *
+				 * 15bpp when you want to use those apps                   :pdh */
+
+				if(regno > 31)
+					return 1;
+				if(regno < 16)
+					rinfo->con_cmap.cfb16[regno] = (regno << 11) | (regno << 6) | regno;
+				regno <<= 3;
+				set_palette_entry(rinfo, regno | 4, red, green, blue);
+
+			} else {
+
+				if(regno > 63)
+					return 1;
+				if(regno < 16)
+					rinfo->con_cmap.cfb16[regno] = (regno << 11) | (regno << 5) | regno;
+				set_palette_entry(rinfo, regno << 2, rinfo->palette[regno >> 1].red,
+					green, rinfo->palette[regno >> 1].blue);
+				if(regno > 31)
+					return 0;
+				regno <<= 1;
+				green = rinfo->palette[regno].green;
+				regno <<= 2;
+			}
+			break;
+
+		case 32:
+			if(regno < 16)
+				rinfo->con_cmap.cfb32[regno] = (regno << 16) | (regno << 8) | regno;
+			break;
 	}
 
- 	if (regno < 16) {
-        	switch (rinfo->depth) {
-#ifdef FBCON_HAS_CFB16
-		        case 15:
-        			rinfo->con_cmap.cfb16[regno] = (regno << 10) | (regno << 5) |
-				                       	 	  regno;   
-			        break;
-		        case 16:
-        			rinfo->con_cmap.cfb16[regno] = (regno << 11) | (regno << 5) |
-				                       	 	  regno;   
-			        break;
-#endif
-#ifdef FBCON_HAS_CFB24
-                        case 24:
-                                rinfo->con_cmap.cfb24[regno] = (regno << 16) | (regno << 8) | regno;
-                                break;
-#endif
-#ifdef FBCON_HAS_CFB32
-	        	case 32: {
-            			u32 i;    
-   
-  		       		i = (regno << 8) | regno;
-            			rinfo->con_cmap.cfb32[regno] = (i << 16) | i;
-		        	break;
-        		}
-#endif
-		}
-        }
+	set_palette_entry(rinfo, regno, red, green, blue);
+
 	return 0;
 }
 
-
-
 static void radeon_save_state (struct radeonfb_info *rinfo,
                                struct radeon_regs *save)
 {
@@ -2373,8 +2421,10 @@
 	int primary_mon = PRIMARY_MONITOR(rinfo);
 	int depth = var_to_depth(mode);
 
+	bytpp = mode->bits_per_pixel >> 3;
 	rinfo->xres = mode->xres;
 	rinfo->yres = mode->yres;
+	rinfo->pitch = mode->xres_virtual * bytpp;
 	rinfo->pixclock = mode->pixclock;
 
 	hSyncStart = mode->xres + mode->right_margin;
@@ -2404,9 +2454,9 @@
 	h_sync_pol = sync & FB_SYNC_HOR_HIGH_ACT ? 0 : 1;
 	v_sync_pol = sync & FB_SYNC_VERT_HIGH_ACT ? 0 : 1;
 
-	RTRACE("hStart = %d, hEnd = %d, hTotal = %d\n",
+	RTRACE("hStart = %d, hEnd = %d, hTotal = %d",
 		hSyncStart, hSyncEnd, hTotal);
-	RTRACE("vStart = %d, vEnd = %d, vTotal = %d\n",
+	RTRACE("vStart = %d, vEnd = %d, vTotal = %d",
 		vSyncStart, vSyncEnd, vTotal);
 
 	hsync_wid = (hSyncEnd - hSyncStart) / 8;
@@ -2427,7 +2477,6 @@
 	cSync = mode->sync & FB_SYNC_COMP_HIGH_ACT ? (1 << 4) : 0;
 
 	format = radeon_get_dstbpp(depth);
-	bytpp = mode->bits_per_pixel >> 3;
 
 	if ((primary_mon == MT_DFP) || (primary_mon == MT_LCD))
 		hsync_fudge = hsync_fudge_fp[format-1];
@@ -2463,7 +2512,7 @@
 	newmode.crtc_v_sync_strt_wid = (((vSyncStart - 1) & 0xfff) |
 					 (vsync_wid << 16) | (v_sync_pol  << 23));
 
-	newmode.crtc_pitch = (mode->xres >> 3);
+	newmode.crtc_pitch = mode->xres_virtual >> 3;
 	newmode.crtc_pitch |= (newmode.crtc_pitch << 16);
 
 #if defined(__BIG_ENDIAN)
@@ -2479,12 +2528,9 @@
 	}
 #endif
 
-	rinfo->pitch = ((mode->xres * ((mode->bits_per_pixel + 1) / 8) + 0x3f)
-			& ~(0x3f)) / 64;
-
-	RTRACE("h_total_disp = 0x%x\t   hsync_strt_wid = 0x%x\n",
+	RTRACE("h_total_disp = 0x%x  hsync_strt_wid = 0x%x",
 		newmode.crtc_h_total_disp, newmode.crtc_h_sync_strt_wid);
-	RTRACE("v_total_disp = 0x%x\t   vsync_strt_wid = 0x%x\n",
+	RTRACE("v_total_disp = 0x%x  vsync_strt_wid = 0x%x",
 		newmode.crtc_v_total_disp, newmode.crtc_v_sync_strt_wid);
 
 	newmode.xres = mode->xres;
@@ -2493,8 +2539,10 @@
 	rinfo->bpp = mode->bits_per_pixel;
 	rinfo->depth = depth;
 
+#if 0
 	rinfo->hack_crtc_ext_cntl = newmode.crtc_ext_cntl;
 	rinfo->hack_crtc_v_sync_strt_wid = newmode.crtc_v_sync_strt_wid;
+#endif
 
 	if (freq > rinfo->pll.ppll_max)
 		freq = rinfo->pll.ppll_max;
@@ -2532,9 +2580,9 @@
 		newmode.ppll_div_3 = rinfo->fb_div | (post_div->bitvalue << 16);
 	}
 
-	RTRACE("post div = 0x%x\n", rinfo->post_div);
-	RTRACE("fb_div = 0x%x\n", rinfo->fb_div);
-	RTRACE("ppll_div_3 = 0x%x\n", newmode.ppll_div_3);
+	RTRACE("post div = 0x%x", rinfo->post_div);
+	RTRACE("fb_div = 0x%x", rinfo->fb_div);
+	RTRACE("ppll_div_3 = 0x%x", newmode.ppll_div_3);
 
 	/* DDA */
 	vclk_freq = round_div(rinfo->pll.ref_clk * rinfo->fb_div,
@@ -2554,8 +2602,8 @@
 	       xclk_per_trans) << (11 - useable_precision);
 	roff = xclk_per_trans_precise * (32 - 4);
 
-	RTRACE("ron = %d, roff = %d\n", ron, roff);
-	RTRACE("vclk_freq = %d, per = %d\n", vclk_freq, xclk_per_trans_precise);
+	RTRACE("ron = %d, roff = %d", ron, roff);
+	RTRACE("vclk_freq = %d, per = %d", vclk_freq, xclk_per_trans_precise);
 
 	if ((ron + rinfo->ram.rloop) >= roff) {
 		printk("radeonfb: error ron out of range\n");
@@ -2621,6 +2669,11 @@
 		newmode.tmds_crc = rinfo->init_state.tmds_crc;
 		newmode.tmds_transmitter_cntl = rinfo->init_state.tmds_transmitter_cntl;
 
+		/* XXX                                                  :pdh *
+		 * this doesn't work with some DFPs. a different driver that *
+		 * does work loads the FP CRTC registers from initial saved  *
+		 * values and doesn't tweak with tmds_transmitter_cntl ????? */
+
 		if (primary_mon == MT_LCD) {
 			newmode.lvds_gen_cntl |= (LVDS_ON | LVDS_BLON);
 			newmode.fp_gen_cntl &= ~(FP_FPON | FP_TMDS_EN);
@@ -2657,15 +2710,13 @@
 	int primary_mon = PRIMARY_MONITOR(rinfo);
 
 	/* blank screen */
-	OUTREGP(CRTC_EXT_CNTL, CRTC_DISPLAY_DIS | CRTC_VSYNC_DIS | CRTC_HSYNC_DIS,
-		~(CRTC_DISPLAY_DIS | CRTC_VSYNC_DIS | CRTC_HSYNC_DIS));
+	OUTREGP(CRTC_EXT_CNTL, mode->crtc_ext_cntl,
+		~(CRTC_HSYNC_DIS | CRTC_VSYNC_DIS | CRTC_DISPLAY_DIS));
 
 	for (i=0; i<9; i++)
 		OUTREG(common_regs[i].reg, common_regs[i].val);
 
 	OUTREG(CRTC_GEN_CNTL, mode->crtc_gen_cntl);
-	OUTREGP(CRTC_EXT_CNTL, mode->crtc_ext_cntl,
-		CRTC_HSYNC_DIS | CRTC_VSYNC_DIS | CRTC_DISPLAY_DIS);
 	OUTREGP(DAC_CNTL, mode->dac_cntl, DAC_RANGE_CNTL | DAC_BLANKING);
 	OUTREG(CRTC_H_TOTAL_DISP, mode->crtc_h_total_disp);
 	OUTREG(CRTC_H_SYNC_STRT_WID, mode->crtc_h_sync_strt_wid);
@@ -2743,7 +2794,7 @@
 	}
 
 	/* unblank screen */
-	OUTREG8(CRTC_EXT_CNTL + 1, 0);
+	OUTREG(CRTC_EXT_CNTL, mode->crtc_ext_cntl);
 
 	return;
 }
@@ -2966,6 +3017,8 @@
 	width *= fontwidth(p);
 	height *= fontheight(p);
 
+	dp_cntl = 0;
+
 	if (srcy < dsty) {
 		srcy += height - 1;
 		dsty += height - 1;
@@ -2992,22 +3045,8 @@
 }
 
 
-
-static void fbcon_radeon_clear(struct vc_data *conp, struct display *p,
-			       int srcy, int srcx, int height, int width)
+static void fbcon_radeon_clear(struct radeonfb_info *rinfo, int srcy, int srcx, int height, int width, u32 clr)
 {
-	struct radeonfb_info *rinfo = (struct radeonfb_info *)(p->fb_info);
-	u32 clr;
-
-	clr = attr_bgcol_ec(p, conp);
-	clr |= (clr << 8);
-	clr |= (clr << 16);
-
-	srcx *= fontwidth(p);
-	srcy *= fontheight(p);
-	width *= fontwidth(p);
-	height *= fontheight(p);
-
 	radeon_fifo_wait(6);
 	OUTREG(DP_GUI_MASTER_CNTL, (rinfo->dp_gui_master_cntl |
 				    GMC_BRUSH_SOLID_COLOR |
@@ -3021,12 +3060,24 @@
 }
 
 
-
 #ifdef FBCON_HAS_CFB8
+static void fbcon_radeon8_clear(struct vc_data *conp, struct display *p,
+		int srcy, int srcx, int height, int width)
+{
+	u32 clr;
+  
+	clr = attr_bgcol_ec(p, conp);
+	clr |= clr << 8;
+
+	fbcon_radeon_clear((struct radeonfb_info *) p->fb_info, srcy * fontheight(p), srcx * fontwidth(p),
+			height * fontheight(p), width * fontwidth(p), clr | (clr << 16));
+}
+
+
 static struct display_switch fbcon_radeon8 = {
 	setup:			fbcon_cfb8_setup,
 	bmove:			fbcon_radeon_bmove,
-	clear:			fbcon_radeon_clear,
+	clear:			fbcon_radeon8_clear,
 	putc:			fbcon_cfb8_putc,
 	putcs:			fbcon_cfb8_putcs,
 	revc:			fbcon_cfb8_revc,
@@ -3034,3 +3085,48 @@
 	fontwidthmask:		FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
 };
 #endif
+
+#ifdef FBCON_HAS_CFB16
+static void fbcon_radeon16_clear(struct vc_data *conp, struct display *p,
+		int srcy, int srcx, int height, int width)
+{
+	u32 clr;
+
+	clr = ((u16 *) p->dispsw_data)[attr_bgcol_ec(p, conp)];
+
+	fbcon_radeon_clear((struct radeonfb_info *) p->fb_info, srcy * fontheight(p), srcx * fontwidth(p),
+			height * fontheight(p), width * fontwidth(p), clr | (clr << 16));
+}
+
+static struct display_switch fbcon_radeon16 = {
+	setup:			fbcon_cfb16_setup,
+	bmove:			fbcon_radeon_bmove,
+	clear:			fbcon_radeon16_clear,
+	putc:			fbcon_cfb16_putc,
+	putcs:			fbcon_cfb16_putcs,
+	revc:			fbcon_cfb16_revc,
+	clear_margins:		fbcon_cfb16_clear_margins,
+	fontwidthmask:		FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+};
+#endif
+
+#ifdef FBCON_HAS_CFB32
+static void fbcon_radeon32_clear(struct vc_data *conp, struct display *p,
+		int srcy, int srcx, int height, int width)
+{
+	fbcon_radeon_clear((struct radeonfb_info *) p->fb_info, srcy * fontheight(p), srcx * fontwidth(p),
+		height * fontheight(p), width * fontwidth(p), ((u32 *) p->dispsw_data)[attr_bgcol_ec(p, conp)]);
+}
+
+static struct display_switch fbcon_radeon32 = {
+	setup:			fbcon_cfb32_setup,
+	bmove:			fbcon_radeon_bmove,
+	clear:			fbcon_radeon32_clear,
+	putc:			fbcon_cfb32_putc,
+	putcs:			fbcon_cfb32_putcs,
+	revc:			fbcon_cfb32_revc,
+	clear_margins:		fbcon_cfb32_clear_margins,
+  	fontwidthmask:		FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+};
+#endif
+

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: [PATCH] radeonfb update vs 2.4.20-pre1
  2002-08-11 21:22 ` [PATCH] radeonfb update vs 2.4.20-pre1 Erik Andersen
@ 2002-08-12 10:18   ` Ani Joshi
  2002-08-12 10:26     ` Erik Andersen
  0 siblings, 1 reply; 39+ messages in thread
From: Ani Joshi @ 2002-08-12 10:18 UTC (permalink / raw)
  To: Erik Andersen; +Cc: Marcelo Tosatti, lkml


These issues are addressed (or should be) in version 0.1.5 of radeonfb
which was posted to the fbdev list a month or so ago.  I am waiting on a
few other fixes I need to get done before I send an update to Marcelo, but
rest assured this will happen in the 2.4.20 cycle.


ani


On Sun, 11 Aug 2002, Erik Andersen wrote:

> Here is an update to the radeonfb.  This is based on a patch
> from Peter Horton that was posted to the lkml back in April
>     http://www.uwsg.indiana.edu/hypermail/linux/kernel/0204.1/0364.html
>
> I have been carrying this patch along in my own tree since April
> and I find it a huge improvement.  Using this patch, I find that
> the radeonfb is quite fast, and colors are correct.
>
> I have updated the patch to fit into 2.4.20-pre1, fixed a few
> obvious little things, and reworked the mtrr handling so it
> matches the behavior of the other framebuffers.  Any chance
> we could get this into 2.4.20?
>
>  -Erik
>
> --
> Erik B. Andersen             http://codepoet-consulting.com/
> --This message was written using 73% post-consumer electrons--
>


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: [PATCH] radeonfb update vs 2.4.20-pre1
  2002-08-12 10:18   ` Ani Joshi
@ 2002-08-12 10:26     ` Erik Andersen
  0 siblings, 0 replies; 39+ messages in thread
From: Erik Andersen @ 2002-08-12 10:26 UTC (permalink / raw)
  To: Ani Joshi; +Cc: Marcelo Tosatti, lkml

On Mon Aug 12, 2002 at 03:18:02AM -0700, Ani Joshi wrote:
> 
> These issues are addressed (or should be) in version 0.1.5 of radeonfb
> which was posted to the fbdev list a month or so ago.  I am waiting on a
> few other fixes I need to get done before I send an update to Marcelo, but
> rest assured this will happen in the 2.4.20 cycle.

Excellent thanks.  Is the latest and greatest posted somewhere?

 -Erik

--
Erik B. Andersen             http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-11 19:46   ` Alan Cox
  2002-08-11 18:49     ` Erik Andersen
@ 2002-08-12 19:29     ` Paul P Komkoff Jr
  1 sibling, 0 replies; 39+ messages in thread
From: Paul P Komkoff Jr @ 2002-08-12 19:29 UTC (permalink / raw)
  To: lkml; +Cc: Alan Cox

Replying to Alan Cox:
> Not a good plan. EFI can be used on non ia64 so NULL_GUID belongs
> somewhere else

maybe but even without NULL_GUID I still need to add asm-ia64 to
KBUILD_INCLUDE_DIRS while trying to kbuild-25ify -ac (and marcelo now)

hint-hint: maybe it IS worth moving to generic include ?

hmm

-- 
Paul P 'Stingray' Komkoff 'Greatest' Jr /// (icq)23200764 /// (http)stingr.net
  When you're invisible, the only one really watching you is you (my keychain)

^ permalink raw reply	[flat|nested] 39+ messages in thread

* RE: Linux 2.4.20-pre1
@ 2002-08-15 17:28 Matt_Domsch
  0 siblings, 0 replies; 39+ messages in thread
From: Matt_Domsch @ 2002-08-15 17:28 UTC (permalink / raw)
  To: linux-kernel; +Cc: marcelo, alan, davej, torvalds, andersen, davidm

> I'd be happy to submit a patch moving asm-ia64/efi.h into 
> include/linux/ if it would be accepted.

I've submitted patches to David Mosberger against 2.4 and 2.5 BK current,
and the latest 2.4 ia64 port patch, which moves efi.h from include/asm-ia64
into include/linux.  This is important now that the GUID Partition Table
(GPT) code is included in the stock 2.4 and 2.5 kernels, and can be used on
non-IA64 platforms - specifically for handling really large disks.  There is
no ia64-specific code in efi.h.  David agrees that it's proper to make this
change.
 
I've asked David, as IA64 port maintainer who currently "owns" this file, to
forward these to Alan, Marcelo, DaveJ, and Linus respectively.

For the curious, the posts to linux-ia64 with patches and explanations:

For 2.5 BK-current:
https://external-lists.vasoftware.com/archives//linux-ia64/2002-August/00385
1.html
https://external-lists.vasoftware.com/archives//linux-ia64/2002-August/00385
2.html

For 2.4 BK-current and ia64-current:
https://external-lists.vasoftware.com/archives//linux-ia64/2002-August/00385
3.html


Thanks,
Matt

--
Matt Domsch
Sr. Software Engineer, Lead Engineer, Architect
Dell Linux Solutions www.dell.com/linux
Linux on Dell mailing lists @ http://lists.us.dell.com
#1 US Linux Server provider for 2001 and Q1/2002! (IDC May 2002)


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: Linux 2.4.20-pre1
  2002-08-05 22:40 Linux 2.4.20-pre1 Marcelo Tosatti
                   ` (8 preceding siblings ...)
  2002-08-11 21:22 ` [PATCH] radeonfb update vs 2.4.20-pre1 Erik Andersen
@ 2002-08-17 19:51 ` Adrian Bunk
  9 siblings, 0 replies; 39+ messages in thread
From: Adrian Bunk @ 2002-08-17 19:51 UTC (permalink / raw)
  To: Marcelo Tosatti, ak; +Cc: lkml, Alan Cox

On Mon, 5 Aug 2002, Marcelo Tosatti wrote:

>...
> Summary of changes from v2.4.19 to v2.4.20-pre1
> ============================================
>...
> <ak@muc.de> (02/08/05 1.657)
> 	[PATCH] Ftape 64bit/x86-64 fixes
>...

This broke the modular building of ftape. In -pre3:

<--  snip  -->

...
depmod: *** Unresolved symbols in
/lib/modules/2.4.20-pre3/kernel/drivers/char/ftape/lowlevel/ftape.o
depmod:         i8253_lock
...

<--  snip  -->


Alan made the following patch to fix it (already in -ac):


--- linux.20pre2/arch/i386/kernel/time.c	2002-08-13 13:58:33.000000000 +0100
+++ linux.20pre2-ac3/arch/i386/kernel/time.c	2002-08-12 15:17:04.000000000 +0100
@@ -31,6 +31,7 @@
  */

 #include <linux/errno.h>
+#include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/param.h>
@@ -116,6 +117,8 @@

 spinlock_t i8253_lock = SPIN_LOCK_UNLOCKED;

+EXPORT_SYMBOL(i8253_lock);
+
 extern spinlock_t i8259A_lock;

 #ifndef CONFIG_X86_TSC



cu
Adrian





^ permalink raw reply	[flat|nested] 39+ messages in thread

end of thread, other threads:[~2002-08-17 19:47 UTC | newest]

Thread overview: 39+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-08-05 22:40 Linux 2.4.20-pre1 Marcelo Tosatti
2002-08-06  0:20 ` Ben Greear
2002-08-06 11:32   ` Marcelo Tosatti
2002-08-06 12:26     ` David S. Miller
2002-08-06 16:45     ` Ben Greear
2002-08-06 17:12     ` NAPI (was Re: Linux 2.4.20-pre1) Jeff Garzik
2002-08-07 14:09       ` Marcus Sundberg
2002-08-06 14:58 ` Linux 2.4.20-pre1 Jason Lunz
2002-08-06 15:03   ` CaT
2002-08-06 21:05 ` Adrian Bunk
2002-08-07 11:09   ` David S. Miller
2002-08-07  0:21 ` J.A. Magallon
2002-08-07  1:08 ` J.A. Magallon
2002-08-07  1:56 ` Bryan Whitehead
2002-08-07  3:35   ` Tim Hockin
2002-08-11  8:57 ` Erik Andersen
2002-08-11  9:16   ` Christoph Hellwig
2002-08-11  9:40     ` Erik Andersen
2002-08-11  9:46     ` Erik Andersen
2002-08-11 19:46   ` Alan Cox
2002-08-11 18:49     ` Erik Andersen
2002-08-12 19:29     ` Paul P Komkoff Jr
2002-08-11 10:56 ` Erik Andersen
2002-08-11 21:22 ` [PATCH] radeonfb update vs 2.4.20-pre1 Erik Andersen
2002-08-12 10:18   ` Ani Joshi
2002-08-12 10:26     ` Erik Andersen
2002-08-17 19:51 ` Linux 2.4.20-pre1 Adrian Bunk
  -- strict thread matches above, loose matches on Subject: below --
2002-08-06  0:21 Jean Tourrilhes
2002-08-06 12:33 ` Marcelo Tosatti
2002-08-06 17:17   ` Jean Tourrilhes
2002-08-06 16:31     ` Marcelo Tosatti
2002-08-06 17:24       ` Jean Tourrilhes
2002-08-06 17:13     ` David S. Miller
2002-08-06 18:48     ` Alan Cox
2002-08-06 23:29 Alan Cox
     [not found] <200208062329.g76NTqP30962@devserv.devel.redhat.com.suse.lists.linux.kernel>
2002-08-07 10:01 ` Andi Kleen
2002-08-07 11:50   ` Alan Cox
2002-08-11 21:12 Matt_Domsch
2002-08-15 17:28 Matt_Domsch

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox