linux-kernel - Re: linux-next: manual merge of the mfd tree with the arm 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: <CAKnu2MoTz5cv9m+x84NeEbO-6YaK0QwwSaHpFwfBWiBG+GrdLw@mail.gmail.com>
Date:	Tue, 27 Sep 2011 07:52:28 +0200
From:	Linus Walleij <linus.ml.walleij@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Samuel Ortiz <sameo@...ux.intel.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the mfd tree with the arm tree

2011/9/27 Stephen Rothwell <sfr@...b.auug.org.au>:

> Today's linux-next merge of the mfd tree got a conflict in
> arch/arm/mach-u300/include/mach/irqs.h between commit cc890cd78acd ("ARM:
> 7083/1: rewrite U300 GPIO to use gpiolib") from the  tree and commit
> e085f9a2e27d ("mfd: Delete ab3550 driver") from the mfd tree.
> I fixed it up (I think - see below) anc can carry the fix as necessary.
> (...)
>
> diff --cc arch/arm/mach-u300/include/mach/irqs.h
> index d270fea,a6867b1..0000000
> --- a/arch/arm/mach-u300/include/mach/irqs.h
> +++ b/arch/arm/mach-u300/include/mach/irqs.h
> @@@ -106,25 -106,9 +106,19 @@@
>  #define IRQ_U300_NFIF                 45
>  #define IRQ_U300_NFIF2                        46
>  #define IRQ_U300_SYSCON_PLL_LOCK      47
>  -#define U300_NR_IRQS                  48
>  +#define U300_VIC_IRQS_END             48
>  #endif
>
>  -#define NR_IRQS U300_NR_IRQS
>  +/* Maximum 8*7 GPIO lines */
>  +#ifdef CONFIG_GPIO_U300
>  +#define IRQ_U300_GPIO_BASE            (U300_VIC_IRQS_END)
>  +#define IRQ_U300_GPIO_END             (IRQ_U300_GPIO_BASE + 56)
>  +#else
>  +#define IRQ_U300_GPIO_END             (U300_VIC_IRQS_END)
>  +#endif
>  +
> - /* Optional AB3550 mixsig chip */
> - #ifdef CONFIG_AB3550_CORE
> - #define IRQ_AB3550_BASE                       (IRQ_U300_GPIO_END)
> - #define IRQ_AB3550_END                        (IRQ_AB3550_BASE + 38)
> - #else
>  +#define IRQ_AB3550_END                        (IRQ_U300_GPIO_END)
> - #endif
>  +
>  +#define NR_IRQS                               (IRQ_AB3550_END)

Nothing mentioning the AB3559 should be left after the merge, so the
IRQ_AB3550_END should be gone.

delete IRQ_AB3550_END and
#define NR_IRQS IRQ_U300_GPIO_END

I will watch this closely in the merge window.

Thanks,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/