From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephan Linz Date: Tue, 9 Dec 2003 15:31:18 +0100 Subject: [U-Boot-Users] RE: [PATCH] probe for smc91111.c before chip i nit. In-Reply-To: <71555548814716479478431542AA5F8A058D7C@dlee2k04.ent.ti.com> References: <71555548814716479478431542AA5F8A058D7C@dlee2k04.ent.ti.com> Message-ID: <0312091531180V.27873@pcj86> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Am Dienstag, 9. Dezember 2003 14:27 schrieb Woodruff, Richard: > What aspect didn't work for you? Its all pretty simple, and derived from > the kernel driver. Its worked on my ARM boards with out problem since > 1.0.0 was release. The patch isn't wrong, but standing in conflict with a patch I've posted two or three weeks ago. Last weekend Wolfgang have put my patch into CVS tree befor working on your patch. So your patch conflicts. > > As far as these patches having conflicts, they were conflict free as of > 1.0.0 and the conflicts were probably added in by you the day before. I > don't mind grabbing the day newer versions and merging to those. It can be > a bit of a pain to do direct CVS checkouts from where my machine sits. > Prior to doing any kind of big merge I usually just get tars off of your > site. If you post a tar I will apply against that quicker. > > Regards, > > Richard W. > > -----Original Message----- > From: wd at denx.de [mailto:wd at denx.de] > Sent: Sunday, December 07, 2003 1:42 PM > To: Woodruff, Richard > Cc: 'u-boot-users at lists.sourceforge.net' > Subject: Re: [U-Boot-Users] RE: [PATCH] probe for smc91111.c before chip > init. > > In message <71555548814716479478431542AA5F8A059043@dlee2k04.ent.ti.com> you > > wrote: > > Seems I did the order wrong in the diff. Here is the corrected version. > > Does not work either. It conflicts with the current version of the > source in CVS. Can you please check, and resubmit? > > Best regards, > > Wolfgang Denk -- Mit freundlichen Gruessen Stephan Linz ====================================================================== Stephan Linz Softwareentwicklung MAZeT GmbH Email: mailto:linz at mazet.de G?schwitzer Str. 32 Tel. : (3641) 2809-55 D-07745 Jena Fax : (3641) 2809-12 Besuchen Sie bitte unsere Web-Seiten: http://www.MAZeT.de ======================================================================