On 11/20/2015 11:39 AM, Greg KH wrote:
> On Fri, Nov 20, 2015 at 10:41:16AM -0500, Doug Ledford wrote:
>> To that end, I've opened my 4.4-rc branch and deleted the three
>> deprecated drivers from staging and moved hfi1 to the rdma tree.  I've
>> sent an email to Linus to see if he's ok taking those changes, and if
>> so, I'll get them submitted and then open up my for-4.5 branch early to
>> be able to start taking for-next patches.
> 
> I think it's too late for that, especially given that I have 34+ patches
> for the staging rdma drivers already in my tree in linux-next.

For hfi1 rename detection should work, for the other three, patches to
removed files are easily resolved as simply dropped patches.  So I don't
think it's that large of an issue.  Correct me if I'm wrong.

>  And the
> hfil1 code really doesn't look like its ready to merge into the "real"
> portion of the kernel tree, given the horrid nature of the patches
> submitted recently for it :(

I'm sorry, that doesn't make sense to me.  How can the quality of
patches that aren't part of the driver yet and are just being submitted
impune the readiness of the code the patches are supposed to be touching?

And that's orthogonal to the issue that the primary TODO item for this
driver requires coordination between it, qib (in the RDMA tree), and the
upcoming soft_roce driver.  If the driver isn't moved, then we have to
coordinate between your tree and mine to make sure that no patches are
taken into your tree until after the patches they depend on have landed
in my tree.  And then you tree likely won't build unless you pull from
my tree and merge up first.  It's not really tenable.  That was why I
had suggested (and originally you agreed to) that I would handle the
entire staging/rdma tree.  However, since you changed your mind on that
issue, we now have this coordination issue.  I don't really want to deal
with that, so I would rather move the hfi1 driver and take care of the
all the needed patching myself going forward.

> I had expected the drivers to be deleted for -rc1, removing them now
> seems a bit late in the merge window.

Yes, I know.  I've been busy.  My apologies for not getting it in prior
to rc1.

-- 
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
              GPG KeyID: 0E572FDD