[ofa-general] linux-next: infiniband merge conflict

[Stephen Rothwell]

On Tue, 18 Mar 2008 11:29:44 -0700 Roland Dreier <rdreier at cisco.com> wrote:
>
>  > Yesterday and today, I got a merge conflict between the infiniband tree
>  > and driver-core patch
>  > ib-convert-struct-class_device-to-struct-device.patch.  The resolution is
>  > pretty tirivial, but maybe a better solution is for that patch to be
>  > added to the infinband tree.
> 
> I assume it's the __FUNCTION__ -> __func__ conversion causing the clash?

Yes, that and "RDMA/nes: Remove redundant NULL check in
nes_unregister_ofa_device()" removes some of the context of Greg's patch.

> Greg, I'm fine with merging that patch through my tree.  The only
> potential problem I see is if you also have the final class_device
> removal patch in your tree too, in which case your tree then depends
> on my tree in an unfortunate way.

I keep reverting that patch (and hope Greg will remove it from his
linux-next series (NEXT_PATCHES_START/END hint, hint :-))

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/general/attachments/20080319/15bdcecd/attachment.sig>