summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-linus' of ↵Linus Torvalds2006-06-2716-110/+191
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] ata_piix: add ICH6/7/8 to Kconfig [PATCH] sata_sil: disable hotplug interrupts on two ATI IXPs [PATCH] libata: cosmetic updates [PATCH] ata: add some NVIDIA chipset IDs [PATCH] libata reduce timeouts [PATCH] libata: implement ata_port_max_devices() [PATCH] libata: make two functions global [PATCH] libata: update ata_do_simple_cmd() [PATCH] libata: move ata_do_simple_cmd() below ata_exec_internal() [PATCH] libata: clear EH action on device detach [PATCH] libata: implement and use ata_deh_dev_action() [PATCH] libata: move ata_eh_clear_action() upward [PATCH] libata.h needs scatterlist.h [libata] sata_vsc: partially revert a PCI ID-related commit [libata] Bump versions
| * [PATCH] ata_piix: add ICH6/7/8 to KconfigAuke Kok2006-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | Ata_piix's Kconfig entry still refers only to ICH5, while it supports ICH6 through 8. This creates confusion with people who are looking to see if their newer SATA enabled motherboards are supported. The following patch makes this clear. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] sata_sil: disable hotplug interrupts on two ATI IXPsTejun Heo2006-06-261-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | Some SATA controllers embedded in ATI IXPs seem to have broken SATA_IRQ bit in their bmdma2 registers which is always stuck at 1. This makes the driver believe that there has been a hotplug event and freeze the port whenever there's an interrupt thus failing all commands. This patch disables SATA_IRQ for those controllers. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] libata: cosmetic updatesTejun Heo2006-06-261-29/+32
| | | | | | | | | | | | | | | | | | | | | | | | Cosmetic updates in libata-core.c. * trim trailing whitespaces * break lines which are over 80 column * kill unnecessary braces * make indentation consistent Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] ata: add some NVIDIA chipset IDsRandy Dunlap2006-06-262-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Randy Dunlap <randy.dunlap@oracle.com> Add some nVidia chipset ID's support. http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=b407680553280f9999a20706d5ab2a3be65312c1;hp=ce4cb48010ab2cca537432b5ccb47d4b1fb489e5 Snagged from lkml. Cc: Jeff Garzik <jeff@garzik.org> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Tejun Heo <htejun@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] libata reduce timeoutsAndrew Morton2006-06-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | From: Andrew Morton <akpm@osdl.org> Provide a module parameter to override the default 30-second-per-device SATA probing timeout. Cc: Tejun Heo <htejun@gmail.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] libata: implement ata_port_max_devices()Tejun Heo2006-06-261-0/+14
| | | | | | | | | | | | | | | | | | Implement ata_port_max_devices(). This function returns the number of possible devices on a port. This will be used by new PM implementation. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] libata: make two functions globalTejun Heo2006-06-262-2/+4
| | | | | | | | | | | | | | | | Make ata_do_simple_cmd() and ata_flush_cache() global. These will be used from libata-eh.c. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] libata: update ata_do_simple_cmd()Tejun Heo2006-06-261-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | * the function has always returned AC_ERR_* masks not -errno but its return type was int. Make return type unsigned int. * don't print error message automatically. it's the caller's responsibility. * add header comment Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] libata: move ata_do_simple_cmd() below ata_exec_internal()Tejun Heo2006-06-261-23/+23
| | | | | | | | | | | | | | Move ata_do_simple_cmd() below ata_exec_internal() for consistency. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] libata: clear EH action on device detachTejun Heo2006-06-261-0/+4
| | | | | | | | | | | | | | | | Clear related EH action on device detach such that new device doesn't receive EH actions scheduled for the old one. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] libata: implement and use ata_deh_dev_action()Tejun Heo2006-06-261-1/+8
| | | | | | | | | | | | | | | | Implement and use ata_eh_dev_action() which returns EH action mask for a device. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] libata: move ata_eh_clear_action() upwardTejun Heo2006-06-261-25/+25
| | | | | | | | | | | | | | Move ata_eh_clear_action() upward. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] libata.h needs scatterlist.hAndrew Morton2006-06-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Andrew Morton <akpm@osdl.org> s390: In file included from drivers/scsi/libata-bmdma.c:39: include/linux/libata.h:391: error: field 'sgent' has incomplete type include/linux/libata.h:392: error: field 'pad_sgent' has incomplete type include/linux/libata.h: In function 'ata_sg_is_last': include/linux/libata.h:849: error: arithmetic on pointer to an incomplete type include/linux/libata.h:849: error: arithmetic on pointer to an incomplete type include/linux/libata.h: In function 'ata_qc_next_sg': include/linux/libata.h:869: error: increment of pointer to unknown structure include/linux/libata.h:869: error: arithmetic on pointer to an incomplete type include/linux/libata.h:869: error: arithmetic on pointer to an incomplete type include/linux/libata.h:869: error: arithmetic on pointer to an incomplete type Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [libata] sata_vsc: partially revert a PCI ID-related commitJeff Garzik2006-06-262-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Partially revert 74d0a988d3aa359b6b8a8536c8cb92cce02ca5d5: [PATCH] PCI: Move various PCI IDs to header file libata policy is to avoid use of named PCI device ID constants. These are often single-use constants, which have little value over direct numeric constants save for constant include/linux/pci_ids.h patching/merging headaches. Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [libata] Bump versionsJeff Garzik2006-06-2610-10/+10
| | | | | | | | | | | | Update major version for libata, and several drivers. Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | Properly delete sound/ppc/toonie.cLinus Torvalds2006-06-271-0/+0
| | | | | | | | | | | | | | The previous "delete" had actually just truncated it to a zero size, something that can easily happen if you just apply a patch. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] i2c-i801.c: don't pci_disable_device() after it was just enabledDaniel Ritz2006-06-271-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 02dd7ae2892e5ceff111d032769c78d3377df970 ("[PATCH] i2c-i801: Merge setup function") has a missing return 0 in the _probe() function. This means the error path is always executed and pci_disable_device() is called even when the device just got successfully enabled. Having the SMBus device disabled makes some systems (eg. Fujitsu-Siemens Lifebook E8010) hang hard during power-off. Intead of reverting the whole commit this patch fixes it up: - don't ever call pci_disable_device(), also not in the _remove() function to avoid hangs - fix missing pci_release_region() in error path Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2006-06-2728-823/+1541
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (25 commits) [CIFS] Fix authentication choice so we do not force NTLMv2 unless the [CIFS] Fix alignment of unicode strings in previous patch [CIFS] Fix allocation of buffers for new session setup routine to allow [CIFS] Remove calls to to take f_owner.lock [CIFS] remove some redundant null pointer checks [CIFS] Fix compile warning when CONFIG_CIFS_EXPERIMENTAL is off [CIFS] Enable sec flags on mount for cifs (part one) [CIFS] Fix suspend/resume problem which causes EIO on subsequent access to [CIFS] fix minor compile warning when config_cifs_weak_security is off [CIFS] NTLMv2 support part 5 [CIFS] Add support for readdir to legacy servers [CIFS] NTLMv2 support part 4 [CIFS] NTLMv2 support part 3 [CIFS] NTLMv2 support part 2 [CIFS] Fix mask so can set new cifs security flags properly CIFS] Support for older servers which require plaintext passwords - part 2 [CIFS] Support for older servers which require plaintext passwords [CIFS] Fix mapping of old SMB return code Invalid Net Name so it is [CIFS] Missing brace [CIFS] Do not overwrite aops ...
| * | [CIFS] Fix authentication choice so we do not force NTLMv2 unless theSteve French2006-06-282-4/+9
| | | | | | | | | | | | | | | | | | user specifies it is required or turns of ntlm Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Fix alignment of unicode strings in previous patchSteve French2006-06-271-7/+15
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Fix allocation of buffers for new session setup routine to allowSteve French2006-06-276-36/+58
| | | | | | | | | | | | | | | | | | longer user and domain names and allow passing sec options on mount Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Remove calls to to take f_owner.lockIngo Molnar2006-06-261-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | CIFS takes/releases f_owner.lock - why? It does not change anything in the fowner state. Remove this locking. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] remove some redundant null pointer checksSteve French2006-06-261-30/+15
| | | | | | | | | | | | | | | | | | some of them pointed out by Dave Jones Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Fix compile warning when CONFIG_CIFS_EXPERIMENTAL is offSteve French2006-06-252-4/+0
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.gitSteve French2006-06-253148-96542/+116320
| |\ \
| * | | [CIFS] Enable sec flags on mount for cifs (part one)Steve French2006-06-234-321/+28
| | | | | | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.gitSteve French2006-06-20725-18128/+41902
| |\ \ \
| * | | | [CIFS] Fix suspend/resume problem which causes EIO on subsequent access toPavel Machek2006-06-132-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the mount. Signed-off-by: Pavel Machek <pavel@suse.de> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | | [CIFS] fix minor compile warning when config_cifs_weak_security is offSteve French2006-06-121-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | | [CIFS] NTLMv2 support part 5Steve French2006-06-084-24/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NTLMv2 authentication (stronger authentication than default NTLM) which many servers support now works. There was a problem with the construction of the security blob in the older code. Currently requires /proc/fs/cifs/Experimental to be set to 2 and /proc/fs/cifs/SecurityFlags to be set to 0x4004 (to require using NTLMv2 instead of default of NTLM) Next we will check signing to make sure optional NTLMv2 packet signing also works. Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | | Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.gitSteve French2006-06-07135-696/+1047
| |\ \ \ \
| * | | | | [CIFS] Add support for readdir to legacy serversSteve French2006-06-075-50/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes oops to OS/2 on ls and removes redundant NTCreateX calls to servers which do not support NT SMBs. Key operations to OS/2 work. Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | | | [CIFS] NTLMv2 support part 4Steve French2006-06-052-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | | | [CIFS] NTLMv2 support part 3Steve French2006-06-054-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Response struct filled in exacty for 16 byte hash which we need to check more to make sure it works. Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | | | [CIFS] NTLMv2 support part 2Steve French2006-06-053-7/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still need to fill in response structure and check that hash works Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | | | [CIFS] Fix mask so can set new cifs security flags properlySteve French2006-06-043-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | | | CIFS] Support for older servers which require plaintext passwords - part 2Steve French2006-06-045-151/+184
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | | | [CIFS] Support for older servers which require plaintext passwordsSteve French2006-06-023-16/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled by default, but can be enabled via proc for servers which require such support. Also includes support for setting security flags for cifs. See fs/cifs/README Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | | | [CIFS] Fix mapping of old SMB return code Invalid Net Name so it isSteve French2006-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recognized on mount the old mapping of this was to ENODEV (instead of ENXIO) - but ENODEV is what mount returns when the cifs driver will not load so change this to map to ENXIO (which was what the equivalent condition returned for mapping errors from more modern servers) Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | | | [CIFS] Missing braceSteve French2006-06-011-1/+1
| | | | | |
| * | | | | [CIFS] Do not overwrite aopsDave Kleikamp2006-06-014-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cifs should not be overwriting an element of the aops structure, since the structure is shared by all cifs inodes. Instead define a separate aops structure to suit each purpose. I also took the liberty of replacing a hard-coded 4096 with PAGE_CACHE_SIZE Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com> Signed-off-by: Steven French <sfrench@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * | | | | [CIFS] Fix minor build breaks due to cifs kconfig issuesSteve French2006-06-012-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | | | [CIFS] Support for setting up SMB sessions to legacy lanman servers part 2Steve French2006-06-019-75/+150
| | | | | |
| * | | | | [CIFS] Missing include shows up on some architecturesSteve French2006-06-013-144/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | | | | [CIFS] Support for setting up SMB sessions to legacy lanman serversSteve French2006-05-3120-76/+837
| | | | | |
| * | | | | [CIFS] Cleanup extra whitespace in dmesg logging. Update cifs change logSteve French2006-05-319-36/+37
| | | | | |
* | | | | | [PATCH] m68knommu: use Kconfig RAM config options in 68328 startup codeGreg Ungerer2006-06-271-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to using the new RAM Kconfig settings, instead of linker defined regions in ROM specific 68328 startup code. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | | [PATCH] m68knommu: use Kconfig RAM config options in 68360 ROM startup codeGreg Ungerer2006-06-271-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to using the new RAM Kconfig settings, instead of linker defined regions in ROM specific 68360 startup code. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | | [PATCH] m68knommu: use Kconfig RAM config options in 68360 RAM startup codeGreg Ungerer2006-06-271-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to using the new RAM Kconfig settings, instead of linker defined regions in RAM specific 68360 startup code. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
OpenPOWER on IntegriCloud