Re: [PATCH v2] gpiolib: tighten up ACPI legacy gpio lookups

[Linus Walleij]

On Sun, Dec 13, 2015 at 5:44 PM, Dmitry Torokhov
<dmitry.torokhov@xxxxxxxxx> wrote:
> On Sun, Dec 13, 2015 at 8:37 AM, Linus Walleij <linus.walleij@xxxxxxxxxx> wrote:
>> On Wed, Dec 9, 2015 at 6:21 PM, Dmitry Torokhov
>> <dmitry.torokhov@xxxxxxxxx> wrote:
>>
>>>> > Hmm, I'd like to get this patch into my tree as well to apply Irina's
>>>> > goodix pieces on top to make sure they do not break. Would it be OK for
>>>> > me to just apply the patch and hope git will sort it out when we merge
>>>> > into next/mainline, you maybe you could prepare a 4.3-based branch with
>>>> > the patch for me to pull?
>>>>
>>>> I had to fuzz the patch so then you need to get the version I applied out
>>>> of my tree.
>>>>
>>>> But I'm not going to rebase the tree so you can pull commit
>>>> 9c3c9bc9cc980d8981f75109f3921576daf75723
>>>> from the GPIO tree if you like. Or I can make a tag there if
>>>> you prefer, just tell me.
>>>
>>> Both would mean I will end up with parts of your work-in-progress queue,
>>> which I would rather avoid. If you create a branch (lets call it A) off
>>> v4.3 and apply that one patch there and merge branch A it into your main
>>> branch (even though you already have a version of the same patch in your
>>> main branch) and I will merge that branch A into my tree then we are
>>> guaranteed not to have conflicts as git will resolve everything nicely.
>>
>> I can't do that, as this patch is not applying cleanly on v4.3.
>>
>> It applies cleanly to v4.4-rc1 though, would you like an immutable
>> branch like such based on v4.4-rc1 instead?
>
> Yep, that would work too.

OK here is a for-dmitry branch:
https://git.kernel.org/cgit/linux/kernel/git/linusw/linux-gpio.git/log/?h=for-dmitry

Absolutely nothing happens when I merge it to my devel branch so I guess
git will cope, but whatever, this one is safe :)

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/