[parisc-linux] Merge with Linus 2.3.99pre1

[parisc-linux] Merge with Linus 2.3.99pre1

[willy]

Linus released 2.3.99pre1 today which marks the start of the 2.4
release effort.  We'd like to merge Linus' changes into our tree on
Friday, starting around 11am EST (8am PST, 4pm UTC, 5pm CET).  If you
have any local changes which can go back into our tree, now would be a
good time to commit them.  If you're in the middle of something which
will be disrupted by this, now would also be a good time to shout `STOP'.

People who wish to help are welcome.  Please contact me if you feel you
can help.

Re: [parisc-linux] Merge with Linus 2.3.99pre1

[Michael Ang]

Later today I will post a list of files that will need to be manually
merged or checked as part of the merge effort.  We will need an "owner"
for each of these files so that we can quickly resolve any problems. 
The last merge went smoothly (as smoothly as possible) due to everyone's
cooperation.  Hopefully this time we will spend even less time in merge
hell :)

	- Mike.

Re: [parisc-linux] Merge with Linus 2.3.99pre1

[Philipp Rumpf]

On Wed, Mar 15, 2000 at 02:03:09PM -0500, willy@thepuffingroup.com wrote:
> Linus released 2.3.99pre1 today which marks the start of the 2.4
> release effort.  We'd like to merge Linus' changes into our tree on
> Friday, starting around 11am EST (8am PST, 4pm UTC, 5pm CET).

I don't think merging with 2.3.99pre1 before verifying it works on at least
one other non-x86 architecture is a good idea.  I'd also prefer it if someone
tried nfsroot aso with it before.

Wouldn't it be a good idea to choose a kernel that has been released for more
than 2 days for merging ?

> If you have any local changes which can go back into our tree, now would be a
> good time to commit them.

I do, but am still waiting for reactions to the Assembly Language Changes
thread.

> If you're in the middle of something which
> will be disrupted by this, now would also be a good time to shout `STOP'.

My changes can as easily be merged after we moved to 2.3.99pre1 as they can
now.

	Philipp

Re: [parisc-linux] Merge with Linus 2.3.99pre1

[willy]

On Thu, Mar 16, 2000 at 12:15:25PM +0100, Philipp Rumpf wrote:
> On Wed, Mar 15, 2000 at 02:03:09PM -0500, willy@thepuffingroup.com wrote:
> > Linus released 2.3.99pre1 today which marks the start of the 2.4
> > release effort.  We'd like to merge Linus' changes into our tree on
> > Friday, starting around 11am EST (8am PST, 4pm UTC, 5pm CET).
> 
> I don't think merging with 2.3.99pre1 before verifying it works on at least
> one other non-x86 architecture is a good idea.  I'd also prefer it if someone
> tried nfsroot aso with it before.

It works on sparc (Josh Uziel has it running).  Your point about trying
nfs-root is a good one.  I shall test that today.

> Wouldn't it be a good idea to choose a kernel that has been released for more
> than 2 days for merging ?

By Friday it'll have been out for 4 days :-)  If there's anything
catastrophic, I think we would know by now.

> > If you have any local changes which can go back into our tree, now would be a
> > good time to commit them.
> 
> I do, but am still waiting for reactions to the Assembly Language Changes
> thread.

i think that anyone who wants to object has had sufficient time to do so
by now.

