Merge window closed: v2.6.19-rc1

Merge window closed: v2.6.19-rc1

[Linus Torvalds]

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.

As usual, the best way to get some grip on a particular subsystem would 
tend to be with some script like

	git log --no-merges v2.6.18.. drivers/usb | git shortlog | less -S 

which gives a more manageable overview of any particular area you're 
interested in (in the example that would be 'drivers/usb', but you can 
use this to browse any interesting area).

			Linus

Re: Merge window closed: v2.6.19-rc1

[Alistair John Strachan]

On Thursday 05 October 2006 04:29, Linus Torvalds 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:

Booted fine here, but I've got a few strange messages from the firewire
subsystem that weren't present in 2.6.18. I think it marginally slows down
boot up, but I could just be imagining it.

[alistair] 16:04 [~] dmesg | grep 1394
ohci1394: fw-host0: OHCI-1394 1.1 (PCI): IRQ=[19]  MMIO=[dffff000-dffff7ff]  Max Packet=[2048]  IR/IT contexts=[4/8]
ohci1394: fw-host1: OHCI-1394 1.1 (PCI): IRQ=[17]  MMIO=[dfffc000-dfffc7ff]  Max Packet=[2048]  IR/IT contexts=[4/8]
ohci1394: fw-host0: Running dma failed because Node ID is not valid
ohci1394: fw-host0: AT dma reset ctx=0, aborting transmission
ieee1394: Current remote IRM is not 1394a-2000 compliant, resetting...
ieee1394: Host added: ID:BUS[0-00:1023]  GUID[00023c0091023fd7]
ieee1394: Host added: ID:BUS[1-00:1023]  GUID[000129200003d023]

-- 
Cheers,
Alistair.

Final year Computer Science undergraduate.
1F2 55 South Clerk Street, Edinburgh, UK.

Re: Merge window closed: v2.6.19-rc1

[Gene Heskett]

On Wednesday 04 October 2006 23:29, Linus Torvalds 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.
>
>As usual, the best way to get some grip on a particular subsystem would
>tend to be with some script like
>
> git log --no-merges v2.6.18.. drivers/usb | git shortlog | less -S
>
>which gives a more manageable overview of any particular area you're
>interested in (in the example that would be 'drivers/usb', but you can
>use this to browse any interesting area).
>
>   Linus

I had to rebuild it 2 extra times to get all the options right, partially 
my fault.  But once my usual .config was achieved, it back to business as 
usual, complete with my logs being littered with this message:

Oct  5 11:14:40 coyote kernel: usb 3-2.1: reset low speed USB device using 
ohci_hcd and address 3

This is my only (so far) minor nit to pick.

[root@coyote linux-2.6.19-rc1]# lsusb
[...]
Bus 003 Device 003: ID 045e:008c Microsoft Corp.
[...]

Now, I'd assume its referring to my mouse, the Microsoft Corp entry above, 
which has had a fresh set of batteries installed without effecting this, 
and I even removed the batteries from another usb/bluetooth mouse I use on 
my lappy when its powered up, all without effecting this apparently 
innocuous error as the mouse itself works just fine.  The receiver is 
about 3 feet away as the tower is at least 5 feet away, under an adjacent 
desk.

This started at about the same time I jumped from a 2.6.16-something to the 
2nd rc of 2.6.18, and has continued more or less un-abated since.  Doing a 
reset/reconfigure on the mouse and base station does not appear to 
generate any log messages, nor to effect the random logging of the above 
messages.

Does anyone have a suggestion?

-- 
Cheers, Gene
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
Yahoo.com and AOL/TW attorneys please note, additions to the above
message by Gene Heskett are:
Copyright 2006 by Maurice Eugene Heskett, all rights reserved.

Re: Merge window closed: v2.6.19-rc1

[Voluspa]

  AR      arch/x86_64/lib/lib.a
  GEN     .version
  CHK     include/linux/compile.h
  UPD     include/linux/compile.h
  CC      init/version.o
  LD      init/built-in.o
  LD      vmlinux
arch/x86_64/kernel/built-in.o: In function `print_trace_warning_symbol':
traps.c:(.text.print_trace_warning_symbol+0xa): undefined reference to
`print_symbol'
make: *** [vmlinux] Error 1

Mvh
Mats Johannesson

Re: Merge window closed: v2.6.19-rc1

[Randy Dunlap]

On Thu, 5 Oct 2006 18:49:16 +0200 Voluspa wrote:

>   AR      arch/x86_64/lib/lib.a
>   GEN     .version
>   CHK     include/linux/compile.h
>   UPD     include/linux/compile.h
>   CC      init/version.o
>   LD      init/built-in.o
>   LD      vmlinux
> arch/x86_64/kernel/built-in.o: In function `print_trace_warning_symbol':
> traps.c:(.text.print_trace_warning_symbol+0xa): undefined reference to
> `print_symbol'
> make: *** [vmlinux] Error 1

