Re: [GIT pull] irq fixes for .39.rc

[Linus Torvalds]

On Wed, Mar 30, 2011 at 7:51 AM, Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote:
>
> Please pull the latest irq-fixes-for-linus git tree from:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq-fixes-for-linus

Hmm. This has a fundamental merge  conflict with BenH's tree that I just pulled.

You guys did different things in arch/powerpc/include/asm/qe_ic.h:

 - BenH has:

        -       struct qe_ic *qe_ic = get_irq_desc_data(desc);
        +       struct qe_ic *qe_ic = irq_desc_get_chip_data(desc);

 - Thomas has:

        -       struct qe_ic *qe_ic = get_irq_desc_data(desc);
        +       struct qe_ic *qe_ic = irq_desc_get_handler_data(desc);

Note the "chip_data" vs "handler_data" difference.

And when I tried to figure out which one is the correct one, I see that

 - qe_ic_host_map does:

        irq_set_chip_data(virq, qe_ic);

 - qe_ic_init does:

        irq_set_handler_data(qe_ic->virq_low, qe_ic);
        ...
                irq_set_handler_data(qe_ic->virq_high, qe_ic);

which just makes me go "Somebody is really really confused".

The whole thing may mean that both handler_data and chip_data contains
the right thing, but it still makes me go "WTF?".

Which way should I resolve it?

                         Linus
--
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/