Keeping the ball rolling.. Fix up some merge errors, scoop
up another bunch of pending fixes, and back out some problem bits
for now.
Patch is available from:
http://www.codemonkey.org.uk/patches/2.5/patch-2.5.1-dj2.diff.bz2
Some of these fixes still haven't found their way back to Marcelo yet
but should show up in 2.4.17-rc2 / 2.4.18pre1 with any luck.
2.5.1-dj2
o bio fixes for qlogicfas. ([email protected])
o Correct x86 CPU helptext. (Me)
o Fix serial.c __ISAPNP__ usage. (Andrey Panin)
o Use better ide-floppy fixes. (Jens Axboe)
o Make NFS 'fsx' proof. (Trond Mykelbust)
| 2 races & 4 bugs, hopefully this is all.
o devfs update (Richard Gooch)
o Backout early CPU init, needs more work. (Me)
| This should fix several strange reports.
o drop new POSIX kill semantics for now (Me)
2.5.1-dj1
o Resync with 2.5.1
| drop reiserfs changes. 2.4's look to be more complete.
o Fix potential sysvfs oops. (Christoph Hellwig)
o Loopback driver deadlock fix. (Andrea Arcangeli)
o __devexit cleanups in drivers/net/ (Daniel Chen,
synclink, wdt_pci & via82cxxx_audio John Tapsell)
o Configure.help updates (Eric S. Raymond)
o Make reiserfs compile again. (Me)
o bio changes for ide floppy (Me)
| handle with care, compiles, but is unfinished.
o Make x86 identify_cpu() happen earlier (Me)
| PPro errata workaround & APIC setup got a little
| cleaner as a result.
o Blink keyboard LEDs on panic (From 2.4.13-ac)
o Change current->state frobbing to set_current_state() (From 2.4.13-ac)
o Add MODULE_LICENSE tags for acpi,md.c,fmvj18x, (From 2.4.13-ac)
atyfb & fbmem.
2.5.1pre11-dj2
o Merge with 2.4.17rc1
o Activate out of order stores on IDT Winchips. (From 2.4.13-ac)
o ICH2 APIC support (From 2.4.13-ac)
o Activate Simple boot flag support (From 2.4.13-ac)
| was merged in -dj1, but not mentioned.
o Remove matroxfb PLL debugging message. (Me)
2.5.1pre11-dj1
o Merge with 2.4.17pre8
Drop devfs changes. (Newer version in 2.5)
o Make ncr53c8xx bio aware. (Me)
--
| Dave Jones. http://www.codemonkey.org.uk
| SuSE Labs .
Dave Jones wrote:
>
> Keeping the ball rolling.. Fix up some merge errors, scoop
> up another bunch of pending fixes, and back out some problem bits
> for now.
>
> Patch is available from:
> http://www.codemonkey.org.uk/patches/2.5/patch-2.5.1-dj2.diff.bz2
>
> Some of these fixes still haven't found their way back to Marcelo yet
> but should show up in 2.4.17-rc2 / 2.4.18pre1 with any luck.
Quick general question since I guess I missed it: What is the 'charter'
for the -dj branch?
Are you accumulating the changes in 2.4 for Linus to merge into 2.5, or
do you have another purpose?
TIA,
Eli
--------------------. Real Users find the one combination of bizarre
Eli Carter \ input values that shuts down the system for days.
eli.carter(a)inet.com `-------------------------------------------------
On Mon, 17 Dec 2001, Eli Carter wrote:
> > http://www.codemonkey.org.uk/patches/2.5/patch-2.5.1-dj2.diff.bz2
> Quick general question since I guess I missed it: What is the 'charter'
> for the -dj branch?
> Are you accumulating the changes in 2.4 for Linus to merge into 2.5, or
> do you have another purpose?
Primarily its to keep 2.4 bits in sync, but at the same time
I'm going to try and keep it in a usable state for experimenting.
Carrying forward merges is no fun if I can't reboot the testboxes
for eg..
I'll also merge things expected to go to Marcelo/Linus to cut down on
merge time between Marcelo & Linus' patches.
When Linus is ready, the accumlated 2.4 bits will take priority
over anything else that happens to get picked up along the way.
regards,
Dave.
--
| Dave Jones. http://www.codemonkey.org.uk
| SuSE Labs