On 12/12/2017 7:09 PM, Sinan Kaya wrote: > On 12/12/2017 7:36 AM, Rafael J. Wysocki wrote: >> On Tue, Dec 12, 2017 at 6:38 AM, Vinod Koul <vinod.koul@xxxxxxxxx> wrote: >>> On Thu, Dec 07, 2017 at 04:10:24PM -0500, Sinan Kaya wrote: >>>> Introduce new ACPI and OF device ids for thw HW along with the helper >>>> functions. >>>> >>>> Changes from v6: >>>> * add const to the device callback parameter in fwnode. >>>> * reorganize the callbacks in the code >>>> * rename get_match_data() as device_get_match_data() >>>> * place pointer checks into acpi_get_match_data() >>> >>> This fails for me at 3rd patch. I am on -rc1 is there a dependency? >> >> There shouldn't be any. >> >> According to git, all changes to the files touched by the [3/7] are in >> -rc1 already. >> > > Let me know if you were able to resolve the conflict. I can rebase against > a development tree if you can point me to there. > Apparently, my patches were based of 4.14 kernel. I just rebased to 4.15-rc1. I can post a new version. Let me know. -- Sinan Kaya Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project. -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