You don't have CONFIG_KALLSYMS enabled?

Does this patch fix the build for you?

---
From: Randy Dunlap <rdunlap@xenotime.net>

Include linux/kallsyms.h unconditionally for print_symbol().

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 arch/x86_64/kernel/traps.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- linux-2619-rc1-pv.orig/arch/x86_64/kernel/traps.c
+++ linux-2619-rc1-pv/arch/x86_64/kernel/traps.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
+#include <linux/kallsyms.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/nmi.h>
@@ -115,7 +116,6 @@ static int call_trace = 1;
 #endif
 
 #ifdef CONFIG_KALLSYMS
-# include <linux/kallsyms.h>
 void printk_address(unsigned long address)
 {
 	unsigned long offset = 0, symsize;

Re: Merge window closed: v2.6.19-rc1

[Andi Kleen]

> 
> You don't have CONFIG_KALLSYMS enabled?
> 
> Does this patch fix the build for you?


Added thanks

-Andi

Re: Merge window closed: v2.6.19-rc1

[Voluspa]

On Thu, 5 Oct 2006 09:59:44 -0700 Randy Dunlap wrote:
> On Thu, 5 Oct 2006 18:49:16 +0200 Voluspa wrote:
> 
> >   AR      arch/x86_64/lib/lib.a
> >   GEN     .version
> >   CHK     include/linux/compile.h
> >   UPD     include/linux/compile.h
> >   CC      init/version.o
> >   LD      init/built-in.o
> >   LD      vmlinux
> > arch/x86_64/kernel/built-in.o: In function
> > `print_trace_warning_symbol':
> > traps.c:(.text.print_trace_warning_symbol+0xa): undefined reference
> > to `print_symbol' make: *** [vmlinux] Error 1
> 
> You don't have CONFIG_KALLSYMS enabled?

Never. I like to keep the kernel as lean as possible until some
bug-reporting requires otherwise.

> 
> Does this patch fix the build for you?

Perfect. Thanx. Built, but haven't booted yet.

Mvh
Mats Johannesson

Re: Merge window closed: v2.6.19-rc1

[Peter Osterlund]

Linus Torvalds <torvalds@osdl.org> writes:

> Ok, it's two weeks since v2.6.18, and as a result I've cut a -rc1 release.
...
> so please give it a good testing, and let's see if there are any 
> regressions.

The UDF filesystem can't be mounted in read-write mode any more,
because of forgotten braces.

Signed-off-by: Peter Osterlund <petero2@telia.com>
---

 fs/udf/super.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/udf/super.c b/fs/udf/super.c
index 1d3b5d2..1aea6a4 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1621,9 +1621,10 @@ #endif
 		goto error_out;
 	}
 
