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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 16 Feb 2016 21:16:27 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Geert Uytterhoeven <geert@...ux-m68k.org>
Cc:	Linus Walleij <linus.walleij@...aro.org>,
	Linux-Next <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Krzysztof Adamski <krzysztof.adamski@...to.com>
Subject: Re: linux-next: manual merge of the gpio tree with the pinctrl tree

Hi Geert,

On Tue, 16 Feb 2016 09:23:48 +0100 Geert Uytterhoeven <geert@...ux-m68k.org> 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