commit 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab Author: Linus Torvalds Date: Fri Jun 17 12:48:29 2005 -0700 Linux 2.6.12 commit dfd11c2e61d3c0c417d341866ed53c44933b65b4 Author: Linus Torvalds Date: Fri Jun 17 12:35:26 2005 -0700 Merge 'for-linus' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block commit 794f5bfa77955c4455f6d72d8b0e2bee25f1ff0c Author: Christoph Hellwig Date: Fri Jun 17 12:25:25 2005 -0700 [PATCH] PCI: don't override drv->shutdown unconditionally There are many drivers that have been setting the generic driver model level shutdown callback, and pci thus must not override it. Without this patch we can have really bad data loss on various raid controllers. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit caf2857ac6e0ba2651e722f05d5f7d3ec8ef2615 Author: Ingo Molnar Date: Fri Jun 17 11:36:36 2005 +0200 [PATCH] timer exit cleanup Do all timer zapping in exit_itimers. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit db3b5848ea6440968fcdd29b80514d0de044bb7c Author: Kiyoshi Ueda Date: Fri Jun 17 16:15:10 2005 +0200 When cfq I/O scheduler is selected, get_request() in __make_request() calls __cfq_get_queue(). __cfq_get_queue() finds an existing queue (struct cfq_queue) of the current process for the device and returns it. If it's not found, __cfq_get_queue() creates and returns a new one if __cfq_get_queue() is called with __GFP_WAIT flag, or __cfq_get_queue() returns NULL (this means that get_request() fails) if no __GFP_WAIT flag. On the other hand, in __make_request(), get_request() is called without __GFP_WAIT flag at the first time. Thus, the get_request() fails when there is no existing queue, typically when it's called for the first I/O request of the process to the device. Though it will be followed by get_request_wait() for general case, __make_request() will just end the I/O with an error (EWOULDBLOCK) when the request was for read-ahead. Signed-off-by: Jens Axboe Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura commit 97008082eacab047c189028202e055280f799ace Author: Linus Torvalds Date: Thu Jun 16 13:40:39 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 22f11c4e662ef0bdd87f09370a76c83ed738d5fd Author: Nicolas Pitre Date: Thu Jun 16 21:23:56 2005 +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 Author: Linus Torvalds Date: Thu Jun 16 13:22:23 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 95220a2ea334b5ff2168cc9bf31c0e08b29bae21 Author: Catalin Marinas Date: Thu Jun 16 18:01:12 2005 +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 Author: Catalin Marinas Date: Thu Jun 16 18:01:11 2005 +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 Author: Catalin Marinas Date: Thu Jun 16 18:01:11 2005 +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 Author: Linus Torvalds Date: Thu Jun 16 09:53:48 2005 -0700 Merge 'for-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block commit 58125f95c62a44f12bb71c58ef70f0068d20c7a2 Author: Oliver Neukum Date: Wed Jun 15 22:26:38 2005 -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 e41fb09b2fa15db095d3ee981299f488d7b48dfe Author: Dmitry Torokhov Date: Wed Jun 15 22:26:36 2005 -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 5db92850d3ab72b830a0fe6e30eaec8462801408 Author: Daniel Jacobowitz Date: Wed Jun 15 22:26:34 2005 -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 a2ef79e1840ebbd0b5907e53c755efd5662112a1 Author: Alexandre Oliva Date: Wed Jun 15 22:26:31 2005 -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 c374f127e4ff17a318b9ae95a5bf65f370c2d0b1 Author: Tejun Heo Date: Thu Jun 16 12:57:31 2005 +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 Author: Tejun Heo Date: Thu Jun 16 12:56:15 2005 +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 Author: David S. Miller Date: Wed Jun 15 20:51:14 2005 -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 Author: Olaf Hering Date: Tue Jun 14 13:52:19 2005 -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 Author: Paul Mackerras Date: Tue Jun 14 22:19:24 2005 +1000 [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 dcf78d80a6c2de829ec08c8e663a3370e982d616 Author: Karsten Wiese Date: Tue Jun 14 09:56:20 2005 -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 efa93dbedd0e2eacf49ea6fff1fe4397d520cf61 Author: Karsten Wiese Date: Tue Jun 14 09:54:55 2005 -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 9a47696970bc8233818d370011e2fddae5cfce9f Author: Randy Dunlap Date: Mon Jun 13 22:58:09 2005 -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 Author: Thomas Hood Date: Mon Jun 13 22:58:04 2005 -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 Author: Markus Lidel Date: Mon Jun 13 22:58:00 2005 -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 e2c16499515aa044676a14b97a1b8a35f879152a Author: Jon Smirl Date: Mon Jun 13 15:52:36 2005 -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 Author: Jan Kara Date: Mon Jun 13 15:52:32 2005 -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 f797f9cc5485b50c35c106b462e1bc432ec37f90 Author: Olof Johansson Date: Mon Jun 13 15:52:27 2005 -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 a3c77c67a443e631febf708bb0c376caede31657 Author: Jeff Dike Date: Mon Jun 13 15:52:18 2005 -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 Author: Jeff Dike Date: Mon Jun 13 15:52:14 2005 -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 36ca1195ad7f760a6af3814cb002bd3a3d4b4db1 Author: Jeff Dike Date: Mon Jun 13 15:52:10 2005 -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 8447f3f4659d91c2f11a1476522369c9d6ae6ada Author: Jeff Dike Date: Mon Jun 13 15:52:04 2005 -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 628c70da8f6c1d5a3bc3af8ca338f18ee3093438 Author: Linus Torvalds Date: Mon Jun 13 18:49:44 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit a96aca88ac71f75e566981b554da44bfd0d111e8 Author: Patrick McHardy Date: Mon Jun 13 18:27:13 2005 -0700 [NETFILTER]: Advance seq-file position in exp_next_seq() Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit cbd83da82b15292337ff2b71e619c9a3a95f6d80 Author: Linus Torvalds Date: Mon Jun 13 17:51:55 2005 -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 Author: Linus Torvalds Date: Mon Jun 13 16:24:01 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit 1c2fb7f93cb20621772bf304f3dba0849942e5db Author: J. Simonetti Date: Mon Jun 13 15:19:03 2005 -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 Author: Sridhar Samudrala Date: Mon Jun 13 15:13:05 2005 -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 Author: Neil Horman Date: Mon Jun 13 15:12:33 2005 -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 Author: Vladislav Yasevich Date: Mon Jun 13 15:11:57 2005 -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 Author: Neil Horman Date: Mon Jun 13 15:11:24 2005 -0700 [SCTP] Support SO_BINDTODEVICE socket option on incoming packets. Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala commit 4243cac1e76228f7ba916d5df9e75a219352160a Author: Vladislav Yasevich Date: Mon Jun 13 15:10:49 2005 -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 Author: Rémi Denis-Courmont Date: Mon Jun 13 15:01:34 2005 -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 Author: YOSHIFUJI Hideaki Date: Mon Jun 13 14:59:44 2005 -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 Author: Linus Torvalds Date: Mon Jun 13 14:47:47 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit a8fa3f0c59f8a1e1d89542cff0be5b057b684653 Author: Nicolas Pitre Date: Mon Jun 13 22:35:41 2005 +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 Author: Ralf Baechle Date: Mon Jun 13 14:30:40 2005 -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 Author: Randy Dunlap Date: Mon Jun 13 14:29:06 2005 -0700 [IPV4]: Multipath modules need a license to prevent kernel tainting. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit e7626486c3c4ce456b11a7944edf164ef76fc599 Author: Andi Kleen Date: Mon Jun 13 14:24:52 2005 -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 Author: Tom Rini Date: Mon Jun 13 13:57:10 2005 -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 Author: Trond Myklebust Date: Mon Jun 13 11:14:01 2005 -0400 [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 Author: David Brownell Date: Mon Jun 13 07:15:28 2005 -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 Author: Alan Cox Date: Sat Jun 11 18:00:52 2005 +0100 [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 Author: Benjamin Herrenschmidt Date: Sat Jun 11 09:45:30 2005 +1000 [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 Author: Geert Uytterhoeven Date: Sun Jun 12 11:25:42 2005 +0200 [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 707f919c643937e43a04e31d0502ecbf5a10445a Author: Geert Uytterhoeven Date: Sun Jun 12 11:25:43 2005 +0200 [PATCH] M68k: Update defconfigs Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit a58e76f25432dc5e3e84d04c27bec03347ca365b Author: Geert Uytterhoeven Date: Sun Jun 12 10:56:26 2005 +0200 [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 392a8b7efe069564bf7ed057103b1a3f41e55734 Author: Geert Uytterhoeven Date: Sun Jun 12 10:57:40 2005 +0200 [PATCH] IrDA: IrDA: Fix CONFIG_VIA_FIR typo (double `those') Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit bb011b8e8eded247cb71cb6d10e47517aacbd542 Author: David Brownell Date: Sun Jun 12 23:26:05 2005 +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 Author: Linus Torvalds Date: Fri Jun 10 20:35:10 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 commit a7df849c67f0a5248693e432d03f738e84d6826c Author: Linus Torvalds Date: Fri Jun 10 20:23:21 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 commit 90abb7b5f3bd9271a455cd640a70c285b4fd0c89 Author: Linus Torvalds Date: Fri Jun 10 09:37:21 2005 -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 Author: Dave Airlie Date: Fri Jun 10 19:27:51 2005 +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 Author: Dave Airlie Date: Fri Jun 10 18:47:38 2005 +1000 [PATCH] drm add i945G pci id Add pci identifier for i945G chipset Signed-off-by: Dave Airlie commit 0086b5ec7834b78358dea3f713275a9ae2b229ec Author: Benjamin Herrenschmidt Date: Fri Jun 10 14:19:02 2005 +1000 [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 243cd55e021baf28babdd88112ac03ae5cd4bb9c Author: Michael Ellerman Date: Thu Jun 9 12:36:33 2005 -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 7fbdf1a23be1837b8bc5bcec096015ca99e00aa7 Author: Eugene Surovegin Date: Thu Jun 9 12:36:29 2005 -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 04dc9ba882d224612f8db50fd60c8a45b843e77c Author: Linus Torvalds Date: Thu Jun 9 15:37:56 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 commit d80d6fc08e111c411a349c4fa0c6d9bf41851087 Author: Linus Torvalds Date: Thu Jun 9 15:36:31 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 99fdb2fe523480a8748a5af18139bb1f7785c815 Author: Linus Torvalds Date: Thu Jun 9 15:25:29 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 1e06276704c101bd1ae7b62879faaffcd7496a3e Author: Narendra Sankar Date: Fri May 6 12:00:05 2005 -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 Author: Steve French Date: Thu Jun 9 14:44:56 2005 -0700 Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit 3079ca621e9e09f4593c20a9a2f24237c355f683 Author: Steve French Date: Thu Jun 9 14:44:07 2005 -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 Author: Vincent Sanders Date: Thu Jun 9 21:59:22 2005 +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 Author: Vincent Sanders Date: Thu Jun 9 21:59:21 2005 +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 Author: Christoph Lameter Date: Thu Jun 9 12:29:00 2005 -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 Author: Linus Torvalds Date: Thu Jun 9 10:44:48 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 commit 12035d64565ae7ecbc7fe906e7fcc8a4a71a3789 Author: Dave Neuer Date: Thu Jun 9 17:40:55 2005 +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 Author: Linus Torvalds Date: Thu Jun 9 09:04:11 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 4e71e47da3367e8df5994a17fb421ddeaa5025e3 Author: Russell King Date: Thu Jun 9 16:53:28 2005 +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 Author: Ian Abbott Date: Thu Jun 2 10:34:11 2005 +0100 [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 Author: Pete Zaitcev Date: Mon Jun 6 13:54:59 2005 -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 Author: Scott Murray Date: Mon Jun 6 15:48:04 2005 -0400 [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 Author: Albert Lee Date: Mon Jun 6 15:56:03 2005 +0800 [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 Author: Jens Axboe Date: Wed Jun 8 13:02:25 2005 +0200 [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 Author: Linus Torvalds Date: Wed Jun 8 16:36:31 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit ce10d979053379553757c3b178a138facaddff82 Author: Paul Mackerras Date: Wed Jun 8 21:59:15 2005 +1000 [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 Author: Linus Torvalds Date: Wed Jun 8 16:22:16 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6 commit 4f58802fae8a51d9e79454746584175c14f84519 Author: Lars Marowsky-Bree Date: Wed Jun 8 15:50:31 2005 -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 Author: Peter Chubb Date: Wed Jun 8 15:50:20 2005 -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 f829fd23c87918374bac0d90404fe12f0e788d52 Author: Ananth N Mavinakayanahalli Date: Wed Jun 8 15:50:00 2005 -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 Author: Ananth N Mavinakayanahalli Date: Wed Jun 8 15:49:41 2005 -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 42442ed5744b03f5351a142649b8b4c97e6950ab Author: Andrew Morton Date: Wed Jun 8 15:49:25 2005 -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 5754c9b649e414f1e3a3ea2ec15e42ed3e42eeb8 Author: Keith Owens Date: Wed Jun 8 15:49:07 2005 -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 f8acd944ea511af02485b1709c07ac7aac12aa48 Author: William Lee Irwin III Date: Wed Jun 8 15:48:52 2005 -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 beb9e1c3f32a0f878765c7c1142f91083739c5bd Author: Eugene Surovegin Date: Wed Jun 8 15:48:42 2005 -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 1f96ddb4fb40961a8ebebf7a00bbfaad55aacbd2 Author: Jeff Dike Date: Wed Jun 8 15:48:27 2005 -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 501cb02b431fb88c7f157c46c8b54de59d1dd463 Author: Jeff Dike Date: Wed Jun 8 15:48:13 2005 -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 da00d9a5466558ccd9e7b7d04b13d7cb9160c876 Author: Jeff Dike Date: Wed Jun 8 15:48:01 2005 -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 3df59529ad1045da61698bb5dd8ebaa547aeb46f Author: Jeff Dike Date: Wed Jun 8 15:47:50 2005 -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 Author: Linus Torvalds Date: Wed Jun 8 16:06:15 2005 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 98e56405521b74b4826f855d45ef7859f34548ff Author: Thomas Graf Date: Wed Jun 8 15:11:19 2005 -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 Author: Thomas Graf Date: Wed Jun 8 15:11:02 2005 -0700 [PKT_SCHED]: Dump classification result for basic classifier Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 4890062960cbc4d3cebdbd8261a68bc85efcf5d4 Author: Thomas Graf Date: Wed Jun 8 15:10:48 2005 -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 Author: Thomas Graf Date: Wed Jun 8 15:10:22 2005 -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 Author: Stephen Hemminger Date: Wed Jun 8 14:56:01 2005 -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 Author: Stephen Hemminger Date: Wed Jun 8 14:55:42 2005 -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 Author: Gabor Fekete Date: Wed Jun 8 14:54:38 2005 -0700 [IPV6]: Update parm.link in ip6ip6_tnl_change() Signed-off-by: Gabor Fekete Signed-off-by: David S. Miller commit ed7fce6c13bdd802817e1988d67047d432e7e30b Author: David S. Miller Date: Wed Jun 8 14:15:52 2005 -0700 [TG3]: Update driver version and release date. Signed-off-by: David S. Miller commit 6d1cfbab4de64f2d0c5b0f81177ade0d75b69288 Author: Michael Chan Date: Wed Jun 8 14:13:14 2005 -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 Author: Keith Owens Date: Fri May 27 23:09:00 2005 -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 Author: Tony Luck Date: Wed Jun 8 12:12:48 2005 -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 Author: Linus Torvalds Date: Wed Jun 8 11:43:17 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 5131bf5db73529e972459060d8559f72e036fe53 Author: Linus Torvalds Date: Wed Jun 8 11:42:44 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial commit 866ba633a81c1e179038f7527809d9513160a6f7 Author: Keith Owens Date: Mon Jun 6 02:04:00 2005 -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 Author: Russell King Date: Wed Jun 8 19:26:47 2005 +0100 [PATCH] Serial: remove unused variable in sa1100 driver Signed-off-by: Russell King commit dcef1f634657dabe7905af3ccda12cf7f0b6fcc1 Author: Nicolas Pitre Date: Wed Jun 8 19:00:47 2005 +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 Author: Nicolas Pitre Date: Wed Jun 8 19:00:16 2005 +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 Author: Giorgio Padrin Date: Wed Jun 8 19:00:15 2005 +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 Author: David Mosberger-Tang Date: Wed Jun 8 10:45:00 2005 -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 358c6ac0dd4ffa5e44d59d4008a2627aa2f02b6f Author: Ananth N Mavinakayanahalli Date: Wed Jun 8 15:33:43 2005 +1000 [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 7840e5e95c1a8622425f11454600a49b6c718886 Author: Olaf Hering Date: Wed Jun 8 15:12:00 2005 +1000 [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 35d1bc90546d1f0af198886ae8062a550142d926 Author: Linus Torvalds Date: Wed Jun 8 07:57:17 2005 -0700 Automatic merge of master.kernel.org:/home/rmk/linux-2.6-arm commit f8f98a9335db4a7d6285b785180fad720bf22864 Author: Russell King Date: Wed Jun 8 15:28:24 2005 +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 Author: Trond Myklebust Date: Tue Jun 7 18:37:01 2005 -0400 [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 Author: Linus Torvalds Date: Tue Jun 7 13:41:30 2005 -0700 Merge of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart commit 93cffffa19960464a52f9c78d9a6150270d23785 Author: Bjorn Helgaas Date: Tue Jun 7 13:22:18 2005 -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 a86d1f4301fad4ff44c1f614c897000bc574ab2f Author: Vojtech Pavlik Date: Tue Jun 7 13:22:14 2005 -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 ad95d6098dd1e94a09d2a1fdf39fd8281fcd8958 Author: Eugene Surovegin Date: Tue Jun 7 13:22:09 2005 -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 eda9937656e0b9879ca521140fe61cbc9788c398 Author: Matthew Dobson Date: Tue Jun 7 13:22:05 2005 -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 66bb8bf8b235ba4d37fda14375827864977c6a3e Author: David Mosberger Date: Mon Apr 4 13:29:43 2005 -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 07eee78ea8ba2d0b7b20551c35a3e7dd158d50bb Author: Keir Fraser Date: Wed Mar 30 13:17:04 2005 -0800 [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 e29b545cb153f230fbd8ff4c19bc98ab950f9f5c Author: Michael Werner Date: Sun Mar 27 22:08:42 2005 -0800 [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 d0de98fa16169562bd74913c6c9b3857f9065c79 Author: Alan Hourihane Date: Tue May 31 19:50:49 2005 +0100 [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 Author: Tony Luck Date: Tue Jun 7 11:29:43 2005 -0700 Auto merge with /home/aegl/GIT/linus commit 3f5948fa2cbbda1261eec9a39ef3004b3caf73fb Author: David Mosberger Date: Mon Jun 6 15:50:09 2005 -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 Author: Tom Rini Date: Mon Jun 6 15:50:08 2005 -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 Author: Linus Torvalds Date: Mon Jun 6 16:59:55 2005 -0700 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6 commit 5065cc02ccf9212d31ecb7fcd63d734e242e64b1 Author: Linus Torvalds Date: Mon Jun 6 16:58:53 2005 -0700 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit 26abd53d8e9e51bbeea0b4772e8dffece3eeff38 Author: Tony Luck Date: Mon Jun 6 15:42:07 2005 -0700 auto merge with /home/aegl/GIT/linus commit 15def7bfb6902aa2b2bc67059f26d696fb27c235 Author: David S. Miller Date: Mon Jun 6 15:22:56 2005 -0700 [TG3]: Update driver version and release date. Signed-off-by: David S. Miller commit 9ba27794197a18168b99ccecfb7b799f18b64426 Author: Michael Chan Date: Mon Jun 6 15:16:20 2005 -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 Author: Michael Chan Date: Mon Jun 6 15:15:17 2005 -0700 [TG3]: Add TSO firmware license Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 9beb1d587f690d5b2f9087f8f10c0ff9f6b66886 Author: John W. Linville Date: Mon Jun 6 15:14:35 2005 -0700 [TG3]: Update pci.ids for BCM5752 Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit fa04ae5c09f3dfedbc923c2954a9a26a573833f1 Author: David S. Miller Date: Mon Jun 6 15:07:19 2005 -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 Author: Yoshinori Sato Date: Mon Jun 6 14:46:32 2005 -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 d671a1cbf7c7a5c5562106d39eb7f830ae5273ae Author: Al Viro Date: Mon Jun 6 13:36:14 2005 -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 Author: Al Viro Date: Mon Jun 6 13:36:13 2005 -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 Author: Al Viro Date: Mon Jun 6 13:36:13 2005 -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 Author: Al Viro Date: Mon Jun 6 13:36:12 2005 -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 d9d29a29669f96903d9950bb881c2a393fd33849 Author: Al Viro Date: Mon Jun 6 13:36:11 2005 -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 4b7b9772e4c3d87e649d4c419d2487aacf1235aa Author: Al Viro Date: Mon Jun 6 13:36:10 2005 -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 ba7a4c1a76f56c607560f1676680ff491747bdae Author: Al Viro Date: Mon Jun 6 13:36:08 2005 -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 Author: Al Viro Date: Mon Jun 6 13:36:08 2005 -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 2f12dbfbb6286c725c283a169f8f05e89a86848b Author: Al Viro Date: Mon Jun 6 13:36:07 2005 -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 e13b210f6f7bdc44dfee0a9bbd633a32db0d6333 Author: Al Viro Date: Mon Jun 6 13:36:06 2005 -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 463ffb2e9d39c2a3fd8c3c1d4a34e01f2078f972 Author: Al Viro Date: Mon Jun 6 13:36:05 2005 -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 d671d5e51400aab03c713a16ce3545aa81ad7b1c Author: Al Viro Date: Mon Jun 6 13:36:04 2005 -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 Author: Al Viro Date: Mon Jun 6 13:36:03 2005 -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 Author: Al Viro Date: Mon Jun 6 13:36:02 2005 -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 1be4a0900be5d2c2fd9cd012e3a153e1ea47b96a Author: Al Viro Date: Mon Jun 6 13:36:01 2005 -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 d73ffe16b8baafae6e9249acee6b50c24099c6de Author: Al Viro Date: Mon Jun 6 13:36:01 2005 -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 4e7506e4dd9e40c189fcbec95d5dbc92f2e5926a Author: Al Viro Date: Mon Jun 6 13:36:00 2005 -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 5f92b3bcec0fa2e2d775b589850097f9dc6b2de2 Author: Al Viro Date: Mon Jun 6 13:35:59 2005 -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 90ebe5654febe3555a2516d51d3d251226d35fdb Author: Al Viro Date: Mon Jun 6 13:35:58 2005 -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 4481e8eea761857367162b0957277d5524fbea63 Author: Kumar Gala Date: Mon Jun 6 13:35:57 2005 -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 8e2894e51d6407e47226a60c0d19bf384642c55a Author: Yoshinori Sato Date: Mon Jun 6 13:35:56 2005 -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 3399ba5b70eccc918ea4ab2630cac68f5c8ff845 Author: Denis Vlasenko Date: Mon Jun 6 13:35:55 2005 -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 a51171816826b074828fa96cb6ef60fc3b13631a Author: Martin Schwidefsky Date: Mon Jun 6 13:35:54 2005 -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 0b68177ccd12866d9f19cafad212b861c9d02a8c Author: Steve French Date: Mon Jun 6 09:57:33 2005 -0700 Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit 7cef5677ef3a8084f2588ce0a129dc95d65161f6 Author: Linus Torvalds Date: Mon Jun 6 08:22:29 2005 -0700 Linux 2.6.12-rc6 Getting ready for the real release.. commit eae936e21bd726f9d9555f2262d439fbcd61dccf Author: Yoichi Yuasa Date: Sat Jun 4 15:43:34 2005 -0700 [PATCH] serial: update NEC VR4100 series serial support - Changed the return value of unknown type to NULL. - Deleted the NULL check of dev_id in siu_interrupt(). - Deleted the NULL check of port->membase in siu_shutdown(). - Added the NULL check of port->membase to siu_startup(). - Removed early_uart_ops. Now using vr41xx_siu standerd one. - Changed KSEG1ADDR() in siu_console_setup() to ioremap(). - When uart_add_one_port() failed, changed to set NULL to port->dev. Signed-off-by: Yoichi Yuasa Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f26d583e41aedad8159acf9533fa287d7209dfbf Author: Gerald Schaefer Date: Sat Jun 4 15:43:33 2005 -0700 [PATCH] s390: deadlock in appldata The system might hang when using appldata_mem with high I/O traffic and a large number of devices. The spinlocks bdev_lock and swaplock are acquired via calls to si_meminfo() and si_swapinfo() from a tasklet, i.e. interrupt context, which can lead to a deadlock. Replace tasklet with work queue. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 595bf2aacae96d0f87352a1ff5476b79e52e212f Author: Martin Schwidefsky Date: Sat Jun 4 15:43:32 2005 -0700 [PATCH] s390: in_interrupt vs. in_atomic The condition for no context in do_exception checks for hard and soft interrupts by using in_interrupt() but not for preemption. This is bad for the users of __copy_from/to_user_inatomic because the fault handler might call schedule although the preemption count is != 0. Use in_atomic() instead in_interrupt(). Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5c3a6d8fe923b8780b9cd10e72344b8cf8518b5 Author: Bodo Stroesser Date: Sat Jun 4 15:43:32 2005 -0700 [PATCH] s390: uml ptrace fixes To make UML build and run on s390, I needed to do these two little changes: 1) UML includes some of the subarch's (s390) headers. I had to change one of them with the following one-liner, to make this compile. AFAICS, this change doesn't break compilation of s390 itself. 2) UML needs to intercept syscalls via ptrace to invalidate the syscall, read syscall's parameters and write the result with the result of UML's syscall processing. Also, UML needs to make sure, that the host does no syscall restart processing. On i386 for example, this can be done by writing -1 to orig_eax on the 2nd syscall interception (orig_eax is the syscall number, which after the interception is used as a "interrupt was a syscall" flag only. Unfortunately, s390 holds syscall number and syscall result in gpr2 and its "interrupt was a syscall" flag (trap) is unreachable via ptrace. So I changed the host to set trap to -1, if the syscall number is changed to an invalid value on the first syscall interception. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 778959db97c7ed8eed4025916916b17a4629ce3d Author: Martin Schwidefsky Date: Sat Jun 4 15:43:30 2005 -0700 [PATCH] s390: ptrace peek and poke The special cases of peek and poke on acrs[15] and the fpc register are not handled correctly. A poke on acrs[15] will clobber the 4 bytes after the access registers in the thread_info structure. That happens to be the kernel stack pointer. A poke on the fpc with an invalid value is not caught by the validity check. On the next context switch the broken fpc value will cause a program check in the kernel. Improving the checks in peek and poke fixes this. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 854715be73b221596c7127d4042e1120d4539e19 Author: Qu Fuping Date: Sat Jun 4 15:43:29 2005 -0700 [PATCH] mpage_end_io_write() I/O error handling fix When fsync() runs wait_on_page_writeback_range() it only inspects pages which are actually under I/O (PAGECACHE_TAG_WRITEBACK). If a page completed I/O prior to wait_on_page_writeback_range() looking at it, it is supposed to have recorded its I/O error state in the address_space. But mpage_mpage_end_io_write() forgot to set the address_space error flag in this case. Signed-off-by: Qu Fuping Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3045064054a93d303094cfb96d980cc3c82a64c Author: Linus Torvalds Date: Sat Jun 4 08:18:39 2005 -0700 Automatic merge of 'misc-fixes' branch from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 910313aa1db1b0c63ee9684bb4f35c17e7192f43 Author: Date: Sat Jun 4 04:31:44 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch r8169-fix commit 17d82fcc6a15887b7138d35802ab8fc5f249794f Author: Deepak Saxena Date: Fri Jun 3 22:18:52 2005 +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 8be3de3fd8469154a2b3e18a4712032dac5b4a53 Author: Nathan Lynch Date: Fri Jun 3 14:25:25 2005 -0500 [PATCH] prom_find_machine_type typo breaks pSeries lpar boot A typo in prom_find_machine_type from Ben's recent patch "ppc64: Fix result code handling in prom_init" prevents pSeries LPAR systems from booting. Tested on a pSeries 570 and OpenPower 720 (both Power5 LPAR). Signed-off-by: Nathan Lynch Signed-off-by: Linus Torvalds commit 8775420d2fbcfff866995471ea5f6130d14d121c Author: Todd Poynor Date: Fri Jun 3 20:52:27 2005 +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 Author: Mike Frysinger Date: Fri Jun 3 20:52:26 2005 +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 Author: Albrecht Dreß Date: Fri Jun 3 20:52:26 2005 +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 Author: Deepak Saxena Date: Fri Jun 3 20:52:25 2005 +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 Author: Dean Nelson Date: Fri Jun 3 05:25:00 2005 -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 d8d088d25822b0199fdfb392085e1cf8a5914a97 Author: Linus Torvalds Date: Fri Jun 3 08:54:02 2005 -0700 Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6 commit b05a720b374ac6af05b2fd4c70bb2c61a9f461ca Author: Greg Ungerer Date: Fri Jun 3 11:35:20 2005 +1000 [PATCH] m68knommu: fix scheduling and race problems in idle loop Re-work the m68knommu specific idle code according to suggestions from Nick Piggin . A couple of rules that we need to follow: 1. Preempt should now disabled over idle routines. Should only be enabled to call schedule() then disabled again. 3. When cpu_idle finds (need_resched() == 'true'), it should call schedule(). It should not call schedule() otherwise. Also fix interrupt locking around the need_resched() and cpu stop state so that there is no race condition. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit f4d340cf869b2b63e1043eed72aa2eab6fa2cb2c Author: David Brownell Date: Fri Jun 3 08:01:35 2005 -0700 [PATCH] USB: resolve Zaurus problem This "obvious" one-liner is needed to recognize Zaurus SL 6000; it just checks two GUIDs not just one. OSDL bugids #4512 and #4545 seem to be duplicates of this report. From: Gerald Skerbitz Signed-off-by: David Brownell Signed-off-by: Linus Torvalds commit c92715b3c22e94105a8fd9e4a23047d05c5077e7 Author: Nathan Lynch Date: Thu Jun 2 17:15:09 2005 -0500 [SCSI] fix slab corruption during ipr probe With CONFIG_DEBUG_SLAB=y I see slab corruption messages during boot on pSeries machines with IPR adapters with any 2.6.12-rc kernel. The change which seems to have introduced the problem is "SCSI: revamp target scanning routines" and may be found at: http://marc.theaimsgroup.com/?l=bk-commits-head&m=111093946426333&w=2 In order to revert that in a 2.6.12-rc1 tree, I had to revert "target code updates to support scanned targets" first: http://marc.theaimsgroup.com/?l=bk-commits-head&m=111094132524649&w=2 With both patches reverted, the corruption messages go away. ipr: IBM Power RAID SCSI Device Driver version: 2.0.13 (February 21, 2005) ipr 0001:d0:01.0: Found IOA with IRQ: 167 ipr 0001:d0:01.0: Starting IOA initialization sequence. ipr 0001:d0:01.0: Adapter firmware version: 020A005C ipr 0001:d0:01.0: IOA initialized. scsi0 : IBM 570B Storage Adapter Vendor: IBM Model: VSBPD4E1 U4SCSI Rev: 4770 Type: Enclosure ANSI SCSI revision: 02 Vendor: IBM H0 Model: HUS103036FL3800 Rev: RPQF Type: Direct-Access ANSI SCSI revision: 04 Vendor: IBM H0 Model: HUS103036FL3800 Rev: RPQF Type: Direct-Access ANSI SCSI revision: 04 Vendor: IBM H0 Model: HUS103036FL3800 Rev: RPQF Type: Direct-Access ANSI SCSI revision: 04 Vendor: IBM H0 Model: HUS103036FL3800 Rev: RPQF Type: Direct-Access ANSI SCSI revision: 04 Vendor: IBM Model: VSBPD4E1 U4SCSI Rev: 4770 Type: Enclosure ANSI SCSI revision: 02 Slab corruption: start=c0000001e8de5268, len=512 Redzone: 0x5a2cf071/0x5a2cf071. Last user: [](.scsi_target_dev_release+0x28/0x50) 080: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6a Prev obj: start=c0000001e8de5050, len=512 Redzone: 0x5a2cf071/0x5a2cf071. Last user: [<0000000000000000>](0x0) 000: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 010: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b Next obj: start=c0000001e8de5480, len=512 Redzone: 0x170fc2a5/0x170fc2a5. Last user: [](.as_init_queue+0x5c/0x228) 000: c0 00 00 01 e8 83 26 08 00 00 00 00 00 00 00 00 010: 00 00 00 00 00 00 00 00 c0 00 00 01 e8 de 54 98 Slab corruption: start=c0000001e8de5268, len=512 Redzone: 0x5a2cf071/0x5a2cf071. Last user: [](.scsi_target_dev_release+0x28/0x50) 080: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6a Prev obj: start=c0000001e8de5050, len=512 Redzone: 0x5a2cf071/0x5a2cf071. Last user: [<0000000000000000>](0x0) 000: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 010: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b Next obj: start=c0000001e8de5480, len=512 Redzone: 0x170fc2a5/0x170fc2a5. Last user: [](.as_init_queue+0x5c/0x228) 000: c0 00 00 01 e8 83 26 08 00 00 00 00 00 00 00 00 010: 00 00 00 00 00 00 00 00 c0 00 00 01 e8 de 54 98 ... I did some digging and the problem seems to be a refcounting issue in __scsi_add_device. The target gets freed in scsi_target_reap, and then __scsi_add_device tries to do another device_put on it. Signed-off-by: Nathan Lynch Signed-off-by: James Bottomley commit 18e144d32cd3dae6953c385e4b376ef9688b61b0 Author: Andrew Vasquez Date: Fri May 27 15:04:47 2005 -0700 [SCSI] qla2xxx: fix bad locking during eh_abort Correct incorrect locking order in qla2xxx_eh_abort() handler which would case a hang during certain code-paths. With extra pieces to fix the irq state in the locks. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 39a66b8d22a36cfa1a48f7f59c6a4639d9c99653 Author: Craig Shelley Date: Fri May 27 00:09:56 2005 +0100 [PATCH] USB: CP2101 Add support for flow control Added support to get/set flow control line levels using TIOCMGET and TIOCMSET. Added support for RTSCTS hardware flow control. cp2101_get_config and cp2101_set_config modified to support long request strings, required for configuring flow control. Signed-off-by: Craig Shelley craig@microtron.org.uk Signed-off-by: Greg Kroah-Hartman commit 719df469cb51199316ae2a11c75a8046be34b899 Author: Roman Kagan Date: Fri May 6 00:55:56 2005 +0400 [PATCH] USB: update urb documentation On Wed, May 04, 2005 at 01:37:30PM -0700, David Brownell wrote: > On Wednesday 04 May 2005 12:19 pm, Roman Kagan wrote: > > struct urb { > > /* private, usb core and host controller only fields in the urb */ > > ... > > struct list_head urb_list; /* list pointer to all active urbs */ > > ... > > }; > > > > Is it safe to use it for driver's purposes when the driver owns the urb, > > that is, starting from the completion routine until the urb is submitted > > with usb_submit_urb()? > > Right now, it should be. Great! FWIW I've briefly tested a modified version of usbatm using the list head in struct urb instead of creating a wrapper struct, and I haven't seen any failures yet. So I tend to believe that your "should be" actually means "is" :) > > If it is, can it be guaranteed in future, e.g. > > by moving the list head into the public section of struct urb? > > In fact I'm not sure why it ever got called "private" to usbcore/hcds. > I thought the idea was that it should be like urb->status, reserved for > whoever controls the URB. OK then how about the following (essentially documentation) patch? Signed-off-by: Roman Kagan Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1724757e5ab5219b46876ac6e4e362a4b2dcfa86 Author: Phil Dibowitz Date: Sat May 21 00:45:55 2005 -0700 [PATCH] USB Storage: Add unusual_devs for Trumpion Voice Recorder The original entry of this patch was submitted by Filippo Bardelli , with cleanups and patch-ification by me. This corrects the subclass that the device reports. Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit 77ddecc3c047e4e9bd7332d3173def93ea2de1ad Author: Paulo Marques Date: Wed May 18 13:12:49 2005 +0100 [PATCH] USB: make MODALIAS code a bit smaller devices This patch makes the code to provide modalias in sysfs for usb devices 56 bytes smaller in i386, while making it clear that the first part of the modalias string is the same no matter what the device class is. Signed-Off-By: Paulo Marques Signed-off-by: Greg Kroah-Hartman commit 58cfe9113e485f7e04bd0eac4fc4251b330af501 Author: Matthias Urlichs Date: Mon May 23 17:00:48 2005 -0700 [PATCH] USB: add Option Card driver This patch adds a new driver for "Option" cards. This is a GSM data card, controlled by three "serial ports" which are connected via an OHCI adapter, all located on an oversized PC-Card. It's sold by several GSM service providers. Traditionally, this card has been accessed via the standard serial driver and appropriate vendor= and product= options. However, testing has revealed several problems with this approach, including hung data transfers and lost data blocks when receiving. Therefore, I've written a separate driver. Signed-off-by: Matthias Urlichs Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 4871d3be13ea2b33edc9ba6fbcc30fc047087be7 Author: Greg Kroah-Hartman Date: Thu Jun 2 22:18:12 2005 -0700 [PATCH] USB: add Vernier devices to HID blacklist They aren't really HID devices. Damm microsoft HID driver, that thing has caused more companies to have to do this kind of hack... Signed-off-by: Greg Kroah-Hartman commit dc1d1003e8309ef8e5153ce0c00cce76144abbdb Author: Lonnie Mendez Date: Tue May 10 00:17:17 2005 -0500 [PATCH] USB: hid-core: add Earthmate lt-20 productid to blacklist table This patch adds the DeLorme Earthmate lt-20 productid to the hid blacklist table. This patch ensures the lt-20 can be claimed by the appropriate driver (cypress_m8). Adds the product id 0x200, of the DeLorme Earthmate lt-20, to the hid blacklist table. Signed-off-by: Lonnie Mendez Signed-off-by: Greg Kroah-Hartman commit 5ce0482e18193a15223911515ee44373cffb35b8 Author: Ping Cheng Date: Thu May 5 15:12:57 2005 -0700 [PATCH] USB: add new wacom device to usb hid-core list - add Intuos3 and Cintiq 21UX Signed-off-by: Ping Cheng Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit d7771a33bf2b23fc6d0b9c133fb0c00670154f10 Author: Adrian Bunk Date: Thu May 5 18:49:59 2005 +0200 [PATCH] USB: remove drivers/usb/media/pwc/ChangeLog This patch removes the outdated ChangeLog file for this driver. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit f4800078d9ed4bd20b1b27f56e7b68cfa0d73038 Author: Pete Zaitcev Date: Sun May 1 16:05:40 2005 -0700 [PATCH] USB: Support multiply-LUN devices in ub Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman diff -urp -X dontdiff linux-2.6.12-rc3/drivers/block/ub.c linux-2.6.12-rc3-lem/drivers/block/ub.c commit aa447acb9291518506a1aec644db47fa6c6e36eb Author: Linus Torvalds Date: Thu Jun 2 17:39:49 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit 5ba0eac6e0b7e2889649a1105d97c600595e2bb1 Author: Jiri Benc Date: Thu Jun 2 16:48:05 2005 -0700 [NET]: Fix HH_DATA_OFF. When the hardware header size is a multiple of HH_DATA_MOD, HH_DATA_OFF() incorrectly returns HH_DATA_MOD (instead of 0). This affects ieee80211 layer as 802.11 header is 32 bytes long. Signed-off-by: Jiri Benc Signed-off-by: David S. Miller commit b597ef4712c05c962640a655386a7f06cc1a1fbc Author: Christoph Hellwig Date: Thu Jun 2 16:36:00 2005 -0700 [NET]: Fix locking in shaper driver. o use a semaphore instead of an opencoded and racy lock o move locking out of shaper_kick and into the callers - most just released the lock before calling shaper_kick o remove in_interrupt() tests. from ->close we can always block, from ->hard_start_xmit and timer context never Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 317604633eface11cb7452298fa44a34624633dc Author: Linus Torvalds Date: Thu Jun 2 16:07:03 2005 -0700 Merge of 'docs' branch from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev commit d7aaf48128ec7fcefcee92ea22833afc1a80e268 Author: Date: Thu Jun 2 18:43:09 2005 -0400 Automatic merge of /spare/repo/linux-2.6/.git branch HEAD commit decc6d0b68f27bbb8a0357fccf41936a3c196b03 Author: Jeff Garzik Date: Thu Jun 2 18:42:33 2005 -0400 libata: kernel-doc warning fixes commit 0baab86b00cdf9785ac2bb2ce1ab63995b3866ca Author: Edward Falk Date: Thu Jun 2 18:17:13 2005 -0400 libata: update inline source docs commit d0d2f2df65ddea9a30ddd117f769bfff65d3fc56 Author: Steve French Date: Thu Jun 2 15:12:36 2005 -0700 [CIFS] Update cifs version number and fix whitespace Signed-off-by: Steve French (sfrench@us.ibm.com) commit 0fd56f67890acf7904c83e7de6cb71723eb1c962 Author: Adrian Bunk Date: Thu Jun 2 14:04:00 2005 -0700 [PATCH] drivers/net/hamradio/baycom_epp.c: cleanups The times when tricky goto's produced better codes are long gone. This patch should express the same in a better way. (Also fixes the final gcc-4.0 x86 compile error) Signed-off-by: Adrian Bunk Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4eb2a93319d61923635c84a5f5e68965b14c754 Author: Anton Blanchard Date: Thu Jun 2 14:02:03 2005 -0700 [PATCH] ppc64: remove decr_overclock Now that we have HZ=1000 there is much less of a need for decr_overclock. Remove it. Leave spread_lpevents but move it into iSeries_setup.c. We should look at making event spreading the default some day. Signed-off-by: Anton Blanchard Acked-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6dc2f0c7df6cefda5932ac8bcd9ca5ef45de36ee Author: Anton Blanchard Date: Thu Jun 2 14:02:02 2005 -0700 [PATCH] ppc64: cleanup iseries runlight support The iseries has a bar graph on the front panel that shows how busy it is. The operating system sets and clears a bit in the CTRL register to control it. Instead of going to the complexity of using a thread info bit, just set and clear it in the idle loop. Also create two helper functions, ppc64_runlatch_on and ppc64_runlatch_off. Finally don't use the short form of the SPR defines. Signed-off-by: Anton Blanchard Acked-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79f1248962cfa1e11a5610e0349bc3515687516d Author: Anton Blanchard Date: Thu Jun 2 14:02:02 2005 -0700 [PATCH] ppc64: cleanup SPR definitions There are a bunch of irrelevant SPR definitions in asm/processer.h. Cut them down a bit, also add a DABR_TRANSLATION define which will be used shortly. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e3b11a9be6ac94bf4af81757b6a10e7e65b846f Author: Jan Kara Date: Thu Jun 2 14:02:01 2005 -0700 [PATCH] ext3: fix list scanning in __cleanup_transaction Fix a bug in list scanning that can cause us to skip the last buffer on the checkpoint list (and hence fail to do any progress under some rather unfavorable conditions). The problem is we first do jh=next_jh and then test } while (jh!=last_jh); Hence we skip the last buffer on the list (if it was not the only buffer on the list). As we already do jh=next_jh; in the beginning of the loop we are safe to just remove the assignment in the end. It can happen that 'jh' will be freed at the point we test jh != last_jh but that does not matter as we never *dereference* the pointer. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00ea81459c279f14a7b344320a71c94f60f88929 Author: Jan Kara Date: Thu Jun 2 14:02:00 2005 -0700 [PATCH] ext3: fix log_do_checkpoint() assertion failure Fix possible false assertion failure in log_do_checkpoint(). We might fail to detect that we actually made a progress when cleaning up the checkpoint lists if we don't retry after writing something to disk. The patch was confirmed to fix observed assertion failures for several users. When we flushed some buffers we need to retry scanning the list. Otherwise we can fail to detect our progress. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 467ca22d3371f132ee225a5591a1ed0cd518cb3d Author: Steve French Date: Thu Jun 2 14:42:23 2005 -0700 Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit 4fef0304eeaa4156db5625e3578f92ed94645a43 Author: Adrian Bunk Date: Thu Jun 2 13:06:36 2005 -0700 [IPV6]: Kill export of fl6_sock_lookup. There is no usage of this EXPORT_SYMBOL in the kernel. Signed-off-by: Adrian Bunk Acked-by: Hideaki YOSHIFUJI Signed-off-by: David S. Miller commit a2c1aa54746bace5d03cc66521fbf3bb6fb2f916 Author: Jesper Juhl Date: Thu Jun 2 13:04:07 2005 -0700 [ATM]: [drivers] kill pointless NULL checks and casts before kfree() Signed-off-by: Jesper Juhl Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 3087e1ff8d64da7b6b527e89d0c0864ab36294b8 Author: Jan Beulich Date: Thu Jun 2 13:03:15 2005 -0700 [ATM]: fix ATM makefile for out-of-source-tree builds Signed-off-by: Jan Beulich Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 64a6c7aa3836e357499d2e822388f30c11f13604 Author: Adrian Bunk Date: Thu Jun 2 13:02:25 2005 -0700 [IPVS]: remove net/ipv4/ipvs/ip_vs_proto_icmp.c ip_vs_proto_icmp.c was never finished. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 1e86d1c648508fd50e6c9960576b87906a7906ad Author: Benjamin Herrenschmidt Date: Thu Jun 2 14:11:37 2005 +1000 [PATCH] ppc64: Fix result code handling in prom_init prom_init(), the trampoline code that "talks" to Open Firmware during early boot, has various issues with managing OF result codes. Some of my recent fixups in fact made the problem worse on some platforms. This patch reworks it all. Tested on g5, Maple, POWER3 and POWER5. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda Author: Linus Torvalds Date: Wed Jun 1 19:17:59 2005 -0700 Merge of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 16a789c11df5069576ef89f817348dbc6f3bd87e Author: Linus Torvalds Date: Wed Jun 1 16:32:03 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 commit d8caebd285a084ee1e4d484ce597865228614067 Author: Peter Chubb Date: Tue May 31 22:37:00 2005 -0700 [IA64] fix compilation warning in sys32_epoll_wait() This gets rid of an unused variable `error' in sys_ia32.c:sys32_epoll_wait() Getting rid of this one makes parsing the output of the kernecomp autobuild easier --- searching for `Error' to find a problem kept hitting this one, even though it's only a warning. Signed-off-by: Tony Luck commit b655913bf364603d17ad770dc4fb80e60555a255 Author: Peter Chubb Date: Tue May 31 22:34:00 2005 -0700 [IA64] Cleanup compile warnings for ski config The attached patch cleans up a compilation warning when ACPI is turned off (i.e., when compiling for the Ski simulator). Signed-off-by: Tony Luck commit 12725675e26d52c39e856d341035b94bf7802458 Author: Steve French Date: Wed Jun 1 15:02:37 2005 -0700 Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit 72a95d14f5047d9efb1e82a9f0b9f230f06d6e3d Author: Linus Torvalds Date: Wed Jun 1 13:21:58 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit f9a22239257561df80ef54fc8f31880e2fb2a27b Author: Linus Torvalds Date: Wed Jun 1 13:20:35 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 commit eff910a91ac04ab1d9e210d4f721484af3b39c8d Author: Linus Torvalds Date: Wed Jun 1 07:56:33 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 commit a340ba1071ccec7da5d5c689471ff8bc07fe022d Author: Linus Torvalds Date: Wed Jun 1 07:56:10 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/i2c-2.6 commit c10fccddf00cb216349ce3171ce2e39d7c70371b Author: Linus Torvalds Date: Wed Jun 1 07:55:46 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6 commit 5f64f73957f6cae3222f97f2599199ee562f7f3f Author: Benjamin Herrenschmidt Date: Wed Jun 1 17:07:27 2005 +1000 [PATCH] ppc32/ppc64: cleanup /proc/device-tree This cleans up the /proc/device-tree representation of the Open Firmware device-tree on ppc and ppc64. It does the following things: - Workaround an issue in some Apple device-trees where a property may exist with the same name as a child node of the parent. We now simply "drop" the property instead of creating duplicate entries in /proc with random result... - Do not try to chop off the "@0" at the end of a node name whose unit address is 0. This is not useful, inconsistent, and the code was buggy and didn't always work anyway. - Do not create symlinks for the short name and unit address parts of a node. These were never really used, bloated the memory footprint of the device-tree with useless struct proc_dir_entry and their matching dentry and inode cache bloat. This results in smaller code, smaller memory footprint, and a more accurate view of the tree presented to userland. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit f93ea2349832c040bdf66dc7495aa87bfe3394b8 Author: Benjamin Herrenschmidt Date: Wed Jun 1 17:02:22 2005 +1000 [PATCH] ppc32: Apple device-tree bug fix This is the ppc32 patch equivalent to the just posted ppc64 one working around a bug in Apple device-trees regarding the "cpus" nodes. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 44e4665cc9d856d15f04a012c78e4ab48f71290b Author: Benjamin Herrenschmidt Date: Wed Jun 1 14:54:25 2005 +1000 [PATCH] ppc64: Fix a device-tree bug on Apple's Apple's Open Firmware has a funny bug when creating the /cpus nodes where it leaves a dangling '\0' character in the CPU name which ends up appearing in the full path of the node. This is bogus and confuses /proc/device-tree badly. This patch strips those bogus zero's from the node full path when reading the device-tree from Open Firmware. The "name" property is not modified and still contains the spurrious 0 (it basically contains 0 tailing 0 instead of one) but that shouldn't be a problem. An equivalent patch for ppc32 will follow shortly Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 88314ee73fd75eb32abdcb3119cd303c116d4500 Author: David S. Miller Date: Tue May 31 19:13:52 2005 -0700 [SPARC64]: Refine PCI strbuf ctx-based flush. The initial peek read PIO of the match register is just a waste. Just do the flush writes first, as that is more efficient. Signed-off-by: David S. Miller commit 21e3024cbddb712f6a078bf4132d7682d3c4e35e Author: Venkatesh Pallipadi Date: Wed May 25 14:43:56 2005 -0700 [PATCH] cpufreq-stats driver documentation Documentation for cpufreq stats. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 58f1df25403988b73d7129fcd2c4d4c24017f1af Author: Venkatesh Pallipadi Date: Wed May 25 14:46:50 2005 -0700 [PATCH] cpufreq-stats driver updates Changes to the cpufreq stats driver: * Changes the way P-state transition table looks in /sysfs providing more clear output * Changes the time unit in the output from HZ to clock_t Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit f94ea640a28230f82a4395c34e1290748a9f6586 Author: Dave Jones Date: Tue May 31 19:03:52 2005 -0700 [CPUFREQ] Typos. cpfureq developers cant spel. Signed-off-by: Dave Jones commit 6778bae0f2f1d4af1b8bb876c992ea094ee958b4 Author: Dave Jones Date: Tue May 31 19:03:51 2005 -0700 [CPUFREQ] longhaul - adjust transition latency. From patch by: Ken Staton Signed-off-by: Dave Jones commit 1174631418fbb2c0c6946081b0b7d391f5d92861 Author: Dave Jones Date: Tue May 31 19:03:51 2005 -0700 [CPUFREQ] Longhaul: Magic timer frobbing. As mandated by the spec, disable timer around transitions. From code by : Ken Staton commit 3be6a48f3c8df1b2fbbe57face95a03d167bda1b Author: Dave Jones Date: