Re: [PATCH 1/3] pinctrl: lantiq: 2 pins have the wrong mux list

[Linus Walleij <linus.walleij@xxxxxxxxxx>]

On Tue, Jan 5, 2016 at 1:59 PM, Martin Schiller <mschiller@xxxxxx> wrote:
> On 01/05/2016 at 11:10 AM, John Crispin wrote:
>>
>>
>> On 05/01/2016 11:03, Linus Walleij wrote:
>> > On Mon, Jan 4, 2016 at 10:27 PM, John Crispin <blogic@xxxxxxxxxxx>
>> wrote:
>> >
>> >> The latest vendor SDK contained this patch.
>> >>
>> >> Signed-off-by: John Crispin <blogic@xxxxxxxxxxx>
>> >
>> > Patch applied. Had to rebase it manually for some reason.
>> >
>> > Yours,
>> > Linus Walleij
>> >
>>
>>
>> weird, it was generated using git on top of v4.4-rc7
>
> I think that's because of the changes submitted by me, which are not in
> the official v4.4-rc7 so far:
>
> https://git.kernel.org/cgit/linux/kernel/git/linusw/linux-pinctrl.git/commit/drivers/pinctrl/pinctrl-xway.c?h=devel&id=be14811c03cf20c793fd176a347625335110b0e6

I found the mess, of course it's my own fault. I merged some patches
into the pin control tree and some into the GPIO tree and that combined
with my massive refactorings is a mess.

I did some reverting and moving patches between the trees and
now it should merge up in linux-next all right.

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