All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Hirst <rhirst@linuxcare.com>
To: parisc-linux@thepuffingroup.com
Subject: Re: [parisc-linux] [MERGE] trouble files
Date: Thu, 25 May 2000 09:35:30 +0100	[thread overview]
Message-ID: <20000525093530.C1338@linuxcare.com> (raw)
In-Reply-To: <20000523200750.F17536@thepuffingroup.com>; from willy@thepuffingroup.com on Tue, May 23, 2000 at 08:07:50PM -0400

On Tue, May 23, 2000 at 08:07:50PM -0400, willy@thepuffingroup.com wrote:
> 
> the following list of files (if I remember to attach them this time...)
> are the files which have been modified in both the parisc tree and Linus'
> 2.3.99pre8 tree.  I've omitted the files where the rcs id is the only thing
> changed.

> drivers/net/82596.c

I don't believe we use that; I guess we started modifying it and then
created our own lasi_82596.c from it.  I'll check if anything that
changed in 82596.c needs feeding back in to lasi_82596.c.

Richard

  parent reply	other threads:[~2000-05-25  8:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2000-05-24  0:07 [parisc-linux] [MERGE] trouble files willy
2000-05-25  1:19 ` Michael Ang
2000-05-25  8:35 ` Richard Hirst [this message]
2000-05-25 15:41   ` willy
2000-05-26  5:43 ` Grant Grundler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20000525093530.C1338@linuxcare.com \
    --to=rhirst@linuxcare.com \
    --cc=parisc-linux@thepuffingroup.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.