-	if (UDF_SB_PARTFLAGS(sb, UDF_SB_PARTITION(sb)) & UDF_PART_FLAG_READ_ONLY)
+	if (UDF_SB_PARTFLAGS(sb, UDF_SB_PARTITION(sb)) & UDF_PART_FLAG_READ_ONLY) {
 		printk("UDF-fs: Partition marked readonly; forcing readonly mount\n");
 		sb->s_flags |= MS_RDONLY;
+	}
 
 	if ( udf_find_fileset(sb, &fileset, &rootdir) )
 	{

-- 
Peter Osterlund - petero2@telia.com
http://web.telia.com/~u89404340

Re: Merge window closed: v2.6.19-rc1

[Eric Sandeen]

Peter Osterlund wrote:
> Linus Torvalds <torvalds@osdl.org> writes:
> 
>> Ok, it's two weeks since v2.6.18, and as a result I've cut a -rc1 release.
> ...
>> so please give it a good testing, and let's see if there are any 
>> regressions.
> 
> The UDF filesystem can't be mounted in read-write mode any more,
> because of forgotten braces.

Urgh.

Thanks...

-Eric

Re: Merge window closed: v2.6.19-rc1

[Alex Romosan]

Linus Torvalds <torvalds@osdl.org> writes:

> so please give it a good testing, and let's see if there are any 
> regressions.

it breaks suspend when the airo module is loaded:

kernel: Stopping tasks: =================================================================================
kernel:  stopping tasks timed out after 20 seconds (1 tasks remaining):
kernel:   eth1
kernel: Restarting tasks...<6> Strange, eth1 not stopped

if i remove the airo module suspend works normally (this is on a
thinkpad t40).

--alex--

-- 
| I believe the moment is at hand when, by a paranoiac and active |
|  advance of the mind, it will be possible (simultaneously with  |
|  automatism and other passive states) to systematize confusion  |
|  and thus to help to discredit completely the world of reality. |

Re: Merge window closed: v2.6.19-rc1

[caszonyi]

On Wed, 4 Oct 2006, Linus Torvalds 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.
>

In dmesg:
warning: process `sleep' used the removed sysctl system call
warning: process `alsactl' used the removed sysctl system call
warning: process `nscd' used the removed sysctl system call
warning: process `tail' used the removed sysctl system call

ver_linux says:
  /~ $ ./src/kernel/linux-2.6.19-rc1/scripts/ver_linux
If some fields are empty or look unusual you may have an old version.
Compare to the current minimal requirements in Documentation/Changes.

Linux grinch 2.6.19-rc1 #1 PREEMPT Thu Oct 5 22:53:57 EEST 2006 i686 
unknown unknown GNU/Linux

Gnu C                  3.3.4
Gnu make               3.80
binutils               2.15.92.0.2
util-linux             2.12p
mount                  2.12p
module-init-tools      3.1
e2fsprogs              1.35
jfsutils               1.1.11
reiserfsprogs          3.6.18
xfsprogs               2.6.13
quota-tools            3.12.
nfs-utils              1.0.7
Linux C Library        2.3.4
Dynamic linker (ldd)   2.3.4
Linux C++ Library      5.0.6
Procps                 3.2.5
Net-tools              1.60
Kbd                    1.12
Sh-utils               5.2.1

  /~ $ /usr/sbin/alsactl -v
alsactl version 1.0.10


In Documentation/feature-removal-schedule.txt it says:

---------------------------

What:   sys_sysctl
When:   January 2007
Why:    The same information is available through /proc/sys and that is 
the
         interface user space prefers to use. And there do not appear to be
         any existing user in user space of sys_sysctl.  The additional
         maintenance overhead of keeping a set of binary names gets
         in the way of doing a good job of maintaining this interface.

Who:    Eric Biederman <ebiederm@xmission.com>

---------------------------

I can upgrade my userspace (Slackware 10.1) if necessary ;)

Bye
Calin

--

"frate, trezeste-te, aici nu-i razboiul stelelor"
 				Radu R. pe offtopic at lug.ro

Re: Merge window closed: v2.6.19-rc1

[Linus Torvalds]

On Fri, 6 Oct 2006, caszonyi@rdslink.ro wrote:
> 
> In dmesg:
> warning: process `sleep' used the removed sysctl system call
> warning: process `alsactl' used the removed sysctl system call
> warning: process `nscd' used the removed sysctl system call
> warning: process `tail' used the removed sysctl system call

You need to compile with CONFIG_SYSCLT set to 'y' rather than 'n'.

Alternatively, you can probably fix it by just upgrading user-land, but 
the SYSCLT thing _does_ still exist, it's just deprecated and defaults to 
off by default..

