> > Can I do this as a subsequent patch though? The current patch fits > > neatly onto our internal stable kernel (currently v3.10). The added > > work will require back-porting Hans' patch-set, which has not yet > > reached Mainline. > > Hmm.... I'll apply Hans' patchset pretty soon and we still have some > time in this devel cycle so I'd much prefer applying the final patch. I think that's a pretty unfair ask. I could understand if the patch(es) didn't apply, or were hindered by the new API change, but I do not believe that is the case? FWIW, I have tried to apply the patches Hans send me, but they don't seem to apply cleanly. Base is v3.14-rc1: Applying: ahci-platform: Add support for devices with more then 1 clock fatal: sha1 information is lacking or useless (drivers/ata/ahci_platform.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 ahci-platform: Add support for devices with more then 1 clock The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Any ideas? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
