bug#164: [kernel] bug#164: drivers/net/pcnet32.c is full of cvs conflicts

X-PA-RISC Linux-PR-Message: report 164
X-PA-RISC Linux-PR-Package: kernel
X-Loop: daniel_frazier@hp.com
Received: via spool by 164-bugs@bugs.parisc-linux.org id=B164.10163740812750
          (code B ref 164); Sun, 17 Mar 2002 14:18:01 GMT
Date: Sun, 17 Mar 2002 14:07:59 +0000
From: Matthew Wilcox <willy@debian.org>
To: Richard Hirst <rhirst@linuxcare.com>, 164@bugs.parisc-linux.org
Message-ID: <20020317140759.H21765@parcelfarce.linux.theplanet.co.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5.1i
In-Reply-To: <no.id>; from kernel-admin@lists.parisc-linux.org on Sun, Mar 17, 2002 at 02:04:35PM +0000
Sender: <willy@www.linux.org.uk>

On Sun, Mar 17, 2002 at 02:04:35PM +0000, kernel-admin@lists.parisc-linux.org wrote:
> Looks like the conflicts in pcnet32.c were not resolved before commiting
> the last merge.

That's right, helge said he'd fix them... drop it from the kernel config
if it's causing you problems.

-- 
Revolutions do not require corporate support.