(Or you can possibly even choose to just ignore the warnings, they 
probably won't affect any actual behaviour)

		Linus

Re: Merge window closed: v2.6.19-rc1

[Eric W. Biederman]

Linus Torvalds <torvalds@osdl.org> writes:

> On Fri, 6 Oct 2006, caszonyi@rdslink.ro wrote:
>> 
>> In dmesg:
>> warning: process `sleep' used the removed sysctl system call
>> warning: process `alsactl' used the removed sysctl system call
>> warning: process `nscd' used the removed sysctl system call
>> warning: process `tail' used the removed sysctl system call
>
> You need to compile with CONFIG_SYSCLT set to 'y' rather than 'n'.
>
> Alternatively, you can probably fix it by just upgrading user-land, but 
> the SYSCLT thing _does_ still exist, it's just deprecated and defaults to 
> off by default..
>
> (Or you can possibly even choose to just ignore the warnings, they 
> probably won't affect any actual behaviour)

I'm tempted to submit a patch that just kills the warning.

The only known user is lipthreads from glibc performing.
if ! uname -v | grep "SMP" ; then
	....
fi

That code if it gets -ENOSYS reads /proc/sys/kernel/version,
and it has worked this way since the day it was written.

I have been looking for other uses of sys_sysctl but I haven't
found any.  Why glibc doesn't call uname like any normal
program when it wants to uname information is beyond me.

Eric

Re: Merge window closed: v2.6.19-rc1

[Grant Coady]

On Fri, 6 Oct 2006 11:12:10 -0700 (PDT), Linus Torvalds <torvalds@osdl.org> wrote:

>
>
>On Fri, 6 Oct 2006, caszonyi@rdslink.ro wrote:
>> 
>> In dmesg:
>> warning: process `sleep' used the removed sysctl system call
>> warning: process `alsactl' used the removed sysctl system call
>> warning: process `nscd' used the removed sysctl system call
>> warning: process `tail' used the removed sysctl system call
>
>You need to compile with CONFIG_SYSCLT set to 'y' rather than 'n'.
>
>Alternatively, you can probably fix it by just upgrading user-land, but 
>the SYSCLT thing _does_ still exist, it's just deprecated and defaults to 
>off by default..
>
>(Or you can possibly even choose to just ignore the warnings, they 
>probably won't affect any actual behaviour)

I get these:
grant@sempro:~$ dmesg |grep removed
warning: process `touch' used the removed sysctl system call
warning: process `touch' used the removed sysctl system call
warning: process `dd' used the removed sysctl system call
warning: process `ls' used the removed sysctl system call
warning: process `touch' used the removed sysctl system call

too, box still works, slack-11.0 if it matters.

Grant.

Re: Merge window closed: v2.6.19-rc1

[Jesper Juhl]

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

Re: Merge window closed: v2.6.19-rc1

[Linus Torvalds]

On Sat, 7 Oct 2006, Jesper Juhl wrote:
>
> arch/i386/mach-voyager/voyager_basic.c:170: error: conflicting types
> for 'voyager_timer_interrupt'

Gaah. That voyager timer handling is a bit confusing.

Maybe something like this would fix it?

Untested. Need James or the other alledged voyager-owner to actually test 
or do somethign better..

		Linus
---
diff --git a/include/asm-i386/mach-voyager/do_timer.h b/include/asm-i386/mach-voyager/do_timer.h
index 04e69c1..ada5bb9 100644
--- a/include/asm-i386/mach-voyager/do_timer.h
+++ b/include/asm-i386/mach-voyager/do_timer.h
@@ -3,12 +3,13 @@ #include <asm/voyager.h>
 
 static inline void do_timer_interrupt_hook(void)
 {
+	struct pt_regs *regs = get_irq_regs();
 	do_timer(1);
 #ifndef CONFIG_SMP
-	update_process_times(user_mode_vm(irq_regs));
+	update_process_times(user_mode_vm(regs));
 #endif
 
-	voyager_timer_interrupt();
+	voyager_timer_interrupt(regs);
 }
 
 static inline int do_timer_overflow(int count)
diff --git a/include/asm-i386/voyager.h b/include/asm-i386/voyager.h
index e74c54a..fad31ca 100644
--- a/include/asm-i386/voyager.h
+++ b/include/asm-i386/voyager.h
@@ -505,7 +505,7 @@ extern int voyager_memory_detect(int reg
 extern void voyager_smp_intr_init(void);
 extern __u8 voyager_extended_cmos_read(__u16 cmos_address);
 extern void voyager_smp_dump(void);
-extern void voyager_timer_interrupt(void);
+extern void voyager_timer_interrupt(struct pt_regs *);
 extern void smp_local_timer_interrupt(void);
 extern void voyager_power_off(void);
 extern void smp_voyager_power_off(void *dummy);

Re: Merge window closed: v2.6.19-rc1

[James Bottomley]

On Fri, 2006-10-06 at 19:33 -0700, Linus Torvalds wrote:
> Gaah. That voyager timer handling is a bit confusing.
> 
> Maybe something like this would fix it?
> 
> Untested. Need James or the other alledged voyager-owner to actually test 
> or do somethign better..

There are other alleged voyager owners ... see, I keep telling you its a
popular architecture ...

I'll take a look ... I think I can probably eliminate the regs usage
from the VIC code as well.

James

Re: Merge window closed: v2.6.19-rc1

[Gabor Gombas]

On Fri, Oct 06, 2006 at 01:05:14PM -0600, Eric W. Biederman wrote:

> That code if it gets -ENOSYS reads /proc/sys/kernel/version,
> and it has worked this way since the day it was written.

What happens if /proc is not mounted (e.g. in a chrooted environment)?

Gabor

-- 
     ---------------------------------------------------------
     MTA SZTAKI Computer and Automation Research Institute
                Hungarian Academy of Sciences
     ---------------------------------------------------------

Re: Merge window closed: v2.6.19-rc1

[Eric W. Biederman]

Gabor Gombas <gombasg@sztaki.hu> writes:

> On Fri, Oct 06, 2006 at 01:05:14PM -0600, Eric W. Biederman wrote:
>
>> That code if it gets -ENOSYS reads /proc/sys/kernel/version,
>> and it has worked this way since the day it was written.
>
> What happens if /proc is not mounted (e.g. in a chrooted environment)?

glibc decides we aren't a SMP system so it's mutex locks don't
busy wait, and go to sleep immediately.

Eric