[ofa-general] Re: [GIT PULL] please pull infiniband.git for-linus

[Andrew Morton]

On Thu, 11 Oct 2007 18:17:19 -0700 (PDT)
David Miller <davem at davemloft.net> wrote:

> From: Roland Dreier <rdreier at cisco.com>
> Date: Thu, 11 Oct 2007 18:08:52 -0700
> 
> > This will get the batch of changes queued up for the 2.6.24 merge
> > window (although I still have a few more things to merge later, once
> > Dave Miller's networking tree has landed too):
> 
> Roland are you absolutely sure this won't create merge conflicts with
> my 8MB net-2.6 merge, inside of which there are many infiniband
> driver changes?

I'd have told him if there were any such problems.

There might of course be runtime problems, but I'm sure the infiniband
developers are testing -mm kernels so that any such problems will be
picked up beforehand (heh, I kill me).