> > If you're in the middle of something which
> > will be disrupted by this, now would also be a good time to shout `STOP'.
> 
> My changes can as easily be merged after we moved to 2.3.99pre1 as they can
> now.

I guess it's your call then.

[parisc-linux] 2.3.99pre1 merge CANCELLED

[Michael Ang]

There have now been reported several problems with the 2.3.99pre1
release, so prumpf is right that we should hold off merging for now. 
Once there is a stable 2.3.99preX release, we should merge to that
kernel since it has been some time since our last merge.

This has been a test of the emergency merge system, we now return you to
our (ir)regularly scheduled hacking.

	- Mike.

Philipp Rumpf wrote:
> 
> On Wed, Mar 15, 2000 at 02:03:09PM -0500, willy@thepuffingroup.com wrote:
> > Linus released 2.3.99pre1 today which marks the start of the 2.4
> > release effort.  We'd like to merge Linus' changes into our tree on
> > Friday, starting around 11am EST (8am PST, 4pm UTC, 5pm CET).
> 
> Wouldn't it be a good idea to choose a kernel that has been released for more
> than 2 days for merging ?

Re: [parisc-linux] 2.3.99pre1 merge CANCELLED

[Paul Bame]

= There have now been reported several problems with the 2.3.99pre1
= release, so prumpf is right that we should hold off merging for now. 
= Once there is a stable 2.3.99preX release, we should merge to that
= kernel since it has been some time since our last merge.

We could use this opportunity to start removing our SOM __setup
hacks since we're now based on ELF?

	-P

Re: [parisc-linux] 2.3.99pre1 merge CANCELLED

[willy]

On Fri, Mar 17, 2000 at 10:18:59AM -0700, Paul Bame wrote:
> = There have now been reported several problems with the 2.3.99pre1
> = release, so prumpf is right that we should hold off merging for now. 
> = Once there is a stable 2.3.99preX release, we should merge to that
> = kernel since it has been some time since our last merge.
> 
> We could use this opportunity to start removing our SOM __setup
> hacks since we're now based on ELF?

Certainly.

Re: [parisc-linux] 2.3.99pre1 merge CANCELLED

[Bryan W. Headley]

Personally, I'd merge now regardless of their situation. If the goal is to be
in the 2.4 baseline, then the rest of the development
community needs to see that the addition of the parisc code does not
negatively effect things.  If not, and it's a 2.5 delivery, we still
have to be firmly rooted in 2.4, when the two trees split off.

Also, the changes required to fix whatever's wrong with 2.3.99pre1 may be in
the realm of 3-4 files; what's the manifest for merging look like in
comparison, and what is the likelihood of the 3-4 (or whatever the count)
files between what you are merging/contributing and what they are fixing
overlapping each other?

Even if they do overlap, I'd rather manage the 1-2 line "patches" they put
into those overlapped files than continually hold off doing the merge.  Either
road, the sooner you can drop the manifest of the files to merge from "the
whole distribution" to a more manageable 2-5 files, plus arch/pa-risc, the
better.

The sooner we're in sync to something, the easier it'll be to keep in sync.
The early 2.4's will go fast, as things forgotten to be merged, or not merged
right and ferreted out and fixed. (One of the reasons I dislike the parallel
development paths: none of us have good enough revision control tools to
notice that something fixed in 2.2 after branch-off did not propagate to 2.3
as it should -- ah, for a PD Clearcase!)


--
Bryan W. Headley                     Phone: 312/913-9158
Chief Technology Officer             Fax:   312/913-9155
Prisma & Company                     Email: bheadley@prismalink.com

Re: [parisc-linux] 2.3.99pre1 merge CANCELLED

[Jason Eckhardt]

On Fri, 17 Mar 2000, Bryan W. Headley wrote:

> The early 2.4's will go fast, as things forgotten to be merged, or not merged
> right and ferreted out and fixed. (One of the reasons I dislike the parallel
> development paths: none of us have good enough revision control tools to
> notice that something fixed in 2.2 after branch-off did not propagate to 2.3
> as it should -- ah, for a PD Clearcase!)
> 

  While CVS isn't the perfect revision control system, I would use almost
  anything before ever touching ClearCase again...the intolerable slowness,
  the endless clearcase admin issues, the more-time-being-pissed-off-at-
  clearcase-than-doing-real-work issues, ... 
  jason.

> 
> --
> Bryan W. Headley                     Phone: 312/913-9158
> Chief Technology Officer             Fax:   312/913-9155
> Prisma & Company                     Email: bheadley@prismalink.com
>