summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2005-11-12[libata sata_mv] mv_hw_ops for hardware families; new errataJeff Garzik
- eliminate a bunch of redundant tests by creating a per-chip-family set of hooks, mv_hw_ops - implement more errata, from newer Marvell GPL'd driver
2005-11-12[libata sata_mv] move code aroundJeff Garzik
No content change, just prepping up future mv_hw_ops modularization.
2005-11-12[libata sata_mv] implement a bunch of errata workaroundsJeff Garzik
Based largely on the GPL'd Marvell vendor driver.
2005-11-12[libata sata_mv] note driver is "HIGHLY EXPERIMENTAL" in KconfigJeff Garzik
2005-11-12[libata sata_mv] trim trailing whitespaceJeff Garzik
2005-11-12[libata sata_mv] minor fixesJeff Garzik
- clear SError and EDMA irq cause registers, after re-init'ing the phy - move enums with type suffix 'U' to their own enum
2005-11-12[libata ahci] set port ATAPI bit correctlyJeff Garzik
Although according to the documentation this largely only affects desktop LED control, let's make sure we set the ATAPI bit when we have an ATAPI device attached to the port.
2005-11-12[libata ahci, qstor] fix miscount of scatter/gather entriesJeff Garzik
Don't directly reference qc->n_elem, as that might cause an off-by-one error for misaligned (padded) ATAPI transfers.
2005-11-11Linux v2.6.15-rc1v2.6.15-rc1Linus Torvalds
As per the new release rules: two weeks of merging, and then an -rc1 and calming down for the next release.
2005-11-11Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds
2005-11-11Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds
2005-11-11Merge branch 'release' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
2005-11-11Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds
2005-11-11[SCTP]: Include ulpevents in socket receive buffer accounting.Neil Horman
Also introduces a sysctl option to configure the receive buffer accounting policy to be either at socket or association level. Default is all the associations on the same socket share the receive buffer. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-11-11[SCTP]: Fix ia64 NaT consumption fault with sctp_sideffect commands.Vladislav Yasevich
On ia64, it is possible to get NaT Consumption Fault and a kernel panic when initializing sctp sideeffect commands arguments. The union sctp_arg_t contains different sized elements and when loading a smaller sized element (32 or 16 bits), it is possible for a speculative load to fail and result in a NaT bit set which causes a kernel crash. The easy way to get around it is to load the largerst member of the union. Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-11-11[SCTP]: Remove timeouts[] array from sctp_endpoint.Vladislav Yasevich
The socket level timeout values are maintained in sctp_sock and association level timeouts are in sctp_association. So there is no need for ep->timeouts. Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-11-11[SCTP]: Fix potential NULL pointer dereference in sctp_v4_get_saddrVladislav Yasevich
It is possible to get to sctp_v4_get_saddr() without a valid association. This happens when processing OOTB packets and the cached route entry is no longer valid. However, when responding to OOTB packets we already properly set the source address based on the information in the OOTB packet. So, if we we get to sctp_v4_get_saddr() without an association we can simply return. Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-11-11[IPV6]: Fix inet6_init missing unregister.David S. Miller
Based mostly upon a patch from Olaf Kirch <okir@suse.de> When initialization fails in inet6_init(), we should unregister the PF_INET6 socket ops. Also, check sock_register()'s return value for errors. Signed-off-by: David S. Miller <davem@davemloft.net>
2005-11-11[PATCH] kill libata scsi_wait_req usage (make libata compile with scsi-misc ↵Mike Christie
changes) scsi_wait_req does not exist any more in the SCSI layer. This patch makes it so libata can compile again. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-11ppc64: default build as the merged 'powerpc' architectureLinus Torvalds
After the last merge of the new unified 'powerpc' architecture, ppc64 no longer compiles cleanly as a standalone architecture. Some bits and pieces still exist as files under the old ppc64 hierarchy, but the old "ARCH=ppc64" is dead. So if "uname" says ppc64, that now implies that the default architecture should be "powerpc". Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-11Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6Linus Torvalds
2005-11-11Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds
2005-11-11[ARM] Update mach-typesRussell King
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-11[ARM] 3147/1: update ixp2000 defconfigs to 2.6.14-git13Lennert Buytenhek
Patch from Lennert Buytenhek Update the ixp2000 defconfigs to 2.6.14-git13. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-11[ARM] 3152/1: make various assembly local labels actually local (the rest)Nicolas Pitre
Patch from Nicolas Pitre For assembly labels to actually be local they must start with ".L" and not only "." otherwise they still remain visible in the final link and clutter kallsyms needlessly, and possibly make for unclear symbolic backtrace. This patch simply inserts a"L" where appropriate. The code itself is unchanged. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-11[ARM] 3151/1: make various assembly local labels actually local (io-*.S)Nicolas Pitre
Patch from Nicolas Pitre For assembly labels to actually be local they must start with ".L" and not only "." otherwise they still remain visible in the final link and clutter kallsyms needlessly, and possibly make for unclear symbolic backtrace. This patch simply inserts a"L" where appropriate. The code itself is unchanged. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-11[ARM] 3150/1: make various assembly local labels actually local (uaccess.S)Nicolas Pitre
Patch from Nicolas Pitre For assembly labels to actually be local they must start with ".L" and not only "." otherwise they still remain visible in the final link and clutter kallsyms needlessly, and possibly make for unclear symbolic backtrace. This patch simply inserts a"L" where appropriate. The code itself is unchanged. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-11[SPARC64]: Restore 2.4.x /proc/cpuinfo behavior for "ncpus probed" field.David S. Miller
Noticed by Tom 'spot' Callaway. Even on uniprocessor we always reported the number of physical cpus in the system via /proc/cpuinfo. But when this got changed to use num_possible_cpus() it always reads as "1" on uniprocessor. This change was unintentional. So scan the firmware device tree and count the number of cpu nodes, and report that, as we always did. Signed-off-by: David S. Miller <davem@davemloft.net>
2005-11-11[DECNET]: fix SIGPIPEPatrick Caulfield
Currently recvmsg generates SIGPIPE whereas sendmsg does not; for the other stacks it seems to be the other way round! It also fixes the bug where reading from a socket whose peer has shutdown returned -EINVAL rather than 0. Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-11-11[IA64-SGI] set altix preferred consoleMark Maule
Fix default VGA console on SN platforms. Since SN firmware does not pass enough ACPI information to identify VGA cards and the associated legacy IO/MEM addresses, we rely on the EFI PCDP table. Since the linux pcdp driver is optional (and overridden if console= directives are used) SN duplicates a portion of the pcdp scan code to identify if there is a usable console VGA adapter. Additionally, dup necessary pcdp related structs to avoid dragging drivers/pcdp.h into a more public location. Signed-off-by: Mark Maule <maule@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
2005-11-11[IA64] 4-level page tablesRobin Holt
This patch introduces 4-level page tables to ia64. I have run some benchmarks and found nothing interesting. Performance has consistently fallen within the noise range. It also introduces a config option (setting the default to 3 levels). The config option prevents having 4 level page tables with 64k base page size. Signed-off-by: Robin Holt <holt@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
2005-11-11Merge branch 'upstream-linus' of ↵Linus Torvalds
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
2005-11-11Merge branch 'upstream-linus' of ↵Linus Torvalds
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
2005-11-11Merge master.kernel.org:/home/rmk/linux-2.6-drvmodelLinus Torvalds
2005-11-11[PATCH] ipmi: fix inconsistent spinlock usageHironobu Ishii
Part of a patch was accidentally reverted, this corrects an inconsistent spinlock use in the IPMI message handler. Signed-off-by: Hironobu Ishii <hishii@soft.fujitsu.com> Signed-off-by: Corey Minyard <minyard@acm.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-11Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds
2005-11-11Merge master.kernel.org:/home/rmk/linux-2.6-mmcLinus Torvalds
2005-11-11[PATCH] TCP: fix vegas buildJeff Garzik
Recent TCP changes broke the build. Signed-off-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-11[PATCH] Input: convert hdaps to dynamic input_dev allocation.Dmitry Torokhov
Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-11[PATCH] gt96100eth.c: Don't concatenate __FUNCTION__ with strings.Ralf Baechle
As part of the ISO C9x conversion gcc deprecates concatenation with __FUNCTION__ because __FUNCTION__ is not a preprocessor macro. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-11-11[PATCH] smc91x: DB1200 support.Pete Popov
The following patch support the SMC9111 present on DB1200 boards. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-11-11[PATCH] SAA9730: Driver overhaulRalf Baechle
o Try to work around some of the undocumented "features" of the SAA9730 o Use netdev_priv() instead of the previous broken mechanism to allocate the private data structure. o Try to make sure we don't leak resources on exit. o No more need to call SET_MODULE_OWNER in 2.6. o Use pci_free_consistent instead of homegrown architecture-specific allocation. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/saa9730.c | 531 +++++++++++++++++++++++--------------------------- 1 files changed, 249 insertions(+), 282 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-11-11[PATCH] SAA9730: Whitespace cleanup.Ralf Baechle
Kill trailing whitespace, replace leading whitespace with tabs. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/saa9730.c | 98 +++++++++++++++++++++++++------------------------- 1 files changed, 49 insertions(+), 49 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-11-11[netdrvr forcedeth] phy address scan rangeAyaz Abdulla
Added phy address 0 to the phy scan. Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com>
2005-11-11[netdrvr forcedeth] support for irq mitigationAyaz Abdulla
This patch contains support for different modes of interrupt mitigation of forcedeth. It includes changes based on Jeff's comments. Currently, the modes are changed through module parameters since ethtool does not support something similar. Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com>
2005-11-11[netdrvr forcedeth] remove superfluous rx engine stop/startAyaz Abdulla
Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com>
2005-11-11[PATCH] gianfar mii needs to zero out the mii_bus structureKumar Gala
To ensure that phy_mask and any future elements of the mii_bus structure are initialized use kzalloc() instead of kmalloc(). This fixes an issue in which phy_mask was not being initialized and we would skip random phy addresses when scanning. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-11-11[PATCH] s390: mail address changedFrank Pavlic
[patch 7/7] s390: mail address changed From: Frank Pavlic <fpavlic@de.ibm.com> - mail address changed to fpavlic@de.ibm.com Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> diffstat: lcs.c | 4 ++-- qeth_main.c | 4 ++-- qeth_mpc.c | 2 +- qeth_mpc.h | 2 +- qeth_sys.c | 2 +- qeth_tso.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-11-11[PATCH] s390: introduce guestLan sniffer support in qethFrank Pavlic
[patch 6/7] s390: introduce guestLan sniffer support in qeth From: Peter Tiedemann <ptiedem@de.ibm.com> - introduce guestLan sniffer support in qeth feature allows a linux in a virtual machine guest to become a network LAN sniffer, monitoring and recording the networking traffic within an entire guestLan. Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> diffstat: qeth.h | 2 + qeth_main.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qeth_mpc.h | 11 ++++--- 3 files changed, 102 insertions(+), 4 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-11-11[PATCH] s390: fix recovery failure of non-guestLAN devicesFrank Pavlic
[patch 5/7] s390: fix recovery failure of non-guestLAN devices From: Frank Pavlic <fpavlic@de.ibm.com> - Recovery of non-guestLAN Layer 2 device failed due to trying to register the real MAC address we got from the READ_MAC adapter parameters command. We have to keep the "old" MAC address when we process the reply of a READ_MAC. Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> diffstat: qeth.h | 12 ++++++------ qeth_main.c | 27 ++++++++++++++++----------- 2 files changed, 22 insertions(+), 17 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>