From: Paul M. <le...@li...> - 2007-04-24 05:28:00
|
This is just a quick breakdown on what's in the 2.6.22 merge window queue so far. Most of this has been out in the staging tree in git for some time already, so there shouldn't be any real surprises. There's still some kprobes, X2 TLB work, and hrtimer stuff that hasn't been merged yet, and given that those are quite isolated, those might show up for -rc2. Changes are scattered. A number of new boards have been added, others have been updated, basic kgdb was resurrected, and SH7722 got clock framework support. As per some of the noise on l-k regarding udivdi3 wrapping (to div64_32 in the sh case), that's been ripped out too. We don't seem to have anything that emits it in-tree anyways, so there's not a lot of point in dragging it around. Those with out-of-tree users will need to do_div() explicitly. Kristoffer Ericson (2): sh: hp6xx driver compile fixes. sh: hp6xx pata_platform support. Nobuhiro Iwamatsu (6): sh: pata_platform pcmcia support for SolutionEngine boards. sh: L-BOX RE2 support. sh: MS7712SE01 board support. sh: Add defconfig for se7712. sh: SH7780 Solution Engine board support. sh: se7780 PCI support. Paul Mundt (14): sh: Bring kgdb back from the dead. sh: Rip out broken kgdb thread support. sh: speculative execution support for SH7780. sh: generic BUG() support. sh: NR_IRQS consolidation. sh: Add SH7785 Highlander board support (R7785RP). serial: sh-sci: Kill off breakpoint in break IRQ. doc: Update sysrq doc for sh kgdb trigger. sh: bootmem tidying for discontig/sparsemem preparation. sh: Kill off udivdi3 div64_32 wrapping. sh: Add defconfig for se7722. sh: Tidy up L-BOX area5 addresses. sh: Add a dummy SH-4 PCIC fixup. sh: Obey CONFIG_HZ for HZ definition. SUGIOKA Toshinobu (1): sh: Fix fstatat64() syscall. Takashi YOSHII (1): sh: heartbeat double 0 fix. dmitry pervushin (2): sh: SH7722 clock framework support. serial: sh-sci: Fix module clock refcounting. kogiidena (1): sh: landisk updates. Documentation/sh/clk.txt | 32 + Documentation/sysrq.txt | 4 +- arch/sh/Kconfig | 75 +- arch/sh/Kconfig.debug | 20 +- arch/sh/Makefile | 5 +- arch/sh/boards/hp6xx/setup.c | 67 +- arch/sh/boards/landisk/Makefile | 2 +- arch/sh/boards/landisk/gio.c | 167 ++++ arch/sh/boards/landisk/io.c | 250 ----- arch/sh/boards/landisk/irq.c | 83 +-- arch/sh/boards/landisk/landisk_pwb.c | 346 ------- arch/sh/boards/landisk/psw.c | 143 +++ arch/sh/boards/landisk/rtc.c | 91 -- arch/sh/boards/landisk/setup.c | 163 +--- arch/sh/boards/lboxre2/Makefile | 5 + arch/sh/boards/lboxre2/irq.c | 31 + arch/sh/boards/lboxre2/setup.c | 85 ++ arch/sh/boards/renesas/r7780rp/Kconfig | 18 +- arch/sh/boards/renesas/r7780rp/Makefile | 6 +- arch/sh/boards/renesas/r7780rp/irq-r7780rp.c | 21 + arch/sh/boards/renesas/r7780rp/irq-r7785rp.c | 29 + arch/sh/boards/renesas/r7780rp/irq.c | 25 +- arch/sh/boards/renesas/r7780rp/setup.c | 74 +- arch/sh/boards/se/770x/io.c | 2 + arch/sh/boards/se/770x/irq.c | 27 +- arch/sh/boards/se/770x/setup.c | 30 +- arch/sh/boards/se/7751/setup.c | 148 --- arch/sh/boards/se/7780/Makefile | 10 + arch/sh/boards/se/7780/irq.c | 89 ++ arch/sh/boards/se/7780/setup.c | 122 +++ arch/sh/configs/lboxre2_defconfig | 1271 ++++++++++++++++++++++++ arch/sh/configs/r7785rp_defconfig | 1334 ++++++++++++++++++++++++++ arch/sh/configs/se7712_defconfig | 1088 +++++++++++++++++++++ arch/sh/configs/se7722_defconfig | 945 ++++++++++++++++++ arch/sh/configs/se7780_defconfig | 1309 +++++++++++++++++++++++++ arch/sh/drivers/Kconfig | 10 + arch/sh/drivers/heartbeat.c | 13 +- arch/sh/drivers/pci/Makefile | 5 +- arch/sh/drivers/pci/fixups-lboxre2.c | 41 + arch/sh/drivers/pci/fixups-se7780.c | 60 ++ arch/sh/drivers/pci/ops-landisk.c | 4 +- arch/sh/drivers/pci/ops-lboxre2.c | 63 ++ arch/sh/drivers/pci/ops-r7780rp.c | 37 +- arch/sh/drivers/pci/ops-se7780.c | 96 ++ arch/sh/drivers/pci/ops-sh4.c | 6 + arch/sh/drivers/pci/pci-sh4.h | 2 +- arch/sh/drivers/pci/pci-sh7751.c | 15 +- arch/sh/drivers/pci/pci-sh7780.c | 45 +- arch/sh/drivers/pci/pci-sh7780.h | 19 +- arch/sh/kernel/cpu/clock.c | 28 +- arch/sh/kernel/cpu/init.c | 19 + arch/sh/kernel/cpu/irq/intc2.c | 3 +- arch/sh/kernel/cpu/sh3/Makefile | 1 + arch/sh/kernel/cpu/sh3/probe.c | 3 + arch/sh/kernel/cpu/sh3/setup-sh7710.c | 60 ++ arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 3 +- arch/sh/kernel/cpu/sh4/probe.c | 8 + arch/sh/kernel/cpu/sh4a/Makefile | 4 +- arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 600 ++++++++++++ arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 162 ++++ arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 98 ++ arch/sh/kernel/irq.c | 5 +- arch/sh/kernel/kgdb_stub.c | 490 ++--------- arch/sh/kernel/process.c | 3 +- arch/sh/kernel/setup.c | 259 ++---- arch/sh/kernel/sh_ksyms.c | 1 - arch/sh/kernel/timers/timer-tmu.c | 4 +- arch/sh/kernel/traps.c | 54 +- arch/sh/kernel/vmlinux.lds.S | 47 +- arch/sh/lib/Makefile | 3 +- arch/sh/lib/udivdi3.c | 16 - arch/sh/mm/Kconfig | 19 + arch/sh/mm/init.c | 197 ++-- arch/sh/tools/mach-types | 2 + drivers/input/touchscreen/hp680_ts_input.c | 2 +- drivers/serial/sh-sci.c | 102 ++- drivers/serial/sh-sci.h | 83 ++- include/asm-sh/bug.h | 92 ++- include/asm-sh/clock.h | 32 +- include/asm-sh/cpu-sh3/mmu_context.h | 1 + include/asm-sh/cpu-sh4/freq.h | 8 + include/asm-sh/irq.h | 91 +-- include/asm-sh/kgdb.h | 51 +- include/asm-sh/lboxre2.h | 27 + include/asm-sh/mmu_context.h | 6 +- include/asm-sh/page.h | 10 +- include/asm-sh/param.h | 2 +- include/asm-sh/pci.h | 2 +- include/asm-sh/processor.h | 2 +- include/asm-sh/r7780rp.h | 68 +- include/asm-sh/se.h | 1 + include/asm-sh/se7751.h | 2 + include/asm-sh/se7780.h | 108 +++ include/asm-sh/stat.h | 19 +- sound/oss/sh_dac_audio.c | 2 +- 95 files changed, 9059 insertions(+), 2274 deletions(-) |