commit dc709bd190c130b299ac19d596594256265c042a
tree 53c74b614d906825d478b62c068e2ed11b883c95
parent d96299537e43681942ea272e00b0e529aa5b5fa4
parent ea4c07d780a6f7b7be2d984117bd3e0a2b772e3d
author Linus Torvalds <torvalds@g5.osdl.org> Tue, 29 Aug 2006 15:54:07 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 29 Aug 2006 15:54:07 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] Do not send Query All EAs SMB when mount option nouser_xattr
[CIFS] endian errors in lanman protocol support
[CIFS] Fix oops in cifs_close due to unitialized lock sem and list in
[CIFS] Fix oops when negotiating lanman and no password specified
[CIFS]
[CIFS] Allow cifsd to suspend if connection is lost
[CIFS] Make midState usage more consistent
[CIFS] spinlock protect read of last srv response time in timeout path
[CIFS] Do not time out posix brl requests when using new posix setfileinfo
commit d96299537e43681942ea272e00b0e529aa5b5fa4
tree 65e4df4142a7a0eb0ec0bfe70058771731e39194
parent 1b8b22f44bc68b066c571ca2b5ab4fda123c15bd
parent 737c17561fb2c6a72810cca7d7c0b8bdc29bb120
author Linus Torvalds <torvalds@g5.osdl.org> Mon, 28 Aug 2006 20:19:55 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 28 Aug 2006 20:19:55 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] Support for Intashield 2 port PCI serial card
commit 1b8b22f44bc68b066c571ca2b5ab4fda123c15bd
tree bb7e9bf87204a60fea86389d5f79fc4fa79b7ec7
parent 60d4684068ff1eec78f55b5888d0bd2d4cca1520
parent 260e98edc8ae8ea862c9c222eeffb1a2eeafa7fc
author Linus Torvalds <torvalds@g5.osdl.org> Mon, 28 Aug 2006 20:19:16 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 28 Aug 2006 20:19:16 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3761/1: fix armv4t breakage after adding thumb interworking to userspace helpers
[ARM] Add Integrator support for glibc outb() and friends
[ARM] Move prototype for register_isa_ports to asm/io.h
[ARM] Arrange for isa.c to use named initialisers
[ARM] 3741/1: remove sa1111.c build warning on non-sa1100 systems
[ARM] 3760/1: This patch adds timeouts while working with SSP registers. Such timeouts were en
[ARM] 3758/1: Preserve signalling NaNs in conversion
[ARM] 3749/3: Correct VFP single/double conversion emulation
[ARM] 3748/3: Correct error check in vfp_raise_exceptions
commit 260e98edc8ae8ea862c9c222eeffb1a2eeafa7fc
tree 33f7e69ca5e27c1fd2c874ddd807e4d8c6e3dc23
parent 863dab453b869136453944bda63e20b6ed39c5ef
author Lennert Buytenhek <buytenh@wantstofly.org> Mon, 28 Aug 2006 12:51:20 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon, 28 Aug 2006 12:51:20 +0100
[ARM] 3761/1: fix armv4t breakage after adding thumb interworking to userspace helpers
Patch from Lennert Buytenhek
On armv4t systems, we have always compiled the kernel with -march=armv4
instead of -march=armv4t, which means that any use of bx will bomb out.
Commit ba9b5d76372dc290b6ca04dad93927a22c2ac49a introduced the use of
bx in the kernel, which means we need to compile with -march=armv4t on
armv4t systems now.
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 863dab453b869136453944bda63e20b6ed39c5ef
tree b6bfe11f05220f1d14e7856f6619fdf09ec15a0d
parent 1645f20bc4440d6f67f73f570f3cf873b4e37f3c
author Russell King <rmk@dyn-67.arm.linux.org.uk> Mon, 28 Aug 2006 12:47:05 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon, 28 Aug 2006 12:47:05 +0100
[ARM] Add Integrator support for glibc outb() and friends
Add the necessary call to register_isa_ports() so that glibc knows
where these are found on Integrator platforms.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 1645f20bc4440d6f67f73f570f3cf873b4e37f3c
tree bad534529fb147d90d870d28ba15e666975fd2c2
parent 7034b0e60a2ccfab4ee2d3a468cb8cad6de3740d
author Russell King <rmk@dyn-67.arm.linux.org.uk> Mon, 28 Aug 2006 12:45:16 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon, 28 Aug 2006 12:45:16 +0100
[ARM] Move prototype for register_isa_ports to asm/io.h
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 7034b0e60a2ccfab4ee2d3a468cb8cad6de3740d
tree e8f4ce9a3c9da04463de9b1a9573b71164deadf8
parent 416112f818afcc08aeaba79ebba899aee5ddf571
author Russell King <rmk@dyn-67.arm.linux.org.uk> Mon, 28 Aug 2006 12:44:03 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon, 28 Aug 2006 12:44:03 +0100
[ARM] Arrange for isa.c to use named initialisers
Convert isa.c (the glibc interface for emulating ISA IO) to use
named initialisers.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 416112f818afcc08aeaba79ebba899aee5ddf571
tree 404f2d5f4c5969d3c46e35328f1fea65456cc7eb
parent 8f1bf8743c459399685f5df43021acd156548c22
author David Brownell <david-b@pacbell.net> Sun, 27 Aug 2006 13:09:14 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 27 Aug 2006 13:09:14 +0100
[ARM] 3741/1: remove sa1111.c build warning on non-sa1100 systems
Patch from David Brownell
Remove buld warning when building sa1111 on non-sa1100 platforms (e.g. PXA).
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 8f1bf8743c459399685f5df43021acd156548c22
tree 3eab5454e3dd04765f0f8b8d9f490596260d0ec5
parent b53a2b41f156a9c9b62c14502037cbc15bc08b54
author Paul Sokolovsky <pmiscml@gmail.com> Sun, 27 Aug 2006 12:54:56 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 27 Aug 2006 12:54:56 +0100
[ARM] 3760/1: This patch adds timeouts while working with SSP registers. Such timeouts were en
Patch from Paul Sokolovsky
This patch adds timeouts while working with SSP registers. Such
timeouts were envisioned by docstrings in ssp.c, but were not
implemented. There were actual lockups while accessing
touchscreen for iPaqs h1910, h4000 due to lack of the timeouts.
This is updated version of previously submitted patch: 3738/1.
Signed-off-by: Paul Sokolovsky <pmiscml@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit b53a2b41f156a9c9b62c14502037cbc15bc08b54
tree 7813d3dfbbb9fe97a8a093c837d7ee5a6746c4ae
parent c29ecac18cb740ae845db14963ac586c53962453
author Daniel Jacobowitz <drow@false.org> Sun, 27 Aug 2006 12:42:14 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 27 Aug 2006 12:42:14 +0100
[ARM] 3758/1: Preserve signalling NaNs in conversion
Patch from Daniel Jacobowitz
The fcvtds and fcvtsd instructions were generating a qnan bit pattern
for both quiet and signalling NaNs.
Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit c29ecac18cb740ae845db14963ac586c53962453
tree c9de25e8cd7ee3729a613b0176b448fd86a62d94
parent 7c6f25141b88b5e926f9d43932ce668602d611ae
author Daniel Jacobowitz <drow@false.org> Sun, 27 Aug 2006 12:42:10 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 27 Aug 2006 12:42:10 +0100
[ARM] 3749/3: Correct VFP single/double conversion emulation
Patch from Daniel Jacobowitz
The fcvtsd/fcvtds emulation was left behind when the numbering of double
precision registers was changed from 0-30 to 0-15. Both conversion
instructions were writing their results to the wrong register. Also,
the conversion instructions should stop after the first element even
if a vector length is specified.
Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 7c6f25141b88b5e926f9d43932ce668602d611ae
tree 50553a8e12aa4918eb3723ba3682e9ba2ca1e025
parent 3a13813e6effcfad5910d47b15b724621b50b878
author Daniel Jacobowitz <drow@false.org> Sun, 27 Aug 2006 12:42:08 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 27 Aug 2006 12:42:08 +0100
[ARM] 3748/3: Correct error check in vfp_raise_exceptions
Patch from Daniel Jacobowitz
The recent fix to hide VFP_NAN_FLAG broke the check in vfp_raise_exceptions;
it would attempt to deliver an exception mask of 0xfffffeff instead of reporting
a serious error condition using printk. Define a safe constant to use for
an invalid exception maskm, and use it at both ends.
Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 737c17561fb2c6a72810cca7d7c0b8bdc29bb120
tree 3c18a3b61e08ed55076759139a331a18fadbbb95
parent 3a13813e6effcfad5910d47b15b724621b50b878
author Peter Horton <pdh@colonel-panic.org> Sat, 26 Aug 2006 09:07:36 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 27 Aug 2006 11:59:49 +0100
[SERIAL] Support for Intashield 2 port PCI serial card
Here is a patch that adds support for the Instashield IS-200 2 port PCI
serial card.
Signed-off-by: Peter Horton <pdh@colonel-panic.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit ea4c07d780a6f7b7be2d984117bd3e0a2b772e3d
tree 5028cb83b1ff387a3c5d997b0688930bc2c55b08
parent 5ddaa683a513439081c9511b0d9ad490672c51c9
author Steve French <sfrench@us.ibm.com> Wed, 16 Aug 2006 19:44:25 +0000
committer Steve French <sfrench@us.ibm.com> Wed, 16 Aug 2006 19:44:25 +0000
[CIFS] Do not send Query All EAs SMB when mount option nouser_xattr
specified
Pointed out by Bjoern Jacke
Signed-off-by: Steve French <sfrench@us.ibm.com>
commit 5ddaa683a513439081c9511b0d9ad490672c51c9
tree 7c90bbc458cc2c05331a8bcb142e2eb41469056f
parent e466e4876bf39474e15d0572f2204578137ae7f5
author Steve French <sfrench@us.ibm.com> Tue, 15 Aug 2006 13:35:48 +0000
committer Steve French <sfrench@us.ibm.com> Tue, 15 Aug 2006 13:35:48 +0000
[CIFS] endian errors in lanman protocol support
le16 compared to host-endian constant
u8 fed to le32_to_cpu()
le16 compared to host-endian constant
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Steve French <sfrench@us.ibm.com>
commit e466e4876bf39474e15d0572f2204578137ae7f5
tree 1cefd7b97eb2d32846cffb5f8a32173e5db65946
parent 66abda5e1fa48e12e06d0b68746b0e67202a97d2
author Steve French <sfrench@us.ibm.com> Tue, 15 Aug 2006 13:07:18 +0000
committer Steve French <sfrench@us.ibm.com> Tue, 15 Aug 2006 13:07:18 +0000
[CIFS] Fix oops in cifs_close due to unitialized lock sem and list in
new POSIX locking code
Signed-off-by: Steve French <sfrench@us.ibm.com>
commit 66abda5e1fa48e12e06d0b68746b0e67202a97d2
tree 5ca65be63b9c3b24548a190d8fcf04653a6ec451
parent 7ee1af765dfa3146aef958258003245e082284e5
author Steve French <sfrench@us.ibm.com> Fri, 11 Aug 2006 16:52:09 +0000
committer Steve French <sfrench@us.ibm.com> Fri, 11 Aug 2006 21:29:13 +0000
[CIFS] Fix oops when negotiating lanman and no password specified
Pointed out by Guenter Kukkukk
Signed-of-by: Steve French <sfrench@us.ibm.com>
(cherry picked from bbf33d512da608c7221fec42b56b9ef89c25a5ee commit)
commit 7ee1af765dfa3146aef958258003245e082284e5
tree 90ab87a136d63c937064e595fd8062e5bc721e03
parent 6c3d8909d85b2c18fd7a6e64f0ca757a257b40fa
author Jeremy Allison <jra@samba.com> Wed, 02 Aug 2006 21:56:33 +0000
committer Steve French <sfrench@us.ibm.com> Fri, 11 Aug 2006 21:28:47 +0000
[CIFS]
Allow Windows blocking locks to be cancelled via a
CANCEL_LOCK call. TODO - restrict this to servers
that support NT_STATUS codes (Win9x will probably
not support this call).
Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Steve French <sfrench@us.ibm.com>
(cherry picked from 570d4d2d895569825d0d017d4e76b51138f68864 commit)
commit 6c3d8909d85b2c18fd7a6e64f0ca757a257b40fa
tree 731c94d9ea4260d8f732f101f2f5e14d4c7fdc26
parent 5da07b0208066fd3544ecf2b521fc7a2e0228ad5
author Steve French <sfrench@us.ibm.com> Mon, 31 Jul 2006 22:46:20 +0000
committer Steve French <sfrench@us.ibm.com> Fri, 11 Aug 2006 21:28:26 +0000
[CIFS] Allow cifsd to suspend if connection is lost
Make cifsd allow us to suspend if it has lost the connection with a server
Ref: http://bugzilla.kernel.org/show_bug.cgi?id=6811
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Steve French <sfrench@us.ibm.com>
(cherry picked from 27bd6cd87b0ada66515ad49bc346d77d1e9d3e05 commit)
commit 5da07b0208066fd3544ecf2b521fc7a2e0228ad5
tree 915422bc93ad4fde6cbacbf980b5cd4adc32b7a7
parent 14a441a2b4ee1dfc00ec822d91d9fb20f401c62f
author Steve French <sfrench@us.ibm.com> Sun, 16 Jul 2006 21:33:15 +0000
committer Steve French <sfrench@us.ibm.com> Fri, 11 Aug 2006 21:28:02 +0000
[CIFS] Make midState usage more consistent
Although harmless, we were sometimes treating midState like it contained
flags but they are exclusive states, and this makes that more clear.
Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Steve French <sfrench@us.ibm.com>
(cherry picked from 586c057c3a68dd6ae0f3ba94fbf76798b1558074 commit)
commit 14a441a2b4ee1dfc00ec822d91d9fb20f401c62f
tree 122a33e5e056bdd433e78b4f6a1c9f8e2d3385d2
parent 3a5ff61c18659443f76bad6cf06f60103046de5d
author Steve French <sfrench@us.ibm.com> Sun, 16 Jul 2006 04:32:51 +0000
committer Steve French <sfrench@us.ibm.com> Fri, 11 Aug 2006 21:27:41 +0000
[CIFS] spinlock protect read of last srv response time in timeout path
Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Steve French <sfrench@us.ibm.com>
(cherry picked from b33a3f55e54fd210fc043eafcf83728b03bc9e02 commit)
commit 3a5ff61c18659443f76bad6cf06f60103046de5d
tree 541e341724b50b11c598c9790370d460f189586b
parent 9f737633e6ee54fc174282d49b2559bd2208391d
author Steve French <sfrench@us.ibm.com> Fri, 14 Jul 2006 22:37:11 +0000
committer Steve French <sfrench@us.ibm.com> Fri, 11 Aug 2006 21:27:07 +0000
[CIFS] Do not time out posix brl requests when using new posix setfileinfo
request and do not time out slow requests to a server that is still responding
well to other threads
Suggested by jra of Samba team
Signed-off-by: Steve French <sfrench@us.ibm.com>
(cherry picked from 89b57148115479eef074b8d3f86c4c86c96ac969 commit)