From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2 2/2] gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections
Date: Thu, 20 Jun 2013 08:04:07 +0000 [thread overview]
Message-ID: <1653091.GeQyMLF6L8@avalon> (raw)
In-Reply-To: <CACRpkdZJ1Hg=4w1fySiMgy0-Qdph1pD0OZGLFecxHhTsMEKQog@mail.gmail.com>
Hi Linus,
On Thursday 20 June 2013 08:42:23 Linus Walleij wrote:
> On Wed, Jun 19, 2013 at 9:51 PM, Laurent Pinchart wrote:
> > On Wednesday 19 June 2013 21:17:35 Linus Walleij wrote:
> >> On Tue, Jun 18, 2013 at 12:29 PM, Laurent Pinchart wrote:
> >> > All functions and data types used by OF-specific code paths are
> >> > declared
> >> > in <linux/of.h> regardless of CONFIG_OF. Replace the #ifdef CONFIG_OF
> >> > guard with a if(IS_ENABLED(CONFIG_OF)) and let the compiler optimize
> >> > the unused code away.
> >> >
> >> > Signed-off-by: Laurent Pinchart
> >> > <laurent.pinchart+renesas@ideasonboard.com>
> >>
> >> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> >
> > Thank you. Can you please take the patch in your tree ?
>
> No. It does not apply:
>
> ]$ git am --signoff rcar-fix.patch
> Tillämpar: gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections
> error: patch misslyckades: drivers/gpio/gpio-rcar.c:279
> error: drivers/gpio/gpio-rcar.c: patchen kan inte tillämpas
> Patchen misslyckades vid 0001 gpio-rcar: Remove #ifdef CONFIG_OF
> around OF-specific sections
> En kopia av patchen som misslyckades finns i:
> /home/linus/src/linux-trees/linux-gpio/.git/rebase-apply/patch
> När du har löst problemet kör du "git am --resolved".
> Om du vill hoppa över patchen kör du istället "git am --skip".
> För att återställa originalgrenen och avbryta kör du "git am --abort".
>
>
> Isn't this RCAR stuff funneled through ARM SoC this merge window?
> Then you have to send it to the ARM SoC folks corresponding branch.
Oops, my bad. I had mistaken it for one of the pinctrl patches.
/me needs to sleep more :-)
--
Regards,
Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: laurent.pinchart@ideasonboard.com (Laurent Pinchart)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 2/2] gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections
Date: Thu, 20 Jun 2013 10:04:07 +0200 [thread overview]
Message-ID: <1653091.GeQyMLF6L8@avalon> (raw)
In-Reply-To: <CACRpkdZJ1Hg=4w1fySiMgy0-Qdph1pD0OZGLFecxHhTsMEKQog@mail.gmail.com>
Hi Linus,
On Thursday 20 June 2013 08:42:23 Linus Walleij wrote:
> On Wed, Jun 19, 2013 at 9:51 PM, Laurent Pinchart wrote:
> > On Wednesday 19 June 2013 21:17:35 Linus Walleij wrote:
> >> On Tue, Jun 18, 2013 at 12:29 PM, Laurent Pinchart wrote:
> >> > All functions and data types used by OF-specific code paths are
> >> > declared
> >> > in <linux/of.h> regardless of CONFIG_OF. Replace the #ifdef CONFIG_OF
> >> > guard with a if(IS_ENABLED(CONFIG_OF)) and let the compiler optimize
> >> > the unused code away.
> >> >
> >> > Signed-off-by: Laurent Pinchart
> >> > <laurent.pinchart+renesas@ideasonboard.com>
> >>
> >> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> >
> > Thank you. Can you please take the patch in your tree ?
>
> No. It does not apply:
>
> ]$ git am --signoff rcar-fix.patch
> Till?mpar: gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections
> error: patch misslyckades: drivers/gpio/gpio-rcar.c:279
> error: drivers/gpio/gpio-rcar.c: patchen kan inte till?mpas
> Patchen misslyckades vid 0001 gpio-rcar: Remove #ifdef CONFIG_OF
> around OF-specific sections
> En kopia av patchen som misslyckades finns i:
> /home/linus/src/linux-trees/linux-gpio/.git/rebase-apply/patch
> N?r du har l?st problemet k?r du "git am --resolved".
> Om du vill hoppa ?ver patchen k?r du ist?llet "git am --skip".
> F?r att ?terst?lla originalgrenen och avbryta k?r du "git am --abort".
>
>
> Isn't this RCAR stuff funneled through ARM SoC this merge window?
> Then you have to send it to the ARM SoC folks corresponding branch.
Oops, my bad. I had mistaken it for one of the pinctrl patches.
/me needs to sleep more :-)
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2013-06-20 8:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 10:29 [PATCH v2 0/2] R-Car GPIO fixes Laurent Pinchart
2013-06-18 10:29 ` Laurent Pinchart
2013-06-18 10:29 ` [PATCH v2 1/2] gpio-rcar: Reference core gpio documentation in the DT bindings Laurent Pinchart
2013-06-18 10:29 ` Laurent Pinchart
2013-06-18 10:29 ` [PATCH v2 2/2] gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections Laurent Pinchart
2013-06-18 10:29 ` Laurent Pinchart
2013-06-19 19:17 ` Linus Walleij
2013-06-19 19:17 ` Linus Walleij
2013-06-19 19:51 ` Laurent Pinchart
2013-06-19 19:51 ` Laurent Pinchart
2013-06-20 6:42 ` Linus Walleij
2013-06-20 6:42 ` Linus Walleij
2013-06-20 8:04 ` Laurent Pinchart [this message]
2013-06-20 8:04 ` Laurent Pinchart
2013-06-19 12:40 ` [PATCH v2 0/2] R-Car GPIO fixes Simon Horman
2013-06-19 12:40 ` Simon Horman
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=1653091.GeQyMLF6L8@avalon \
--to=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.