Subject: Re: linux-next: manual merge of the gpio tree with the pinctrl tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 16 Feb 2016 21:16:27 +1100

Hi Geert,

On Tue, 16 Feb 2016 09:23:48 +0100 Geert Uytterhoeven <[email-masked]> wrote:
>
> That resolution looks correct to me, but doesn't match your end result
> in next-20160216:
> 
>         u32 set_mux = pctl->desc->irq_read_needs_mux &&
>                         test_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
>         u32 pin = offset + chip->base;
> 
> I think the end result should be:
> 
>         bool set_mux = pctl->desc->irq_read_needs_mux &&
>                 gpiochip_line_is_irq(chip, offset);
>         u32 pin = offset + chip->base;

Yeah, that's because the resulting tree failed to build so I undid the
merge and merged yesterday's version of the gpio tree.

-- 
Cheers,
Stephen Rothwell