From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Linus Walleij <linus.walleij@linaro.org>,
Linux-Next <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Krzysztof Adamski <krzysztof.adamski@tieto.com>
Subject: Re: linux-next: manual merge of the gpio tree with the pinctrl tree
Date: Tue, 16 Feb 2016 21:16:27 +1100 [thread overview]
Message-ID: <20160216211627.3a8dc62d@canb.auug.org.au> (raw)
In-Reply-To: <CAMuHMdW2CVgzX0vvjdrLq4bFwcUvJto_a6JPfXP_NG=VGDoqjw@mail.gmail.com>
Hi Geert,
On Tue, 16 Feb 2016 09:23:48 +0100 Geert Uytterhoeven <geert@linux-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
next prev parent reply other threads:[~2016-02-16 10:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 3:37 linux-next: manual merge of the gpio tree with the pinctrl tree Stephen Rothwell
2016-02-16 8:23 ` Geert Uytterhoeven
2016-02-16 10:16 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-09-13 3:15 Stephen Rothwell
2014-10-01 6:01 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160216211627.3a8dc62d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=geert@linux-m68k.org \
--cc=krzysztof.adamski@tieto.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).