commit 97008082eacab047c189028202e055280f799ace tree 5b80274682ef87606f13cd585f78f1c57b22031f parent 043cf3fd20a22df5957c28888f4c8d41438f2140 parent 22f11c4e662ef0bdd87f09370a76c83ed738d5fd author Linus Torvalds Thu, 16 Jun 2005 13:40:39 -0700 committer Linus Torvalds Thu, 16 Jun 2005 13:40:39 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 22f11c4e662ef0bdd87f09370a76c83ed738d5fd tree 3b3c2df768eacbd59240cd4be8d9922ab4a0ba7d parent 95220a2ea334b5ff2168cc9bf31c0e08b29bae21 author Nicolas Pitre Thu, 16 Jun 2005 21:23:56 +0100 committer Russell King Thu, 16 Jun 2005 21:23:56 +0100 [PATCH] ARM: 2715/1: restore CPLD interrupts upon resume for Lubbock and Mainstone Patch from Nicolas Pitre Without this some devices fail to work again after a suspend event. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 043cf3fd20a22df5957c28888f4c8d41438f2140 tree ca0c79f43fd55a34e7694290e9d214cf59ca6819 parent c081474c184b34136e09e1e335f41356a11c7b68 parent 95220a2ea334b5ff2168cc9bf31c0e08b29bae21 author Linus Torvalds Thu, 16 Jun 2005 13:22:23 -0700 committer Linus Torvalds Thu, 16 Jun 2005 13:22:23 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 95220a2ea334b5ff2168cc9bf31c0e08b29bae21 tree 48073fc72e6f93c531f99e1bdd44b89f4c597095 parent fea7722fd7b45c6957caed84251d95269319fe16 author Catalin Marinas Thu, 16 Jun 2005 18:01:12 +0100 committer Russell King Thu, 16 Jun 2005 18:01:12 +0100 [PATCH] ARM: 2714/1: Fix the IB2 definitions for the Versatile platform Patch from Catalin Marinas The initial IB2 addresses did not depend on the IB2 base. This patch defines them as (VERSATILE_IB2_BASE + offset). Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit fea7722fd7b45c6957caed84251d95269319fe16 tree 125bf0a248ecf97e6cda409486d82d73b94344dc parent 90ef713b6368dcfe7a74bcc0026b998b4c44d5bc author Catalin Marinas Thu, 16 Jun 2005 18:01:11 +0100 committer Russell King Thu, 16 Jun 2005 18:01:11 +0100 [PATCH] ARM: 2713/1: Fix the GPIO base for Integrator/CP Patch from Catalin Marinas The GPIO base for Integrator/CP is different from the Integrator/AP. This patch sets the correct value for INTEGRATOR_GPIO_BASE. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 90ef713b6368dcfe7a74bcc0026b998b4c44d5bc tree c77b046000b6eb18725448a34527ce3a1044db1b parent bcfff0b471a60df350338bcd727fc9b8a6aa54b2 author Catalin Marinas Thu, 16 Jun 2005 18:01:11 +0100 committer Russell King Thu, 16 Jun 2005 18:01:11 +0100 [PATCH] ARM: 2712/1: Fix the RGB order for the Versatile CLCD Patch from Catalin Marinas The current red and blue colours on the Versatile CLCD are reversed when the 5:6:5 mode is used. The patch sets the proper bit in the SYS_CLCD register value. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit c081474c184b34136e09e1e335f41356a11c7b68 tree fe68ea74235af27d23cc375c94b4bf6baf99eb26 parent 58125f95c62a44f12bb71c58ef70f0068d20c7a2 parent c374f127e4ff17a318b9ae95a5bf65f370c2d0b1 author Linus Torvalds Thu, 16 Jun 2005 09:53:48 -0700 committer Linus Torvalds Thu, 16 Jun 2005 09:53:48 -0700 Merge 'for-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block commit e41fb09b2fa15db095d3ee981299f488d7b48dfe tree d8fdaeacb061432f28b3db11444e87c9d94902ce parent 5db92850d3ab72b830a0fe6e30eaec8462801408 author Dmitry Torokhov Wed, 15 Jun 2005 22:26:36 -0700 committer Linus Torvalds Thu, 16 Jun 2005 09:02:59 -0700 [PATCH] ALPS: fix enabling hardware tapping It looks like logic for enabling hardware tapping in ALPS driver was inverted and we enable it only if it was already enabled by BIOS or firmware. I have a confirmation from one user that the patch below fixes the problem for him and it might be beneficial if we could get it into 2.6.12. Signed-off-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2ef79e1840ebbd0b5907e53c755efd5662112a1 tree b6d0c2c0b961b2e1fb3d5e07ebb9e0eef4de944a parent bcfff0b471a60df350338bcd727fc9b8a6aa54b2 author Alexandre Oliva Wed, 15 Jun 2005 22:26:31 -0700 committer Linus Torvalds Thu, 16 Jun 2005 09:02:59 -0700 [PATCH] sbp2 slab corruption fix This fixed a problem that showed up in the Fedora development tree a few weeks before the Fedora Core 4 release, initially as slab corruption, later as hard crashes on boot up, when slab debugging was disabled for the release. More details on the history at https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158424 The problem is caused by sbp2's use of scsi_host->hostdata[0] to hold a scsi_id, without explicitly requesting space for it. Since hostdata is declared as a zero-sized array, we don't get any such space by default, so it must be explicitly requested. The patch below implements just that. Signed-off-by: Alexandre Oliva Cc: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5db92850d3ab72b830a0fe6e30eaec8462801408 tree 1f1b40c7b1873cf24cf98859907912ff514eb056 parent a2ef79e1840ebbd0b5907e53c755efd5662112a1 author Daniel Jacobowitz Wed, 15 Jun 2005 22:26:34 -0700 committer Linus Torvalds Thu, 16 Jun 2005 09:02:59 -0700 [PATCH] Fix large core dumps with a 32-bit off_t The ELF core dump code has one use of off_t when writing out segments. Some of the segments may be passed the 2GB limit of an off_t, even on a 32-bit system, so it's important to use loff_t instead. This fixes a corrupted core dump in the bigcore test in GDB's testsuite. Signed-off-by: Daniel Jacobowitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58125f95c62a44f12bb71c58ef70f0068d20c7a2 tree 633880e297915359244176619b18838bee45769e parent e41fb09b2fa15db095d3ee981299f488d7b48dfe author Oliver Neukum Wed, 15 Jun 2005 22:26:38 -0700 committer Linus Torvalds Thu, 16 Jun 2005 09:02:59 -0700 [PATCH] fix for kaweth broken by changes in the networking layer Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c374f127e4ff17a318b9ae95a5bf65f370c2d0b1 tree d1e42b31f9a66582096e9548fc90cc069d6f39e2 parent 9c56187d3c345cc0e7a2f162b8c32543175d7bf7 author Tejun Heo Thu, 16 Jun 2005 12:57:31 +0200 committer Jens Axboe Thu, 16 Jun 2005 12:57:31 +0200 This patch fixes q->unplug_thresh condition check in __elv_add_request(). rq.count[READ] + rq.count[WRITE] can increase more than one if another thread has allocated a request after the current request is allocated or in_flight could have changed resulting in larger-than-one change of nrq, thus breaking the threshold mechanism. Signed-off-by: Jens Axboe Signed-off-by: Tejun Heo commit 9c56187d3c345cc0e7a2f162b8c32543175d7bf7 tree 709155ae306690634da0261bb2a1887e10bd6db1 parent bcfff0b471a60df350338bcd727fc9b8a6aa54b2 author Tejun Heo Thu, 16 Jun 2005 12:56:15 +0200 committer Jens Axboe Thu, 16 Jun 2005 12:56:15 +0200 This patch kills elevator_global_init() in elevator.c which does nothing. Signed-off-by: Jens Axboe Signed-off-by: Tejun Heo commit bcfff0b471a60df350338bcd727fc9b8a6aa54b2 tree f3cb0028c65b96f2d38cc31c578bbc9b6271a85d parent 1016888fb69662936b32ab767c7419a3be9a69d3 author David S. Miller Wed, 15 Jun 2005 20:51:14 -0700 committer David S. Miller Wed, 15 Jun 2005 20:51:14 -0700 [NETFILTER]: ipt_recent: last_pkts is an array of "unsigned long" not "u_int32_t" This fixes various crashes on 64-bit when using this module. Based upon a patch by Juergen Kreileder . Signed-off-by: David S. Miller ACKed-by: Patrick McHardy commit 1016888fb69662936b32ab767c7419a3be9a69d3 tree 719924701adccf053de08548a2195cba0a6198e0 parent 4845f3333765b732aa2d7ea6d72fd03cfec4fbf3 author Olaf Hering Tue, 14 Jun 2005 13:52:19 -0700 committer Linus Torvalds Tue, 14 Jun 2005 17:41:39 -0700 [PATCH] update ppc64 defconfig enable cpusets enable new lpfc and jsm drivers enable new dm-multipath leave new agp disabled disable rivafb, it does not handle the cards in G5 models (FX5200 as example) the new nvidiafb doesnt work on bigendian, yet Signed-off-by: Olaf Hering Acked-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4845f3333765b732aa2d7ea6d72fd03cfec4fbf3 tree 5f71f88770c75cae90587457b11e453f02a80bb2 parent dcf78d80a6c2de829ec08c8e663a3370e982d616 author Paul Mackerras Tue, 14 Jun 2005 22:19:24 +1000 committer Linus Torvalds Tue, 14 Jun 2005 12:11:12 -0700 [PATCH] ppc64: update example configs Here is a patch to update the example configs in arch/ppc64/configs. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit efa93dbedd0e2eacf49ea6fff1fe4397d520cf61 tree 2fc2f2f52d2509bb73d6aa847c4fc8a8a188e0bc parent 9a47696970bc8233818d370011e2fddae5cfce9f author Karsten Wiese Tue, 14 Jun 2005 09:54:55 -0700 committer Linus Torvalds Tue, 14 Jun 2005 11:05:13 -0700 [PATCH] usbaudio: prevent oops & dead keyboard on usb unplugging while the device is being used Without this patch, some usb kobjects, which are parents to the usx2y's kobjects can be freed before the usx2y's. This led to an oops in get_kobj_path_length() and a dead keyboard, when the usx2y's kobjects were freed. The patch ensures the correct sequence. Tested ok on kernel 2.6.12-rc2. Present in ALSA cvs Signed-off-by: Karsten Wiese Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright Signed-off-by: Linus Torvalds commit dcf78d80a6c2de829ec08c8e663a3370e982d616 tree 77b572ad1e4dcda54f876ac721f54f1e8c8f117e parent efa93dbedd0e2eacf49ea6fff1fe4397d520cf61 author Karsten Wiese Tue, 14 Jun 2005 09:56:20 -0700 committer Linus Torvalds Tue, 14 Jun 2005 11:05:13 -0700 [PATCH] usbusx2y: prevent oops & dead keyboard on usb unplugging while the device is being used Without this patch, some usb kobjects, which are parents to the usx2y's kobjects can be freed before the usx2y's. This led to an oops in get_kobj_path_length() and a dead keyboard, when the usx2y's kobjects were freed. The patch ensures the correct sequence. Tested ok on kernel 2.6.12-rc2. Present in ALSA cvs Signed-off-by: Karsten Wiese Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright Signed-off-by: Linus Torvalds commit 9a47696970bc8233818d370011e2fddae5cfce9f tree fbd1b360658959b2ba71e606bd10dff26006eb8d parent 92c6dc59b7c1ca514021502c7eef53b9f2c738fd author Randy Dunlap Mon, 13 Jun 2005 22:58:09 -0700 committer Linus Torvalds Tue, 14 Jun 2005 07:19:35 -0700 [PATCH] macmodes: needs a license Module needs a license to prevent kernel tainting. Signed-off-by: Randy Dunlap Acked-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92c6dc59b7c1ca514021502c7eef53b9f2c738fd tree 18b82203c75979094e089e4feed1f825fa326c07 parent 223230e78900e5f0be984f7697cb9bf172d71a35 author Thomas Hood Mon, 13 Jun 2005 22:58:04 -0700 committer Linus Torvalds Tue, 14 Jun 2005 07:19:35 -0700 [PATCH] apm.c: ignore_normal_resume is set a bit too late This patch causes the ignore_normal_resume flag to be set slightly earlier, before there is a chance that the apm driver will receive the normal resume event from the BIOS. (Addresses Debian bug #310865) Signed-off-by: Thomas Hood Acked-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 223230e78900e5f0be984f7697cb9bf172d71a35 tree dc3a3232d24db3ad0fbf66db2ca0b1359d15c2b4 parent e2c16499515aa044676a14b97a1b8a35f879152a author Markus Lidel Mon, 13 Jun 2005 22:58:00 -0700 committer Linus Torvalds Tue, 14 Jun 2005 07:19:35 -0700 [PATCH] i2o: Fix free of event memory in i2o_block_event() Fixed freeing of event memory in i2o_block_event() Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f797f9cc5485b50c35c106b462e1bc432ec37f90 tree 283443fcdeb709c768ed5cd481203459b5222441 parent a3c77c67a443e631febf708bb0c376caede31657 author Olof Johansson Mon, 13 Jun 2005 15:52:27 -0700 committer Linus Torvalds Mon, 13 Jun 2005 20:58:58 -0700 [PATCH] Fix PCI BAR size interpretation on 64-bit arches On 64-bit machines, PCI_BASE_ADDRESS_MEM_MASK and other mask constants passed to pci_size() are 64-bit (for example ~0x0fUL). However, pci_size does comparisons between the u32 arguments and the mask, which will fail even though any result from pci_size is still just 32-bit. Changing the mask argument to u32 seems the obvious thing to do, since all arithmetic in the function is 32-bit and having a larger mask makes no sense. This triggered on a PPC64 system here where an adapter (VGA, as it happened) had a memory region base of 0xfe000000 and a sz of the same, matching the if (max == maxbase ...) test at the bottom of pci_size but failing the mask comparison. Quite a corner case which I guess explains why we haven't seen it until now. Signed-off-by: Olof Johansson Acked-by: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2c16499515aa044676a14b97a1b8a35f879152a tree 87addb997369837e8cdad63c212876d161691ad2 parent 6df3cecbb95345981718b38d357c50bc3425420a author Jon Smirl Mon, 13 Jun 2005 15:52:36 -0700 committer Linus Torvalds Mon, 13 Jun 2005 20:58:58 -0700 [PATCH] Typo in fbdev sysfs support, virtual_size It prints out x,x instead of x,y. Signed-off-by: Jon Smirl Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6df3cecbb95345981718b38d357c50bc3425420a tree 50550e3863513ac051164abc082e2899d61d4dab parent f797f9cc5485b50c35c106b462e1bc432ec37f90 author Jan Kara Mon, 13 Jun 2005 15:52:32 -0700 committer Linus Torvalds Mon, 13 Jun 2005 20:58:58 -0700 [PATCH] cond_resched_lock() fix On one path, cond_resched_lock() fails to return true if it dropped the lock. We think this might be causing the crashes in JBD's log_do_checkpoint(). Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3c77c67a443e631febf708bb0c376caede31657 tree 75672c8dec41054de7b635df59a9f014f6a5ad14 parent 98fdffccea6cc3fe9dba32c0fcc310bcb5d71529 author Jeff Dike Mon, 13 Jun 2005 15:52:18 -0700 committer Linus Torvalds Mon, 13 Jun 2005 20:58:43 -0700 [PATCH] uml: slirp and slip driver cleanups and fixes This patch merges a lot of duplicated code in the slip and slirp drivers, abstracts out the slip protocol, and makes the slip driver work in 2.6. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98fdffccea6cc3fe9dba32c0fcc310bcb5d71529 tree a103491fdd6e9bec45f408d32c976929a7ecd458 parent 36ca1195ad7f760a6af3814cb002bd3a3d4b4db1 author Jeff Dike Mon, 13 Jun 2005 15:52:14 -0700 committer Linus Torvalds Mon, 13 Jun 2005 20:58:43 -0700 [PATCH] uml: use fork instead of clone Convert the boot-time host ptrace testing from clone to fork. They were essentially doing fork anyway. This cleans up the code a bit, and makes valgrind a bit happier about grinding it. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8447f3f4659d91c2f11a1476522369c9d6ae6ada tree cf04a383839f31cce3976207c48c49310970d6b8 parent 628c70da8f6c1d5a3bc3af8ca338f18ee3093438 author Jeff Dike Mon, 13 Jun 2005 15:52:04 -0700 committer Linus Torvalds Mon, 13 Jun 2005 20:58:43 -0700 [PATCH] uml: remove duplicate includes A few files include the same header twice. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36ca1195ad7f760a6af3814cb002bd3a3d4b4db1 tree 570a895d2af09f464d7f9fea2fe78e7fe0f73cb7 parent 8447f3f4659d91c2f11a1476522369c9d6ae6ada author Jeff Dike Mon, 13 Jun 2005 15:52:10 -0700 committer Linus Torvalds Mon, 13 Jun 2005 20:58:43 -0700 [PATCH] uml: build cleanups Fix a build failure when CONFIG_MODE_SKAS is disabled and make a Makefile comment fit in 80 columns. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 628c70da8f6c1d5a3bc3af8ca338f18ee3093438 tree 9a9353127facb79ae1a55d959a405aa78ba96815 parent cbd83da82b15292337ff2b71e619c9a3a95f6d80 parent a96aca88ac71f75e566981b554da44bfd0d111e8 author Linus Torvalds Mon, 13 Jun 2005 18:49:44 -0700 committer Linus Torvalds Mon, 13 Jun 2005 18:49:44 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit a96aca88ac71f75e566981b554da44bfd0d111e8 tree f33460f2f2452807483ba6453e3319dcfe4bf856 parent 814d8ffd5009e13f1266759b583ef847c5350d77 author Patrick McHardy Mon, 13 Jun 2005 18:27:13 -0700 committer David S. Miller Mon, 13 Jun 2005 18:27:13 -0700 [NETFILTER]: Advance seq-file position in exp_next_seq() Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit cbd83da82b15292337ff2b71e619c9a3a95f6d80 tree d48270f5e5f42f52622bd605e9803f7e2fe336b3 parent 814d8ffd5009e13f1266759b583ef847c5350d77 author Linus Torvalds Mon, 13 Jun 2005 17:51:55 -0700 committer Linus Torvalds Mon, 13 Jun 2005 17:51:55 -0700 Update DCO ("signoff") rules to 1.1 This adds a clause that notes explicitly that the person doing the sign-off knows that the project (and his sign-off) is public and will possibly get archived and re-distributed. commit 814d8ffd5009e13f1266759b583ef847c5350d77 tree 00b01e4ccac6ba82ab5e67c27103f6f75f8ccf9d parent 386bfcf5e8a3c34d92156c945c8db58a1e2f7c69 parent 1c2fb7f93cb20621772bf304f3dba0849942e5db author Linus Torvalds Mon, 13 Jun 2005 16:24:01 -0700 committer Linus Torvalds Mon, 13 Jun 2005 16:24:01 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit 1c2fb7f93cb20621772bf304f3dba0849942e5db tree 0cb992ad463ee13af28d80d6730dcf1c4532b707 parent 6a6ddb2a9c11fcc3e8d7517841d28c9ea206ddef author J. Simonetti Mon, 13 Jun 2005 15:19:03 -0700 committer David S. Miller Mon, 13 Jun 2005 15:19:03 -0700 [IPV4]: Sysctl configurable icmp error source address. This patch alows you to change the source address of icmp error messages. It applies cleanly to 2.6.11.11 and retains the default behaviour. In the old (default) behaviour icmp error messages are sent with the ip of the exiting interface. The new behaviour (when the sysctl variable is toggled on), it will send the message with the ip of the interface that received the packet that caused the icmp error. This is the behaviour network administrators will expect from a router. It makes debugging complicated network layouts much easier. Also, all 'vendor routers' I know of have the later behaviour. Signed-off-by: David S. Miller commit 6a6ddb2a9c11fcc3e8d7517841d28c9ea206ddef tree 9d974bc57b036ba997ba65903725e3e5b6eff5b8 parent cdac4e07748934e37e415437055ed591aed9eb21 author Sridhar Samudrala Mon, 13 Jun 2005 15:13:05 -0700 committer David S. Miller Mon, 13 Jun 2005 15:13:05 -0700 [SCTP] Fix incorrect setting of sk_bound_dev_if when binding/sending to a ipv6 link local address. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit cdac4e07748934e37e415437055ed591aed9eb21 tree 56ecdba35c5b549c2580daf88cb2282ebf6a401f parent bca735bd0d5969497704a125b05344b92155172f author Neil Horman Mon, 13 Jun 2005 15:12:33 -0700 committer David S. Miller Mon, 13 Jun 2005 15:12:33 -0700 [SCTP] Add support for ip_nonlocal_bind sysctl & IP_FREEBIND socket option Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit bca735bd0d5969497704a125b05344b92155172f tree 996f7096abab29bd3fee41a942372dc1a6990d12 parent 0fd9a65a76e883b7d16e72dde3f8bf20ebc1e82a author Vladislav Yasevich Mon, 13 Jun 2005 15:11:57 -0700 committer David S. Miller Mon, 13 Jun 2005 15:11:57 -0700 [SCTP] Extend the info exported via /proc/net/sctp to support netstat for SCTP. Signed-off-by: Vladislav Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 0fd9a65a76e883b7d16e72dde3f8bf20ebc1e82a tree 431da2afc6344a078d16cd5b6b1e65fde9df29d1 parent 4243cac1e76228f7ba916d5df9e75a219352160a author Neil Horman Mon, 13 Jun 2005 15:11:24 -0700 committer David S. Miller Mon, 13 Jun 2005 15:11:24 -0700 [SCTP] Support SO_BINDTODEVICE socket option on incoming packets. Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala commit 4243cac1e76228f7ba916d5df9e75a219352160a tree 7cfea76f4a0e1ea979bc090ac14e83465b78b7d4 parent 77bd91967a97e5b94ae36113efe1d9e4f68a716e author Vladislav Yasevich Mon, 13 Jun 2005 15:10:49 -0700 committer David S. Miller Mon, 13 Jun 2005 15:10:49 -0700 [SCTP]: Fix bug in restart of peeled-off associations. Signed-off-by: Vladislav Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 77bd91967a97e5b94ae36113efe1d9e4f68a716e tree 269b466f7b8d6d3821ae6fedd8bf802c865b324b parent 84427d533076a08137779b3182a71c37bf000b27 author Rémi Denis-Courmont Mon, 13 Jun 2005 15:01:34 -0700 committer David S. Miller Mon, 13 Jun 2005 15:01:34 -0700 [IPv6] Don't generate temporary for TUN devices Userland layer-2 tunneling devices allocated through the TUNTAP driver (drivers/net/tun.c) have a type of ARPHRD_NONE, and have no link-layer address. The kernel complains at regular interval when IPv6 Privacy extension are enabled because it can't find an hardware address : Dec 29 11:02:04 auguste kernel: __ipv6_regen_rndid(idev=cb3e0c00): cannot get EUI64 identifier; use random bytes. IPv6 Privacy extensions should probably be disabled on that sort of device. They won't work anyway. If userland wants a more usual Ethernet-ish interface with usual IPv6 autoconfiguration, it will use a TAP device with an emulated link-layer and a random hardware address rather than a TUN device. As far as I could fine, TUN virtual device from TUNTAP is the very only sort of device using ARPHRD_NONE as kernel device type. Signed-off-by: Rémi Denis-Courmont Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 84427d533076a08137779b3182a71c37bf000b27 tree 248f7bbcebe0be59bc9b520b8611133b870a5c71 parent 979b6c135fc4d466a39d8e3ec05583e5ee30261a author YOSHIFUJI Hideaki Mon, 13 Jun 2005 14:59:44 -0700 committer David S. Miller Mon, 13 Jun 2005 14:59:44 -0700 [IPV6]: Ensure to use icmpv6_socket in non-preemptive context. We saw following trace several times: |BUG: using smp_processor_id() in preemptible [00000001] code: httpd/30137 |caller is icmpv6_send+0x23/0x540 | [] smp_processor_id+0x9b/0xb8 | [] icmpv6_send+0x23/0x540 This is because of icmpv6_socket, which is the only one user of smp_processor_id() in icmpv6_send(), AFAIK. Since it should be used in non-preemptive context, let's defer the dereference after disabling preemption (by icmpv6_xmit_lock()). Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 386bfcf5e8a3c34d92156c945c8db58a1e2f7c69 tree c62e56731b3740a1962af91c261de7c2a0d3bbcc parent 980802e311088fda56c16650589faa4597c695fb parent a8fa3f0c59f8a1e1d89542cff0be5b057b684653 author Linus Torvalds Mon, 13 Jun 2005 14:47:47 -0700 committer Linus Torvalds Mon, 13 Jun 2005 14:47:47 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit a8fa3f0c59f8a1e1d89542cff0be5b057b684653 tree 4e5cf8eadec0948c107c17b00db9b999ab1e469f parent c0105338eb4e61e537ca34ae06921177cb6efcf0 author Nicolas Pitre Mon, 13 Jun 2005 22:35:41 +0100 committer Russell King Mon, 13 Jun 2005 22:35:41 +0100 [PATCH] ARM: 2711/1: fix compilation on PXA targets with CONFIG_PM=n Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 979b6c135fc4d466a39d8e3ec05583e5ee30261a tree 1f78eec2624902890bd15259088813f10f3eaea8 parent 6efd8455cff1979dd081daaa1ce3d3f1764863dc author Ralf Baechle Mon, 13 Jun 2005 14:30:40 -0700 committer David S. Miller Mon, 13 Jun 2005 14:30:40 -0700 [NET]: Move the netdev list to vger.kernel.org. From: Ralf Baechle There are archives of the old list at http://oss.sgi.com/archives/netdev Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 6efd8455cff1979dd081daaa1ce3d3f1764863dc tree 6ab1046f0a60e0689e78eed6810a514cbb31a8bb parent e7626486c3c4ce456b11a7944edf164ef76fc599 author Randy Dunlap Mon, 13 Jun 2005 14:29:06 -0700 committer David S. Miller Mon, 13 Jun 2005 14:29:06 -0700 [IPV4]: Multipath modules need a license to prevent kernel tainting. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit e7626486c3c4ce456b11a7944edf164ef76fc599 tree 78e374b63ebc2c8ca354203d2bbe866d2d7a415f parent 03722adce90a248d0bea77d390decbd05991e2d2 author Andi Kleen Mon, 13 Jun 2005 14:24:52 -0700 committer David S. Miller Mon, 13 Jun 2005 14:24:52 -0700 [TCP]: Adjust TCP mem order check to new alloc_large_system_hash Signed-off-by: Andi Kleen Signed-off-by: David S. Miller commit 03722adce90a248d0bea77d390decbd05991e2d2 tree db63362ac8061e61914029974039264fcbee4d63 parent c0105338eb4e61e537ca34ae06921177cb6efcf0 author Tom Rini Mon, 13 Jun 2005 13:57:10 -0700 committer David S. Miller Mon, 13 Jun 2005 13:57:10 -0700 [NET]: linux/if_tr.h needs asm/byteorder.h uses __be16, but does not directly include . Add this in, so that dhcp/net-tools token ring code can compile again. Signed-off-by: Tom Rini Signed-off-by: David S. Miller commit 980802e311088fda56c16650589faa4597c695fb tree 37092823ea5ad1203253ee5e54e7c9631df4087d parent c22fa3acbc2ef79ea57217643f6cd6d226963069 author Trond Myklebust Mon, 13 Jun 2005 11:14:01 -0400 committer Linus Torvalds Mon, 13 Jun 2005 10:33:02 -0700 [PATCH] NFS: Ensure that we revalidate the cached file length for llseek(SEEK_END) This fixes a data corruption error for mail delivery applications that expect to be able to do posix locking and then append writes on NFS. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit c22fa3acbc2ef79ea57217643f6cd6d226963069 tree d79cf44149684a0cefc825f1619f0fbd33ea7e59 parent c0105338eb4e61e537ca34ae06921177cb6efcf0 author David Brownell Mon, 13 Jun 2005 07:15:28 -0700 committer Linus Torvalds Mon, 13 Jun 2005 08:20:41 -0700 [PATCH] spin longer for ehci port reset completion This makes the EHCI driver spin a bit longer before concluding that the port reset failed. "Obviously safe." It allows some devices to enumerate that previously didn't. We've seen a bunch of these problem reports recently, this will make some go away. As reported by Michael Zapf , some EHCI controllers seem to take forever to finish port resets and produce "port N reset error -110" type errors. Spinning a bit longer helps. Signed-off-by: David Brownell Signed-off-by: Linus Torvalds commit c0105338eb4e61e537ca34ae06921177cb6efcf0 tree 30c3c6006591fe88e8cd3c9ee8ef06ff2343ee97 parent 8d5f7b4353dae4c7ee342c61303372fd996ca161 author Alan Cox Sat, 11 Jun 2005 18:00:52 +0100 committer Linus Torvalds Sun, 12 Jun 2005 21:05:57 -0700 [PATCH] pwc bug fix The pwc chainsaw session left some setups not working. There is a sanity check on compression buffers that simply isn't right any more as we never allocate one. This doesn't address the email and other changes. I'll do those tomorrow if I get time, but it is the minimal fix for the code and basic feature set. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8d5f7b4353dae4c7ee342c61303372fd996ca161 tree 8e82ed5ca2d5934947ca13771300599151d2b882 parent c3315ede1bdf7bc706b59870df41b9cdb6e3995a author Benjamin Herrenschmidt Sat, 11 Jun 2005 09:45:30 +1000 committer Linus Torvalds Sun, 12 Jun 2005 20:59:05 -0700 [PATCH] radeonfb: don't blow up VGA console on load The current radeonfb memset's the framebuffer to 0 when loaded. This removes occasional artifacts but has the nasty side effect that if you load radeonfb without framebuffer console, you destroy the VGA text buffer, font, etc... radeon must not touch the framebuffer content when it doesn't "own" it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit c3315ede1bdf7bc706b59870df41b9cdb6e3995a tree 2739a03a44772035abb8c2be9085944c404ea810 parent 707f919c643937e43a04e31d0502ecbf5a10445a author Geert Uytterhoeven Sun, 12 Jun 2005 11:25:42 +0200 committer Linus Torvalds Sun, 12 Jun 2005 20:43:22 -0700 [PATCH] M68k: Mark Sun-3 NCR5380 SCSI broken M68k: Mark Sun-3 NCR5380 SCSI broken until NCR5380_abort() and NCR5380_bus_reset() are replaced with real new-style EH routines (the old EH SCSI constants were removed in 2.6.12-rc3). Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit a58e76f25432dc5e3e84d04c27bec03347ca365b tree 5bc5c6100f25b30aac547e27e7e6fff26fa40e84 parent 392a8b7efe069564bf7ed057103b1a3f41e55734 author Geert Uytterhoeven Sun, 12 Jun 2005 10:56:26 +0200 committer Linus Torvalds Sun, 12 Jun 2005 20:43:21 -0700 [PATCH] Remove obsolete HAVE_ARCH_GET_SIGNAL_TO_DELIVER? Now m68k no longer sets HAVE_ARCH_GET_SIGNAL_TO_DELIVER, can it be removed completely? Or may ARM26 still need it? Note that its usage was removed from kernel/signal.c about 2 months ago. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 707f919c643937e43a04e31d0502ecbf5a10445a tree 8f8cd503daad5283750b8174386c5232de920cc4 parent a58e76f25432dc5e3e84d04c27bec03347ca365b author Geert Uytterhoeven Sun, 12 Jun 2005 11:25:43 +0200 committer Linus Torvalds Sun, 12 Jun 2005 20:43:21 -0700 [PATCH] M68k: Update defconfigs Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 392a8b7efe069564bf7ed057103b1a3f41e55734 tree 2388081d82bbdcf70cb96bf81335ea75dedc497a parent bb011b8e8eded247cb71cb6d10e47517aacbd542 author Geert Uytterhoeven Sun, 12 Jun 2005 10:57:40 +0200 committer Linus Torvalds Sun, 12 Jun 2005 20:43:21 -0700 [PATCH] IrDA: IrDA: Fix CONFIG_VIA_FIR typo (double `those') Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit bb011b8e8eded247cb71cb6d10e47517aacbd542 tree ea9b80c2e57a94d874f47284f3fd733617beb213 parent 27198d855abbfc82df69e81b6c8d2f333580114c author David Brownell Sun, 12 Jun 2005 23:26:05 +0100 committer Russell King Sun, 12 Jun 2005 23:26:05 +0100 [PATCH] ARM: 2709/1: Systems with PCMCIA should also see IDE options (for CompactFlash memories) Patch from David Brownell The ARM generic Kconfig filters out IDE options ... except for an error prone ARMload of special cases. This adds one general case to the systems that will offer IDE options: kernels with PCMCIA support, which probably want to use IDE to access CompactFlash cards. This might allow many (most?) of the other cases to disappear, for systems that only see IDE hardware through CF cards. Right now this one patch is used to gate access to CF cards, including MicroDrives, for both omap_cf and at91_cf drivers. Signed-off-by: David Brownell Signed-off-by: Russell King commit 27198d855abbfc82df69e81b6c8d2f333580114c tree 944bb3e49bfc40387c70686a68c4b90c7edf4549 parent a7df849c67f0a5248693e432d03f738e84d6826c parent f5d9b97ee0d6d00a29bf881263510d74291fb862 author Linus Torvalds Fri, 10 Jun 2005 20:35:10 -0700 committer Linus Torvalds Fri, 10 Jun 2005 20:35:10 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 commit a7df849c67f0a5248693e432d03f738e84d6826c tree dbb53fca04da00b7b1e9a27499cce29d69032429 parent 90abb7b5f3bd9271a455cd640a70c285b4fd0c89 parent 74e8ebc55d85ca1acb3e73610965bea63cc39054 author Linus Torvalds Fri, 10 Jun 2005 20:23:21 -0700 committer Linus Torvalds Fri, 10 Jun 2005 20:23:21 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 commit 90abb7b5f3bd9271a455cd640a70c285b4fd0c89 tree 1149103d1e9255208e81cb426fad07839e15039f parent 0086b5ec7834b78358dea3f713275a9ae2b229ec author Linus Torvalds Fri, 10 Jun 2005 09:37:21 -0700 committer Linus Torvalds Fri, 10 Jun 2005 09:37:21 -0700 ppc: remove two extraneous descriptors for the 405EP CPU The patch to add them keeps on getting applied, over and over again ;) Hopefully no more. commit 74e8ebc55d85ca1acb3e73610965bea63cc39054 tree 7408fb2a44074fc8d7b7d1458e4b4c260b3fa41a parent e98ded32f37a538b906d98059b3db71be36405a7 author Dave Airlie Fri, 10 Jun 2005 19:27:51 +1000 committer Dave Airlie Fri, 10 Jun 2005 19:27:51 +1000 [PATCH] remove bogus hack from radeon IRQ handler This removes a bogus hack from the radeon IRQ handler. There is a better fix from myself and benh in DRM CVS but I'll wait until 2.6.13-rc so it gets more testing. Signed-off-by: Dave Airlie commit e98ded32f37a538b906d98059b3db71be36405a7 tree 7cfd5a685b0ddc1f83a2087b918a184cfca3d073 parent 8be3de3fd8469154a2b3e18a4712032dac5b4a53 author Dave Airlie Fri, 10 Jun 2005 18:47:38 +1000 committer Dave Airlie Fri, 10 Jun 2005 18:47:38 +1000 [PATCH] drm add i945G pci id Add pci identifier for i945G chipset Signed-off-by: Dave Airlie commit 0086b5ec7834b78358dea3f713275a9ae2b229ec tree 589b4166efe6ab929ee25b20b2e89935efba504e parent 243cd55e021baf28babdd88112ac03ae5cd4bb9c author Benjamin Herrenschmidt Fri, 10 Jun 2005 14:19:02 +1000 committer Linus Torvalds Thu, 09 Jun 2005 21:33:35 -0700 [PATCH] ppc32: Fix nasty sleep/wakeup problem Despite all the care lately in making the powermac sleep/wakeup as robust as possible, there is still a nasty related to the use of cpufreq on PMU based machines. Unfortunately, it affects paulus old powerbook so I have to fix it :) We didn't manage to understand what is precisely going on, it leads to memory corruption and might have to do with RAM not beeing properly refreshed when a cpufreq transition is done right before the sleep. The best workaround (and less intrusive at this point) we could come up with is included in this patch. We basically do _not_ force a switch to high speed on suspend anymore (that is what is causing the problem) on those machines. We still force a speed switch on wakeup (since we don't know what speed we are coming back from sleep at, and that seems to work fine). Since, during this short interval, the actual CPU speed might be incorrect, we also hack around by multiplying loops_per_jiffy by 2 (max speed factor on those machines) during early wakeup stage to make sure udelay's during that time aren't too short. For after 2.6.12, we'll change udelay implementation to use the CPU timebase (which is always constant) instead like we do on ppc64 and thus get rid of all those problems. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 7fbdf1a23be1837b8bc5bcec096015ca99e00aa7 tree 991e076dabd33ed04ff1b181319e96cf80336047 parent 04dc9ba882d224612f8db50fd60c8a45b843e77c author Eugene Surovegin Thu, 09 Jun 2005 12:36:29 -0700 committer Linus Torvalds Thu, 09 Jun 2005 15:39:52 -0700 [PATCH] ppc32: add 405EP cpu_spec entry Add a definition for PPC 405EP which was lost somehow during 2.4 -> 2.6 transition. Recent change to arch/ppc/kernel/misc.S ("Fix incorrect CPU_FTR fixup usage for unified caches") triggered this bug and 405EP boards don't boot anymore. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 243cd55e021baf28babdd88112ac03ae5cd4bb9c tree f1bf0f1f17ed03f92f0bbce12b3f958dde028906 parent 7fbdf1a23be1837b8bc5bcec096015ca99e00aa7 author Michael Ellerman Thu, 09 Jun 2005 12:36:33 -0700 committer Linus Torvalds Thu, 09 Jun 2005 15:39:52 -0700 [PATCH] iseries_veth: Supress spurious WARN_ON() at module unload My patch from a few weeks back (now in mainline), called "Cleanup skbs to prevent unregister_netdevice() hanging", can cause our TX timeout code to fire on machines with lots of VLANs (because it takes > 2 seconds between when we stop the queues and when we're finished stopping the connections). When that happens the TX timeout code freaks out and does a WARN_ON() because as far as it's concerned there shouldn't be a TX timeout happening, which is fair enough. I have a "proper" fix for this, which is to a) do refcounting on connections and b) implement a proper ack timer so we don't keep unacked skbs lying around for ever. But for 2.6.12 I propose just supressing the WARN_ON(). Users will still see the "NETDEV WATCHDOG" warning, but that's not nearly as bad as a WARN_ON() which users interpret as an Oops. Signed-off-by: Michael Ellerman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04dc9ba882d224612f8db50fd60c8a45b843e77c tree 5eb80b7d54418fe0ecafa716c57214ca48ed7718 parent d80d6fc08e111c411a349c4fa0c6d9bf41851087 parent 1e06276704c101bd1ae7b62879faaffcd7496a3e author Linus Torvalds Thu, 09 Jun 2005 15:37:56 -0700 committer Linus Torvalds Thu, 09 Jun 2005 15:37:56 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 commit d80d6fc08e111c411a349c4fa0c6d9bf41851087 tree c6cb9ab6099ffd9e34c6e67372283eeba283a0ea parent 99fdb2fe523480a8748a5af18139bb1f7785c815 parent 07c6d48fd10a8eeae899e06876aa0b885a8e2a1b author Linus Torvalds Thu, 09 Jun 2005 15:36:31 -0700 committer Linus Torvalds Thu, 09 Jun 2005 15:36:31 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 99fdb2fe523480a8748a5af18139bb1f7785c815 tree fbe9d2d5210266544a94ca6b5733c35d8a91d082 parent cf380ee7308db0f067ceb2ae8b852838788bf453 parent a2a64769d0d3cc0380b4b6ecdcb781a2f790a69e author Linus Torvalds Thu, 09 Jun 2005 15:25:29 -0700 committer Linus Torvalds Thu, 09 Jun 2005 15:25:29 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 1e06276704c101bd1ae7b62879faaffcd7496a3e tree 0b983e8000ed7f57d189f68097a6e78ad5c33488 parent 76854ceac3ef3408ab9a50a2521147fb14779f58 author Narendra Sankar Fri, 06 May 2005 12:00:05 -0700 committer Greg Kroah-Hartman Thu, 09 Jun 2005 14:52:30 -0700 [PATCH] PCI: MSI functionality broken on Serverworks GC chipset MSI functionality is broken on the GC_LE x86 chipset that Serverworks developed and that is being used in various platforms today. Broadcom is going to push out to the kernel MSI enabled Gigabit drivers (in the very near future), and we would like to make sure that MSI does not get enabled on any platforms using the GC_LE chipset (device id 0x17). Following the AMD 8131 example, I am including a patch to disable MSI functionality when a GCNB_LE is detected. Please let me know if there are any issues with this. This is a permanent fix for this chipset, as the hardware will not be updated. Signed-off-by: Narendra Sankar Signed-off-by: Greg Kroah-Hartman commit f5d9b97ee0d6d00a29bf881263510d74291fb862 tree 90b22e6038da0ad40e54c3f52e8da67189730ae8 parent 3079ca621e9e09f4593c20a9a2f24237c355f683 parent cf380ee7308db0f067ceb2ae8b852838788bf453 author Steve French Thu, 09 Jun 2005 14:44:56 -0700 committer Steve French Thu, 09 Jun 2005 14:44:56 -0700 Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit 3079ca621e9e09f4593c20a9a2f24237c355f683 tree 0eb2e22cb0fa382cde357f9e6125043d1cdd3758 parent 0b68177ccd12866d9f19cafad212b861c9d02a8c author Steve French Thu, 09 Jun 2005 14:44:07 -0700 committer Steve French Thu, 09 Jun 2005 14:44:07 -0700 [CIFS] Fix cifs update of page cache. Write at correct offset when out of memory and add_to_page_cache fails. Thanks to Shaggy for pointing out the fix. Signed-off-by: Steve French (sfrench@us.ibm.com) Signed-off-by: Shaggy (shaggy@us.ibm.com) commit 07c6d48fd10a8eeae899e06876aa0b885a8e2a1b tree 4e33771adca1d1fb4db2a92f0d6347a22bbccb5f parent 7aa0b0d5ab5eed29a49fce55868456bca073d77e author Vincent Sanders Thu, 09 Jun 2005 21:59:22 +0100 committer Russell King Thu, 09 Jun 2005 21:59:22 +0100 [PATCH] ARM: 2708/1: Fix hackkit CPU Frequency build faliure Patch from Vincent Sanders This fixes the "multiple definitions of cpufreq_get" build faliure on the hackkit SA1100 platform. Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 7aa0b0d5ab5eed29a49fce55868456bca073d77e tree e328b5c73809218f0b28109838162c3ed87f9570 parent 12035d64565ae7ecbc7fe906e7fcc8a4a71a3789 author Vincent Sanders Thu, 09 Jun 2005 21:59:21 +0100 committer Russell King Thu, 09 Jun 2005 21:59:21 +0100 [PATCH] ARM: 2707/2: Fix badge4 CPU Frequency build faliure Patch from Vincent Sanders This fixes the "multiple definitions of cpufreq_get" build faliure on the Badge4 SA1100 platform. Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit a2a64769d0d3cc0380b4b6ecdcb781a2f790a69e tree 387ee93cf8ee39ca64dd53380d1ea25a4f6134e7 parent 1834cd9fd27763f4e55184e4138a19ba36620174 author Christoph Lameter Thu, 09 Jun 2005 12:29:00 -0700 committer Tony Luck Thu, 09 Jun 2005 13:04:30 -0700 [IA64] Fix race condition in the rt_sigprocmask fastcall current->blocked will be set to the value of current->thread_info->flags if the cmpxchg to update thread_info->flags fails. For performance reasons the store into current->blocked was placed in the cmpxchg loop. However, the cmpxchg overwrites the register holding the value to be stored. In the rare case of a retry the value of thread_info->flags will be written into current->blocked. The fix is to use another register so that the register containing the current->blocked value is not overwritten. Signed-off-by: Christoph Lameter Signed-off-by: Tony Luck commit cf380ee7308db0f067ceb2ae8b852838788bf453 tree c4f9e1d25e876e5b8fb302292c21b22edd6cf1dd parent 1834cd9fd27763f4e55184e4138a19ba36620174 parent 76854ceac3ef3408ab9a50a2521147fb14779f58 author Linus Torvalds Thu, 09 Jun 2005 10:44:48 -0700 committer Linus Torvalds Thu, 09 Jun 2005 10:44:48 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 commit 12035d64565ae7ecbc7fe906e7fcc8a4a71a3789 tree beb375feb2aec8b4255ebbfa341d3f0d97730555 parent 4e71e47da3367e8df5994a17fb421ddeaa5025e3 author Dave Neuer Thu, 09 Jun 2005 17:40:55 +0100 committer Russell King Thu, 09 Jun 2005 17:40:55 +0100 [PATCH] ARM: 2706/1: Fix compile on SA-based iPAQs and remove stale CREDITS info Patch from Dave Neuer This fixes the "multiple definitions of cpufreq_get" errors on StrongARM-based iPAQs. Signed-off-by: Dave Neuer Signed-off-by: Russell King commit 1834cd9fd27763f4e55184e4138a19ba36620174 tree 0d5cf1d3d6512dc8a49df546711f58fd86bfd0f5 parent 6952df035509717bdc46194b2a3d6ffb9349f267 parent 4e71e47da3367e8df5994a17fb421ddeaa5025e3 author Linus Torvalds Thu, 09 Jun 2005 09:04:11 -0700 committer Linus Torvalds Thu, 09 Jun 2005 09:04:11 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 4e71e47da3367e8df5994a17fb421ddeaa5025e3 tree 25c594c39a3090cef50482b19a45b155a92199ff parent 5273a00d9c763108397658d440618f7ac3e40f83 author Russell King Thu, 09 Jun 2005 16:53:28 +0100 committer Russell King Thu, 09 Jun 2005 16:53:28 +0100 [PATCH] ARM: Remove zero-byte sized file Remove the remaining zero byte file left over from the Xscale fixes. Signed-off-by: Russell King commit 76854ceac3ef3408ab9a50a2521147fb14779f58 tree 130700c6871e73269bfad0b9f0439d51e0c353a3 parent 9f793d2c77ec5818679e4747c554d9333cecf476 author Ian Abbott Thu, 02 Jun 2005 10:34:11 +0100 committer Greg Kroah-Hartman Thu, 09 Jun 2005 01:38:15 -0700 [PATCH] USB: ftdi_sio: avoid losing received data in tty-ldisc ftdi_sio: Avoid losing bytes at tty-ldisc. This patch was originally developed by Daniel Smertnig. I (Ian Abbott) made a few changes. It has been tested by both Daniel and I, at least for raw, non-canonical receive data processing. Here is Daniel's original description of the patch: === During a project in which I was using a FTDI 232BM to transmit data at relative high speeds (625kBit/s), I noticed a problem where data was lost even if flow control was enabled: The FTDI-Driver receives 512 Bytes of data over USB at a time, which consists of 8 64-Byte packets. Subtracting the 2 bytes of status information included in each packet this gives 496 "real" data bytes per read. This data is passed (indirectly, via the flip buffers) to the tty line discipline which takes care of throttling when there the free buffer space reaches TTY_THRESHOLD_THROTTLE (128). Because the FTDI driver processes up to 496 bytes at a time, throttling won't happen in time and the line discipline will discard the remaining bytes. To avoid this the patch passes data in 62-byte blocks to the tty layer and checks the available space in the ldisc-buffers. If there isn't enough free space, processing the rest of the data is delayed using a workqueue. Note: The original problem should be easily reproducible with a userspace program which does slow & small reads. === Signed-off-by: Ian Abbott Signed-off-by: Daniel Smertnig Signed-off-by: Greg Kroah-Hartman commit 9f793d2c77ec5818679e4747c554d9333cecf476 tree 47904d2099435d4527432479e869311be7c6515b parent 03e49d40ea3436cae0fe43708f11584130ee4a0c author Pete Zaitcev Mon, 06 Jun 2005 13:54:59 -0700 committer Greg Kroah-Hartman Thu, 09 Jun 2005 01:38:11 -0700 [PATCH] USB: fix ub issues This smoothes two imperfections: - Increase number of LUNs per device from 4 to 9. The best solution would be to remove this limit altogether, but that has to wait until the time when more than 26 hosts are allowed. - Replace mdelay with msleep in a probing routine. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 03e49d40ea3436cae0fe43708f11584130ee4a0c tree acaa11b11c0ff1d4c9f743c0d8df2bc5a865a440 parent 5273a00d9c763108397658d440618f7ac3e40f83 author Scott Murray Mon, 06 Jun 2005 15:48:04 -0400 committer Greg Kroah-Hartman Thu, 09 Jun 2005 01:37:59 -0700 [PATCH] PCI Hotplug: fix CPCI reference counting bug Here's a patch that fixes up the pci_dev refcounting in the CPCI code. I've done some testing against it and it seems fine here. Signed-off-by: Scott Murray Signed-off-by: Greg Kroah-Hartman commit 6952df035509717bdc46194b2a3d6ffb9349f267 tree bf8709691e303a533e5798c4c7c5a17c9d752fed parent e1dd23a0012c3929737798fda9fede0e783f4ff3 author Albert Lee Mon, 06 Jun 2005 15:56:03 +0800 committer Jeff Garzik Thu, 09 Jun 2005 03:14:59 -0400 [PATCH] sg traverse fix for __atapi_pio_bytes() Problem: Incorrect md5sum when using ATAPI PIO mode to verify a distro CD. Root cause: sg traverse problem. In __atapi_pio_bytes(), if qc->cursg++ is increased and "goto next_page" is executed, then sg is not updated to the new qc->cursg and the old sg is overwritten with the new data. Changes: - Replace "goto next_page" with "goto next_sg" to make sg updated. Signed-off-by: Albert Lee commit e1dd23a0012c3929737798fda9fede0e783f4ff3 tree c7f808b6433ef1015f55418e7f11f432943bdefd parent 5273a00d9c763108397658d440618f7ac3e40f83 author Jens Axboe Wed, 08 Jun 2005 13:02:25 +0200 committer Jeff Garzik Thu, 09 Jun 2005 03:06:22 -0400 [PATCH] sata_sil: Fix FIFO PCI Bus Arbitration kernel oops Correct this. diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c commit 5273a00d9c763108397658d440618f7ac3e40f83 tree 7bbdacdaa307703528968510d37838b1eb8b2a1f parent ce10d979053379553757c3b178a138facaddff82 parent 98e56405521b74b4826f855d45ef7859f34548ff author Linus Torvalds Wed, 08 Jun 2005 16:36:31 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:36:31 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit ce10d979053379553757c3b178a138facaddff82 tree ce88ba988eebab6cafb1ed34feedbcb13aa926e3 parent fee02f80e68abbcc45ed3c5dd5ed09d04a284791 author Paul Mackerras Wed, 08 Jun 2005 21:59:15 +1000 committer Linus Torvalds Wed, 08 Jun 2005 16:24:15 -0700 [PATCH] ppc64: Fix PER_LINUX32 behaviour This patch fixes some bugs in the ppc64 PER_LINUX32 implementation, noted by Juergen Kreileder: * uname(2) doesn't respect PER_LINUX32, it returns 'ppc64' instead of 'ppc' * Child processes of a PER_LINUX32 process don't inherit PER_LINUX32 Along the way I took the opportunity to move things around so that sys_ppc32.c only has 32-bit syscall emulation functions and to remove the obsolete "fakeppc" command line option. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit fee02f80e68abbcc45ed3c5dd5ed09d04a284791 tree 6858df38d1fa451d8ce309fc8c238a6bc71f7629 parent 4f58802fae8a51d9e79454746584175c14f84519 parent ed7fce6c13bdd802817e1988d67047d432e7e30b author Linus Torvalds Wed, 08 Jun 2005 16:22:16 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:22:16 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6 commit 4f58802fae8a51d9e79454746584175c14f84519 tree 022533cfacde17b54e8f9b7ac3f12c82ed1c48be parent 05062d96a23ec0959ee5ea969f40813170c73c0e author Lars Marowsky-Bree Wed, 08 Jun 2005 15:50:31 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:21:14 -0700 [PATCH] dm: Handle READA requests in dm-mpath.c READA errors failing with EWOULDBLOCK/EAGAIN do not constitute a valid reason for failing the path; this lead to erratic errors on DM multipath devices. This error can be safely propagated upwards without failing the path. Acked-by: Kevin Corry Acked-by: Jens Axboe Signed-off-by: Lars Marowsky-Bree Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05062d96a23ec0959ee5ea969f40813170c73c0e tree 9aa09b58ff455cc43b81cae10d3c4dac9fe9f462 parent f829fd23c87918374bac0d90404fe12f0e788d52 author Peter Chubb Wed, 08 Jun 2005 15:50:20 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:21:14 -0700 [PATCH] ia64: fix floating-point preemption problem There've been reports of problems with CONFIG_PREEMPT=y and the high floating point partition. This is caused by the possibility of preemption and rescheduling on a different processor while saving or restioirng the high partition. The only places where the FPU state is touched are in ptrace, in switch_to(), and where handling a floating-point exception. In switch_to() preemption is off. So it's only in trap.c and ptrace.c that we need to prevent preemption. Here is a patch that adds commentary to make the conditions clear, and adds appropriate preempt_{en,dis}able() calls to make it so. In trap.c I use preempt_enable_no_resched(), as we're about to return to user space where the preemption flag will be checked anyway. Signed-off-by: Peter Chubb Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8acd944ea511af02485b1709c07ac7aac12aa48 tree 1bd9bf244b4deec6249fda8de70e3d07e85fc546 parent beb9e1c3f32a0f878765c7c1142f91083739c5bd author William Lee Irwin III Wed, 08 Jun 2005 15:48:52 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:21:13 -0700 [PATCH] sparc32: silence access_ok() warnings The fact that access_ok() doesn't use some of its arguments trips some unused variable warnings. This patch silences them permanently. Signed-off-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f829fd23c87918374bac0d90404fe12f0e788d52 tree 2f1e238d0b16e2784eee46e62a5a09f94ffd406f parent 63224d1e8b4cf87cc7420201a8cb3b44b9bf0b40 author Ananth N Mavinakayanahalli Wed, 08 Jun 2005 15:50:00 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:21:13 -0700 [PATCH] ppc64 kprobes: remove spurious MSR_SE masking Remove spurious MSR_SE reset during kprobe processing. single_step_exception() already does it for us. Reset it to be safe when executing the fault_handler. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63224d1e8b4cf87cc7420201a8cb3b44b9bf0b40 tree ba7d897b1aeecb087d536b121176c10255bd1744 parent 42442ed5744b03f5351a142649b8b4c97e6950ab author Ananth N Mavinakayanahalli Wed, 08 Jun 2005 15:49:41 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:21:13 -0700 [PATCH] ppc64 kprobes: correct kprobe registration return values Add stricter checks during kprobe registration. Return correct error value so insmod doesn't succeed. Also printk reason for registration failure. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5754c9b649e414f1e3a3ea2ec15e42ed3e42eeb8 tree 7f22b5778559492c994fcaa9ca79ed409a6f3f2a parent f8acd944ea511af02485b1709c07ac7aac12aa48 author Keith Owens Wed, 08 Jun 2005 15:49:07 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:21:13 -0700 [PATCH] Stop arch/i386/kernel/vsyscall-note.o being rebuilt every time arch/i386/kernel/vsyscall-note.o is not listed as a target so its .cmd file is neither considered as a target nor is it read on the next build. This causes vsyscall-note.o to be rebuilt every time that you run make, which causes vmlinux to be rebuilt every time. Signed-off-by: Keith Owens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42442ed5744b03f5351a142649b8b4c97e6950ab tree 35a9a89161365a317338d72bcb402aa7adda05be parent 5754c9b649e414f1e3a3ea2ec15e42ed3e42eeb8 author Andrew Morton Wed, 08 Jun 2005 15:49:25 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:21:13 -0700 [PATCH] revert x86_64-use-the-e820-hole-to-map-the-iommu-agp-aperture Martin Bligh determined that this patch is causing his test box to not boot. Revert. Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da00d9a5466558ccd9e7b7d04b13d7cb9160c876 tree 4edc27caa63126e902da3752f58adb8ee792762c parent 3df59529ad1045da61698bb5dd8ebaa547aeb46f author Jeff Dike Wed, 08 Jun 2005 15:48:01 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:21:12 -0700 [PATCH] uml: compile fixes for gcc 4 This is a bunch of compile fixes provoked by building UML with gcc 4. There are a bunch of signedness mismatches, a couple of uninitialized references, and a botched C99 structure initialization which had somehow gone unnoticed. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit beb9e1c3f32a0f878765c7c1142f91083739c5bd tree a9eb68688061e70cdbd8974e90f697f8860d217d parent 1f96ddb4fb40961a8ebebf7a00bbfaad55aacbd2 author Eugene Surovegin Wed, 08 Jun 2005 15:48:42 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:21:12 -0700 [PATCH] ppc32: add 405EP cpu_spec entry Add a definition for PPC 405EP which was lost somehow during 2.4 -> 2.6 transition. Recent change to arch/ppc/kernel/misc.S ("Fix incorrect CPU_FTR fixup usage for unified caches") triggered this bug and 405EP boards don't boot anymore. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 501cb02b431fb88c7f157c46c8b54de59d1dd463 tree e41592306301f7bbd727466ca1a4b4b0f93751cf parent da00d9a5466558ccd9e7b7d04b13d7cb9160c876 author Jeff Dike Wed, 08 Jun 2005 15:48:13 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:21:12 -0700 [PATCH] uml: fix strace -f It turns out that we need to check for pending signals when a newly forked process is run for the first time. With strace -f, strace needs to know about the forked process before it gets going. If it doesn't, then it ptraces some bogus values into its registers, and the process segfaults. So, I added calls to interrupt_end, which does that, plus checks for reschedules. There shouldn't be any of those, but x86 does the same thing, so I'm copying that behavior to be safe. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f96ddb4fb40961a8ebebf7a00bbfaad55aacbd2 tree 7c6ede0fdab8d85c29145c9ad1ae0f5ce9d56143 parent 501cb02b431fb88c7f157c46c8b54de59d1dd463 author Jeff Dike Wed, 08 Jun 2005 15:48:27 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:21:12 -0700 [PATCH] uml: clean up error path This cleans an error path which used to leak file descriptors by returning without trying to tidy up. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3df59529ad1045da61698bb5dd8ebaa547aeb46f tree f7370854b4c8aa3a6c72990b00094dc454b3e039 parent a38133298fc678335a0229e97b6161a7ac6fec84 author Jeff Dike Wed, 08 Jun 2005 15:47:50 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:21:11 -0700 [PATCH] uml: make the emulated iomem driver work on 2.6 This makes the minimal fixes needed to make the UML iomem driver work in 2.6. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a38133298fc678335a0229e97b6161a7ac6fec84 tree 2500f23fd230e67a8eba96b380245ecb43c3fd4c parent 97d26b8042a6f14cc4a19e84e911a953363e3d69 parent 70aa488cff83c965c9e1850f48d82b000d0d6c1c author Linus Torvalds Wed, 08 Jun 2005 16:06:15 -0700 committer Linus Torvalds Wed, 08 Jun 2005 16:06:15 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 98e56405521b74b4826f855d45ef7859f34548ff tree dbd9b7ac68a916f665c8d59f996913bfdf7bb07a parent e1e284a4bd827db2288af9536664b44590e419eb author Thomas Graf Wed, 08 Jun 2005 15:11:19 -0700 committer David S. Miller Wed, 08 Jun 2005 15:11:19 -0700 [PKT_SCHED]: Fix numeric comparison in meta ematch This patch is brought to you by the department of applied stupidity. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit e1e284a4bd827db2288af9536664b44590e419eb tree 040570a09a556d4e2ae13694b0d4b7aeae803feb parent 4890062960cbc4d3cebdbd8261a68bc85efcf5d4 author Thomas Graf Wed, 08 Jun 2005 15:11:02 -0700 committer David S. Miller Wed, 08 Jun 2005 15:11:02 -0700 [PKT_SCHED]: Dump classification result for basic classifier Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 4890062960cbc4d3cebdbd8261a68bc85efcf5d4 tree c834cb84fc939d64d5331a769abe6c20b8347ac8 parent b824979aeccbfd997e6e5dbe75c47d586b5a2923 author Thomas Graf Wed, 08 Jun 2005 15:10:48 -0700 committer David S. Miller Wed, 08 Jun 2005 15:10:48 -0700 [PKT_SCHED]: Allow socket attributes to be matched on via meta ematch Adds meta collectors for all socket attributes that make sense to be filtered upon. Some of them are only useful for debugging but having them doesn't hurt. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit b824979aeccbfd997e6e5dbe75c47d586b5a2923 tree 18cb867c7153a4608a65e3e0415b91ba64d8859b parent e3876605450979fe52a1a03e7eb78a89bf59e76a author Thomas Graf Wed, 08 Jun 2005 15:10:22 -0700 committer David S. Miller Wed, 08 Jun 2005 15:10:22 -0700 [PKT_SCHED]: Fix typo in NET_EMATCH_STACK help text Spotted by Geert Uytterhoeven . Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit e3876605450979fe52a1a03e7eb78a89bf59e76a tree f9231d5bda84f4450583b4fbd64456ba3caeb499 parent 699a411451a32cc111410f44f172b265f6d679c8 author Stephen Hemminger Wed, 08 Jun 2005 14:56:01 -0700 committer David S. Miller Wed, 08 Jun 2005 14:56:01 -0700 [NET]: Fix sysctl net.core.dev_weight Changing the sysctl net.core.dev_weight has no effect because the weight of the backlog devices is set during initialization and never changed. This patch propagates any changes to the global value affected by sysctl to the per-cpu devices. It is done every time the packet handler function is run. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 699a411451a32cc111410f44f172b265f6d679c8 tree 7a959a5f8a7da6c1f9d7a41c9c0425754625314c parent 8181b8c1f3a69fe5abcc51cb732eb512ccd1566a author Stephen Hemminger Wed, 08 Jun 2005 14:55:42 -0700 committer David S. Miller Wed, 08 Jun 2005 14:55:42 -0700 [NET]: Allow controlling NAPI device weight with sysfs Simple interface to allow changing network device scheduling weight with sysfs. Please consider this for 2.6.12, since risk/impact is small. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8181b8c1f3a69fe5abcc51cb732eb512ccd1566a tree 1989bf25817c8fc838f7448d48bad9ddcc3e546e parent 97d26b8042a6f14cc4a19e84e911a953363e3d69 author Gabor Fekete Wed, 08 Jun 2005 14:54:38 -0700 committer David S. Miller Wed, 08 Jun 2005 14:54:38 -0700 [IPV6]: Update parm.link in ip6ip6_tnl_change() Signed-off-by: Gabor Fekete Signed-off-by: David S. Miller commit ed7fce6c13bdd802817e1988d67047d432e7e30b tree dab851d41b05c17e10903e1e6d1609a2be1e54a4 parent 6d1cfbab4de64f2d0c5b0f81177ade0d75b69288 author David S. Miller Wed, 08 Jun 2005 14:15:52 -0700 committer David S. Miller Wed, 08 Jun 2005 14:15:52 -0700 [TG3]: Update driver version and release date. Signed-off-by: David S. Miller commit 6d1cfbab4de64f2d0c5b0f81177ade0d75b69288 tree 9076b18ac9d821bedba5b3499a7f34515ef44e57 parent 35d1bc90546d1f0af198886ae8062a550142d926 author Michael Chan Wed, 08 Jun 2005 14:13:14 -0700 committer David S. Miller Wed, 08 Jun 2005 14:13:14 -0700 [TG3]: Fix 5700/5701 DMA corruption on Apple G4. Fix 5700/5701 DMA write corruption on Apple G4 by detecting the Apple UniNorth PCI 1.5 chipset and adjusting the DMA write boundary to 16. DMA test fails to detect the problem with this chipset. Thanks to Manuel Perez Ayala for reporting the problem and helping to debug it. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 70aa488cff83c965c9e1850f48d82b000d0d6c1c tree 9236fa880fe3fab2ee3cf2bcb0ec4a4e19ded3c5 parent 86ebacd360767f6a5cf9c8810977593dccf3f3da author Keith Owens Fri, 27 May 2005 23:09:00 -0700 committer Tony Luck Wed, 08 Jun 2005 12:25:24 -0700 [IA64] Extract correct break number for break.b break.b does not store the break number in cr.iim, instead it stores 0, which makes all break.b instructions look like BUG(). Extract the break number from the instruction itself. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 86ebacd360767f6a5cf9c8810977593dccf3f3da tree 9ee60c8036dcf3a260ce18580517c5a8dfe00b6b parent 866ba633a81c1e179038f7527809d9513160a6f7 author Tony Luck Wed, 08 Jun 2005 12:12:48 -0700 committer Tony Luck Wed, 08 Jun 2005 12:12:48 -0700 [IA64] Update comment to describe modes set in default control register. Christian Hildner pointed out that the comment did not match what the code does in cpu_init() when we set up the default control register. Patch based on suggestions from Ken Chen. Signed-off-by: Tony Luck commit 97d26b8042a6f14cc4a19e84e911a953363e3d69 tree 9b72b650285720c17d0aa0a3795c30fe492700b3 parent 5131bf5db73529e972459060d8559f72e036fe53 parent dcef1f634657dabe7905af3ccda12cf7f0b6fcc1 author Linus Torvalds Wed, 08 Jun 2005 11:43:17 -0700 committer Linus Torvalds Wed, 08 Jun 2005 11:43:17 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 5131bf5db73529e972459060d8559f72e036fe53 tree 0037ac7e0cc8b3433301042cf40b3fdc10955d6b parent 358c6ac0dd4ffa5e44d59d4008a2627aa2f02b6f parent ff39bc772ad18d8c7f9334926053b718d7932de0 author Linus Torvalds Wed, 08 Jun 2005 11:42:44 -0700 committer Linus Torvalds Wed, 08 Jun 2005 11:42:44 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial commit 866ba633a81c1e179038f7527809d9513160a6f7 tree 10c06d91204027a8688a2337aa061e51a3321c0f parent ad597bd518559f59ede8d01262cdf4467e13282e author Keith Owens Mon, 06 Jun 2005 02:04:00 -0700 committer Tony Luck Wed, 08 Jun 2005 11:41:31 -0700 [IA64] Module gp must point to valid memory Some bits of the kernel assume that gp always points to valid memory, in particular PHYSICAL_MODE_ENTER() assumes that both gp and sp are valid virtual addresses with associated physical pages. The IA64 module loader puts gp well past the end of the module, with no physical backing. Offsets on gp are still valid, but physical mode addressing breaks for modules. Ensure that gp always falls within the module body. Also ensure that gp is 8 byte aligned. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit ff39bc772ad18d8c7f9334926053b718d7932de0 tree bc2602207de0be0147cf5c2fae41aed4c22e26a4 parent eae936e21bd726f9d9555f2262d439fbcd61dccf author Russell King Wed, 08 Jun 2005 19:26:47 +0100 committer Russell King Wed, 08 Jun 2005 19:26:47 +0100 [PATCH] Serial: remove unused variable in sa1100 driver Signed-off-by: Russell King commit dcef1f634657dabe7905af3ccda12cf7f0b6fcc1 tree e1b8bf471c3c268d0be919561268c24f298d031b parent aeabbbbe126f3d5e61e2db07629443cd10932bb2 author Nicolas Pitre Wed, 08 Jun 2005 19:00:47 +0100 committer Russell King Wed, 08 Jun 2005 19:00:47 +0100 [PATCH] ARM: 2664/2: add support for atomic ops on pre-ARMv6 SMP systems Patch from Nicolas Pitre Not that there might be many of them on the planet, but at least RMK apparently has one. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit aeabbbbe126f3d5e61e2db07629443cd10932bb2 tree 36955efefca5f102c9c1e67fba3743ae91927062 parent 57cfa5e97ff60d909a7e0a5f6e4d0a49aa3e2aec author Nicolas Pitre Wed, 08 Jun 2005 19:00:16 +0100 committer Russell King Wed, 08 Jun 2005 19:00:16 +0100 [PATCH] ARM: 2705/1: fix writesw for misaligned source pointer Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 57cfa5e97ff60d909a7e0a5f6e4d0a49aa3e2aec tree 59b30be58f405d93542177f7d45a20037329e35f parent 35d1bc90546d1f0af198886ae8062a550142d926 author Giorgio Padrin Wed, 08 Jun 2005 19:00:15 +0100 committer Russell King Wed, 08 Jun 2005 19:00:15 +0100 [PATCH] ARM: 2703/1: pxa-regs.h: complete I2S GPIO alternate functions for PXA27x Patch from Giorgio Padrin The patch completes I2S GPIO alternate functions for PXA27x, adding I2S_SYSCLK. File: pxa-regs.h . Signed-off-by: Giorgio Padrin Signed-off-by: Russell King commit ad597bd518559f59ede8d01262cdf4467e13282e tree d86cef4525e0bfb45b22bd67f40e9c8d0eaa66b5 parent 2bfe94905d3601774c6418c020ba830c118578b4 author David Mosberger-Tang Wed, 08 Jun 2005 10:45:00 -0700 committer Tony Luck Wed, 08 Jun 2005 10:58:21 -0700 [IA64] Fill holes in FIXADDR_USER space with zero pages. This fixes an oops reported by Jason Baron. Signed-off-by: David Mosberger-Tang Signed-off-by: Tony Luck commit 7840e5e95c1a8622425f11454600a49b6c718886 tree 52fdb9af6d424196231e78ec17842a24de1fa8c5 parent 35d1bc90546d1f0af198886ae8062a550142d926 author Olaf Hering Wed, 08 Jun 2005 15:12:00 +1000 committer Linus Torvalds Wed, 08 Jun 2005 10:18:59 -0700 [PATCH] ppc64: print negative numbers correctly in boot wrapper if num has a value of -1, accessing the digits[] array will fail and the format string will be printed in funny way, or not at all. This happens if one prints negative numbers. Just change the code to match lib/vsprintf.c asm/div64.h cant be used because u64 maps to u32 for this build. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 358c6ac0dd4ffa5e44d59d4008a2627aa2f02b6f tree 3505f699e2de7a5c74bbe9d7073b2656d840e1d7 parent 7840e5e95c1a8622425f11454600a49b6c718886 author Ananth N Mavinakayanahalli Wed, 08 Jun 2005 15:33:43 +1000 committer Linus Torvalds Wed, 08 Jun 2005 10:18:59 -0700 [PATCH] ppc64 kprobes: don't eat dabr/iabr exceptions Kprobes was eating the hardware instruction and data address breakpoint exceptions. This patch fixes it; kprobes doesn't use those exceptions at all and should ignore them. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 35d1bc90546d1f0af198886ae8062a550142d926 tree 5aa33046f09436fa292cdcdf6e6db138db6cf58a parent 1d6757fbff5bc86e94e59ab0d7bdd7e71351d839 parent f8f98a9335db4a7d6285b785180fad720bf22864 author Linus Torvalds Wed, 08 Jun 2005 07:57:17 -0700 committer Linus Torvalds Wed, 08 Jun 2005 07:57:17 -0700 Automatic merge of master.kernel.org:/home/rmk/linux-2.6-arm commit f8f98a9335db4a7d6285b785180fad720bf22864 tree 201cf5ce682812b0ed15544269930c0d45e1a42f parent 17d82fcc6a15887b7138d35802ab8fc5f249794f author Russell King Wed, 08 Jun 2005 15:28:24 +0100 committer Russell King Wed, 08 Jun 2005 15:28:24 +0100 [PATCH] ARM: Fix Xscale copy_page implementation The ARM copypage changes in 2.6.12-rc4-git1 removed the preempt locking from the copypage functions which broke the XScale implementation. This patch fixes the locking on XScale and removes the now unneeded minicache code. Signed-off-by: Russell King Checked-by: Richard Purdie commit 1d6757fbff5bc86e94e59ab0d7bdd7e71351d839 tree 65e75b32e0810961615101cb1f137a060c707c6b parent eba4f669d6ec9be4173bb2619e9b8500b3c36542 author Trond Myklebust Tue, 07 Jun 2005 18:37:01 -0400 committer Linus Torvalds Tue, 07 Jun 2005 15:53:47 -0700 [PATCH] NFS: Fix lookup intent handling We should never apply a lookup intent to anything other than the last path component in an open(), create() or access() call. Introduce the helper nfs_lookup_check_intent() which always returns zero if LOOKUP_CONTINUE or LOOKUP_PARENT are set, and returns the intent flags if we're on the last component of the lookup. By doing so, we fix a bug in open(O_EXCL), where we may end up optimizing away a real lookup of the parent directory. Problem noticed by Linda Dunaphant Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit eba4f669d6ec9be4173bb2619e9b8500b3c36542 tree 60178d4f2dd4fa1f8985b38fdbe4cd6b99a58c7a parent 93cffffa19960464a52f9c78d9a6150270d23785 parent 66bb8bf8b235ba4d37fda14375827864977c6a3e author Linus Torvalds Tue, 07 Jun 2005 13:41:30 -0700 committer Linus Torvalds Tue, 07 Jun 2005 13:41:30 -0700 Merge of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart commit eda9937656e0b9879ca521140fe61cbc9788c398 tree 86c234bdcf33d664ed9881a9282976be9aa8e454 parent 3f5948fa2cbbda1261eec9a39ef3004b3caf73fb author Matthew Dobson Tue, 07 Jun 2005 13:22:05 -0700 committer Linus Torvalds Tue, 07 Jun 2005 13:39:26 -0700 [PATCH] send_IPI_mask_sequence() warning fix In file included from arch/i386/kernel/smp.c:235: include/asm-i386/mach-numaq/mach_ipi.h:4: warning: `send_IPI_mask_sequence' declared inline after its definition Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad95d6098dd1e94a09d2a1fdf39fd8281fcd8958 tree 527a17f1c54e7f3825440fdd4a85eadfedc1b78c parent eda9937656e0b9879ca521140fe61cbc9788c398 author Eugene Surovegin Tue, 07 Jun 2005 13:22:09 -0700 committer Linus Torvalds Tue, 07 Jun 2005 13:39:26 -0700 [PATCH] ppc32: add 405EP cpu_spec entry Add a definition for PPC 405EP which was lost somehow during 2.4 -> 2.6 transition. Recent change to arch/ppc/kernel/misc.S ("Fix incorrect CPU_FTR fixup usage for unified caches") triggered this bug and 405EP boards don't boot anymore. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a86d1f4301fad4ff44c1f614c897000bc574ab2f tree 0eb60f1d27d9ae673285aecaa2769f877dc1a0c4 parent ad95d6098dd1e94a09d2a1fdf39fd8281fcd8958 author Vojtech Pavlik Tue, 07 Jun 2005 13:22:14 -0700 committer Linus Torvalds Tue, 07 Jun 2005 13:39:26 -0700 [PATCH] input: disable scroll feature on AT keyboards This patch disables the scroll feature on AT keyboards by default, because it causes the numbers of mouse devices to shift, breaking user setups. Signed-off-by: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93cffffa19960464a52f9c78d9a6150270d23785 tree 67341f2e824b1812fde8c68bcd1bf42f3672e612 parent a86d1f4301fad4ff44c1f614c897000bc574ab2f author Bjorn Helgaas Tue, 07 Jun 2005 13:22:18 -0700 committer Linus Torvalds Tue, 07 Jun 2005 13:39:26 -0700 [PATCH] PCI: do VIA IRQ fixup always, not just in PIC mode At least some VIA chipsets require the fixup even in IO-APIC mode. This was found and debugged with the patient assistance of Stian Jordet on an Asus CUV266-DLS motherboard. Signed-off-by: Bjorn Helgaas Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66bb8bf8b235ba4d37fda14375827864977c6a3e tree 830da5361c73af24b309f6ecc6b87482eb4f1c32 parent 07eee78ea8ba2d0b7b20551c35a3e7dd158d50bb author David Mosberger Mon, 04 Apr 2005 13:29:43 -0700 committer Dave Jones Tue, 07 Jun 2005 12:35:44 -0700 [PATCH] Replace check_bridge_mode() with (bridge->mode & AGSTAT_MODE_3_0). [AGPGART] Replace check_bridge_mode() with (bridge->mode & AGSTAT_MODE_3_0). As mentioned earlier, the current check_bridge_mode() code assumes that AGP bridges are PCI devices. This isn't always true. Definitely not for HP zx1 chipset and the same seems to be the case for SGI's AGP bridge. The patch below fixes the problem by picking up the AGP_MODE_3_0 bit from bridge->mode. I feel like I may be missing something, since I can't see any reason why check_bridge_mode() wasn't doing that in the first place. According to the AGP 3.0 specs, the AGP_MODE_3_0 bit is determined during the hardware reset and cannot be changed, so it seems to me it should be safe to pick it up from bridge->mode. With the patch applied, I can definitely use AGP acceleration both with AGP 2.0 and AGP 3.0 (one with an Nvidia card, the other with an ATI FireGL card). Unless someone spots a problem, please apply this patch so 3d acceleration can work on zx1 boxes again. This makes AGP work again on machines with an AGP bridge that isn't a PCI device. Signed-off-by: David Mosberger-Tang Signed-off-by: Dave Jones commit e29b545cb153f230fbd8ff4c19bc98ab950f9f5c tree cfc8573440b7eb277aaf835842286a36c5e59531 parent d0de98fa16169562bd74913c6c9b3857f9065c79 author Michael Werner Sun, 27 Mar 2005 22:08:42 -0800 committer Dave Jones Tue, 07 Jun 2005 12:35:43 -0700 [PATCH] sgi-agp: fixes a problem with accessing GART memory in sgi_tioca_insert_memory and sgi_tioca_remove_memory This patch fixes a problem with accessing GART memory in sgi_tioca_insert_memory and sgi_tioca_remove_memory. sgi-agp.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) Signed-off-by: Mike Werner Signed-off-by: Dave Jones commit 07eee78ea8ba2d0b7b20551c35a3e7dd158d50bb tree a11d2e705253faaa9779cfd83bb8ca9de311b195 parent e29b545cb153f230fbd8ff4c19bc98ab950f9f5c author Keir Fraser Wed, 30 Mar 2005 13:17:04 -0800 committer Dave Jones Tue, 07 Jun 2005 12:35:43 -0700 [PATCH] AGP fix for Xen VMM When Linux is running on the Xen virtual machine monitor, physical addresses are virtualised and cannot be directly referenced by the AGP GART. This patch fixes the GART driver for Xen by adding a layer of abstraction between physical addresses and 'GART addresses'. Architecture-specific functions are also defined for allocating and freeing the GATT. Xen requires this to ensure that table really is contiguous from the point of view of the GART. These extra interface functions are defined as 'no-ops' for all existing architectures that use the GART driver. Signed-off-by: Keir Fraser Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit d0de98fa16169562bd74913c6c9b3857f9065c79 tree 5a81c4e8e8ef76addec655f1edbf6abaa09acfb0 parent 3f5948fa2cbbda1261eec9a39ef3004b3caf73fb author Alan Hourihane Tue, 31 May 2005 19:50:49 +0100 committer Dave Jones Tue, 07 Jun 2005 12:35:42 -0700 [PATCH] i945G patch for agpgart Attached is a small patch for i945G support against 2.6.11.11. From: Alan Hourihane Signed-off-by: Dave Jones commit 2bfe94905d3601774c6418c020ba830c118578b4 tree 49f908df283332371b74c4686dd2f0109db2bc61 parent 26abd53d8e9e51bbeea0b4772e8dffece3eeff38 parent 3f5948fa2cbbda1261eec9a39ef3004b3caf73fb author Tony Luck Tue, 07 Jun 2005 11:29:43 -0700 committer Tony Luck Tue, 07 Jun 2005 11:29:43 -0700 Auto merge with /home/aegl/GIT/linus commit 3f5948fa2cbbda1261eec9a39ef3004b3caf73fb tree b754365f2ca35a8f8d77c92af8a2c9ad056f0325 parent 74262de5d15fe0cab9e6fe75655a502d3c90acca author David Mosberger Mon, 06 Jun 2005 15:50:09 -0700 committer Linus Torvalds Mon, 06 Jun 2005 17:02:03 -0700 [PATCH] Include before testing CONFIG_ACPI I'm not sure why this issue is suddenly showing, but without this patchlet, the zx1 config won't compile anymore (e.g., to see the compilation-error, look for "***" in [1]). [1] http://www.gelato.unsw.edu.au/kerncomp/results//2005-06-06-17-00/zx1_defconfig-log.html Signed-off-by: David Mosberger-Tang Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74262de5d15fe0cab9e6fe75655a502d3c90acca tree fe97a42038552f22215c7d2c13d9c92b7aa3b9bc parent ef130126cc8794f748d7513735ecb4d3d99fa39e author Tom Rini Mon, 06 Jun 2005 15:50:08 -0700 committer Linus Torvalds Mon, 06 Jun 2005 17:02:02 -0700 [PATCH] ppc32: add to On ppc32, uses __user, but doesn't directly include . This adds that in. Without this, glibc will not compile. Signed-off-by: Tom Rini Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef130126cc8794f748d7513735ecb4d3d99fa39e tree be4d1ba5fbea1d83570d50d8be6ce92a07496d31 parent 5065cc02ccf9212d31ecb7fcd63d734e242e64b1 parent 15def7bfb6902aa2b2bc67059f26d696fb27c235 author Linus Torvalds Mon, 06 Jun 2005 16:59:55 -0700 committer Linus Torvalds Mon, 06 Jun 2005 16:59:55 -0700 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6 commit 5065cc02ccf9212d31ecb7fcd63d734e242e64b1 tree 7bd0b973ecc31a932a30ca9ab40797e4190d28da parent 8f5bb0438b86d1a5393176ceeec2836fd469edf8 parent fa04ae5c09f3dfedbc923c2954a9a26a573833f1 author Linus Torvalds Mon, 06 Jun 2005 16:58:53 -0700 committer Linus Torvalds Mon, 06 Jun 2005 16:58:53 -0700 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit 26abd53d8e9e51bbeea0b4772e8dffece3eeff38 tree d9dc6f45c9142e6a8f58f1aa8fc75e66f9edd0e9 parent ff89bf3bc0534aa03b5375aa906544d96911bad4 parent 8f5bb0438b86d1a5393176ceeec2836fd469edf8 author Tony Luck Mon, 06 Jun 2005 15:42:07 -0700 committer Tony Luck Mon, 06 Jun 2005 15:42:07 -0700 auto merge with /home/aegl/GIT/linus commit 15def7bfb6902aa2b2bc67059f26d696fb27c235 tree e3512682907cfa08041c26ea3c41f8e8c80fa64d parent 9ba27794197a18168b99ccecfb7b799f18b64426 author David S. Miller Mon, 06 Jun 2005 15:22:56 -0700 committer David S. Miller Mon, 06 Jun 2005 15:22:56 -0700 [TG3]: Update driver version and release date. Signed-off-by: David S. Miller commit 9ba27794197a18168b99ccecfb7b799f18b64426 tree 1bb183a3fda7b5b8904d1d27663fced5f5035f50 parent 49cabf49abd7676d026a61baabf5aae9337a82be author Michael Chan Mon, 06 Jun 2005 15:16:20 -0700 committer David S. Miller Mon, 06 Jun 2005 15:16:20 -0700 [TG3] Fix link failure in 5701 On some 5701 devices with older bootcode, the LED configuration bits in SRAM may be invalid with value zero. The fix is to check for invalid bits (0) and default to PHY 1 mode. Incorrect LED mode will lead to error in programming the PHY. Thanks to Grant Grundler for debugging the problem. >From Grant: | In May, 2004, tg3 v3.4 changed how MAC_LED_CTRL (0x40c) was getting | programmed and how to determine what to program into LED_CTRL. The new | code trusted NIC_SRAM_DATA_CFG (0x00000b58) to indicate what to write | to LED_CTRL and MII EXT_CTRL registers. On "IOX Core Lan", SRAM was | saying MODE_MAC (0x0) and that doesn't work. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 49cabf49abd7676d026a61baabf5aae9337a82be tree 942d26ce4359cec83cae75d5de8765454688bbb3 parent 9beb1d587f690d5b2f9087f8f10c0ff9f6b66886 author Michael Chan Mon, 06 Jun 2005 15:15:17 -0700 committer David S. Miller Mon, 06 Jun 2005 15:15:17 -0700 [TG3]: Add TSO firmware license Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 9beb1d587f690d5b2f9087f8f10c0ff9f6b66886 tree d9f65f5fd428aaa4af4ca2b75bab67259c4eb91f parent 7cef5677ef3a8084f2588ce0a129dc95d65161f6 author John W. Linville Mon, 06 Jun 2005 15:14:35 -0700 committer David S. Miller Mon, 06 Jun 2005 15:14:35 -0700 [TG3]: Update pci.ids for BCM5752 Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit fa04ae5c09f3dfedbc923c2954a9a26a573833f1 tree df0b22f8d9f8c954cfb6d863dabb89bde430aac4 parent 7cef5677ef3a8084f2588ce0a129dc95d65161f6 author David S. Miller Mon, 06 Jun 2005 15:07:19 -0700 committer David S. Miller Mon, 06 Jun 2005 15:07:19 -0700 [ETHTOOL]: Check correct pointer in ethtool_set_coalesce(). It was checking the "GET" function pointer instead of the "SET" one. Looks like a cut&paste error :-) Signed-off-by: David S. Miller commit 8f5bb0438b86d1a5393176ceeec2836fd469edf8 tree 7b47dcf5d182cc3465cac1c904bdc3aec6e7e8f2 parent d671a1cbf7c7a5c5562106d39eb7f830ae5273ae author Yoshinori Sato Mon, 06 Jun 2005 14:46:32 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:57:51 -0700 [PATCH] binfmt_flat mmap flag fix Make sure that binfmt_flat passes the correct flags into do_mmap(). nommu's validate_mmap_request() will simple return -EINVAL if we try and pass it a flags value of zero. Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9d29a29669f96903d9950bb881c2a393fd33849 tree d2e12822db98a1bf8feac9f428ba18d867771a85 parent 4b7b9772e4c3d87e649d4c419d2487aacf1235aa author Al Viro Mon, 06 Jun 2005 13:36:11 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:27 -0700 [PATCH] namei fixes (15/19) Getting rid of sloppy logics: a) in do_follow_link() we have the wrong vfsmount dropped if our symlink had been mounted on something. Currently it worls only because we never get such situation (modulo filesystem playing dirty tricks on us). And it obfuscates already convoluted logics... b) same goes for open_namei(). c) in __link_path_walk() we have another "it should never happen" sloppiness - out_dput: there does double-free on underlying vfsmount and leaks the covering one if we hit it just after crossing a mountpoint. Again, wrong vfsmount getting dropped. d) another too-early-mntput() race - in do_follow_mount() we need to postpone conditional mntput(path->mnt) until after dput(path->dentry). Again, this one happens only in it-currently-never-happens-unless-some-fs-plays-dirty scenario... Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d671a1cbf7c7a5c5562106d39eb7f830ae5273ae tree c27ab7e75684cb70d943c3b2690ebbd62000a921 parent 634ee7017b31e46e28c0bd2cb488213331bfd39a author Al Viro Mon, 06 Jun 2005 13:36:14 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:27 -0700 [PATCH] namei fixes (19/19) __do_follow_link() passes potentially worng vfsmount to touch_atime(). It matters only in (currently impossible) case of symlink mounted on something, but it's trivial to fix and that actually makes more sense. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 634ee7017b31e46e28c0bd2cb488213331bfd39a tree 98094ec596bd637bc305b626b3c9482860b13d88 parent 58c465eba4d7ed307c4c7cb3382ba7ee565e8858 author Al Viro Mon, 06 Jun 2005 13:36:13 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:27 -0700 [PATCH] namei fixes (18/19) Cosmetical cleanups - __follow_mount() calls in __link_path_walk() absorbed into do_lookup(). Obviously equivalent transformation. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58c465eba4d7ed307c4c7cb3382ba7ee565e8858 tree f147af3fee122ec5cc054ac78fa30e1490a8acd0 parent 39ca6d49759346d4710c759d443eec8048b27213 author Al Viro Mon, 06 Jun 2005 13:36:13 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:27 -0700 [PATCH] namei fixes (17/19) follow_mount() made void, reordered dput()/mntput() in it. follow_dotdot() switched from struct vfmount ** + struct dentry ** to struct nameidata *; callers updated. Equivalent transformation + fix for too-early-mntput() race. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39ca6d49759346d4710c759d443eec8048b27213 tree 559f7d4f5536d2f155ef4301bb2e4056e7a5e587 parent d9d29a29669f96903d9950bb881c2a393fd33849 author Al Viro Mon, 06 Jun 2005 13:36:12 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:27 -0700 [PATCH] namei fixes (16/19) Conditional mntput() moved into __do_follow_link(). There it collapses with unconditional mntget() on the same sucker, closing another too-early-mntput() race. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e13b210f6f7bdc44dfee0a9bbd633a32db0d6333 tree f957ec2fc24f8a9eb84dcffe76341262c1acedf0 parent 463ffb2e9d39c2a3fd8c3c1d4a34e01f2078f972 author Al Viro Mon, 06 Jun 2005 13:36:06 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:26 -0700 [PATCH] namei fixes (10/19) In open_namei(), __follow_down() loop turned into __follow_mount(). Instead of if we are on a mountpoint dentry if O_NOFOLLOW checks fail drop path.dentry drop nd return do equivalent of follow_mount(&path.mnt, &path.dentry) nd->mnt = path.mnt we do if __follow_mount(path) had, indeed, traversed mountpoint /* now both nd->mnt and path.mnt are pinned down */ if O_NOFOLLOW checks fail drop path.dentry drop path.mnt drop nd return mntput(nd->mnt) nd->mnt = path.mnt Now __follow_down() can be folded into follow_down() - no other callers left. We need to reorder dput()/mntput() there - same problem as in follow_mount(). Equivalent transformation + fix for a bug in O_NOFOLLOW handling - we used to get -ELOOP if we had the same fs mounted on /foo and /bar, had something bound on /bar/baz and tried to open /foo/baz with O_NOFOLLOW. And fix of too-early-mntput() race in follow_down() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba7a4c1a76f56c607560f1676680ff491747bdae tree c68f4fd0d5802819eb16dc6c126b2c24f4e09634 parent a15a3f6fc67d910f43098acec6e19d25a37d7cb9 author Al Viro Mon, 06 Jun 2005 13:36:08 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:26 -0700 [PATCH] namei fixes (13/19) In open_namei() exit_dput: we have mntput() done in the wrong order - if nd->mnt != path.mnt we end up doing mntput(nd->mnt); nd->mnt = path.mnt; dput(nd->dentry); mntput(nd->mnt); which drops nd->dentry too late. Fixed by having path.mnt go first. That allows to switch O_NOFOLLOW under if (__follow_mount(...)) back to exit_dput, while we are at it. Fix for early-mntput() race + equivalent transformation. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a15a3f6fc67d910f43098acec6e19d25a37d7cb9 tree f00e6a3f505f2e77568695f6f5e2bd4786fcc8ca parent 2f12dbfbb6286c725c283a169f8f05e89a86848b author Al Viro Mon, 06 Jun 2005 13:36:08 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:26 -0700 [PATCH] namei fixes (12/19) In open_namei() we take mntput(nd->mnt);nd->mnt=path.mnt; out of the if (__follow_mount(...)), making it conditional on nd->mnt != path.mnt instead. Then we shift the result downstream. Equivalent transformations. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b7b9772e4c3d87e649d4c419d2487aacf1235aa tree 943427ad8ef5ed51ab0802cf81f5c0e721fb36c6 parent ba7a4c1a76f56c607560f1676680ff491747bdae author Al Viro Mon, 06 Jun 2005 13:36:10 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:26 -0700 [PATCH] namei fixes (14/19) shifted conditional mntput() into do_follow_link() - all callers were doing the same thing. Obviously equivalent transformation. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f12dbfbb6286c725c283a169f8f05e89a86848b tree 5d0a725f71a041955d49146c4837a0df19a015dc parent e13b210f6f7bdc44dfee0a9bbd633a32db0d6333 author Al Viro Mon, 06 Jun 2005 13:36:07 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:26 -0700 [PATCH] namei fixes (11/19) shifted conditional mntput() calls in __link_path_walk() downstream. Obviously equivalent transformation. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d671d5e51400aab03c713a16ce3545aa81ad7b1c tree c0ba8f1af3d55320a52024d02be4ab9869a0f6e2 parent cd4e91d3bca8d5527289f5984cf32e9fe6fb8293 author Al Viro Mon, 06 Jun 2005 13:36:04 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:25 -0700 [PATCH] namei fixes (8/19) In open_namei() we never use path.mnt or path.dentry after exit: or ok:. Assignment of path.dentry in case of LAST_BIND is dead code and only obfuscates already convoluted function; assignment of path.mnt after __do_follow_link() can be moved down to the place where we set path.dentry. Obviously equivalent transformations, just to clean the air a bit in that region. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd4e91d3bca8d5527289f5984cf32e9fe6fb8293 tree 5059fedcd7fb8e8893b8d204e18b5813dfae3449 parent 839d9f93c9f1623fb37234d464d739617879d97e author Al Viro Mon, 06 Jun 2005 13:36:03 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:25 -0700 [PATCH] namei fixes (7/19) The first argument of __do_follow_link() switched to struct path * (__do_follow_link(path->dentry, ...) -> __do_follow_link(path, ...)). All callers have the same calls of mntget() right before and dput()/mntput() right after __do_follow_link(); these calls have been moved inside. Obviously equivalent transformations. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 839d9f93c9f1623fb37234d464d739617879d97e tree 1f3e2e6b31d0417a99868d748fae044a5fd0995e parent 1be4a0900be5d2c2fd9cd012e3a153e1ea47b96a author Al Viro Mon, 06 Jun 2005 13:36:02 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:25 -0700 [PATCH] namei fixes (6/19) mntget(path->mnt) in do_follow_link() moved down to right before the __do_follow_link() call and rigth after loop: resp. dput()+mntput() on non-ELOOP branch moved up to right after __do_follow_link() call. resulting loop: mntget(path->mnt); path_release(nd); dput(path->mnt); mntput(path->mnt); replaced with equivalent dput(path->mnt); path_release(nd); Equivalent transformations - the reason why we have that mntget() is that __do_follow_link() can drop a reference to nd->mnt and that's what holds path->mnt. So that call can happen at any point prior to __do_follow_link() touching nd->mnt. The rest is obvious. NOTE: current tree relies on symlinks *never* being mounted on anything. It's not hard to get rid of that assumption (actually, that will come for free later in the series). For now we are just not making the situation worse than it is. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 463ffb2e9d39c2a3fd8c3c1d4a34e01f2078f972 tree e5d9b39aca2a546bf2b832c5a2a7066e34f9c1b5 parent d671d5e51400aab03c713a16ce3545aa81ad7b1c author Al Viro Mon, 06 Jun 2005 13:36:05 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:25 -0700 [PATCH] namei fixes (9/19) New helper: __follow_mount(struct path *path). Same as follow_mount(), except that we do *not* do mntput() after the first lookup_mnt(). IOW, original path->mnt stays pinned down. We also take care to do dput() before mntput() in the loop body (follow_mount() also needs that reordering, but that will be done later in the series). The following are equivalent, assuming that path.mnt == x: (1) follow_mount(&path.mnt, &path.dentry) (2) __follow_mount(&path); if (path->mnt != x) mntput(x); (3) if (__follow_mount(&path)) mntput(x); Callers of follow_mount() in __link_path_walk() converted to (2). Equivalent transformation + fix for too-late-mntput() race in __follow_mount() loop. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d73ffe16b8baafae6e9249acee6b50c24099c6de tree 321319974be9fcc50f4ec36ccad26b84d4b66b66 parent 4e7506e4dd9e40c189fcbec95d5dbc92f2e5926a author Al Viro Mon, 06 Jun 2005 13:36:01 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:24 -0700 [PATCH] namei fixes (4/19) path.mnt in open_namei() set to mirror nd->mnt. nd->mnt is set in 3 places in that function - path_lookup() in the beginning, __follow_down() loop after do_last: and __do_follow_link() call after do_link:. We set path.mnt to nd->mnt after path_lookup() and __do_follow_link(). In __follow_down() loop we use &path.mnt instead of &nd->mnt and set nd->mnt to path.mnt immediately after that loop. Obviously equivalent transformation. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90ebe5654febe3555a2516d51d3d251226d35fdb tree 576e1b58886329a4ea0c8a4b20416ce0dead0e51 parent 4481e8eea761857367162b0957277d5524fbea63 author Al Viro Mon, 06 Jun 2005 13:35:58 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:24 -0700 [PATCH] namei fixes OK, here comes a patch series that hopefully should close all too-early-mntput() races in fs/namei.c. Entire area is convoluted as hell, so I'm splitting that series into _very_ small chunks. Patches alread in the tree close only (very wide) races in following symlinks (see "busy inodes after umount" thread some time ago). Unfortunately, quite a few narrower races of the same nature were not closed. Hopefully this should take care of all of them. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f92b3bcec0fa2e2d775b589850097f9dc6b2de2 tree 239ce9af16392b452f651780e85b40b809b8d17a parent 90ebe5654febe3555a2516d51d3d251226d35fdb author Al Viro Mon, 06 Jun 2005 13:35:59 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:24 -0700 [PATCH] namei fixes (2/19) All callers of do_follow_link() do mntget() right before it and dput()+mntput() right after. These calls are moved inside do_follow_link() now. Obviously equivalent transformation. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e7506e4dd9e40c189fcbec95d5dbc92f2e5926a tree 2c13ff8c1ed25fea1511e67a27575824fc56aabe parent 5f92b3bcec0fa2e2d775b589850097f9dc6b2de2 author Al Viro Mon, 06 Jun 2005 13:36:00 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:24 -0700 [PATCH] namei fixes (3/19) Replaced struct dentry *dentry in namei with struct path path. All uses of dentry replaced with path.dentry there. Obviously equivalent transformation. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1be4a0900be5d2c2fd9cd012e3a153e1ea47b96a tree e743475f1ff0e078bda6bc8555bfc5b9fb8b4097 parent d73ffe16b8baafae6e9249acee6b50c24099c6de author Al Viro Mon, 06 Jun 2005 13:36:01 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:24 -0700 [PATCH] namei fixes (5/19) fix for too early mntput() in open_namei() - we pin path.mnt down for the duration of __do_follow_link(). Otherwise we could get the fs where our symlink lived unmounted while we were in __do_follow_link(). That would end up with dentry of symlink staying pinned down through the fs shutdown. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a51171816826b074828fa96cb6ef60fc3b13631a tree e3c6f7a9852d45e9fdec75d7c71548ba404625e7 parent 7cef5677ef3a8084f2588ce0a129dc95d65161f6 author Martin Schwidefsky Mon, 06 Jun 2005 13:35:54 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:23 -0700 [PATCH] broken fault_in_pages_readable call in generic_file_buffered_write() fault_in_pages_readable() is being passed an incorrect `end' address, which can result in writes accidentally faulting in pages which will not be affected by the write() call. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e2894e51d6407e47226a60c0d19bf384642c55a tree 9450c84cb6467d17e13a9def59479216d6af1b29 parent 3399ba5b70eccc918ea4ab2630cac68f5c8ff845 author Yoshinori Sato Mon, 06 Jun 2005 13:35:56 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:23 -0700 [PATCH] h8300 build error fix h8300 was missing a few definitions. Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4481e8eea761857367162b0957277d5524fbea63 tree 2b8e0a7ae33b67be3e0a195a11919705e3934865 parent 8e2894e51d6407e47226a60c0d19bf384642c55a author Kumar Gala Mon, 06 Jun 2005 13:35:57 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:23 -0700 [PATCH] ppc32: Fix incorrect CPU_FTR fixup usage for unified caches Runtime feature support for unified caches was testing a userland feature flag (PPC_FEATURE_UNIFIED_CACHE) instead of a cpu feature flag (CPU_FTR_SPLIT_ID_CACHE). Luckily the current defined bit mask for cpu features and userland features do not overlap so this only causes an issue on machines with a unified cache, which is extremely rare on PPC today. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3399ba5b70eccc918ea4ab2630cac68f5c8ff845 tree 8bc0679962247a65012a2e39d137df4cd9e21d82 parent a51171816826b074828fa96cb6ef60fc3b13631a author Denis Vlasenko Mon, 06 Jun 2005 13:35:55 -0700 committer Linus Torvalds Mon, 06 Jun 2005 14:42:23 -0700 [PATCH] moxa: do not ignore input Stop using tty internal structure in mxser_receive_chars(), use tty_insert_flip_char(tty, ch flag); instead. Without this change driver ignores any rx'ed chars. Run tested. Cc: Alan Cox Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b68177ccd12866d9f19cafad212b861c9d02a8c tree 6fc26aa59fb183fe9c86d44ae14ce423ad7211da parent d0d2f2df65ddea9a30ddd117f769bfff65d3fc56 parent 7cef5677ef3a8084f2588ce0a129dc95d65161f6 author Steve French Mon, 06 Jun 2005 09:57:33 -0700 committer Steve French Mon, 06 Jun 2005 09:57:33 -0700 Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit 17d82fcc6a15887b7138d35802ab8fc5f249794f tree b550dc5b0acdb6017788d3c1aab36ae12352aab7 parent 8775420d2fbcfff866995471ea5f6130d14d121c author Deepak Saxena Fri, 03 Jun 2005 22:18:52 +0100 committer Russell King Fri, 03 Jun 2005 22:18:52 +0100 [PATCH] ARM: 2700/1: Disable IXP2000 IRQs at bootup Patch from Deepak Saxena The IXDP2800 bootloader does not disable IRQs before jumping into the kernel and this is causing the Grand Unified KGDB to crash the system when we do an early call to trap_init() and irq handlers have not yet been registered. This patch disables IRQs before we jump into the kernel. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 8775420d2fbcfff866995471ea5f6130d14d121c tree bef5911e6c02b5780a8d81e8db656177ff9b8c4a parent 718a30a5cf0a9142f716a49853bd4b4a25a8da1b author Todd Poynor Fri, 03 Jun 2005 20:52:27 +0100 committer Russell King Fri, 03 Jun 2005 20:52:27 +0100 [PATCH] ARM: 2691/1: PXA27x sleep fixes take 2 Patch from Todd Poynor PXA27x sleep fixes: * set additional sleep/wakeup registers for Mainstone boards. * move CKEN=0 to pxa25x-specific code; that value is harmful on pxa27x. * save/restore additional registers, including some found necessary for C5 processors and/or newer blob versions. * enable future support of additional sleep modes for PXA27x (eg, standby, deep sleep). * split off cpu-specific sleep processing between pxa27x and pxa25x into separate files (partly in preparation for additional sleep modes). Includes fixes from David Burrage. Signed-off-by: Todd Poynor Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 718a30a5cf0a9142f716a49853bd4b4a25a8da1b tree e7c825c4c835195a49b17372966be733dfcaa9ed parent 105bb2698b54a838165947199f1c8be5c2e7d9bb author Mike Frysinger Fri, 03 Jun 2005 20:52:26 +0100 committer Russell King Fri, 03 Jun 2005 20:52:26 +0100 [PATCH] ARM: 2696/1: remove ';' in ELF_DATA define in asm-arm{,26}/elf.h Patch from Mike Frysinger the ELF_DATA define in both arm asm subdirs of linux/include/ contain a semicolon at the end. this of course will cause any code that tries to use ELF_DATA in assignment or comparison to fail. no other arch has a semicolon in their ELF_DATA defines. Signed-off-by: Mike Frysinger Signed-off-by: Russell King commit 105bb2698b54a838165947199f1c8be5c2e7d9bb tree bd5028148a5299bc1f064bbe631f42b59ba9a21a parent 4ab5c01c7cc28f29d5cf5f2a591cb6f7bbece48e author Albrecht Dreß Fri, 03 Jun 2005 20:52:26 +0100 committer Russell King Fri, 03 Jun 2005 20:52:26 +0100 [PATCH] ARM: 2694/1: [s3c2410/dma] release irq properly to fix kernel oops Patch from Albrecht Dreß Problem: When a module requests a DMA channel via the function s3c2410_dma_request(), this function requests the appropriate irq under the name of the client module. When the client module is unloaded, it calls s3c2410_dma_free() which does not free the irq. Consequently, when e.g. running "cat /proc/interrupts", the irq owner points to freed memory, leading to a kernel oops. File: linux/arch/arm/mach-s3c2410/dma.c Fix: trivial, below Signed-off-by: Albrecht Dreß Signed-off-by: Russell King commit 4ab5c01c7cc28f29d5cf5f2a591cb6f7bbece48e tree d69fc21d2dbba664249efe6394213a11a119dcc1 parent eff910a91ac04ab1d9e210d4f721484af3b39c8d author Deepak Saxena Fri, 03 Jun 2005 20:52:25 +0100 committer Russell King Fri, 03 Jun 2005 20:52:25 +0100 [PATCH] ARM: 2692/1: Fix compile warnings in include/asm-arm/arch-ixp2000/io.h Patch from Deepak Saxena This patch fixes the following warnings: include/asm/arch/io.h: In function `insw': include/asm/arch/io.h:78: warning: comparison of distinct pointer types lacks acast include/asm/arch/io.h:79: warning: comparison of distinct pointer types lacks acast include/asm/arch/io.h: In function `outsw': include/asm/arch/io.h:103: warning: comparison of distinct pointer types lacks a cast include/asm/arch/io.h:104: warning: comparison of distinct pointer types lacks a cast include/asm/arch/io.h: In function `inw': include/asm/arch/io.h:127: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit ff89bf3bc0534aa03b5375aa906544d96911bad4 tree 530ad23b9a0879b3a17f2b6fee93760b24af0b22 parent 0fd56f67890acf7904c83e7de6cb71723eb1c962 author Dean Nelson Fri, 03 Jun 2005 05:25:00 -0700 committer Tony Luck Fri, 03 Jun 2005 12:37:53 -0700 [IA64] fix setting of sn_hub_info->shub_1_1_found Fix a bug in which shub_1_1_found is not being properly initialized or set, resulting in the improper setting of sn_hub_info->shub_1_1_found. Signed-off-by: Dean Nelson Signed-off-by: Tony Luck commit d0d2f2df65ddea9a30ddd117f769bfff65d3fc56 tree 43d7f695330199f8b384da4b78c5652aa06aeff3 parent 467ca22d3371f132ee225a5591a1ed0cd518cb3d author Steve French Thu, 02 Jun 2005 15:12:36 -0700 committer Steve French Thu, 02 Jun 2005 15:12:36 -0700 [CIFS] Update cifs version number and fix whitespace Signed-off-by: Steve French (sfrench@us.ibm.com) commit 467ca22d3371f132ee225a5591a1ed0cd518cb3d tree 0e3d6de84b4ffa379c2c7ddcebd3f55de52b9844 parent 12725675e26d52c39e856d341035b94bf7802458 parent 1e86d1c648508fd50e6c9960576b87906a7906ad author Steve French Thu, 02 Jun 2005 14:42:23 -0700 committer Steve French Thu, 02 Jun 2005 14:42:23 -0700 Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit 12725675e26d52c39e856d341035b94bf7802458 tree f9cf054ddcdf3845df7e9e0b4f84a87e86577a03 parent af6f5e3247a68074e384ef93c0b4bce1b73c9d80 parent eff910a91ac04ab1d9e210d4f721484af3b39c8d author Steve French Wed, 01 Jun 2005 15:02:37 -0700 committer Steve French Wed, 01 Jun 2005 15:02:37 -0700 Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit af6f5e3247a68074e384ef93c0b4bce1b73c9d80 tree 87b0f1e48bd0ca67a78fab0fa42b37864863fdfd parent 7e2987503dda95a5f80290bb8c06279009c2419e parent 2e3e80c2b75e3815a0160cbd23d4fdb767d66b35 author Steve French Tue, 31 May 2005 14:32:44 -0700 committer Steve French Tue, 31 May 2005 14:32:44 -0700 Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git