[openib-general] [PATCH] Consolidate access to ib_agent_port_list

Tue Oct 26 10:39:26 PDT 2004

Hi again KK,

On Tue, 2004-10-26 at 13:26, Krishna Kumar wrote:
> Thanks for applying the patch with the 2 fixes.

Thanks for your efforts on this :-)

> > I also don't understand why the patching resulted in the need to do some
> > manual merging (as several hunks failed).
> 
> Sorry about this, but I am not sure why it happened - I did a svn update
> a few minutes before sending the patch. I am not sure if my mailer is
> mangling the patch - I will check that today.

I don't think it is your mailer. patch seemed to complain about the line
numbers although manually this was a trivial merge. I am less than
impressed with svn's merge capabilities. It seems to handle only the
most basic merging. Oh well, I've worked with less in the distant past.

-- Hal