YAMAMOTO Takashi <yamt@mwd.biglobe.ne.jp> writes:
>> > is it ok to revert some of these changes,
>> > at least uvm_km.c, which is in a function removed on yamt-km branch?
>> 
>> Wouldn't it be easier to just fix the branch?
>
> sorry, what do you mean by "fix"?
>
> my point is, i don't want to resolve confilicts by hand where
> it can be done easily via "patch -R".

Take the file on the branch where there is a merge problem, and run
sed over it to strip the trailing whitespace. The file will then merge
cleanly.

-- 
Perry E. Metzger		perry@piermont.com