On 08/24/2017 04:28 PM, Linus Walleij wrote:
I don't see how you can have a merge conflict between this patch that only affects gpiolib.c and something in the pin control tree?
Actually, the merge conflict is because this is missing in the gpio tree: pinctrl: msm: add support to configure ipq40xx GPIO_PULL bits
The merge window is imminent, so if it is not extremely urgent I would opt to wait until after.
As long as it gets into 4.14-final, I don't care which specific RC it appears in. Thanks.
-- 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 linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
