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

[Stephen Rothwell]

On Tue, 18 Mar 2008 16:04:09 -0700 Roland Dreier <rdreier at cisco.com> wrote:
>
>  > > 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 :-))
> 
> Sorry, I'm not able to parse the antecedent of "that" in your
> sentence.  Which patch are you hoping about?

The one that removes struct class_device
(driver-core-remove-no-longer-used-struct-class_device.patch).  Greg has
agreed that that patch needs to be merged late.

-- 
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/e72bcde7/attachment.sig>