On Thu, 2017-02-23 at 08:39 -0800, Linus Torvalds wrote: > On Thu, Feb 23, 2017 at 8:33 AM, Linus Torvalds > <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > > > > > > Do you have pointers to the actual diff? > > Ok, I found them. Not sure which you found, mailing list archive or other. But they are also in my git repo on the k.o/for-4.11-dma_ops branch. > > > > That doesn't sound very > > tree-wide, it sounds limited to just rdma, and as such shouldn't > > impact anybody else. > > Ok, it's somewhat tree-wide, but doesn't look all that conflicting to > me. I'd rather have those patches early than late. I'll get those to you tomorrow then. I pulled these patches on Jan 20, and as a result of being in their own branch and not in my for-next area (as per some guidance I received on how to handle these since they are at least lightly tree-wide), they have developed some merge conflicts. It will be cleaner if I send the Mellanox pull request next so you can process it while I fix up those 3 issues tonight (I have to run to an appt soon). -- Doug Ledford <dledford@xxxxxxxxxx> GPG KeyID: B826A3330E572FDD Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
Attachment:
signature.asc
Description: This is a digitally signed message part
