From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailserv2.iuinc.com (IDENT:qmailr@mailserv2.iuinc.com [206.245.164.55]) by puffin.external.hp.com (8.9.3/8.9.3) with SMTP id NAA23167 for ; Wed, 15 Mar 2000 13:27:07 -0700 Sender: subc@mailserv2.iuinc.com Message-ID: <38CFE44B.8EAF5DCA@subcarrier.org> Date: Wed, 15 Mar 2000 14:28:11 -0500 From: Michael Ang MIME-Version: 1.0 To: willy@thepuffingroup.com CC: parisc-linux@thepuffingroup.com Subject: Re: [parisc-linux] Merge with Linus 2.3.99pre1 References: <20000315140309.U27942@thepuffingroup.com> Content-Type: text/plain; charset=us-ascii List-ID: 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.