All of lore.kernel.org
 help / color / mirror / Atom feed
* Re: [parisc-linux] linux-2.4.0
@ 2001-01-26  0:48 Matthew Wilcox
  2001-01-26  1:57 ` Grant Grundler
  2001-01-26 10:23 ` [parisc-linux] linux-2.4.0 Richard Hirst
  0 siblings, 2 replies; 13+ messages in thread
From: Matthew Wilcox @ 2001-01-26  0:48 UTC (permalink / raw)
  To: parisc-linux


ok, the merge is complete and the head of the tree is now linux-2.4.0.
it's marked with the LINUS_240_DEVEL tag.  sorry for messing it up
so badly.

drivers/pci is almost unaltered from 2.4.0-test10 as grant thinks the
changes which have been made will break our PCI code.

a few conflicts worth noting... jsm had merged some stuff from -test11
into our tree.  dealt with those dual patches, no problem.

kernel/ptrace.c, kernel/module.c got some cache flushing changeswhich
conflicted with some of ours (only textually, not semantically).

tulip_core.c seemed to have absorbed some of our patches.  acenic.c had
some small changes.

we have large outstanding diffs in the scsi directory -- richard
volunteered to take care of this.  some other drivers need submitting
/ updating.

i'm going to send linus a patch tomorrow to get our arch/parisc and
include/asm-parisc trees uptodate in his tree.

-- 
Revolutions do not require corporate support.

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [parisc-linux] linux-2.4.0
@ 2001-01-25  0:06 Matthew Wilcox
  0 siblings, 0 replies; 13+ messages in thread
From: Matthew Wilcox @ 2001-01-25  0:06 UTC (permalink / raw)
  To: parisc-linux


i've merged linus' 2.4.0 release into our tree.  it compiles, with fewer
warnings than before.  but some things have been changed in the vm system
i'm not 100% confident with.  so, since i'm not in a position to boot
the 712 right now (lack of networking), i'm checking it in as a branch
called LINUS_240_FIXUP.

the checkin's going a bit slowly, so don't try it just yet, but it should
be done shortly.  those of you on the cvs list will see when it's done.

-- 
Revolutions do not require corporate support.

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

end of thread, other threads:[~2001-02-14 16:18 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2001-01-26  0:48 [parisc-linux] linux-2.4.0 Matthew Wilcox
2001-01-26  1:57 ` Grant Grundler
2001-01-26  3:04   ` Matthew Wilcox
2001-01-31 16:16     ` Alan Cox
2001-01-31 18:49       ` Andrew Shugg
2001-02-02  2:52         ` Matthew Wilcox
2001-02-13 18:32           ` [parisc-linux] C100 & Latest CVS Bits Greg Ingram
2001-02-13 19:46             ` Grant Grundler
2001-02-13 20:16               ` Greg Ingram
2001-02-13 22:46                 ` Steven Pritchard
2001-02-14 16:17                   ` Auto-rebooting (was Re: [parisc-linux] C100 & Latest CVS Bits) Greg Ingram
2001-01-26 10:23 ` [parisc-linux] linux-2.4.0 Richard Hirst
  -- strict thread matches above, loose matches on Subject: below --
2001-01-25  0:06 Matthew Wilcox

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.