On 01/23/2016 10:13 PM, Linus Torvalds wrote:
> On Sat, Jan 23, 2016 at 7:05 PM, Linus Torvalds
> <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>>
>> rdma had better not be this kind of pain in the arse in the future,
>> because I really will just stop pulling if it is.
>
> Side note: I'd suggest you start using branches for rdma. Because I'm
> going to be very picky about my rdma pulls going forward, and if you
> put everything in one big pile, the likelihood that it just gets
> rejected is now very very high.
Understood. This release cycle was a bit of a flag day. There were
early cleanups that the rest of the code depended on, hence the way it
was put together. I tend to use branches if they can be merged easily
and don't have these sorts of early, intrusive dependencies.
> Using separate branches means that I can decide to merge the sane and
> easy stuff. The stuff that doesn't contain Mellanox shit, in other
> words. The stuff that isn't controversial.
Ok.
> At least that way you get *something* merged. Because right now I'm
> actually so fed up with this that if I hadn't already pushed it out, I
> would have decided to just undo the pull after all.
Or, can you please make sure that the right people inside Mellanox
review Linus tree for any merge issues ASAP. Then let's have a separate
conversation about preventing this in the future?
--
Doug Ledford <dledford@xxxxxxxxxx>
GPG KeyID: 0E572FDD
Attachment:
signature.asc
Description: OpenPGP digital signature
