linux-kernel - Re: linux-next: build failure after merge of the gpio 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20171113223305.42aae1a2@canb.auug.org.au>
Date:   Mon, 13 Nov 2017 22:33:05 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Linus Walleij <linus.walleij@...aro.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Masahiro Yamada <yamada.masahiro@...ionext.com>
Subject: Re: linux-next: build failure after merge of the gpio tree

Hi all,

On Thu, 2 Nov 2017 16:20:38 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> After merging the gpio tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/gpio/gpio-uniphier.c:324:14: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .activate = uniphier_gpio_irq_domain_activate,
>               ^
> 
> Caused by commit
> 
>   dbe776c2ca54 ("gpio: uniphier: add UniPhier GPIO controller driver")
> 
> interacting with commit
> 
>   72491643469a ("genirq/irqdomain: Update irq_domain_ops.activate() signature")
> 
> from the tip tree
> 
> I added the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Thu, 2 Nov 2017 16:10:46 +1100
> Subject: [PATCH] gpio: uniphier: merge fix for "Update
>  irq_domain_ops.activate() signature"
> 
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  drivers/gpio/gpio-uniphier.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c
> index d62cea4ed6b7..d0069202ade3 100644
> --- a/drivers/gpio/gpio-uniphier.c
> +++ b/drivers/gpio/gpio-uniphier.c
> @@ -300,13 +300,15 @@ static int uniphier_gpio_irq_domain_alloc(struct irq_domain *domain,
>  	return irq_domain_alloc_irqs_parent(domain, virq, 1, &parent_fwspec);
>  }
>  
> -static void uniphier_gpio_irq_domain_activate(struct irq_domain *domain,
> -					      struct irq_data *data)
> +static int uniphier_gpio_irq_domain_activate(struct irq_domain *domain,
> +					      struct irq_data *data,
> +					      bool early)
>  {
>  	struct uniphier_gpio_priv *priv = domain->host_data;
>  	struct gpio_chip *chip = &priv->chip;
>  
>  	gpiochip_lock_as_irq(chip, data->hwirq + UNIPHIER_GPIO_IRQ_OFFSET);
> +	return 0;
>  }
>  
>  static void uniphier_gpio_irq_domain_deactivate(struct irq_domain *domain,

Just a reminder that this conflict still exists.

-- 
Cheers,
Stephen Rothwell