Message-ID: <CAMuHMdX7C5NU5_MO5GdO=Pf2X59B3vFo4Y9B5wg-NQzwVbbLZA@mail.gmail.com>
Date:	Sun, 23 Oct 2011 11:49:55 +0200
From:	Geert Uytterhoeven <geert@...ux-m68k.org>
To:	linux-m68k@...ts.linux-m68k.org, Greg Ungerer <gerg@...pgear.com>,
	Thomas Gleixner <tglx@...utronix.de>
Cc:	linux-kernel@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH 00/28 v6] m68k: Convert to genirq

On Thu, Oct 20, 2011 at 14:18, Geert Uytterhoeven <geert@...ux-m68k.org> wrote:
> On Sun, Sep 11, 2011 at 13:59, Geert Uytterhoeven <geert@...ux-m68k.org> wrote:
>> This patch series converts the m68k/mmu (nommu was converted before)
>> architecture to the generic hardirq framework.
>>
>>  - [01/28] genirq: Add missing "else" in irq_shutdown()
>>  - [02/28] ide-{cd,floppy,tape}: Do not include <linux/irq.>
>>  - [03/28] keyboard: Do not include <linux/irq.>
>>  - [04/28] m68k/irq: Rename irq_controller to irq_chip
>>  - [05/28] m68k/irq: Kill irq_node_t typedef, always use struct irq_node
>>  - [06/28] m68k/irq: Rename irq_node to irq_data
>>  - [07/28] m68k/irq: Switch irq_chip methods to "struct irq_data *data"
>>  - [08/28] m68k/irq: Rename setup_irq() to m68k_setup_irq() and make it static
>>  - [09/28] m68k/irq: Extract irq_set_chip()
>>  - [10/28] m68k/irq: Add m68k_setup_irq_controller()
>>  - [11/28] m68k/irq: Rename {,__}m68k_handle_int()
>>  - [12/28] m68k/irq: Remove obsolete IRQ_FLG_* definitions and users
>>  - [13/28] m68k/irq: Add genirq support
>>  - [14/28] m68k/atari: Convert Atari to genirq
>>  - [15/28] m68k/atari: Remove code and comments about different irq types
>>  - [16/28] m68k/amiga: Refactor amiints.c
>>  - [17/28] m68k/amiga: Convert Amiga to genirq
>>  - [18/28] m68k/amiga: Optimize interrupts using chain handlers
>>  - [19/28] m68k/mac: Convert Mac to genirq
>>  - [20/28] m68k/mac: Optimize interrupts using chain handlers
>>  - [21/28] m68k/hp300: Convert HP9000/300 and HP9000/400 to genirq
>>  - [22/28] m68k/vme: Convert VME to genirq
>>  - [23/28] m68k/apollo: Convert Apollo to genirq
>>  - [24/28] m68k/sun3: Use the kstat_irqs_cpu() wrapper
>>  - [25/28] m68k/sun3: Convert Sun3/3x to genirq
>>  - [26/28] m68k/q40: Convert Q40/Q60 to genirq
>>  - [27/28] m68k/irq: Remove obsolete m68k irq framework
>>  - [28/28] m68k/irq: Remove obsolete support for user vector interrupt fixups
>>
>> Overview:
>>  - [01] is a fix for the core genirq code,
>
> This went into v3.1-rc6.
>
>>  - [02-03] are fixes to avoid compile problems later in the conversion
>>    process,
>
> The keyboard path went into the tty -next tree.
> The IDE one is still pending (I've just resent it).

The IDE one got acked in the mean time.

>> I will update my m68k-genirq branch as soon as master.kernel.org is available
>> again.
>
> Updated, on top of m68k master (which is at v3.1-rc10 now).
> http://git.kernel.org/?p=linux/kernel/git/geert/linux-m68k.git;a=shortlog;h=refs/heads/m68k-genirq
>
> If noone objects, I'd like to add this to the m68k master and for-3.2 branches.

I added it to m68k master.

As there were several merge conflicts with current -next
(arch/m68k/kernel/Makefile_mm
due to the mmu/nommu merge, and drivers/net/macsonic.c in [12/28] due
to the network
driver reshuffling dance), I did not add it to for-3.2 and for-next,
but to for-3.3.

Depending on Stephen's return during or after the merge window, and
the merge timing
of the m68knommu and netdev trees, I may stil try to sneak it in 3.2, though.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@...ux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Powered by blists - more mailing lists