[ewg] Re: [ofa-general] ANNOUNCE ofed backports for 2.6.22 kernel bits

[Michael S. Tsirkin]

> Quoting Sean Hefty <sean.hefty at intel.com>:
> Subject: RE: [ofa-general] ANNOUNCE ofed backports for 2.6.22 kernel bits
> 
> >Examples: What if there's a conflict? I currently do git reset, we'll
> 
> If there's a conflict applying a patch, you reject it.  I fail to see any issue
> here.

But the proposal here was to have a bush of branches, all of which
need to be merged at the same time. It's possible that some
would merge and some would fail, leaving me in an inconsistent state,
and no easy way to get back to where I started.

-- 
MST