kernel/linux.git, branch v2.6.18-rc1

Linux 2.6.18-rc1

2006-07-06T04:09:49+00:00

It's all good.

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2006-07-06T04:08:43+00:00

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [PKT_SCHED]: Fix error handling while dumping actions [PKT_SCHED]: Return ENOENT if action module is unavailable [PKT_SCHED]: Fix illegal memory dereferences when dumping actions

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

2006-07-06T04:08:35+00:00

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix stack overflow checking in modular non-SMP kernels. [SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.

[PKT_SCHED]: Fix error handling while dumping actions

2006-07-06T03:47:28+00:00

"return -err" and blindly inheriting the error code in the netlink failure exception handler causes errors codes to be returned as positive value therefore making them being ignored by the caller. May lead to sending out incomplete netlink messages. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller

[PKT_SCHED]: Return ENOENT if action module is unavailable

2006-07-06T03:45:57+00:00

Signed-off-by: Thomas Graf Signed-off-by: David S. Miller

[PKT_SCHED]: Fix illegal memory dereferences when dumping actions

2006-07-06T03:45:06+00:00

The TCA_ACT_KIND attribute is used without checking its availability when dumping actions therefore leading to a value of 0x4 being dereferenced. The use of strcmp() in tc_lookup_action_n() isn't safe when fed with string from an attribute without enforcing proper NUL termination. Both bugs can be triggered with malformed netlink message and don't require any privileges. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller

[SPARC64]: Fix stack overflow checking in modular non-SMP kernels.

2006-07-06T03:42:58+00:00

The sparc64 kernel's EXPORT_SYMBOL(_mcount) is inside an #ifdef CONFIG_SMP. This breaks modules in non-SMP kernels built with stack overflow checking (CONFIG_STACK_DEBUG=y), as modules_install reports: WARNING: /lib/modules/2.6.17/kernel/drivers/ide/ide-cd.ko needs unknown symbol _mcount Trivially fixed by moving EXPORT_SYMBOL(_mcount) outside of the #ifdef CONFIG_SMP. Signed-off-by: Mikael Pettersson Signed-off-by: David S. Miller

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

2006-07-06T03:19:30+00:00

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PCI] Add JMicron PCI ID constants [PATCH] ahci: Ensure that we don't grab both functions [PATCH] libata-core.c: restore configuration boot messages in ata_dev_configure(), v2 [PATCH] sata_sil24: add suspend/sleep support [PATCH] sata_sil24: separate out sil24_init_controller() [PATCH] sata_sil: add suspend/sleep support [PATCH] sata_sil: separate out sil_init_controller() [PATCH] libata: reimplement controller-wide PM [PATCH] libata: reimplement per-dev PM [PATCH] libata: implement PM EH actions [PATCH] libata: separate out __ata_ehi_hotplugged() [PATCH] libata: implement ATA_EHI_NO_AUTOPSY and QUIET [PATCH] libata: clean up debounce parameters and improve parameter selection [PATCH] libata: implement ATA_EHI_RESUME_LINK [PATCH] libata: replace ap_lock w/ ap->lock in ata_scsi_error() [PATCH] libata: fix ehc->i.action setting in ata_eh_autopsy() [PATCH] libata: add ap->pflags and move core dynamic flags to it [PATCH] libata: Conditionally set host->max_cmd_len [PATCH] sata_vsc: data_xfer should use mmio

[SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.

2006-07-06T03:18:39+00:00

Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller

[PCI] Add JMicron PCI ID constants

2006-07-06T03:02:48+00:00

They will be used in several IDE/libata files. Signed-off-by: Jeff Garzik