Re: Merge window closed: v2.6.19-rc1

Jesper Juhl
2006-10-06T22:47:04Z

On 05/10/06, Linus Torvalds <torvalds@osdl.org> wrote:
>
> Ok, it's two weeks since v2.6.18, and as a result I've cut a -rc1 release.
>
> As usual for -rc1 with a lot of pending merges, it's a huge thing with
> tons of changes, and in fact since 2.6.18 took longer than normal due to
> me traveling (and others probably also being on vacations), it's possibly
> even larger than usual.
>
> I think we got updates to pretty much all of the active architectures,
> we've got VM changes (dirty shared page tracking, for example), we've got
> networking, drivers, you name it. Even the shortlog and the diffstats are
> too big to make the kernel mailing list, but even just the summary says
> something:
>
> 4998 total commits
> 6535 files changed, 414890 insertions(+), 233881 deletions(-)
>
> so please give it a good testing, and let's see if there are any
> regressions.
>

2.6.19-rc1-git2 :

...
CC arch/i386/mm/pgtable.o
CC arch/i386/mach-voyager/voyager_basic.o
CC arch/i386/mm/fault.o
CC arch/i386/kernel/ptrace.o
arch/i386/mach-voyager/voyager_basic.c:170: error: conflicting types
for 'voyager_timer_inte
rrupt'
include/asm/voyager.h:508: error: previous declaration of
'voyager_timer_interrupt' was here
arch/i386/mach-voyager/voyager_basic.c:170: error: conflicting types
for 'voyager_timer_inte
rrupt'
include/asm/voyager.h:508: error: previous declaration of
'voyager_timer_interrupt' was here
make[1]: *** [arch/i386/mach-voyager/voyager_basic.o] Error 1
make: *** [arch/i386/mach-voyager] Error 2
make: *** Waiting for unfinished jobs....
CC arch/i386/kernel/time.o
In file included from arch/i386/kernel/time.c:74:
include/asm-i386/mach-voyager/do_timer.h: In function `do_timer_interrupt_hook':
include/asm-i386/mach-voyager/do_timer.h:8: error: `irq_regs'
undeclared (first use in this
function)
include/asm-i386/mach-voyager/do_timer.h:8: error: (Each undeclared
identifier is reported o
nly once
include/asm-i386/mach-voyager/do_timer.h:8: error: for each function
it appears in.)
make[1]: *** [arch/i386/kernel/time.o] Error 1
make[1]: *** Waiting for unfinished jobs....
CC arch/i386/mm/ioremap.o
make: *** [arch/i386/kernel] Error 2

--
Jesper Juhl <jesper.juhl@gmail.com>
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please http://www.expita.com/nomime.html