Re: linux-next: manual merge of the irqdomain tree with the tree

[Grant Likely]

On Tue, Jun 18, 2013 at 6:45 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Grant,
>
> Today's linux-next merge of the irqdomain tree got a conflict in
> kernel/irq/irqdomain.c between commit c5cdc67a58a2 ("irqdomain: Remove
> temporary MIPS workaround code") from the mips tree and commit
> bd4641e31e90 ("irq: fix checkpatch error") from the irqdomain tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks Stephen.

g.

>
> --
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
>
> diff --cc kernel/irq/irqdomain.c
> index a341b3d,13f2654..0000000
> --- a/kernel/irq/irqdomain.c
> +++ b/kernel/irq/irqdomain.c
> @@@ -665,8 -475,20 +475,8 @@@ unsigned int irq_create_of_mapping(stru
>
>         domain = controller ? irq_find_host(controller) : irq_default_domain;
>         if (!domain) {
> -               pr_warning("no irq domain found for %s !\n",
> -                          of_node_full_name(controller));
>  -#ifdef CONFIG_MIPS
>  -              /*
>  -               * Workaround to avoid breaking interrupt controller drivers
>  -               * that don't yet register an irq_domain.  This is temporary
>  -               * code. ~~~gcl, Feb 24, 2012
>  -               *
>  -               * Scheduled for removal in Linux v3.6.  That should be enough
>  -               * time.
>  -               */
>  -              if (intsize > 0)
>  -                      return intspec[0];
>  -#endif
> +               pr_warn("no irq domain found for %s !\n",
> +                       of_node_full_name(controller));
>                 return 0;
>         }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/