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: Tue May 31 19:03:51 2005 -0700 [CPUFREQ] longhaul - disable PCI mastering around transition. The spec states that we have to do this, which is *horrid*. Based on code from: Ken Staton Signed-off-by: Dave Jones commit e131832ca7d3a3e5f9c7624bb310a7747dc2b57c Author: Dave Jones Date: Tue May 31 19:03:50 2005 -0700 [CPUFREQ] ondemand governor default sampling downfactor as 1 [PATCH] [5/5] ondemand governor default sampling downfactor as 1 Make default sampling downfactor 1. This works better with earlier auto downscaling change in ondemand governor. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit c29f1403098135bdef75b190a5037db514701031 Author: Dave Jones Date: Tue May 31 19:03:50 2005 -0700 [CPUFREQ] ondemand governor automatic downscaling [PATCH] [4/5] ondemand governor automatic downscaling Here is a change of policy for the ondemand governor. The modification concerns the frequency downscaling. Instead of decreasing to a lower frequency when the CPU usage is under 20%, this new policy automatically scales to the optimal frequency. The optimal frequency being the lowest frequency which provides enough power to not trigger the upscaling policy. Signed-off-by: Eric Piel Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 9c7d269b9b05440dd0fe92d96f4e5d7e73dd7238 Author: Dave Jones Date: Tue May 31 19:03:49 2005 -0700 [CPUFREQ] ondemand,conservative governor idle_tick clean-up [PATCH] [3/5] ondemand,conservative governor idle_tick clean-up Ondemand and conservative governor clean-up, it factorises the idle ticks measurement. Signed-off-by: Eric Piel Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 790d76fa979f55bfc49a6901bb911778949b582d Author: Dave Jones Date: Tue May 31 19:03:49 2005 -0700 [CPUFREQ] ondemand,conservative governor store the idle ticks for all cpus [PATCH] [2/5] ondemand,conservative governor store the idle ticks for all cpus Ondemand, conservative governor did not store prev_cpu_idle_up into prev_cpu_idle_down for other CPUs than the current CPU. Signed-off-by: Eric Piel Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit dac1c1a56279b4545a822ec7bc770003c233e546 Author: Dave Jones Date: Tue May 31 19:03:49 2005 -0700 [CPUFREQ] ondemand,conservative minor bug-fix and cleanup [PATCH] [1/5] ondemand,conservative minor bug-fix and cleanup Attached patch fixes some minor issues with Alexander's patch and related cleanup in both ondemand and conservative governor. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 1206aaac285904e3e3995eecbf4129b6555a8973 Author: Dave Jones Date: Tue May 31 19:03:48 2005 -0700 [CPUFREQ] Allow ondemand stepping to be changed by user. Adds support so that the cpufreq change stepping is no longer fixed at 5% and can be changed dynamically by the user Signed-off-by: Alexander Clouter Signed-off-by: Dave Jones commit c11420a616039e2181e4ecbffb4d125d39e6877d Author: Dave Jones Date: Tue May 31 19:03:48 2005 -0700 [CPUFREQ] Prevents un-necessary cpufreq changes if we are already at min/max Signed-off-by: Alexander Clouter Signed-off-by: Dave Jones commit 3d5ee9e55d13de28d2fa58d6e13f2e4d3a5f8b1a Author: Dave Jones Date: Tue May 31 19:03:47 2005 -0700 [CPUFREQ] Add support to cpufreq_ondemand to ignore 'nice' cpu time Signed-off-by: Alexander Clouter Signed-off-by: Dave Jones commit b9170836d1aa4ded7cc1ac1cb8fbc7867061c98c Author: Dave Jones Date: Tue May 31 19:03:47 2005 -0700 [CPUFREQ] Conservative cpufreq governer A new cpufreq module, based on the ondemand one with my additional patches just posted. This one is more suitable for battery environments where its probably more appealing to have the cpu freq gracefully increase and decrease rather than flip between the min and max freq's. N.B. Bruno Ducrot pointed out that the amd64's "do have unacceptable latency between min and max freq transition, due to the step-by-step requirements (200MHz IIRC)"; so AMD64 users would probably benefit from this too. Signed-off-by: Alexander Clouter Signed-off-by: Dave Jones commit b53cc6ead046093477ec7a3354d620337101ea5b Author: Dave Jones Date: Tue May 31 19:03:47 2005 -0700 [CPUFREQ] fix up comment in cpufreq.h Fix up comment in cpufreq.h stating transition latency should be passed in microseconds -- it was decided long ago to switch to nanoseconds. Signed-off-by: Dominik Brodowski Signed-off-by: Dave Jones commit 065b807ca1f5bdbeb081e3cf75ac8de9be8ac212 Author: Dave Jones Date: Tue May 31 19:03:46 2005 -0700 [CPUFREQ] dual-core powernow-k8 With the release of the dual-core AMD Opterons last week, it's high time that cpufreq supported them. The attached patch applies cleanly to 2.6.12-rc3 and updates powernow-k8 to support the latest Athlon 64 and Opteron processors. Update the driver to version 1.40.0 and provide support for dual-core processors. Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones commit 7f335d4ef2d50a693fad70b8fa053d0382f4a45c Author: Dave Jones Date: Tue May 31 19:03:46 2005 -0700 [CPUFREQ] make cpufreq_gov_dbs static This patch makes a needlessly global and EXPORT_SYMBOL'ed struct static. Signed-off-by: Adrian Bunk Signed-off-by: Dave Jones commit c5d28fb297efaa97c4b90e36f9dff3066e7f2778 Author: Dave Jones Date: Tue May 31 19:03:46 2005 -0700 [CPUFREQ] Recalibrate cpu_khz [2/2] Some cpufreq drivers (at that time, only powernow-k7) need to recalibrate the cpu_khz at runtime. Signed-off-by: Bruno Ducrot Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit 91350ed49bf3613e243c2e216228cd4ae8f32516 Author: Dave Jones Date: Tue May 31 19:03:45 2005 -0700 [CPUFREQ] Recalibrate cpu_khz [1/2] We have to recalibrate cpu_khz in order to use the current FID instead the max FID since some BIOS do not put the processor at maximum frequency at POST. Also, some BIOS will change the processor frequency at our back after cpu_khz was calibrate. Finally, this will fix a long standing bug when we do something like this: # rmmod powernow-k7 # modprobe powernow-k7 Signed-off-by: Bruno Ducrot Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit bf6fc9fd2d848d06b8f6c4caccef1dba9ef8c4c6 Author: Dave Jones Date: Tue May 31 19:03:45 2005 -0700 [CPUFREQ] AMD Elan SC520 cpufreq driver. From: Sean Young Signed-off-by: Dave Jones commit 3310010818aa12145905faf97ffe3742acc842e2 Author: Dave Jones Date: Tue May 31 19:03:44 2005 -0700 [CPUFREQ] Add warning comment about default governors. This comes up time and time again. Until its fixed, place this comment in the Kconfig which should stem the flow of resubmissions. Signed-off-by: Rob Weryk Signed-off-by: Dave Jones commit 6f4095af6df7aa365ecf18473c8b05c5f6c38a78 Author: Dave Jones Date: Tue May 31 19:03:44 2005 -0700 [CPUFREQ] speedstep-smi: it works on at least one P4M The speedstep-smi driver actually works on >=1 notebook with a Pentium 4-M CPU where all other cpufreq drivers fail. Therefore, allow speedstep-smi on P4Ms again, but warn users of likely failure Signed-off-by: Dominik Brodowski Signed-off-by: Dave Jones commit 6fe711658fcf92d39d84c0b7e6332ed6625dc520 Author: Dave Jones Date: Tue May 31 19:03:44 2005 -0700 [CPUFREQ] ondemand: trivial clean-ups Trivial ondemand governor clean-ups: - change from sampling_rate_in_HZ() to the official function usecs_to_jiffies(). - use for_each_online_cpu() to instead of using "if (cpu_online(i))" Signed-off-by: Eric Piel Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dominik Brodowski Signed-off-by: Dave Jones commit 8282864a96ef0a7b88ee9e4b357e08504131394d Author: Dave Jones Date: Tue May 31 19:03:43 2005 -0700 [CPUFREQ] speedstep-centrino: Pentium 4 - M (HT) support The Pentium 4 - Ms (HT) with CPUID 0xF34 and 0xF41 seem to support centrino-like enhanced speedstep; however, no "table" support is possible. Therefore, put NULL entries into speedstep-centrino.c Signed-off-by: Dominik Brodowski Signed-off-by: Dave Jones commit 78ee998fd46ed4cc647ee442d2a5492f389ee27a Author: Dave Jones Date: Tue May 31 19:03:43 2005 -0700 [CPUFREQ] cpufreq-core: reduce warning messages. cpufreq core is printing out messages at KERN_WARNING level that the core recovers from without intervention, and that the system administrator can do nothing about. Patch below reduces the severity of these messages to debug. Signed-off-by: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit 7eb53d88230e23f83b2e20a78955e1412fa7bb26 Author: Dave Jones Date: Tue May 31 19:03:42 2005 -0700 [CPUFREQ] powernow-k7: don't print khz element of FSB. Signed-off-by: Dave Jones commit 92bab26be5544d8b495389646490fcfdca6dbcf2 Author: Jeff Garzik Date: Tue May 31 20:43:57 2005 -0400 libata: more docs updates commit 36839836e8132731e0cadddce452423036a1d5b3 Author: Edgar E Iglesias Date: Tue May 31 17:08:05 2005 -0700 [IPSEC]: Fix esp_decap_data size verification in esp4. Signed-off-by: Edgar E Iglesias Signed-off-by: David S. Miller commit 7c963ad1d113790a8c723a178988b675868f3abe Author: David S. Miller Date: Tue May 31 16:57:59 2005 -0700 [SPARC64]: Fix streaming buffer flushing on PCI and SBUS. Firstly, if the direction is TODEVICE, then dirty data in the streaming cache is impossible so we can elide the flush-flag synchronization in that case. Next, the context allocator is broken. It is highly likely that contexts get used multiple times for different dma mappings, which confuses the strbuf flushing code and makes it run inefficiently. Signed-off-by: David S. Miller commit 08e9cd1fc559c00bc05df3fc551efe3b87c57ee3 Author: Thomas Graf Date: Tue May 31 15:17:28 2005 -0700 [PKT_SCHED]: Disable dsmark debugging messages by default Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 486b53e59ca8cd07d91ad88375c1c884b15cc9bd Author: Thomas Graf Date: Tue May 31 15:16:52 2005 -0700 [PKT_SCHED]: make dsmark try using pfifo instead of noop while grafting Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 0451eb074eef30240c6c06dacf2911bee26831e1 Author: Thomas Graf Date: Tue May 31 15:15:58 2005 -0700 [PKT_SCHED]: Fix dsmark to count ignored indices while walking Unused indices which are ignored while walking must still be counted to avoid dumping the same index twice. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit e74d633dc5f56bf059f870370b2f36b021298652 Author: Goffredo Baroncelli Date: Tue May 31 14:39:31 2005 -0700 [PATCH] UDF filesystem: array '__mon_yday' declared as not static in fs/udf/udftime.c the global array '__mon_yday' is not static, and it conflicts with the glibc one when the kernel is compiled as user mode. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97d3a00f77fa527886d53dd943017654ce142186 Author: Peter Chubb Date: Tue May 31 14:39:30 2005 -0700 [PATCH] pcdp.c build fix In file included from drivers/firmware/pcdp.c:18: drivers/firmware/pcdp.h:48: error: field `addr' has incomplete type drivers/firmware/pcdp.c: In function `setup_serial_console': drivers/firmware/pcdp.c:27: error: `ACPI_ADR_SPACE_SYSTEM_MEMORY' undeclared (first use in this function) Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae92ef8a442421356950a0a8dfdc35e8e783000e Author: Roman Zippel Date: Tue May 31 14:39:29 2005 -0700 [PATCH] flush icache in correct context flush_icache_range() is used in two different situation - in binfmt_elf.c & co for user space mappings and module.c for kernel modules. On m68k flush_icache_range() doesn't know which data to flush, as it has separate address spaces and the pointer argument can be valid in either address space. First I considered splitting flush_icache_range(), but this patch is simpler. Setting the correct context gives flush_icache_range() enough information to flush the correct data. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f50734569c25c4e902bd3d0fb2e5bd93a200cc75 Author: Anton Blanchard Date: Tue May 31 14:39:29 2005 -0700 [PATCH] ppc64: allow timer based profiling on iseries We used to have an iseries specific profiler that used /proc/profile. Now thats gone we can use the generic timer based stuff. Signed-off-by: Anton Blanchard Acked-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e214953295dd33fc62d43ac7ec91997afad75bb Author: Nick Piggin Date: Tue May 31 14:39:28 2005 -0700 [PATCH] h8300 sleep problem h8300 appears to sleep (halt) when need_resched IS set. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit adaa765d76f58b47e10a4760f2c0bc86de5479b9 Author: Alexander Nyberg Date: Tue May 31 14:39:27 2005 -0700 [PATCH] acpi build fix: x86 setup.c This is a neverending story linux/acpi.h contains empty declarations for acpi_boot_init() & acpi_boot_table_init() but they are nested inside #ifdef CONFIG_ACPI. So we'll have to #ifdef in arch/i386/kernel/setup.c: setup_arch() Signed-off-by: Alexander Nyberg Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c2be6a0fa186e2cb0cf14f41f20b08a5809a026 Author: Andi Kleen Date: Tue May 31 14:39:26 2005 -0700 [PATCH] x86_64 CONFIG_ACPI=n build fix Make CONFIG_X86_PM_TIMER dependent on CONFIG_ACPI Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d91640606c47551771a9b27664f249f4b176613 Author: Andi Kleen Date: Tue May 31 14:39:26 2005 -0700 [PATCH] x86_64: More fixes for compilation without CONFIG_ACPI Suggested by Alexander Nyberg Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af6f5e3247a68074e384ef93c0b4bce1b73c9d80 Author: Steve French Date: Tue May 31 14:32:44 2005 -0700 Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit bcc488ab02254a6e60d749187a632dc3d642d4f8 Author: Scott Murray Date: Fri May 27 16:48:52 2005 -0400 [PATCH] PCI Hotplug: more CPCI updates Here is my third attempt at a patch to further update the CompactPCI hotplug driver infrastructure to address the pci_enable_device issue discussed on the list as well as a few other issues I discovered during some more testing. This version addresses a few more issues pointed out by Prarit Bhargava. Changes include: - cpci_enable_device and its recursive calling of pci_enable_device on new devices removed. - Use list_rwsem to avoid slot status change races between disable_slot and check_slots. - Fixed oopsing in cpci_hp_unregister_bus caused by calling list_del on a slot after calling pci_hp_deregister. - Removed kfree calls in cleanup_slots since release_slot will have done it already. - Reworked init_slots a bit to fix latch and adapter file updating on subsequent calls to cpci_hp_start. - Improved sanity checking in cpci_hp_register_controller. - Now shut things down correctly in cpci_hotplug_exit. - Switch to pci_get_slot instead of deprecated pci_find_slot. - A bunch of CodingStyle fixes. Signed-off-by: Scott Murray Signed-off-by: Greg Kroah-Hartman commit af00f9811e0ccbd3db84ddc4cffb0da942653393 Author: Andy Currid Date: Mon May 23 08:55:45 2005 -0700 [PATCH] PCI: amd74xx patch for new NVIDIA device IDs Here's the 2.6 amd74xx patch for NVIDIA MCP51. Signed-off-by: Andy Currid Signed-off-by: Greg Kroah-Hartman commit 2ac2610b26c9da72820443328ff2c56c7b8c87b8 Author: Kenji Kaneshige Date: Fri May 27 16:08:14 2005 +0900 [PATCH] PCI Hotplug: SHPCHP driver doesn't enable PERR and SERR properly Current shpchp driver doesn't seem to program command register to enable PERR and SERR properly. The following patch fixes this issue. Signed-off-by: Kenji Kaneshige Signed-off-by: Greg Kroah-Hartman commit 7a8cb869f31de525bc34095f51f8c8a43ffcb6a9 Author: Kenji Kaneshige Date: Mon May 23 19:50:32 2005 +0900 [PATCH] PCI Hotplug: shpchp driver doesn't program _HPP values properly Current shpchp driver doesn't seem to program _HPP values properly. The following patch fixes this issue. Signed-off-by: Kenji Kaneshige Signed-off-by: Greg Kroah-Hartman commit 06299db3e7f857a4985cf70dc1a5049ec12482c1 Author: Greg Kroah-Hartman Date: Thu May 26 05:55:55 2005 -0700 [PATCH] USB: fix usb-serial generic initialization At module load time, if a generic device is found, the tty information for the device is not set up properly (as the tty structures aren't initialized yet.) This can cause big problems for things like udev. This patch fixes this. Thanks to Kay Sievers for the original patch for this problem. Signed-off-by: Greg Kroah-Hartman commit 47900743a56dc41a053107d64054aca3e1b42157 Author: Ian Abbott Date: Tue May 17 15:12:13 2005 +0100 [PATCH] USB: ftdi_sio: new PID for ELV UM100 ftdi_sio: Add PID for "ELV USB Module UM100". PID sent by Armin Laugher. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit c6de2b64eb575a3f9326969ec5fcdc6032b38e42 Author: David Brownell Date: Thu May 26 05:55:55 2005 -0700 [PATCH] USB: add sl811_cs support This adds support for a CF-card USB Host adapter, the Ratoc REX-CFU1U, by wrapping a PCMCIA driver around the existing "sl811-hcd" platform driver. This CF card is especially useful for PDAs, which currently tend to have no other solution for USB host capability. From: Botond Botyanszki Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1e9a47b62f7daf5a94fdd74a94dd4e076f44909a Author: David Brownell Date: Thu May 26 05:55:55 2005 -0700 [PATCH] USB: sl811-hcd fixes Various fixes to the sl811-hcd driver: * Fix small glitches that crept in during recent evolution of usbcore's hcd glue layer, coupling endpoint state records to usbcore and active urbs. (As noted by folk whose boards weren't stuck on 2.6.9 kernels...) * Cope with various system-specific issues: - Some configurations (e.g. a CF-card uses this chip) have iospace addresses for the two registers, rather than memory mapped ones. - Some configurations do interesting things with IRQs; maybe the line is shared, or it doesn't support level triggering. - Not all boards can drive the chip reset line in software. * Address a potential race during unlinking. * Tweak probe/remove section info to handle the case where this segment of a platform bus is hotpluggable (e.g. CF card). (The basic problem is that CONFIG_HOTPLUG is global, which is wrong since not all busses can hotplug even on hotplug-friendly systems...) Also export the driver, so that the CF driver can depend on it. Also removed some annoying end-of-line whitespace. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4a4e5787e0b721021fe0a456ddc987a04cebfc8d Author: R.Marek@sh.cvut.cz Date: Thu Apr 21 09:07:56 2005 +0000 [PATCH] I2C: ALI1563 SMBus driver fix This patch fixes "grave" bugs in i2c-ali1563 driver. It seems on recent chipset revisions the HSTS_DONE is set only for block transfers, so we must detect the end of ordinary transaction other way. Also due to missing and mask, setting other transfer modes was not possible. Moreover the continous byte mode transfer uses DAT0 for command rather than CMD command. All those changes were tested with help of Chunhao Huang from Winbond. I'm willing to maintain the driver. Second patch adds me as maintainer if this is neccessary. Signed-Off-By: Rudolf Marek Signed-off-by: Greg Kroah-Hartman commit 2e3e80c2b75e3815a0160cbd23d4fdb767d66b35 Author: Linus Torvalds Date: Tue May 31 11:07:54 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 commit fffcc150a21853651ea890a605832c5cccbb6279 Author: Tony Luck Date: Tue May 31 10:38:32 2005 -0700 [IA64] Use "PER_CPU" form of EXPORT macro I was gently reminded that there are per-cpu forms of the EXPORT_SYMBOL macros. Signed-off-by: Tony Luck commit 4e7c6816d680d1945916db047a47847afe4b9b02 Author: Jens Axboe Date: Tue May 31 17:47:36 2005 +0200 [PATCH] Relax idecd dma alignment check Only the address needs alignment of mask bits, length should work with a relaxed alignment check. Signed-off-by: Jens Axboe [ This is take 2: make the length check be for 16-byte alignment, not just word alignment. That should hopefully keep everybody happy, while still allowing CD writing with DMA ] Signed-off-by: Linus Torvalds commit 05fda3b1d88ebac1fc866fc3ed5b7ef5a4672fa6 Author: Paul Mackerras Date: Tue May 31 17:01:11 2005 +1000 [PATCH] ppc64: actually call prom_send_capabilities When I sent in the patch adding the code for the kernel to tell the firmware about its capabilities on pSeries machines, I included the function to give the capabilities to firmware but somehow forgot the hunk that adds the call to the new function. This patch adds the call. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 0cba632b737fc2de76934137b8dccf92d9fa4d19 Author: Jeff Garzik Date: Mon May 30 19:49:12 2005 -0400 libata: doc updates commit 208d89843b7b03978d8e748b8b991c1be81c4f43 Author: Herbert Xu Date: Mon May 30 15:50:15 2005 -0700 [IPV4]: Fix BUG() in 2.6.x, udp_poll(), fragments + CONFIG_HIGHMEM Steven Hand wrote: > > Reconstructed forward trace: > > net/ipv4/udp.c:1334 spin_lock_irq() > net/ipv4/udp.c:1336 udp_checksum_complete() > net/core/skbuff.c:1069 skb_shinfo(skb)->nr_frags > 1 > net/core/skbuff.c:1086 kunmap_skb_frag() > net/core/skbuff.h:1087 local_bh_enable() > kernel/softirq.c:0140 WARN_ON(irqs_disabled()); The receive queue lock is never taken in IRQs (and should never be) so we can simply substitute bh for irq. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9bb7bc942d3da606f184ac6a4dfc7e4d470c831b Author: Harald Welte Date: Mon May 30 15:35:26 2005 -0700 [NETFILTER]: Fix deadlock with ip_queue and tcp local input path. When we have ip_queue being used from LOCAL_IN, then we end up with a situation where the verdicts coming back from userspace traverse the TCP input path from syscall context. While this seems to work most of the time, there's an ugly deadlock: syscall context is interrupted by the timer interrupt. When the timer interrupt leaves, the timer softirq get's scheduled and calls tcp_delack_timer() and alike. They themselves do bh_lock_sock(sk), which is already held from somewhere else -> boom. I've now tested the suggested solution by Patrick McHardy and Herbert Xu to simply use local_bh_{en,dis}able(). Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 780a87f71841932db8dbb0f1eb9daf3a973a6bd6 Author: Jeff Garzik Date: Mon May 30 15:41:05 2005 -0400 libata: more doc updates Document recently-added ata_port_operations hooks. Fill several doc stubs in libata-core.c. commit 07dd39b9f62e0532c6922459c3a26d54a07bc231 Author: Jeff Garzik Date: Mon May 30 13:15:52 2005 -0400 libata: minor DocBook update commit 5e485b7975472ba4a408523deb6541e70c451842 Author: Linus Torvalds Date: Sun May 29 22:39:38 2005 -0700 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6 commit acf0f100e95516e2ba5a3353c3b86dbcd159e3d1 Author: David S. Miller Date: Sun May 29 21:25:01 2005 -0700 Merge of /home/davem/src/GIT/tg3-2.6/ commit d1102b59ca7b3a3c58912330a4ae38f549c8d569 Author: David S. Miller Date: Sun May 29 20:28:25 2005 -0700 [NET]: Use %lx for netdev->features sysfs formatting. Signed-off-by: David S. Miller commit 6c94d3611be61e4cff33b311f1a626d93d1d3e92 Author: David S. Miller Date: Sun May 29 20:28:01 2005 -0700 [IPV6]: Clear up user copy warning in flowlabel code. We are intentionally ignoring the copy_to_user() value, make it clear to the compiler too. Noted by Jeff Garzik. Signed-off-by: David S. Miller commit 69f6a0fafcdf0bfe85af182695d6d38f80f9d549 Author: Jon Mason Date: Sun May 29 20:27:24 2005 -0700 [NET]: Add ethtool support for NETIF_F_HW_CSUM. Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit 37e20a66db02eff9adbeee043af990cca85d0034 Author: Pravin B. Shelar Date: Sun May 29 20:26:44 2005 -0700 [IPV4]: Kill MULTIPATHHOLDROUTE flag. It cannot work properly, so just ignore it in drr and rr multipath algorithms just like the random multipath algorithm does. Suggested by Herbert Xu. Signed-off by: Pravin B. Shelar Signed-off-by: David S. Miller commit 79165121bc09c209451487d977df910c4ff6fc94 Author: Michael Ellerman Date: Sun May 29 20:24:30 2005 -0700 [NET]: Add is_multicast_ether_addr() in include/linux/etherdevice.h This patch adds is_multicast_ether_addr() to go along with is_valid_ether_addr() and friends. It then changes is_valid_ether_addr() to use the new macro, and fixes up the comment on that function to move implementation details out of the API doco. Signed-off-by: Michael Ellerman Signed-off-by: David S. Miller commit 8f937c6099858eee15fae14009dcbd05177fa91d Author: Harald Welte Date: Sun May 29 20:23:46 2005 -0700 [IPV4]: Primary and secondary addresses Add an option to make secondary IP addresses get promoted when primary IP addresses are removed from the device. It defaults to off to preserve existing behavior. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 79158229b09873ca296ac53de5c952488f944646 Author: Linus Torvalds Date: Sun May 29 19:30:03 2005 -0700 Automatic merge of 'misc-fixes' branch from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 1b62815193f6c20c60958e5347751155833e3d35 Author: Michael Chan Date: Sun May 29 14:59:49 2005 -0700 [TG3]: Fix bug in tg3_load_firmware_cpu Add tg3_nvram_lock() and tg3_nvram_unlock() calls around tg3_halt_cpu(). It is possible that the bootcode may be loading code from nvram during this call and stopping the cpu without getting the lock may cause uncompleted nvram data to be left in the nvram data register. Subsequent calls to read/write nvram data will fail. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit d4bc3927d284784b3f0bff05b4eed2242cc3e226 Author: Michael Chan Date: Sun May 29 14:59:20 2005 -0700 [TG3]: Add interrupt test This test uses the previously added tg3_test_interrupt() to perform the test. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c76949a6826fc11efcd6bb1abdca1ae02761071d Author: Michael Chan Date: Sun May 29 14:58:59 2005 -0700 [TG3]: Add loopback test The test will loopback one packet in MAC loopback mode and verify the packet data. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 7942e1dbd7252b480ed238096dca617189d293df Author: Michael Chan Date: Sun May 29 14:58:36 2005 -0700 [TG3]: Add memory test Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a71116d1f3b85a69fe3a3acec9223fefb4b1fc66 Author: Michael Chan Date: Sun May 29 14:58:11 2005 -0700 [TG3]: Add register test Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 944d980ecaabe44616a9e2d50101ce774f517bb6 Author: Michael Chan Date: Sun May 29 14:57:48 2005 -0700 [TG3]: Add parameter to tg3_halt Add a reset kind parameter to tg3_halt() so that the RESET_KIND_SUSPEND parameter can be passed to tg3_halt() before doing offline tests. All other calls to tg3_halt() will use the RESET_KIND_SHUTDOWN parameter. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit ca43007a92662621e5819912fc31c346e3a2eed8 Author: Michael Chan Date: Sun May 29 14:57:23 2005 -0700 [TG3]: Add link test Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 566f86adb336637d03900f53b886d879aa5f5d56 Author: Michael Chan Date: Sun May 29 14:56:58 2005 -0700 [TG3]: Add nvram test Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 4cafd3f533475c976879d85773735c004f09f576 Author: Michael Chan Date: Sun May 29 14:56:34 2005 -0700 [TG3]: Add basic selftest infrastructure Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 7ce54e3f428b33af714271140601c87b8bf2c544 Author: Stephen Hemminger Date: Sun May 29 14:16:48 2005 -0700 [BRIDGE]: receive path optimization This improves the bridge local receive path by avoiding going through another softirq. The bridge receive path is already being called from a netif_receive_skb() there is no point in going through another receiveq round trip. Recursion is limited because bridge can never be a port of a bridge so handle_bridge() always returns. Signed-off-by: David S. Miller commit 85967bb46dd1f8f2c49b85a313866c00ac0c9b59 Author: Stephen Hemminger Date: Sun May 29 14:15:55 2005 -0700 [BRIDGE]: prevent bad forwarding table updates Avoid poisoning of the bridge forwarding table by frames that have been dropped by filtering. This prevents spoofed source addresses on hostile side of bridge from causing packet leakage, a small but possible security risk. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 81d35307dd468b92fe8c58797abb13c62e3e64dd Author: Stephen Hemminger Date: Sun May 29 14:15:17 2005 -0700 [BRIDGE]: set features based on enslaved devices Make features of the bridge pseudo-device be a subset of the underlying devices. Motivated by Xen and others who use bridging to do failover. Signed-off-by: Catalin BOIE Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 81e8157583c559c27aac75c708d40a35f563d734 Author: Stephen Hemminger Date: Sun May 29 14:14:35 2005 -0700 [BRIDGE]: make dev->features unsigned The features field in netdevice is really a bitmask, and bitmask's should be unsigned. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d8a33ac435c43a1a404b2ec560ef1d1536710c36 Author: Stephen Hemminger Date: Sun May 29 14:13:47 2005 -0700 [BRIDGE]: features change notification Resend of earlier patch (no changes) from Catalin used to provide device feature change notification. Signed-off-by: Catalin BOIE Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7238cfb3342078ad6d1dd06c7b567da428672476 Author: Jeff Garzik Date: Sun May 29 14:48:20 2005 -0400 libata: bump version commit d582c4ea307873503a68d6d7ab72ee8599e032a9 Author: Date: Sun May 29 14:24:57 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch use-after-unmap commit 45b30105e7231b70bb855923dbca443ee3ba44c3 Author: Linus Torvalds Date: Sun May 29 10:40:13 2005 -0700 Automatic merge of 'for-linus' branch from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input commit 7d6064d44bc79e328f2794ee7322ba2676511e2b Author: Vojtech Pavlik Date: Sun May 29 01:27:44 2005 -0500 Input: Fix fast scrolling scancodes in atkbd.c Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 6cf2b3fc9934a56ceeb393ea5d0149e0bebc80fa Author: Kumar Gala Date: Sat May 28 15:52:15 2005 -0700 [PATCH] ppc32: i8259 PIC should not be initialized if PCI is not configured Trying to initialize the i8259 PIC will not work if CONFIG_PCI is not enabled. The kernel hangs if the initialization is tried. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9e4a005827ec0b33f0c61fec1634a5a3421decd Author: Kumar Gala Date: Sat May 28 15:52:15 2005 -0700 [PATCH] ppc32: Add soft reset to MPC834x This change allows mpc83xx_restart to issue a software reset. Signed-off-by: Randy Vinson Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff945023c6a455679165b14d298316e262ceeb1f Author: Kumar Gala Date: Sat May 28 15:52:14 2005 -0700 [PATCH] ppc32: MPC834x BCSR_SIZE too small for use in a BAT. The call to io_block_mapping was creating an invalid BAT entry because the value of BCSR_SIZE (32K) is too small to be used in a BAT (128K min). This change removes the io_block_mapping call since these registers can easily be mapped using ioremap at the point of use. Signed-off-by: Randy Vinson Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92b4dc16257fef814ddf1c8d1d2a20f67f67ee4b Author: Kumar Gala Date: Sat May 28 15:52:13 2005 -0700 [PATCH] ppc32: Simplified load string emulation error checking The error checking for emulation of load string instructions was overly generous and would cause certain valid forms of the instructions to be treated as illegal. We drop the range checking since the architecture allows this to be boundedly undefined. Tests on CPUs that support these instructions appear not do cause illegal instruction traps on range errors and just allow the execution to occur. Thanks to Kim Phillips for debugging this and figuring out what real HW was doing. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91f9855a7afbb160ba1709bf342858732138abad Author: Kumar Gala Date: Sat May 28 15:52:12 2005 -0700 [PATCH] ppc32: Fix building MPC8555 CDS when CONFIG_PCI is disabled The patch that introduced support for the VIA chipset broke building if CONFIG_PCI is disabled. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6dbba77a9d4b47c60d60c4f07fa79b3ca93a1d5 Author: Vitaly Bordug Date: Sat May 28 15:52:09 2005 -0700 [PATCH] ppc32: Support for 82xx PQII on-chip PCI bridge This patch adds on-chip PCI bridge support for the PQ2 family. The incomplete existent code is updated with interrupt handling stuff and board-specific bits for 8272ADS and PQ2FADS; the related files were renamed (from m8260_pci to m82xx_pci) to be of more generic fashion. This is tested with 8266ADS and 8272ADS, should work on PQ2FADS as well. Signed-off-by: Vitaly Bordug Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed36959621451da7195be83b87878b060ce64724 Author: Kumar Gala Date: Sat May 28 15:52:07 2005 -0700 [PATCH] ppc32: Add VIA IDE support to MPC8555 CDS platform Add support for the VIA IDE controller that exists on the MPC8555 CDS system. Updated the config for the system to enable support by default. Signed-off-by: Scott Hall Signed-off-by: Kumar Gala Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 252fcaed48fc5473b3fc3cafbf977244b0cbf670 Author: Kumar Gala Date: Sat May 28 15:52:06 2005 -0700 [PATCH] ppc32: Fix some minor issues related to FSL Book-E KGDB support Some debug registers needed to be initialized early on to allow proper support for KGDB. Additionally, we need to setup the ppc.md_early_serial_map function pointer on boards that have serial support for KGDB. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94b9f46d61904422c498bf4cf9a90cc14398d311 Author: Kumar Gala Date: Sat May 28 15:52:05 2005 -0700 [PATCH] ppc32: Fix uImage make target to report success correctly The existing make rule when building a uImage would check to see if the image file existed to report 'is ready' or 'not made'. However make appeared to compute the file list before the rule was executed. Signed-off-by: Chris Clark Signed-off-by: Kumar Gala Signed-off-by: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e21683bb458c73c6fe87844202a64eac730995e Author: Paolo 'Blaisorblade' Giarrusso Date: Sat May 28 15:52:04 2005 -0700 [PATCH] uml: remove jail mode + other leftovers This var is currently useless, as it's apparent from reading the code. Until 2.6.11 it was used in some code related to jail mode, in the same proc.: if(jail){ while(!reading) sched_yield(); } jail mode has been dropped, together with that use, so let's finish dropping this. Also, remove some other useless definitions I met. Acked-by: Jeff Dike Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f767b02f35a3db5c1b1c6454992c070510cef07f Author: Paolo 'Blaisorblade' Giarrusso Date: Sat May 28 15:52:03 2005 -0700 [PATCH] uml: fixlet for arch_prctl_skas Fix it a bit (after some cross checking with "man arch_prctl"). There were: *) typos FS/GS and back *) FS in place of FS_BASE (and the same for GS) *) the procedure used put_user on &addr, where addr was the parameter (i.e. changed its param with put_user, completely useless) rather than interpreting addr as a pointer, as requested in this case (see the man page). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f28e8fa46625310102aea06fac61ba04c8b5b88 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat May 28 15:52:02 2005 -0700 [PATCH] irq code: Add coherence test for PREEMPT_ACTIVE After porting this fixlet to UML: http://linux.bkbits.net:8080/linux-2.5/cset@41791ab52lfMuF2i3V-eTIGRBbDYKQ , I've also added a warning which should refuse compilation with insane values for PREEMPT_ACTIVE... maybe we should simply move PREEMPT_ACTIVE out of architectures using GENERIC_IRQS. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37053cc84d51a790a6e5c3987665902cdab122a5 Author: Paul Mundt Date: Sat May 28 15:52:01 2005 -0700 [PATCH] sh: PREEMPT_ACTIVE fix Port Paulus's ppc64 fix to sh: When the generic IRQ stuff went in, it seems that HARDIRQ_BITS got bumped from 9 (for ppc64) up to 12. Consequently, the PREEMPT_ACTIVE bit is now within HARDIRQ_MASK, and I get in_interrupt() falsely returning true when PREEMPT_ACTIVE is set, and thus a BUG_ON tripping in arch/ppc64/mm/tlb.c. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit affac4bcbba617d7329b04c7882bc49a9826e12f Author: Paolo 'Blaisorblade' Giarrusso Date: Sat May 28 15:52:00 2005 -0700 [PATCH] uml: fix PREEMPT_ACTIVE This is a continuation for UML of: http://linux.bkbits.net:8080/linux-2.5/cset@41791ab52lfMuF2i3V-eTIGRBbDYKQ Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Paul Mackerras Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3461034d7d46455060c8476910be22b6b0fc313 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat May 28 15:52:00 2005 -0700 [PATCH] uml: stack dump fix Copy (and adapt) to UML the stack code dumper used in i386 when CONFIG_FRAME_POINTER is enabled. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37fce857bec00d26d0e8251c909da2bd8736c949 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat May 28 15:51:59 2005 -0700 [PATCH] uml: split CONFIG_FRAME_POINTER from DEBUG_INFO Until now, FRAME_POINTER was set = DEBUG_INFO for UML. Change it to be the default way, so that it can be enabled alone (for instance to get better backtraces on crashes). The call-trace dumper which uses the frame pointer is not yet in, I'm going to introduce it in a separate patch. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 567b56508f7367e161d6d861ef214a900ab45ce9 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat May 28 15:51:58 2005 -0700 [PATCH] uml: add MOD_LICENSE to random driver Add a MODULE_LICENSE("GPL") to the driver, remove some unused macros and add the GPL license (it's GPL-licensed anyway since it's a GPL-derivative, apart that Jeff Dike releases GPL software, in case anybody is wondering). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34a1a63e37ee8d60bdb842476d9337cdff5413d9 Author: Paolo 'Blaisorblade' Giarrusso Date: Sat May 28 15:51:57 2005 -0700 [PATCH] uml: add modversions support Actually, the real support was added by some earlier patches. Now we simply re-enable the config. option. I've actually tested it and it works well. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7590d3ec1cda7d504c25103bde0c9911f93810e9 Author: Jeff Dike Date: Sat May 28 15:51:57 2005 -0700 [PATCH] uml: remove unused code This removes two now unused files and a couple of unused functions. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92515da73a5df50db45111b8659ac463b4800236 Author: Jeff Dike Date: Sat May 28 15:51:56 2005 -0700 [PATCH] uml: fix segfault on exit with CONFIG_GCOV We need to disable signals on exit in all cases, not just when rebooting. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0894e27e7999bdbad2e65734caa1d5de65e7d890 Author: Jeff Dike Date: Sat May 28 15:51:55 2005 -0700 [PATCH] uml: single-space a help message One of the ubd driver help strings was bust. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2e4b972c99685d9d7b869c4bf8d8b258ff5b60c Author: Jeff Dike Date: Sat May 28 15:51:54 2005 -0700 [PATCH] uml: remove 2_5compat.h Remove old useless header that was used in Ye Olde Times during 2.4->2.5 porting to abstract differences. It's definitions are no more used anyway, so let's finally kill it. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6770cb61ff6d557613a8382b28f9b0a919fb112f Author: Jeff Dike Date: Sat May 28 15:51:54 2005 -0700 [PATCH] uml: turn off kmalloc always on a fatal signal We should turn off kmalloc when getting a fatal signal regardless of the mode we're in. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9e0d0696c9e86d4e40b23039feefb8c377cb524 Author: Jeff Dike Date: Sat May 28 15:51:53 2005 -0700 [PATCH] uml: fix a couple of warnings Eliminate an unused variable warning in ptrace.c and a size mismatch warning by adding a cast to __pa. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 226d97ec3e47b54ecc13f6ea3c300dc6a1b290c3 Author: Manu Abraham Date: Sat May 28 15:51:52 2005 -0700 [PATCH] dvb: Small cleanup Miscellaneous cleanup Signed-off-by: Manu Abraham Cc: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86360a3edeb6b7b6230dc13ef6835d2851409502 Author: Manu Abraham Date: Sat May 28 15:51:51 2005 -0700 [PATCH] dvb: Fix 22k tone control Signed-off-by: Manu Abraham Cc: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f6da8f166228c1720d16216a9d82d630c58de57 Author: Manu Abraham Date: Sat May 28 15:51:51 2005 -0700 [PATCH] dvb: Fix LNB power switching Signed-off-by: Manu Abraham Cc: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0eac3e486e1f246a9d59fee9251cc69e409cb58e Author: Manu Abraham Date: Sat May 28 15:51:50 2005 -0700 [PATCH] dvb: Remove unnecessary casts Cleanup unnecessary (and undesirable) casts, demodulator_priv is already a void*. Suggestion from Andrew Morton Signed-off-by: Manu Abraham Cc: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 203fe8b3d1f5b1b527e86f6dbe5b75960acb7f4f Author: Manu Abraham Date: Sat May 28 15:51:48 2005 -0700 [PATCH] dvb: Fix Mini DiSEqC bug The bug was visible as a warning with gcc-3.4.4 (prerelease) Message: drivers/media/dvb/bt8xx/dst.c:1349: warning: initialization from incompatible pointer type. Signed-off-by: Manu Abraham Cc: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5212dd58e67e4b8009107d69a9de45dd2e687496 Author: Vojtech Pavlik Date: Sat May 28 15:51:47 2005 -0700 [PATCH] input: Fix fast scrolling scancodes in atkbd.c Signed-off-by: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 346e399b2a3a01b323fa74a0937e2d855479833b Author: Patrick McManus Date: Sat May 28 15:51:46 2005 -0700 [PATCH] intelfb section fix On Nov 16 2004 a change to intelfbdrv.c was commited (as part of 0.9.2 it looks like) that added __initdata to all of the module param variables that seems to create the opportunity for an oops. I've recently been chasing an OOPS (http://marc.theaimsgroup.com/?l=linux-kernel&m=111552250920370&w=2) I created by reading every file on the /sys file system and I've traced it back to this code in the intelfbdrv. Though I had root privs in my initial problem report, it turns out they are un-necessary to generate the oops - all you've got to do is "cat /sys/module/intelfb/parameters/mode" enough times and eventually it will oops. This is because sysfs automatically exports all module_param declarations to the sysfs file system.. which means those variables can be dynamically evaluated at any later time, which of course means marking them __initdata is a bad idea ;).. when they happen to be char *'s it is an especially bad idea ;). Applying the patch below clears up the OOPS for me. Signed-off-by: Patrick McManus Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1e4c8d3ee3300f363a52fd4cf3d90fdf5098f5a Author: Pavel Machek Date: Fri May 27 12:53:03 2005 -0700 [PATCH] fix jumpy mouse cursor on console Do not send empty events to gpm. (Keyboards are assumed to have scroll wheel these days, that makes them part-mouse. That means typing on keyboard generates empty mouse events). From: Dmitry Torokhov Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bd7f125e2f217c8aa3dff005ae291c81246c340 Author: Shaohua Li Date: Fri May 27 12:53:03 2005 -0700 [PATCH] swsusp: ahd_dv_0 can't be stopped This driver wants to set PF_NOFREEZE. Cc: James Bottomley Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b16eeb47292597a8bf3ad53fdaf1f727f57bd8e4 Author: Benjamin Herrenschmidt Date: Fri May 27 12:53:02 2005 -0700 [PATCH] ppc32: Fix cpufreq vs. sleep issue Recent kernels occasionally trigger a PMU timeout on some mac laptops, typically on wakeup from sleep. This seem to be caused by either a too big latency caused by the cpufreq switch on wakeup from sleep or by an interrupt beeing lost due to the reset of the interrupt controller done during wakeup. This patch makes that code more robust by stopping PMU auto poll activity around cpufreq changes on machines that use the PMU for such changes (long latency switching involving a CPU hard reset and flush of all caches) and by removing the reset of the open pic interrupt controller on wakeup (that can cause the loss of an interrupt and Darwin doesn't do it, so it must not be necessary). Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49f384b82b03416dd7e4fc77847a959fe3247362 Author: Siddha, Suresh B Date: Fri May 27 12:53:01 2005 -0700 [PATCH] x86: fix smp_num_siblings on buggy BIOSes This fixes 'smp_num_siblings' value on the systems with a buggy bios, which sets number of siblings to '2' even when HT is disabled. (more details are at http://bugzilla.kernel.org/show_bug.cgi?id=4359) I am planning to do more cleanup in this area (like moving smp_num_siblings to per cpuinfo) shortly. Signed-off-by: Suresh Siddha Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b60c1f6ffd88850079ae419aa933ab0eddbd5535 Author: John Hawkes Date: Fri May 27 12:53:00 2005 -0700 [PATCH] drop note_interrupt() for per-CPU for proper scaling The "unhandled interrupts" catcher, note_interrupt(), increments a global desc->irq_count and grossly damages scaling of very large systems, e.g., >192p ia64 Altix, because of this highly contented cacheline, especially for timer interrupts. 384p is severely crippled, and 512p is unuseable. All calls to note_interrupt() can be disabled by booting with "noirqdebug", but this disables the useful interrupt checking for all interrupts. I propose eliminating note_interrupt() for all per-CPU interrupts. This was the behavior of linux-2.6.10 and earlier, but in 2.6.11 a code restructuring added a call to note_interrupt() for per-CPU interrupts. Besides, note_interrupt() is a bit racy for concurrent CPU calls anyway, as the desc->irq_count++ increment isn't atomic (which, if done, would make scaling even worse). Signed-off-by: John Hawkes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70ffc71c5c42c8ac62d951e80d9799bd5764f2f5 Author: Adrian Bunk Date: Fri May 27 12:52:59 2005 -0700 [PATCH] arch/i386/kernel/cpu/intel_cacheinfo.c: section fix num_cache_leaves is used in __devexit cache_remove_dev() and can therefore not be __devinit. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9db29258893b08a838e5ecfa4a0933c9c1f2e305 Author: Stephen Rothwell Date: Fri May 27 12:52:58 2005 -0700 [PATCH] ppc64 iSeries: make virtual DVD-RAMs writable again It appears that another test has been added in the Uniform CDROM layer that must be passed before a DVD-RAM is considered writeable. This patch implements an emulation of the needed packet command for the viocd driver. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ae250d175e1cbff82223ce2c07897c790c5b948 Author: Benjamin Herrenschmidt Date: Fri May 27 12:52:57 2005 -0700 [PATCH] ppc32: Fix Alsa PowerMac driver on old machines The g5 support code broke some earlier models unfortunately as those bail out early from the detect function, before the point where I added the code to locate the PCI device for use with DMA allocations. This patch fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6649bc76a57523209a6b2ee4844c9078a4dd8bb Author: Benjamin Herrenschmidt Date: Fri May 27 12:52:56 2005 -0700 [PATCH] ppc32: small cpufreq update This patch adds a missing attribute to pmac cpufreq so that "scaling_available_frequencies" works. It also cleans up the duplicate definitions for low and high speed constants. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: John Clemens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5924b7d97430657fa07ebf1a208c7e8cf135ef3 Author: Oliver Korpilla Date: Fri May 27 12:52:55 2005 -0700 [PATCH] x86_64: signal.c build fix For unspecified reasons, arch/x86_64/kernel/signal.c apparently needs ia32_unistd.h. Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcefb396c2af4d52fba48dc58b4021794b042046 Author: Dave Jones Date: Sat May 28 00:51:24 2005 -0400 [PATCH] Fix up pwc driver compilation. The neutering of the pwc driver was incomplete. It still references some now-dead files.. Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 409b7506759430f7c3841d425ca1f8a31eeadece Author: Dmitry Torokhov Date: Sat May 28 02:12:18 2005 -0500 Input: synaptics - reduce verboseness of synaptics driver - there is no reason one driver should take 10 lines in dmesg. Signed-off-by: Dmitry Torokhov commit b4ff99b60c5e17b1031deb20c9d7688ebe6c9659 Author: Dmitry Torokhov Date: Sat May 28 02:12:10 2005 -0500 Input: yet another model that does not play nicely when i8042 is put in MUX mode - Fujitsu Lifebook S6230 Signed-off-by: Dmitry Torokhov commit 59311de3fb5f293b2e99d7f52e0ab5572759951d Author: Dmitry Torokhov Date: Sat May 28 02:12:05 2005 -0500 Input: automatically disable MUX mode on Toshiba Satellite P10 because it interferes with ALPS touchpad detection and causes horrible death on reboot. Since P10 does not have external PS/2 ports MUX mode does not have any advantages over legacy mode anyway. Signed-off-by: Dmitry Torokhov commit a07461ec0cffb105c7e7b7404520ea2c74129db0 Author: Dmitry Torokhov Date: Sat May 28 02:12:00 2005 -0500 Input: gunze - fix out-of-bound array access reported by Adrian Bunk. Signed-off-by: Dmitry Torokhov commit f24949e8e0b9bed223ad9a435bf37e91ee8d0db7 Author: Vojtech Pavlik Date: Sat May 28 02:11:49 2005 -0500 Input: Fix button mapping in joydev - BTN_TRIGGER was being mapped twice, resulting in it being the last (instead of first) button on a joystick. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 7741e9317137a7456baa9c09ad8308c80c23b8db Author: Vojtech Pavlik Date: Sat May 28 02:11:42 2005 -0500 Input: Workaround for Sunrex K8561 IR Keyboard/Mouse. The mouse sends an incorrect ID and wasn't recognized. Reported-by: Stefan Seyfried Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 74af42bb729651855f78ea27498250724689130e Author: Kurt Garloff Date: Sat May 28 02:11:38 2005 -0500 Input: Avoid double unregistering of i8042 PnP driver. This can happen when no i8042 controller (not PnP, not legacy) is present. From: Kurt Garloff Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 5a72afc03ccc29458502cf032f5c34e5ee004ae7 Author: Dmitry Torokhov Date: Sat May 28 02:11:32 2005 -0500 Input: Tone down the severity of a printk() in i386/ia64 arch code for i386, it's printed on many machines and usually is not a cause for worry. Signed-off-by: Dmitry Torokhov Signed-off-by: Vojtech Pavlik commit 2673c836ab9a44b02d45ae5c1c44c03df138dba4 Author: Vojtech Pavlik Date: Sat May 28 02:11:27 2005 -0500 Input: Only write the CTR in i8042 resume function. Reading it is wrong, since it may (will) contain nonsensical data. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit be15692310ec0e93998d763931089cb21386a058 Author: Vojtech Pavlik Date: Sat May 28 02:11:19 2005 -0500 Input: Remove (now) unused variable in i8042.c Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 39fa58007a54b09c91cb7bf3ce3cfcc4957f92ff Author: Vojtech Pavlik Date: Sat May 28 02:11:16 2005 -0500 Input: Add a missing KERN_INFO message designation, fix behavior when only a keyboard part of the controller is detected. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 668d1e6093110f7534e661e2ff43d54c74659b6d Author: Adrian Bunk Date: Sat May 28 02:11:12 2005 -0500 Input: This patch adds dummy gameport_register_port, gameport_unregister_port and gameport_set_phys functions to gameport.h for the case when a driver can't use gameport. This fixes the compilation of some OSS drivers with GAMEPORT=n without the need to #if inside every single driver. This patch also removes the non-working and now obsolete SOUND_GAMEPORT. This patch is also an alternative solution for ALSA drivers with similar problems (but #if's inside the drivers might have the advantage of saving some more bytes of gameport is not available). The only user-visible change is that for GAMEPORT=m the affected OSS drivers are now allowed to be built statically (but they won't have gameport support). Signed-off-by: Adrian Bunk Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 271b74d0b886301f297407dd7ae11b99607f8089 Author: Andrew Morton Date: Sat May 28 02:11:06 2005 -0500 Input: Fix a warning in psmouse-base.c Signed-off-by: Andrew Morton Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 87507cfdd2cde397c9da8f6e7ec23b2b47ec53d6 Author: domen@coderock.org Date: Fri Apr 8 09:53:06 2005 +0200 [PATCH] drivers/scsi/ahci: add #include req'd for the DMA_{64,32}BIT_MASK constants The previous patch did not compile cleanly on all architectures so here's a fixed one which #includes . Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer diff -puN drivers/scsi/ahci.c~dma_mask-drivers_scsi_ahci drivers/scsi/ahci.c commit 7003c05d77593f567e9940e68a944d846228fd7a Author: domen@coderock.org Date: Fri Apr 8 09:53:09 2005 +0200 [PATCH] drivers/scsi/sata_vsc: add #include req'd for DMA_32BIT_MASK constant The previous patch did not compile cleanly on all architectures so here's a fixed one which #includes . Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer diff -puN drivers/scsi/sata_vsc.c~dma_mask-drivers_scsi_sata_vsc drivers/scsi/sata_vsc.c commit b9a6eaffe7ff3d3481efa9fa353b2c6a02eda756 Author: Daniel Ritz Date: Sun Apr 10 20:27:45 2005 +0200 [PATCH] 3c574_cs: disable interrupts in el3_close 3c574_cs forgets to disable interrupts during el3_close(). fix it by doing what 3c59x does. Signed-off-by: Daniel Ritz commit 254feb882a7c6e4e51416dff6a97d847fbbba551 Author: Linus Torvalds Date: Fri May 27 09:26:10 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/hch/xfs-2.6 commit 8aadff7dd519800ce7c0e7fb75dcd4438b373134 Author: Alexander Nyberg Date: Fri May 27 12:48:50 2005 +0200 [PATCH] Note on ACPI build fix Even after the previous fix you can still set CONFIG_ACPI_BOOT indirectly even without CONFIG_ACPI by choosing CONFIG_PCI and CONFIG_PCI_MMCONFIG. That doesn't build very well either. This makes PCI_MMCONFIG depend on ACPI, fixing that hole. [ I guess in theory Kconfig could follow the whole chain of dependencies for things that get selected, but that sounds insanely complicated, so we'll just fix up these things by hand. --Linus ] Signed-off-by: Alexander Nyberg Signed-off-by: Linus Torvalds commit 3e11c3ce0a4ce3d30802babccb0e5f881778ccf1 Author: Len Brown Date: Fri May 27 04:53:27 2005 -0400 [PATCH] ACPI build fix Fix 2.6.12 CONFIG_ACPI=n build regression. CONFIG_ACPI_BOOT shall be set only if CONFIG_ACPI. Signed-off-by: Len Brown Signed-off-by: Linus Torvalds commit 9920e91450ee9b373dd4924f79d287a267b8f6a3 Author: Alexander Nyberg Date: Fri May 27 12:27:05 2005 +0200 [PATCH] Fixup VIA IRQ quirk quirk_via_irqpic can't be __devinit for swsuspend Signed-off-by: Alexander Nyberg Signed-off-by: Linus Torvalds commit 25be5e6ccc5c9cab77012fabbb72520f9b6e4618 Author: Len Brown Date: Fri May 27 04:21:50 2005 -0400 [PATCH] VIA IRQ quirk Delete quirk_via_bridge(), restore quirk_via_irqpic() -- but now improved to be invoked upon device ENABLE, and now only for VIA devices -- not all devices behind VIA bridges. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2efe86b809d97debaaf9fcc13b041aedf15bd3d2 Author: Paul Jackson Date: Fri May 27 02:02:43 2005 -0700 [PATCH] cpuset exit NULL dereference fix There is a race in the kernel cpuset code, between the code to handle notify_on_release, and the code to remove a cpuset. The notify_on_release code can end up trying to access a cpuset that has been removed. In the most common case, this causes a NULL pointer dereference from the routine cpuset_path. However all manner of bad things are possible, in theory at least. The existing code decrements the cpuset use count, and if the count goes to zero, processes the notify_on_release request, if appropriate. However, once the count goes to zero, unless we are holding the global cpuset_sem semaphore, there is nothing to stop another task from immediately removing the cpuset entirely, and recycling its memory. The obvious fix would be to always hold the cpuset_sem semaphore while decrementing the use count and dealing with notify_on_release. However we don't want to force a global semaphore into the mainline task exit path, as that might create a scaling problem. The actual fix is almost as easy - since this is only an issue for cpusets using notify_on_release, which the top level big cpusets don't normally need to use, only take the cpuset_sem for cpusets using notify_on_release. This code has been run for hours without a hiccup, while running a cpuset create/destroy stress test that could crash the existing kernel in seconds. This patch applies to the current -linus git kernel. Signed-off-by: Paul Jackson Acked-by: Simon Derr Acked-by: Dinakar Guniguntala Signed-off-by: Linus Torvalds commit 88c1834633341bbb94e315433067496338bff4ad Author: Alan Cox Date: Fri May 27 13:40:53 2005 +0100 [PATCH] remove non-cleanroom pwc driver compression The original pwc author raised some questions about the reverse engineering of the decompressor algorithms used in the pwc driver. Having done some detailed investigation it appears those concerns that clean room policy was not followed are reasonable. I've also had a friendly discussion with Philips to ask their view on this. This removes the problem items of code which reduces the pwc functionality in the kernel a little but leaves all the framework for setup that will be needed for decompressors in user space (where they eventually belong). This change set is designed to be the minimal risk change set given that 2.6.12 is hopefully close to hand, with a view to merging the much updated pwc code in 2.6.13 series kernels. Someone else can then redo the decompressors properly (clean room) in user space. Note that while its easy to say that it should have been caught earlier, but the violation was really only obvious to someone who had access to both the proprietary source and the 'GPL' source. commit 5d9e4ea55ae19f9083b9c2c97cc912b823ee7ab4 Author: Linus Torvalds Date: Fri May 27 07:36:17 2005 -0700 ide-cd: revert DMA mask test change The change to require the DMA length to be only word-aligned was not safe. commit 66f5507133f97088e553b1c8f8d341a0efd438f9 Author: Christoph Hellwig Date: Fri May 27 01:17:08 2005 -0700 [XFS] remove an over-zealous WARN_ON commit b19312c4c8f3f84da57bba01d45549df1cf10dcd Author: Christoph Hellwig Date: Fri May 27 01:16:24 2005 -0700 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit aa8f0dc6c3dbf1cf3ff58f3e945c981be134814d Author: Jeff Garzik Date: Thu May 26 21:54:27 2005 -0400 libata: Fix use-after-iounmap Jens Axboe pointed out that the iounmap() call in libata was occurring too early, and some drivers (ahci, probably others) were using ioremap'd memory after it had been unmapped. The patch should address that problem by way of improving the libata driver API: * move ->host_stop() call after all ->port_stop() calls have occurred. * create default helper function ata_host_stop(), and move iounmap() call there. * add ->host_stop_prewalk() hook, use it in sata_qstor.c (hi Mark). sata_qstor appears to require the host-stop-before-port-stop ordering that existed prior to applying the attached patch. commit 462cee296476278acaa54c41925b3273e0e4dd40 Author: Date: Thu May 26 21:40:25 2005 -0400 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD commit d68b8622ccbee8a18e495ad1650c3306f2eeb0d6 Author: Roland McGrath Date: Thu May 26 15:21:13 2005 -0700 [PATCH] i386: fix prevent_tail_call We fixed this bug before, but it didn't take. It may have been the case that the problem was first noticed to occur in a CONFIG_REGPARM compile. But it's not regparm functions that need not to make tail calls, it's asmlinkage functions called with a user pt_regs frame on the stack supplying their arguments. prevent_tail_call probably doesn't do anything at all in regparm functions (your argument registers are going to be clobbered, period). It was a braino to conditionalize that definition in the first place. Signed-off-by: Roland McGrath Signed-off-by: Linus Torvalds commit 4ec5240ec367a592834385893200dd4fb369354c Author: Linus Torvalds Date: Thu May 26 13:54:33 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 commit b6016b767397258b58163494a869f8f1199e6897 Author: Michael Chan Date: Thu May 26 13:03:09 2005 -0700 [BNX2]: New Broadcom gigabit network driver. A new driver bnx2 for Broadcom bcm5706 is available. The patch also includes new 1000BASE-X advertisement bit definitions in mii.h Thanks to David Miller and Jeff Garzik for reviewing and their valuable feedback. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c8b35d2a29ec3c93e3b9c1e70d649a77a214b1c1 Author: Alexey Dobriyan Date: Thu May 26 12:59:42 2005 -0700 [TOKENRING]: net/802/tr.c: s/struct rif_cache_s/struct rif_cache/ "_s" suffix is certainly of hungarian origin. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit c6b3365391c626206f6789354794a81a010cb7a1 Author: Alexey Dobriyan Date: Thu May 26 12:59:05 2005 -0700 [TOKENRING]: be'ify trh_hdr, trllc, rif_cache_s Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 92d63decc0b6a5d600f792fcf5f3ff9718c09a3d Author: Hideaki YOSHIFUJI Date: Thu May 26 12:58:04 2005 -0700 From: Kazunori Miyazawa [XFRM] Call dst_check() with appropriate cookie This fixes infinite loop issue with IPv6 tunnel mode. Signed-off-by: Kazunori Miyazawa Signed-off-by: Hideaki YOSHIFUJI Signed-off-by: David S. Miller commit 2f872f0401d4b470990864fbf99c19130f25ad4d Author: Jay Vosburgh Date: Thu May 26 12:56:59 2005 -0700 [BONDING]: bonding using arp_ip_target may stay down with active path Correcting the list traversal makes the problem go away. Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit 0dca51d362b8e4af6b0dbc9e54d1e5165341918a Author: Stephen Hemminger Date: Thu May 26 12:55:48 2005 -0700 [PKT_SCHED] netem: allow random reordering (with fix) Here is a fixed up version of the reorder feature of netem. It is the same as the earlier patch plus with the bugfix from Julio merged in. Has expected backwards compatibility behaviour. Go ahead and merge this one, the TCP strangeness I was seeing was due to the reordering bug, and previous version of TSO patch. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 0f9f32ac65ee4a452a912a8440cebbc4dff73852 Author: Stephen Hemminger Date: Thu May 26 12:55:01 2005 -0700 [PKT_SCHED] netem: use only inner qdisc -- no private skbuff queue Netem works better if there if packets are just queued in the inner discipline rather than having a separate delayed queue. Change to use the dequeue/requeue to peek like TBF does. By doing this potential qlen problems with the old method are avoided. The problems happened when the netem_run that moved packets from the inner discipline to the nested discipline failed (because inner queue was full). This happened in dequeue, so the effective qlen of the netem would be decreased (because of the drop), but there was no way to keep the outer qdisc (caller of netem dequeue) in sync. The problem window is still there since this patch doesn't address the issue of requeue failing in netem_dequeue, but that shouldn't happen since the sequence dequeue/requeue should always work. Long term correct fix is to implement qdisc->peek in all the qdisc's to allow for this (needed by several other qdisc's as well). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 0afb51e72855971dba83b3c6b70c547c2d1161fd Author: Stephen Hemminger Date: Thu May 26 12:53:49 2005 -0700 [PKT_SCHED]: netem: reinsert for duplication Handle duplication of packets in netem by re-inserting at top of qdisc tree. This avoid problems with qlen accounting with nested qdisc. This recursion requires no additional locking but will potentially increase stack depth. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f49809fe9b39e22b0f6f75c86295ce216ce3e374 Author: Linus Torvalds Date: Thu May 26 10:27:39 2005 -0700 Automatic merge of 'for-linus' branch from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit d11cf326bd5e785cc5a3f5a3d3f4e3a5522f4fb7 Author: Zhang Yanmin Date: Sun May 22 17:47:00 2005 -0700 [IA64] sys_mmap doesn't follow posix.1 when parameter len=0 In IA64 kernel, sys_mmap calls do_mmap2 and do_mmap2 returns addr if len=0, which means the mmap sys call succeeds. Posix.1 says: The mmap() function shall fail if: [EINVAL] The value of len is zero. Here is a patch to fix it. Signed-off-by: Zhang Yanmin Acked-by: David Mosberger Signed-off-by: Tony Luck commit cdbbde14cb55dd10771ce79154f787322d88411b Author: Linus Torvalds Date: Thu May 26 10:02:30 2005 -0700 Merge of 'misc-fixes' branch from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 284e423811495f632a7a334b2b93caba07d4f778 Author: Marcello Maggioni Date: Thu May 26 15:47:35 2005 +0200 [PATCH] timeout at boottime with NEC3500A (and possibly others) when inserted a CD in it From: Marcello Maggioni Problem: Some drives (NEC 3500, TDK 1616N, Mad-dog MD-16XDVD9, RICOH MP5163DA, Memorex DVD9 drive and IO-DATA's too for sure), if a CD/DVD is inserted into the tray when the system is booted and if before the OS bootup the BIOS checked for the presence of a bootable CD/DVD into the drive, during the IDE probe phase the drive may result busy and remain so for the next 25/30 seconds . This cause the drive to be skipped during the booting phase and not begin usable until the next reboot (if the reboot goes well and the drive doesn't timeout again). Solution: Rising the timeout time from 10 seconds to 35 seconds (during these 35 seconds every drive should wake up for sure according to the tests I've done). commit 41bb4c43b34bcde7eb62cf19acdcf9f2eb13801d Author: Stuart Hayes Date: Thu May 26 15:38:45 2005 +0200 [PATCH] ide-scsi: kmap scatter/gather before doing PIO From: Stuart Hayes The system can panic with a null pointer dereference using ide-scsi if PIO is being done on scatter gather pages that are in high memory, because page_address() returns 0. We are actually seeing this using a tape drive. This patch will kmap_atomic() the pages before performing PIO. commit 8604affde9d4f52f04342d6a37c77d95fa167e7a Author: Bartlomiej Zolnierkiewicz Date: Thu May 26 14:55:34 2005 +0200 [PATCH] convert IDE device drivers to driver-model * add ide_bus_match() and export ide_bus_type * split ide_remove_driver_from_hwgroup() out of ide_unregister() * move device cleanup from ide_unregister() to drive_release_dev() * convert ide_driver_t->name to driver->name * convert ide_driver_t->{attach,cleanup} to driver->{probe,remove} * remove ide_driver_t->busy as ide_bus_type->subsys.rwsem protects against concurrent ->{probe,remove} calls * make ide_{un}register_driver() void as it cannot fail now * use driver_{un}register() directly, remove ide_{un}register_driver() * use device_register() instead of ata_attach(), remove ata_attach() * add proc_print_driver() and ide_drivers_show(), remove ide_drivers_op * fix ide_replace_subdriver() and move it to ide-proc.c * remove ide_driver_t->drives, ide_drives and drives_lock * remove ide_driver_t->drivers, drivers and drivers_lock * remove ide_drive_t->driver and DRIVER() macro commit 32529e0128923e42126b5d14e444c18295a452ba Author: Albert Lee Date: Thu May 26 03:49:42 2005 -0400 [PATCH] libata: Fix zero sg_dma_len() on 64-bit platform When testing ATAPI PIO data transfer on the ppc64 platform, __atapi_pio_bytes() got zero when sg_dma_len() is used. I checked the , the struct scatterlist is defined as: struct scatterlist { struct page *page; unsigned int offset; unsigned int length; /* For TCE support */ u32 dma_address; u32 dma_length; }; #define sg_dma_address(sg) ((sg)->dma_address) #define sg_dma_len(sg) ((sg)->dma_length) So, if the scatterlist is not DMA mapped, sg_dma_len() will return zero on ppc64. The same problem should occur on the x86-64 platform. On the i386 platform, sg_dma_len() returns sg->length, that's why the problem does not occur on an i386. Changes: - Use sg->length if the scatterlist is not DMA mapped (yet). Signed-off-by: Albert Lee commit c1ef1f351db70ad60c793b8218dd9f6739cfd66d Author: Date: Thu May 26 02:17:16 2005 -0400 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD commit ad6a9984eec72f3a609a8685281740f5e5f466aa Author: Date: Wed May 25 22:11:38 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch tlan commit 38778204a1ad0d2c266f85170c2fb7d80ed43160 Author: Date: Wed May 25 22:11:28 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch sis900 commit 8cf0d9d075916c9affa53a0cfa8d1b94c9e95fd7 Author: Date: Wed May 25 22:11:14 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch veth commit 8a75e7d644b373f86c8c2316392cb7374fc4e063 Author: Date: Wed May 25 22:11:06 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch qeth commit f5a702b26a0cd6052f0bae2bc3f0548538d3909c Author: Date: Wed May 25 22:10:53 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch ns83820 commit 5ea6f2c33f0c8b126136dbf1776ffbc444772cd7 Author: Date: Wed May 25 22:10:38 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch natsemi commit acb969560d5b42500697a8bcd1667ac824928383 Author: Date: Wed May 25 22:10:25 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch forcedeth commit ee03a68c108cce4af3b4988cb1204e84d81f1243 Author: Date: Wed May 25 22:09:52 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch airo commit 0c2fc10901e1b516526c92849ccd03327f119dbe Author: Date: Wed May 25 22:07:51 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch atmel commit bef9c558841604116704e10b3d9ff3dbf4939423 Author: Linus Torvalds Date: Wed May 25 18:01:26 2005 -0700 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 3db602bdcd52d8b7523cfb4fb705cea84dbe1617 Author: Linus Torvalds Date: Wed May 25 17:56:57 2005 -0700 Merge of 'new-ids' branch from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 4c3a53d4108367f639e5e0fe9366dfd7679c5514 Author: Francisco Javier Date: Wed May 25 19:29:37 2005 -0400 [PATCH] sata_promise: add PCI ID for FastTrak TX2200 2-ports commit 525a099771d348a25d12ef9c47aa8680c7317e35 Author: NAKAMURA Kenta Date: Wed May 25 19:28:38 2005 -0400 [PATCH] sata_sil: new ID 1002:437A for ATI IXP400 commit d20c507f28dbee33086e8212b98f9ddc5372cd81 Author: Colin Leroy Date: Wed May 25 12:31:35 2005 -0700 [PATCH] therm_adt746x: show correct sensor locations This patch shows the correct locations of the heat sensors present in iBook and PowerBooks G4, instead of displaying them as being on CPU and GPU (which is not always the case). Signed-off-by: Colin Leroy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8bacec09352b86bd389cc93a20008577fa14764 Author: Colin Leroy Date: Wed May 25 12:31:34 2005 -0700 [PATCH] Make sure therm_adt746x only handles known hardware This patch limits therm_adt746x to currently existing fan controllers in Apple laptops. It may avoid problems with future hardware. Signed-off-by: Colin Leroy Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bf4fb820d7382318d178bd765c20028415466ab Author: Roland Dreier Date: Wed May 25 12:31:31 2005 -0700 [PATCH] IB: fix endianness of path record MTU field Make MTU field in SA PathRecord and MCMemberRecord a u8 rather than an enum to avoid complications with endianness. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 561e148ea972a6e8d2c8f7aecc658b3a64f7a6de Author: Roland Dreier Date: Wed May 25 12:31:30 2005 -0700 [PATCH] IB: fix potential ib_umad leak Free all unclaimed MAD receive buffers when userspace closes our file so we don't leak memory. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4f50f003dc568f6fc3904d451c562007bd09640 Author: Roland Dreier Date: Wed May 25 12:31:29 2005 -0700 [PATCH] IB: allow NULL sa_query callbacks Check if a client passes a NULL callback into an SA query, and if so, never call back. This fixes an oops if someone unloads ib_ipoib and ib_sa in rapid succession. ib_ipoib does an MCMember delete with a NULL callback and 0 timeout on unload, which is usually fine since the delete completes successfully. However, if ib_sa is unloaded immediately afterwards, the delete will be canceled and ib_sa will try to call the (now already unloaded) ib_ipoib module back with the cancel completion, which triggers the oops. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f60fdf613536402e3313c5019b3ae6060b2ae4a Author: Alexander Nyberg Date: Wed May 25 12:31:28 2005 -0700 [PATCH] x86_64: CONFIG_BUG=n fixes Fixes some !CONFIG_BUG warnings: include/asm/mmu_context.h: I funktion `switch_mm': include/asm/mmu_context.h:57: varning: implicit declaration of function `out_of_line_bug' Signed-off-by: Alexander Nyberg Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dca79a046b93a81496bb30ca01177fb17f37ab72 Author: Neil Horman Date: Wed May 25 12:31:27 2005 -0700 [PATCH] ipmi build fix It looks like the recent IPMI patches had some -mm-onlyisms. Signed-off-by: Neil Horman Cc: Corey Minyard Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5daf05fbf73fc199e7a93a818e504856d07c5586 Author: Gerd Knorr Date: Wed May 25 12:31:26 2005 -0700 [PATCH] v4l: bttv i2c oops fix Don't try to access the i2c bus if the register wasn't successful. Signed-off-by: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b463f785837f73bdd88ae3821bb7b69599010c9 Author: David S. Miller Date: Wed May 25 14:58:04 2005 -0700 Merge of /home/davem/src/GIT/linux-2.6/.git/ commit 1b981021e88c8c28dc6a22cb1a327d8dc9296473 Author: Linus Torvalds Date: Wed May 25 14:01:50 2005 -0700 Merge of 'for-linus' branch from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit f6f3a488e56783836a0b6ca9188719a1229f505c Author: Date: Wed May 25 13:57:36 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch amd8111 commit a58eae6480f354595c3954534e1ab591dc3ef1bf Author: Date: Wed May 25 13:57:25 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch pcnet32 commit 09e62666d8a6312426f96bf483cdb003bde556fe Author: Date: Wed May 25 13:57:15 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch ixgb commit 34812c9e188b47b1d6c9fff8ba530e6f2365ebc4 Author: Date: Wed May 25 13:57:03 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch e1000 commit d6d78f63cea62851806bf6ac40c6f53349de442b Author: Date: Wed May 25 13:56:55 2005 -0400 Automatic merge of /spare/repo/netdev-2.6 branch e100 commit a83d5cf7a1d1dd22f3a8162b728a7e895192dda8 Author: Date: Wed May 25 13:56:22 2005 -0400 Merge of /spare/repo/netdev-2.6 branch misc-fixes commit 384f1fcd2db8bc5a15f20f10793d8e1c82acd6c5 Author: Jens Axboe Date: Wed May 25 17:00:15 2005 +0200 [PATCH] relax ide-cd dma restrictions This has been sitting for a while, and is causing lots of grief for people burning CDs. It relaxes the dma restriction for ide-cd, requiring only the length to be 32-byte aligned, address should be fine at normal double word alignment. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 0e15850200437c60b969025500e466383ec51ed8 Author: David Woodhouse Date: Wed May 25 09:49:13 2005 +0100 [PATCH] Speedtouch resync after lost signal. There's a bigger Speedtouch update coming your way after 2.6.12 but in the meantime, let's at least make it automatically resync if the DSL signal is lost. Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit d0e8e29100c9866878d43bbb40ca17e8fe429851 Author: Stephen Rothwell Date: Wed May 25 16:29:26 2005 +1000 [PATCH] ppc64 iSeries: fix boot time setting For quite a while, there has existed a hypervisor bug on legacy iSeries which means that we do not get the boot time set in the kernel. This patch works around that bug. This was most noticable when the root partition needed to be checked at every boot as the kernel thought it was some time in 1905 until user mode reset the time correctly. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 8f80e5c911465743ccd3a328f992c7d8aaebf1e8 Author: Stephen Rothwell Date: Wed May 25 13:41:26 2005 +1000 [PATCH] ppc64: fix initialisation of gettimeofday calculations On PPC64, we keep track of when we need to update jiffies (and the variables used to calculate the time of day) based on the time base. If the time base frequence is sufficiently high compared to the processor clock frequency, then it is possible for the time of day variables to be corrupted at the time of the first decrementer interrupt we take. This became obvious on a legacy iSeries where the time base frequency is the same as the processor clock. This one line patch fixes the initialisation so that the time of day variables and the indicator we use to tell when updates are due are better synchronised. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 2a24ab628aa7b190be32f63dfb6d96f3fb61580a Author: Linus Torvalds Date: Tue May 24 20:31:20 2005 -0700 Linux 2.6.12-rc5 commit d981289627a7e2d8ef62dfcaa11fb60da68f30c6 Author: Andrew Morton Date: Tue May 24 19:31:10 2005 -0700 [PATCH] aic7xxx_osm build fix Fix a c99ism. Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 558ac33e094f3a47c74a3a66b19cd3616f183184 Author: Andrew Morton Date: Tue May 24 19:31:10 2005 -0700 [PATCH] saa6752hs build fix For older gcc's. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cafdd8ba08935d9b161bb781851dc4c0e6f70427 Author: William Lee Irwin III Date: Tue May 24 19:31:09 2005 -0700 [PATCH] try_to_unmap_cluster() passes out-of-bounds pte to pte_unmap() try_to_unmap_cluster() does: for (pte = pte_offset_map(pmd, address); address < end; pte++, address += PAGE_SIZE) { ... } pte_unmap(pte); It may take a little staring to notice, but pte can actually fall off the end of the pte page in this iteration, which makes life difficult for kmap_atomic() and the users not expecting it to BUG(). Of course, we're somewhat lucky in that arithmetic elsewhere in the function guarantees that at least one iteration is made, lest this force larger rearrangements to be made. This issue and patch also apply to non-mm mainline and with trivial adjustments, at least two related kernels. Discovered during internal testing at Oracle. Signed-off-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c33880aaddbbab1ccf36f4457ed1090621f2e39a Author: Kirill Korotaev Date: Tue May 24 19:29:47 2005 -0700 [PATCH] sigkill priority fix If SIGKILL does not have priority, we cannot instantly kill task before it makes some unexpected job. It can be critical, but we were unable to reproduce this easily until Heiko Carstens reported this problem on LKML. Signed-Off-By: Kirill Korotaev Signed-Off-By: Alexey Kuznetsov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6431e6a28e8df423e1ebcda065e9ff086198d2c6 Author: Dominik Hackl Date: Tue May 24 19:29:46 2005 -0700 [PATCH] voyager_smp.c static inline fix This patch fixes a compile bug by moving a static inline function to the right place. The body of a static inline function has to be declared before the use of this function. Signed-off-by: Dominik Hackl Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6df16d0c35b9c0d3627f30c106e6142d3d12662b Author: David S. Miller Date: Tue May 24 18:08:07 2005 -0700 Merge of davem@nuts.davemloft.net:/disk1/GIT/sparc-2.6/.git/ commit 7e43c84e3e5423ae72ae31e4cd7bbccfd1605194 Author: blaisorblade@yahoo.it Date: Wed May 25 01:31:42 2005 +0200 [PATCH] Cleanup DEFINE_WAIT Use LIST_HEAD_INIT rather than doing it by hand in DEFINE_WAIT. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 9092f46b5aed4515d9a427d5dab3be1584851f07 Author: John W. Linville Date: Wed May 18 13:41:33 2005 -0400 [PATCH] tulip: add return to ULI526X clause in tulip_mdio_write The 'if' clause for ULI526X in tulip_mdio_write allows for spin_unlock_irqrestore to be called twice for tp->mii_lock. I believe this is caused by the unintentional omission of a return at the end of that clause. This patch adds that return. Signed-off-by: John W. Linville commit 187a1a94d629621d1471b42308e63573b1150773 Author: Kay Sievers Date: Mon May 23 15:50:26 2005 -0700 [PATCH] driver core: restore event order for device_add() As a result of the split of the kobject-registration and the corresponding hotplug event, the order of events for device_add() has changed. This restores the old order, cause it confused some userspace applications. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 816242da3735957bee99aeba40aa60c4f120a101 Author: David S. Miller Date: Mon May 23 15:52:08 2005 -0700 [SPARC64]: Add boot option to force UltraSPARC-III P-Cache on. Older UltraSPARC-III chips have a P-Cache bug that makes us disable it by default at boot time. However, this does hurt performance substantially, particularly with memcpy(), and the bug is _incredibly_ obscure. I have never seen it triggered in practice, ever. So provide a "-P" boot option that forces the P-Cache on. It taints the kernel, so if it does trigger and cause some data corruption or OOPS, we will find out in the logs that this option was on when it happened. Signed-off-by: David S. Miller commit ab3fc403633c38aef5ef48844f8e5dbfee7c34f8 Author: Linus Torvalds Date: Mon May 23 14:57:14 2005 -0700 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/ commit d1faeaeb95a05275cf0c5b51b88f2fa833434625 Author: David S. Miller Date: Mon May 23 14:00:44 2005 -0700 [TG3]: Update driver version. Signed-off-by: David S. Miller commit ded7340d9d9142807a1ef94ab9c51d13ab76a1c9 Author: David S. Miller Date: Mon May 23 13:59:47 2005 -0700 [TG3]: Increase TEST_BUFFER_SIZE to 8K. This makes the DMA bug workaround test more likely to find the problem on some systems. Signed-off-by: David S. Miller commit 413f5431a5a27e44c6610de640e507e1e3c885f4 Author: David S. Miller Date: Mon May 23 13:13:15 2005 -0700 [TG3]: Update driver version and reldate. Signed-off-by: David S. Miller commit 180e42503300629692b513daeb55a6bb0b51500c Author: Herbert Xu Date: Mon May 23 13:11:07 2005 -0700 [IPV6]: Fix xfrm tunnel oops with large packets Signed-off-by: Herbert Xu Acked-by: Hideaki YOSHIFUJI Signed-off-by: David S. Miller commit 205902ecc7bcb2a007ed27bb3518e8f70e5d113e Author: Alexey Dobriyan Date: Mon May 23 13:09:19 2005 -0700 [NET]: netdevice.h: be'ify packet_type Everybody does struct packet_type foo_packet_type = { .type = __constant_htons(ETH_P_FOO); }; 5 introduced warnings will be properly fixed later. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit d8659255c599ba497bcfb8b4abc187d9e0951d99 Author: Xose Vazquez Perez Date: Mon May 23 12:54:51 2005 -0700 [TG3]: Add 5752M device ID. Add 0x1601 as 5752M, it's a 5752 but for mobile PCs. Stolen from Broadcom bcm5700-8.1.55 driver. Someone forgot to add it to tg3 ;-) Signed-off-by: David S. Miller commit 82d1542c1df6b3a0105843deddebeff03068d1dc Author: Jon Mason Date: Mon May 23 12:53:14 2005 -0700 [NET]: include/linux/if_tr.h clean-up I removed the ethernet definitions (which were commented out) and cleaned up the tabs. Signed-off-by: Jon Mason commit deaf2622bdc74270381873c7936c91500c683853 Author: David S. Miller Date: Mon May 23 12:45:26 2005 -0700 [NET]: Kill stray reference to sock->passcred. That struct member was deleted, but a comment was not updated to reflect this. commit 15333038d577b0c0255c0f14a38d9e6895937453 Author: Herbert Xu Date: Mon May 23 12:36:25 2005 -0700 [CRYPTO]: Only reschedule if !in_atomic() The netlink gfp_any() problem made me double-check the uses of in_softirq() in crypto/*. It seems to me that we should be checking in_atomic() instead of in_softirq() in crypto_yield. Otherwise people calling the crypto ops with spin locks held or preemption disabled will get burnt, right? Signed-off-by: David S. Miller commit 314324121f9b94b2ca657a494cf2b9cb0e4a28cc Author: David S. Miller Date: Mon May 23 12:03:06 2005 -0700 [TCP]: Fix stretch ACK performance killer when doing ucopy. When we are doing ucopy, we try to defer the ACK generation to cleanup_rbuf(). This works most of the time very well, but if the ucopy prequeue is large, this ACKing behavior kills performance. With TSO, it is possible to fill the prequeue so large that by the time the ACK is sent and gets back to the sender, most of the window has emptied of data and performance suffers significantly. This behavior does help in some cases, so we should think about re-enabling this trick in the future, using some kind of limit in order to avoid the bug case. Signed-off-by: David S. Miller commit f10d20c1f192aa90fc935207f22da32462e793ee Author: Benjamin Herrenschmidt Date: Mon May 23 16:54:14 2005 +1000 [PATCH] ppc64: Fix g5 hw timebase sync The hardware sync of the timebase on SMP G5s uses a black magic incantation to the i2c clock chip that was inspired from what Darwin does. However, this was an earlier version of Darwin that was ... buggy ! heh. This causes the latest models to break though when starting SMP, so it's worth fixing. Here's a new version of the incantation based on careful transcription of the said incantations as found in the latest version of apple's temple. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit e16fa6b9d2ad9467cf5bdf517e6b6f45e5867ad6 Author: Kumar Gala Date: Mon May 23 12:29:56 2005 -0500 [PATCH] ppc32: Fix an off-by-one error in ipic_init There is an off-by-one error in the IPIC code that configures the external interrupts (Edge or Level Sensitive). Signed-off-by: Randy Vinson Signed-off-by: Kumar Gala Signed-off-by: Linus Torvalds commit 1263cc67c09bc7f913a6877f3ba0427f0b76617e Author: Benjamin Herrenschmidt Date: Mon May 23 10:03:52 2005 +1000 [PATCH] ppc64: Fix booting on latest G5 models The latest speedbumped Apple G5 models have a "bug" in the Open Firmware device tree that lacks the proper interrupt routing information for the northbridge i2c controller. Apple's driver silently falls back into a sub-optimal "polled" mode (heh, maybe they didn't even notice the bug because of that :), our driver didn't properly check and crashes :( This patch fixes our driver to not crash, and adds code to the prom_init() OF trampoline code that detects the "bug" and adds the missing information back for this chipset revision. This fixes booting and thermal control on these models. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit b5c44c2147a447f77e07fecdb087ae288e1f4e40 Author: Suparna Bhattacharya Date: Sat May 21 16:33:36 2005 -0700 [PATCH] fix for __generic_file_aio_read() to return 0 on EOF I came across the following problem while running ltp-aiodio testcases from ltp-full-20050405 on linux-2.6.12-rc3-mm3. I tried running the tests with EXT3 as well as JFS filesystems. One or two fsx-linux testcases were hung after some time. These testcases were hanging at wait_for_all_aios(). Debugging shows that there were some iocbs which were not getting completed eventhough the last retry for those returned -EIOCBQUEUED. Also all such pending iocbs represented READ operation. Further debugging revealed that all such iocbs hit EOF in the DIO layer. To be more precise, the "pos" from which they were trying to read was greater than the "size" of the file. So the generic_file_direct_IO returned 0. This happens rarely as there is already a check in __generic_file_aio_read(), for whether "pos" < "size" before calling direct IO routine. >size = i_size_read(inode); >if (pos < size) { > retval = generic_file_direct_IO(READ, iocb, > iov, pos, nr_segs); But for READ, we are taking the inode->i_sem only in the DIO layer. So it is possible that some other process can change the size of the file before we take the i_sem. In such a case ( when "pos" > "size"), the __generic_file_aio_read() would return -EIOCBQUEUED even though there were no I/O requests submitted by the DIO layer. This would cause the AIO layer to expect aio_complete() for THE iocb, which doesnot happen. And thus the test hangs forever, waiting for an I/O completion, where there are no requests submitted at all. The following patch makes __generic_file_aio_read() return 0 (instead of returning -EIOCBQUEUED), on getting 0 from generic_file_direct_IO(), so that the AIO layer does the aio_complete(). Testing: I have tested the patch on a SMP machine(with 2 Pentium 4 (HT)) running linux-2.6.12-rc3-mm3. I ran the ltp-aiodio testcases and none of the fsx-linux tests hung. Also the aio-stress tests ran without any problem. Signed-off-by: Suzuki K P Signed-off-by: Suparna Bhattacharya Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f359b74c80bc76c1f6c2cb8f2837882f2335ba0c Author: Vladimir Saveliev Date: Sat May 21 16:33:34 2005 -0700 [PATCH] reiserfs: max_key fix This patch fixes a bug introduced by Al Viro's patch: [patch 136/174] reiserfs endianness: clone struct reiserfs_key The problem is MAX_KEY and MAX_IN_CORE_KEY defined in this patch do not look equal from reiserfs comp_key's point of view. This caused reiserfs' sanity check to complain. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1808caffaf448f0ad42ba04b25825fc170cf8e44 Author: Linus Torvalds Date: Sat May 21 15:27:09 2005 -0700 Merge of master.kernel.org:/home/rmk/linux-2.6-mmc.git commit 3d15e4a32dfa3da45751356e5f47aa04b97370e0 Author: Linus Torvalds Date: Sat May 21 15:04:27 2005 -0700 Merge of master.kernel.org:/home/rmk/linux-2.6-serial.git commit 10f02d1c59e55f529140dda3a92f0099d748451c Author: Samuel Thibault Date: Sat May 21 17:50:15 2005 +0200 [PATCH] spin_unlock_bh() and preempt_check_resched() In _spin_unlock_bh(lock): do { \ _raw_spin_unlock(lock); \ preempt_enable(); \ local_bh_enable(); \ __release(lock); \ } while (0) there is no reason for using preempt_enable() instead of a simple preempt_enable_no_resched() Since we know bottom halves are disabled, preempt_schedule() will always return at once (preempt_count!=0), and hence preempt_check_resched() is useless here... This fixes it by using "preempt_enable_no_resched()" instead of the "preempt_enable()", and thus avoids the useless preempt_check_resched() just before re-enabling bottom halves. Signed-off-by: Samuel Thibault Signed-off-by: Linus Torvalds commit 857dde2e79082d2954ede7f10783addaae956777 Author: David Woodhouse Date: Sat May 21 15:52:23 2005 +0100 When we detect that a 16550 was in fact part of a NatSemi SuperIO chip with high-speed mode enabled, we switch it to high-speed mode so that baud_base becomes 921600. However, we also need to multiply the baud divisor by 8 at the same time, in case it's already in use as a console. Signed-off-by: David Woodhouse Acked-by: Tom Rini Signed-off-by: Russell King commit 912490db699d83cb3d03570b63df7448677a3f56 Author: Pierre Ossman Date: Sat May 21 10:27:02 2005 +0100 [PATCH] MMC: Proper MMC command classes support Defines for the different command classes as defined in the MMC and SD specifications. Removes the check for high command classes and instead checks that the command classes needed are present. Previous solution killed forward compatibility at no apparent gain. Signed-of-by: Pierre Ossman commit 9636273dae265b9354b861b373cd43cd76a6d0fe Author: Linus Torvalds Date: Fri May 20 17:21:03 2005 -0700 Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git commit 2df9fa36643f03b0462b170515c1e221c3709fa9 Author: Andi Kleen Date: Fri May 20 14:27:59 2005 -0700 [PATCH] x86_64: i386/x86-64: Export cpu_core_map Needed for the powernow k8 driver for dual core support. Signed-off-by: Andi Kleen Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14d98cad82b78956957e95567b8b5fb38ec5859f Author: Andi Kleen Date: Fri May 20 14:27:59 2005 -0700 [PATCH] x86_64: Add option to disable timer check This works around the too fast timer seen on some ATI boards. I don't feel confident enough about it yet to enable it by default, but give users the option. Patch and debugging from Christopher Allen Wing , with minor tweaks (renamed the option and documented it) Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 607a16858397829806c5a4db999ce6daf327f98c Author: Andi Kleen Date: Fri May 20 14:27:58 2005 -0700 [PATCH] x86_64: Fix 32bit system call restart The test case at http://cvs.sourceforge.net/viewcvs.py/posixtest/posixtestsuite/conforman ce/interfaces/clock_nanosleep/1-5.c fails if it runs as a 32bit process on x86_86 machines. The root cause is the sub 32bit process fails to restart the syscall after it is interrupted by a signal. The syscall number of sys_restart_syscall in table sys_call_table is __NR_restart_syscall (219) while it's __NR_ia32_restart_syscall (0) in ia32_sys_call_table. When regs->rax==(unsigned long)-ERESTART_RESTARTBLOCK, function do_signal doesn't distinguish if the process is 64bit or 32bit, and always sets restart syscall number as __NR_restart_syscall (219). Signed-off-by: Zhang Yanmin Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4057923614e2868a865aa6c6e3bc53542c818d4d Author: Andi Kleen Date: Fri May 20 14:27:57 2005 -0700 [PATCH] i386: Fix race in iounmap We need to hold the vmlist_lock while doing change_page_attr, otherwise we could reset someone else's mapping. Requires previous patch to add __remove_vm_area Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7856dfeb23c16ef3d8dac8871b4d5b93c70b59b9 Author: Andi Kleen Date: Fri May 20 14:27:57 2005 -0700 [PATCH] x86_64: Fixed guard page handling again in iounmap Caused oopses again. Also fix potential mismatch in checking if change_page_attr was needed. To do it without races I needed to change mm/vmalloc.c to export a __remove_vm_area that does not take vmlist lock. Noticed by Terence Ripperda and based on a patch of his. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4d1fcf3a2ea89b6d6221fa8b4588c77aff50995 Author: Andi Kleen Date: Fri May 20 14:27:56 2005 -0700 [PATCH] x86_64: Don't allow accesses below register frame in ptrace There was a "off by one quad word" error in there. I don't think it is exploitable because it will only store into a unused area, but better to plug it. Found and fixed by John Blackwood Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b41e29398a873945d02e0009ce7e57608fdb4042 Author: Andi Kleen Date: Fri May 20 14:27:55 2005 -0700 [PATCH] x86_64: 386/x86-64 Further AMD dual core fixes - Remove duplicated ifdef - Make core_id match what Intel uses - Initialize phys_proc_id correctly for non DC case - Handle non power of two core numbers. Fixes for both i386 and x86-64 Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b39c4fab259b216148e705344a892c96efe1946d Author: Paul Jackson Date: Fri May 20 13:59:15 2005 -0700 [PATCH] cpusets+hotplug+preepmt broken This patch removes the entwining of cpusets and hotplug code in the "No more Mr. Nice Guy" case of sched.c move_task_off_dead_cpu(). Since the hotplug code is holding a spinlock at this point, we cannot take the cpuset semaphore, cpuset_sem, as would seem to be required either to update the tasks cpuset, or to scan up the nested cpuset chain, looking for the nearest cpuset ancestor that still has some CPUs that are online. So we just punt and blast the tasks cpus_allowed with all bits allowed. This reverts these lines of code to what they were before the cpuset patch. And it updates the cpuset Doc file, to match. The one known alternative to this that seems to work came from Dinakar Guniguntala, and required the hotplug code to take the cpuset_sem semaphore much earlier in its processing. So far as we know, the increased locking entanglement between cpusets and hot plug of this alternative approach is not worth doing in this case. Signed-off-by: Paul Jackson Acked-by: Nathan Lynch Acked-by: Dinakar Guniguntala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2665f92ae67a2d086537979d317a6f3a5697c63 Author: Matt Porter Date: Fri May 20 13:59:14 2005 -0700 [PATCH] ppc32: fix CONFIG_TASK_SIZE handling on 44x This patch fixed CONFIG_TASK_SIZE handling on 44x. Currently head_44x.S hardcodes 0x80000000, which breaks if user chooses to change TASK_SIZE (e.g. for 3G user-space). Tested on Ocotea in 3G/1G configuration. Signed-off-by: Eugene Surovegin Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f8cd80fb261177244c1479cfcad1387dbf3cd4b Author: Kumar Gala Date: Fri May 20 13:59:13 2005 -0700 [PATCH] ppc32: Fix platform device initialization of 8250 serial ports Initialization of 8250 serial ports that are platform devices require that at empty entry exists in the array of plat_serial8250_port. With out an empty entry we can get some pretty random behavior. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84ddaa8c86fc12ee1c3509be5ff3464821535c17 Author: Jeff Dike Date: Fri May 20 13:59:12 2005 -0700 [PATCH] uml: Change printf to printk in console driver From: Al Viro - we have error messages with KERN_ERR in them, so they should be printk-ed rather than printf-ed. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12f49643bc44c428919b210148a930496827dd26 Author: Jeff Dike Date: Fri May 20 13:59:12 2005 -0700 [PATCH] uml: fixrange_init 3-level page table support From: Al Viro - add three-level page table support to fixrange_init. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b9014c1da380384efe7752db38a0253a74d0238 Author: Jeff Dike Date: Fri May 20 13:59:11 2005 -0700 [PATCH] uml: Remove ubd-mmap support Finally rip out the ubd-mmap code, which turned out to be broken by design. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b67a3c4cd380968bffe8efb681470acda42b441 Author: Jeff Dike Date: Fri May 20 13:59:10 2005 -0700 [PATCH] uml: initrd cleanup The serial UML OS-abstraction layer patch (um/kernel dir). This moves all systemcalls from initrd_user.c file under os-Linux dir and join initrd_user.c and initrd_kern.c files in new file initrd.c Signed-off-by: Gennady Sharapov Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41a9cf8ebe08ccdd5799c175f9758f14617c0b0a Author: Jeff Dike Date: Fri May 20 13:59:10 2005 -0700 [PATCH] uml: Export clear_user_* From: Oleg Drokin: This patch is needed to support kernel modules that want to use clear_user() (that is exported symbol on all other architectures). Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c00c31fc0f003363773121a0ac6f4e5b128e879 Author: Jeff Dike Date: Fri May 20 13:59:09 2005 -0700 [PATCH] uml: multicast driver cleanup Byte-swapping of the port and IP address passed in to the multicast driver by the user used to happen in different places, which was a bug in itself. The port also was swapped before being printk-ed, which led to a misleading message. This patch moves the port swapping to the same place as the IP address swapping. It also cleans up the error paths of mcast_open. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 060e352236ece3325a684c72817fbacdac597574 Author: Jeff Dike Date: Fri May 20 13:59:08 2005 -0700 [PATCH] uml: Delay loop cleanups This patch cleans up the delay implementations a bit, makes the loops unoptimizable, and exports __udelay and __const_udelay. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13479d52c7a61a18900d7f36730b7d3b43723d97 Author: Jeff Dike Date: Fri May 20 13:59:08 2005 -0700 [PATCH] uml: Page fault fixes Any access to a PROT_NONE page should segfault the process. A JVM seems to do this on purpose. Also, Al noticed some bogus code, which is now deleted. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba9950c820e556e39cd26581826b5581a64fb641 Author: Jeff Dike Date: Fri May 20 13:59:07 2005 -0700 [PATCH] uml: small fixes left over from rc4 Some changes that I sent in didn't make 2.6.12-rc4 for some reason. This adds them back. We have an x86_64 definition of TOP_ADDR a reimplementation of the x86_64 csum_partial_copy_from_user some syntax fixes in arch/um/kernel/ptrace.c removal of a CFLAGS definition in the x86_64 Makefile some include changes in the x86_64 ptrace.c and user-offsets.h a syntax fix in elf-x86_64.h Also moved an include in the i386 and x86_64 Makefiles to make the symlinks work, and some small fixes from Al Viro. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46f4e1b7d5fa3ddf2486bf69716c404147e38ebf Author: Peter Osterlund Date: Fri May 20 13:59:06 2005 -0700 [PATCH] packet driver permission checking fix If you tried to open a packet device first in read-only mode and then a second time in read-write mode, the second open succeeded even though the device was not correctly set up for writing. If you then tried to write data to the device, the writes would fail with I/O errors. This patch prevents that problem by making the second open fail with -EBUSY. Signed-off-by: Peter Osterlund Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2bf2c568c878b9c0bbacac5c3210a6bd81856d21 Author: James Bottomley Date: Thu May 19 21:30:13 2005 -0500 [SCSI] aic7xxx: fix U160 mode The new period/dt setting routines don't get the coupling of these parameters correct. This means that Domain Validation never gets DT set, and thus the drive gets restricted to U80. Fix this by restoring the couplings in the set routines. Signed-off-by: James Bottomley commit fb3089dfb58bf07992252b42e77c6f35d45dff5e Author: James Bottomley Date: Tue May 17 21:09:52 2005 -0500 [SCSI] aic7xxx: add back locking Tampering with the settings has to be done under the host lock ... slave_alloc isn't called under any lock, so this has to be done explicitly. Signed-off-by: James Bottomley commit c7525233d2df39b95552f6f49c6b390a9c4d2e80 Author: James Bottomley Date: Tue May 17 18:07:34 2005 -0500 [SCSI] aic7xxx: make correct use of slave_alloc/destroy and remove the per device timer The allocation of all of our components should be done in slave alloc. Currently it's rather fancifully refcounted in the queuecommand callback. This patch moves allocation and destroy to their correct places in slave_alloc/slave_destory. Now we can guarantee that everywhere a device is requested, it's actually been allocated, so don't check for this anymore. Additionally, the per device busy timer was the only source of potential use after free. It's been deleted because Linux does the correct thing with busy returns, so there's no need to implement a separate timer in the driver. Finally, implement code that forces all the device parameters to zero (i.e. async and narrow) in the slave alloc, inform the spi class of the bios recorded maximums and wait until slave configure before trying anything more adventurous. Signed-off-by: James Bottomley commit 8e45ebcc661069bfb002c56dd942aedf43ba9239 Author: James Bottomley Date: Tue May 17 00:06:08 2005 -0500 [SCSI] aic7xxx: remove the completeq This should finish the spurious queue removal from aic7xxx (there are other queues that are probably unnecessary, but at least the major and obviously unnecessary ones are done with). Signed-off-by: James Bottomley commit 38c29ce06d24691d6e6dd786175fcc54efd5995b Author: James Bottomley Date: Mon May 16 21:37:58 2005 -0500 [SCSI] aic7xxx: remove the last vestiges of the runq This was rendered obsolete by the busyq removal; remove some of the last remnants of its presence. Signed-off-by: James Bottomley commit 013791ee01754f83dbb4ccfd266381db74e120b5 Author: Christoph Hellwig Date: Mon May 16 18:52:39 2005 +0200 [SCSI] aic7xxx: remove usage of obsolete typedefs Signed-off-by: James Bottomley commit 7dfa0f2673c17334c5de75a449f7bc161c9bd2c0 Author: Christoph Hellwig Date: Mon May 16 18:54:12 2005 +0200 [SCSI] remove dma_mask hacks pci_alloc_consistent is under 4G by default. Also simplify the definition of bus_dmamap_t. Signed-off-by: James Bottomley commit dedd831081052028f35aaf924ea3d6c55109074f Author: Christoph Hellwig Date: Mon May 16 18:52:06 2005 +0200 [SCSI] aic7xxx: remove Linux 2.4 ifdefs There's not much sense in sharing code anymore now that aic7xxx uses various transport class facilities. Signed-off-by: James Bottomley commit c06716fe1cea97749668c83e8374b453fbd00823 Author: Christoph Hellwig Date: Mon May 16 18:51:13 2005 +0200 [SCSI] aic7xxx: remove some DV leftovers Signed-off-by: James Bottomley commit e4e360c325c90f7830baaa2a27cd7a1f2bdeb6b0 Author: James Bottomley Date: Mon May 16 16:39:38 2005 -0500 [SCSI] remove aic7xxx busyq The aic7xxx driver has two spurious queues in it's linux glue code: the busyq which queues incoming commands to the driver and the completeq which queues finished commands before sending them back to the mid-layer This patch just removes the busyq and makes the aic finally return the correct status to get the mid-layer to manage its queueing, so a command is either committed to the sequencer or returned to the midlayer for requeue. Signed-off-by: James Bottomley commit fad01ef88d2a27303757924c1fc013b31fe9a76b Author: James Bottomley Date: Sun May 8 16:00:15 2005 -0500 [SCSI] correct aic7xxx period setting routines This is similar to the previous sym2 problem. For Domain Validation to work we can't allow any period setting to turn wide on if it was previously off. Signed-off-by: James Bottomley commit 62a8612972eaea804e1e42c63ee403cd4e14cc35 Author: James Bottomley Date: Fri May 6 18:05:20 2005 -0500 [SCSI] implement parameter limits in the SPI transport class There's a basic need not to have parameters go under or over certain values when doing domain validation. The basic ones are max_offset, max_width and min_period This patch makes the transport class take and enforce these three limits. Currently they can be set by the user, although they could obviously be read from the HBA's on-board NVRAM area during slave_configure (if it has one). Signed-off-by: James Bottomley commit 1c7878f024705594ac455e501ad51e475a400d5d Author: Linus Torvalds Date: Fri May 20 13:36:19 2005 -0700 Remove some left-over empty files Hopefully the addition of -E to my applypatch script will mean that I won't have these kinds of leftovers in the future. commit a228dfd5dc4b92288ea22d427b2bfc48ba5bb8b0 Author: David S. Miller Date: Fri May 20 11:40:32 2005 -0700 [SPARC64]: Fix bad performance side effect of strbuf timeout changes. The recent change to add a timeout to strbuf flushing had a negative performance impact. The udelay()'s are too long, and they were done in the wrong order wrt. the register read checks. Fix both, and things are happy again. There are more possible improvements in this area. In fact, PCI streaming buffer flushing seems to be part of the bottleneck in network receive performance on my SunBlade1000 box. Signed-off-by: David S. Miller commit 37e0915b701281182cea9fc90e894d10addf134a Author: Corey Minyard Date: Fri May 20 08:56:23 2005 +0200 [PATCH] Add sysfs support for the IPMI device interface Add support for sysfs to the IPMI device interface. Clean-ups based on Dimitry Torokovs comment by Philipp Hahn. Signed-off-by: Corey Minyard Signed-off-by: Philipp Hahn Signed-off-by: Linus Torvalds commit 45fed46f5b98aaf439e9ef125992ec853cd98499 Author: Paul Mackerras Date: Fri May 20 16:45:58 2005 +1000 [PATCH] ppx32: Fix uninitialized variable in set_preferred_console This fixes an uninitialized variable warning in arch/ppc/kernel/setup.c, and this time gcc is actually right, there is a path that could result in offset being uninitialized. Zero is a sane default in this instance. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 72480ef863740c3dc301b0803c9ed6d10716aa11 Author: Paul Mackerras Date: Fri May 20 16:50:55 2005 +1000 [PATCH] ppc32: Fix __copy_tofrom_user return value Recently the __copy_tofrom_user routine was modified to avoid doing prefetches past the end of the source array. However, in doing so we introduced a bug in that it now returns the wrong value for the number of bytes not copied when a fault is encountered. This fixes it to return the correct number. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 3207a80a6e11c7ceff7e46d5ec6bfcc03c14e729 Author: Paul Mackerras Date: Fri May 20 17:15:00 2005 +1000 [PATCH] ppc32: remove unused computation We are computing phys in the code below and never using. This patch takes out the redundant computation. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 6c37a88c5b1195d4ac74d44a6413839b93df5af4 Author: Paul Mackerras Date: Fri May 20 16:57:22 2005 +1000 [PATCH] ppc32: don't call progress functions after boot On ppc32, the platform code can supply a "progress" function that is used to show progress through the boot. These functions are usually in an init section and so can't be called after the init pages are freed. Now that the cpu bringup code can be called after the system is booted (for hotplug cpu) we can get the situation where the progress function can be called after boot. The simple fix is to set the progress function pointer to NULL when the init pages are freed, and that is what this patch does (note that all callers already check whether the function pointer is NULL before trying to call it). Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 07ab67c8d0d7c1021343b7d5c045033d6bf7be69 Author: Linus Torvalds Date: Thu May 19 22:43:37 2005 -0700 Fix get_unmapped_area sanity tests As noted by Chris Wright, we need to do the full range of tests regardless of whether MAP_FIXED is set or not, so re-organize get_unmapped_area() slightly to do the sanity checks unconditionally. commit 66e60f92518268f4d2a702a1c4ffbe1caacd6290 Author: Linus Torvalds Date: Thu May 19 15:31:18 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git/ commit 804c64ea864d0a8ee13f3de0b74158a3e9c3166d Author: Linus Torvalds Date: Thu May 19 15:29:23 2005 -0700 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/ commit aa1c6a6f7f0518b42994d02756a41cbfdcac1916 Author: Tommy S. Christensen Date: Thu May 19 13:07:32 2005 -0700 [NETLINK]: Defer socket destruction a bit In netlink_broadcast() we're sending shared skb's to netlink listeners when possible (saves some copying). This is OK, since we hold the only other reference to the skb. However, this implies that we must drop our reference on the skb, before allowing a receiving socket to disappear. Otherwise, the socket buffer accounting is disrupted. Signed-off-by: Tommy S. Christensen Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 68acc024ea7391e03c2c695ba0b9fb31baa974bf Author: Tommy S. Christensen Date: Thu May 19 13:06:35 2005 -0700 [NETLINK]: Move broadcast skb_orphan to the skb_get path. Cloned packets don't need the orphan call. Signed-off-by: Tommy S. Christensen Acked-by: Herbert Xu Signed-off-by: David S. Miller commit db61ecc3352d72513c1b07805bd6f760e30c001b Author: Tommy S. Christensen Date: Thu May 19 12:46:59 2005 -0700 [NETLINK]: Fix race with recvmsg(). This bug causes: assertion (!atomic_read(&sk->sk_rmem_alloc)) failed at net/netlink/af_netlink.c (122) What's happening is that: 1) The skb is sent to socket 1. 2) Someone does a recvmsg on socket 1 and drops the ref on the skb. Note that the rmalloc is not returned at this point since the skb is still referenced. 3) The same skb is now sent to socket 2. This version of the fix resurrects the skb_orphan call that was moved out, last time we had 'shared-skb troubles'. It is practically a no-op in the common case, but still prevents the possible race with recvmsg. Signed-off-by: Tommy S. Christensen Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 1eda339e76a9aac05883c548028bf91aed734783 Author: Jamal Hadi Salim Date: Thu May 19 12:42:39 2005 -0700 [PKT_SCHED]: Fixup simple action define. Make it consistent with other net/sched files Signed-off-by: Jamal Hadi Salim commit 31c26852cb2ac77f1d4acb37bcf31f165fd5eb68 Author: Herbert Xu Date: Thu May 19 12:39:49 2005 -0700 [IPSEC]: Verify key payload in verify_one_algo We need to verify that the payload contains enough data so that attach_one_algo can copy alg_key_len bits from the payload. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b9e9dead05b19e7f52c9aa00cd3a5b7ac4fcacf4 Author: Herbert Xu Date: Thu May 19 12:39:04 2005 -0700 [IPSEC]: Fixed alg_key_len usage in attach_one_algo The variable alg_key_len is in bits and not bytes. The function attach_one_algo is currently using it as if it were in bytes. This causes it to read memory which may not be there. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8be58932ca596972e4953ae980d8bc286857cae8 Author: David S. Miller Date: Thu May 19 12:36:33 2005 -0700 [NETFILTER]: Do not be clever about SKB ownership in ip_ct_gather_frags(). Just do an skb_orphan() and be done with it. Based upon discussions with Herbert Xu on netdev. Signed-off-by: David S. Miller commit d9fa0f392b20b2b8e3df379c44194492a2446c6e Author: Julian Anastasov Date: Thu May 19 12:29:59 2005 -0700 [IP_VS]: Remove extra __ip_vs_conn_put() for incoming ICMP. Remove extra __ip_vs_conn_put for incoming ICMP in direct routing mode. Mark de Vries reports that IPVS connections are not leaked anymore. Signed-off-by: Julian Anastasov Signed-off-by: David S. Miller commit 7e2987503dda95a5f80290bb8c06279009c2419e Author: Steve French Date: Thu May 19 12:26:57 2005 -0700 Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit f81a0bffa116ea22149aa7cfb0b4ee09096d9d92 Author: Christoph Hellwig Date: Thu May 19 12:26:43 2005 -0700 [AF_UNIX]: Use lookup_create(). currently it opencodes it, but that's in the way of chaning the lookup_hash interface. I'd prefer to disallow modular af_unix over exporting lookup_create, but I'll leave that to you. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 49a43876b935c811cfd29d8fe998a6912a1cc5c4 Author: Linus Torvalds Date: Wed May 18 15:39:33 2005 -0700 [PATCH] prevent NULL mmap in topdown model Prevent the topdown allocator from allocating mmap areas all the way down to address zero. We still allow a MAP_FIXED mapping of page 0 (needed for various things, ranging from Wine and DOSEMU to people who want to allow speculative loads off a NULL pointer). Tested by Chris Wright. Signed-off-by: Linus Torvalds commit 2fdba6b085eb7068e9594cfa55ffe40466184b4d Author: Herbert Xu Date: Wed May 18 22:52:33 2005 -0700 [IPV4/IPV6] Ensure all frag_list members have NULL sk Having frag_list members which holds wmem of an sk leads to nightmares with partially cloned frag skb's. The reason is that once you unleash a skb with a frag_list that has individual sk ownerships into the stack you can never undo those ownerships safely as they may have been cloned by things like netfilter. Since we have to undo them in order to make skb_linearize happy this approach leads to a dead-end. So let's go the other way and make this an invariant: For any skb on a frag_list, skb->sk must be NULL. That is, the socket ownership always belongs to the head skb. It turns out that the implementation is actually pretty simple. The above invariant is actually violated in the following patch for a short duration inside ip_fragment. This is OK because the offending frag_list member is either destroyed at the end of the slow path without being sent anywhere, or it is detached from the frag_list before being sent. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d48102007d068df7ba3055cdc1723e12db1ba30f Author: Evgeniy Polyakov Date: Wed May 18 22:51:45 2005 -0700 [XFRM]: skb_cow_data() does not set proper owner for new skbs. It looks like skb_cow_data() does not set proper owner for newly created skb. If we have several fragments for skb and some of them are shared(?) or cloned (like in async IPsec) there might be a situation when we require recreating skb and thus using skb_copy() for it. Newly created skb has neither a destructor nor a socket assotiated with it, which must be copied from the old skb. As far as I can see, current code sets destructor and socket for the first one skb only and uses truesize of the first skb only to increment sk_wmem_alloc value. If above "analysis" is correct then attached patch fixes that. Signed-off-by: Evgeniy Polyakov Acked-by: Herbert Xu Signed-off-by: David S. Miller commit f7383c22246cfccbe912541dd83103009ed2b537 Author: David S. Miller Date: Wed May 18 22:50:53 2005 -0700 [TG3]: In tg3_poll(), resample status_tag after doing work. Signed-off-by: David S. Miller commit 59e6b4343299373bc10dd131ab5142f53ddd838a Author: David S. Miller Date: Wed May 18 22:50:10 2005 -0700 [TG3]: Refine DMA boundary setting. Extract DMA boundary bit selection into a seperate function, tg3_calc_dma_bndry(). Call this from tg3_test_dma(). Make DMA test more reliable by using no DMA boundry setting during the test. If the test passes, then use the setting we selected before the test. Signed-off-by: David S. Miller Signed-off-by: Michael Chan commit 15f9850d3c2d46f5851a424d2990a18b5bb5ebfd Author: David S. Miller Date: Wed May 18 22:49:26 2005 -0700 [TG3]: Set minimal hw interrupt mitigation. Even though we do software interrupt mitigation via NAPI, it still helps to have some minimal hw assisted mitigation. This helps, particularly, on systems where register I/O overhead is much greater than the CPU horsepower. For example, it helps on NUMA systems. In such cases the PIO overhead to disable interrupts for NAPI accounts for the majority of the packet processing cost. The CPU is fast enough such that only a single packet is processed by each NAPI poll call. Thanks to Michael Chan for reviewing this patch. Signed-off-by: David S. Miller commit fac9b83ea79aa3112ed245d9a4fc2a5c3ec2b7ec Author: David S. Miller Date: Wed May 18 22:46:34 2005 -0700 [TG3]: Add tagged status support. When supported, use the TAGGED interrupt processing support the chip provides. In this mode, instead of a "on/off" binary semaphore, an incrementing tag scheme is used to ACK interrupts. All MSI supporting chips support TAGGED mode, so the tg3_msi() interrupt handler uses it unconditionally. This invariant is verified when MSI support is tested. Since we can invoke tg3_poll() multiple times per interrupt under high packet load, we fetch a new copy of the tag value in the status block right before we actually do the work. Also, because the tagged status tells the chip exactly which work we have processed, we can make two optimizations: 1) tg3_restart_ints() need not check tg3_has_work() 2) the tg3_timer() need not poke the chip 10 times per second to keep from losing interrupt events Based upon valuable feedback from Michael Chan Signed-off-by: David S. Miller commit fe12e25ebdd195a57d3fd655061fd2525609b16b Author: Tony Luck Date: Wed May 18 17:09:06 2005 -0700 [IA64] initialize spinlock pfm_alt_install_check I applied the penultimate version of the perfmon patch, which didn't have the initialization of the new spinlock that was added. Signed-off-by: Tony Luck commit 05d3794aa8bd3b2c9f7920a05003c331cdeb75c5 Author: Linus Torvalds Date: Wed May 18 16:37:46 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/ commit 3d620cd75588a37c7f5547e26e2a28b046c280f0 Author: Tony Luck Date: Wed May 18 16:28:52 2005 -0700 Sync with Linus - rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit a1ecf7f6e65637ba4470405ad39794710dbf85d4 Author: Tony Luck Date: Wed May 18 16:06:00 2005 -0700 [IA64] alternate perfmon handler Patch from Charles Spirakis Some linux customers want to optimize their applications on the latest hardware but are not yet willing to upgrade to the latest kernel. This patch provides a way to plug in an alternate, basic, and GPL'ed PMU subsystem to help with their monitoring needs or for specialty work. It can also be used in case of serious unexpected bugs in perfmon. Mutual exclusion between the two subsystems is guaranteed, hence no conflict can arise from both subsystem being present. Acked-by: Stephane Eranian Signed-off-by: Tony Luck commit 301216244b1e39c4346e56d38b079ca53d528580 Author: Stephen Tweedie Date: Wed May 18 11:47:17 2005 -0400 [PATCH] Avoid console spam with ext3 aborted journal. Avoid console spam with ext3 aborted journal. ext3 usually reports error conditions that it detects in its environment. But when its journal gets aborted due to such errors, it can sometimes continue to report that condition forever, spamming the console to such an extent that the initial first cause of the journal abort can be lost. When the journal aborts, we put the filesystem into readonly mode. Most subsequent filesystem operations will get rejected immediately by checks for MS_RDONLY either in the filesystem or in the VFS. But some paths do not have such checks --- for example, if we continue to write to a file handle that was opened before the fs went readonly. (We only check for the ROFS condition when the file is first opened.) In these cases, we can continue to generate log errors similar to EXT3-fs error (device $DEV) in start_transaction: Journal has aborted for each subsequent write. There is really no point in generating these errors after the initial error has been fully reported. Specifically, if we're starting a completely new filesystem operation, and the filesystem is *already* readonly (ie. the ext3 layer has already detected and handled the underlying jbd abort), and we see an EROFS error, then there is simply no point in reporting it again. Signed-off-by: Stephen Tweedie Signed-off-by: Linus Torvalds commit e72022e13d659bece2fc9cb2dd97afa67047dbca Author: Stephen Tweedie Date: Wed May 18 11:22:31 2005 -0400 [PATCH] Fix filp being passed through raw ioctl handler Don't pass meaningless file handles to block device ioctls. The recent raw IO ioctl-passthrough fix started passing the raw file handle into the block device ioctl handler. That's unlikely to be useful, as the file handle is actually open on a character-mode raw device, not a block device, so dereferencing it is not going to yield useful results to a block device ioctl handler. Previously we just passed NULL; also not a value that can usefully be dereferenced, but at least if it does happen, we'll oops instead of silently pretending that the file is a block device, so NULL is the more defensive option here. This patch reverts to that behaviour. Noticed by Al Viro. Signed-off-by: Stephen Tweedie Acked-by: Al Viro Signed-off-by: Linus Torvalds commit 0b405a0f7e4d4d18fd1fe46ddf5ff465443036ab Author: David Brownell Date: Thu May 12 12:06:27 2005 -0700 [PATCH] Driver Core: remove driver model detach_state The driver model has a "detach_state" mechanism that: - Has never been used by any in-kernel drive; - Is superfluous, since driver remove() methods can do the same thing; - Became buggy when the suspend() parameter changed semantics and type; - Could self-deadlock when called from certain suspend contexts; - Is effectively wasted documentation, object code, and headspace. This removes that "detach_state" mechanism; net code shrink, as well as a per-device saving in the driver model and sysfs. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 82428b62aa6294ea640c7e920a9224ecaf46db65 Author: David Brownell Date: Mon May 9 08:07:00 2005 -0700 [PATCH] Driver Core: pm diagnostics update, check for errors This patch includes various tweaks in the messaging that appears during system pm state transitions: * Warn about certain illegal calls in the device tree, like resuming child before parent or suspending parent before child. This could happen easily enough through sysfs, or in some cases when drivers use device_pm_set_parent(). * Be more consistent about dev_dbg() tracing ... do it for resume() and shutdown() too, and never if the driver doesn't have that method. * Say which type of system sleep state is being entered. Except for the warnings, these only affect debug messaging. Signed-off-by: David Brownell Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit d1ded203adf16b42ca90e9041120ae465ca5c4a6 Author: Greg KH Date: Thu May 5 11:57:25 2005 -0700 [PATCH] PCI: add MODALIAS to hotplug event for pci devices Signed-off-by: Greg Kroah-Hartman commit 9888549e0507cc95d1d7ade1595c00ff8e902659 Author: Greg KH Date: Thu May 5 11:57:25 2005 -0700 [PATCH] PCI: add modalias sysfs file for pci devices Signed-off-by: Greg Kroah-Hartman commit c22610dadc0452b1273494f2b5157123c6cd60e1 Author: Scott Murray Date: Mon May 9 17:36:27 2005 -0400 [PATCH] PCI Hotplug: remove pci_visit_dev If my CPCI hotplug update patch is applied, then there are no longer any in tree users of the pci_visit_dev API, and it and its related code can be removed. Signed-off-by: Scott Murray Signed-off-by: Greg Kroah-Hartman commit 43b7d7cfb157b5c8c5cc0933f4e96fd81adc81ca Author: Scott Murray Date: Mon May 9 17:31:50 2005 -0400 [PATCH] PCI Hotplug: CPCI update [PATCH] CPCI: update I have finally done some work to update the CompactPCI hotplug driver to fix some of the outstanding issues in 2.6: - Added adapter and latch status ops so that those files will get created by the current PCI hotplug core. This used to not be required, but seems to be now after some of the sysfs rework in the core. - Replaced slot list spinlock with a r/w semaphore to avoid any potential issues with sleeping. This quiets all of the runtime warnings. - Reworked interrupt driven hot extraction handling to remove need for a polling operator for ENUM# status. There are a lot of boards that only have an interrupt driven by ENUM#, so this lowers the bar to entry. - Replaced pci_visit_dev usage with better use of the PCI core functions. The new code is functionally equivalent to the previous code, but the use of pci_enable_device on insert needs to be investigated further, as I need to do some more testing to see if it is still necessary. Signed-off-by: Scott Murray Signed-off-by: Greg Kroah-Hartman commit 8b245e45f34280ec61e3c8d643d4613b9e0eb7a4 Author: Dely Sy Date: Fri May 6 17:19:09 2005 -0700 [PATCH] PCI Hotplug: get pciehp to work on the downstream port of a switch Here is the updated patch to get pciehp driver to work for downstream port of a switch and handle the difference in the offset value of PCI Express capability list item of different ports. Signed-off-by: Dely Sy Signed-off-by: Greg Kroah-Hartman commit ee17fd93a5892c162b0a02d58cdfdb9c50cf8467 Author: Dely Sy Date: Thu May 5 11:57:25 2005 -0700 [PATCH] PCI Hotplug: Fix echoing 1 to power file of enabled slot problem with SHPC driver Here is a patch to fix the problem of echoing 1 to "power" file to enabled slot causing the slot to power down, and echoing 0 to disabled slot causing shpchp_disabled_slot() to be called twice. This problem was reported by kenji Kaneshige. Thanks, Dely Signed-off-by: Dely Sy Signed-off-by: Greg Kroah-Hartman commit b1a45695bde0204597957e448923f09ce271ca80 Author: Steve French Date: Tue May 17 16:07:23 2005 -0500 [CIFS] fix casts of unicode strings to match function definition Signed-off-by: Steve French (sfrench@us.ibm.com) commit 6872ec548970e9fb3ccd61013f84f9bb8b30fa9a Author: Russ Anderson <(rja@sgi.com)> Date: Mon May 16 15:30:00 2005 -0700 [IS64-SGI] Set Altix error handling features The 2.6 kernel has CPE error thresholding. This patch lets SAL know of this error handling feature. The changes are SN specific. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit 8eac3757158ccd9c6b43f44f228a5762fec33781 Author: Russ Anderson <(rja@sgi.com)> Date: Mon May 16 15:19:00 2005 -0700 [IA64-SGI] Make Altix SAL call to POD reentrant Change the SAL call for POD mode to be reentrant. This change is SN specific. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit bb68c12b40c3c745381d7ce61d7b2e371f157505 Author: Russ Anderson <(rja@sgi.com)> Date: Mon May 9 15:03:00 2005 -0700 [IA64-SGI] cpe interrupts are not being enabled. acpi_request_vector() is called in ia64_mca_init() to get the cpe_vector. The problem is that acpi_request_vector() looks in platform_intr_list[] to get the vector, but platform_intr_list[] is not initialized with a valid vector until later (in sn_setup()). Without a valid vector the code defaults to polling mode. This patch moves the call to acpi_request_vector() from ia64_mca_init() to ia64_mca_late_init(), which is after platform_intr_list[] is initialized. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit 056b5033fb8d16095fb074fc910fad90186374f3 Author: Jesse Barnes Date: Mon May 9 14:52:00 2005 -0700 [PATCH] update sn2 maintainer Now that I'm no longer at SGI and don't have access to Altix equipment, it's time to pass on the job of patch monkey to someone else. Greg Edwards has foolishly^Wkindly volunteered for the job, so here's a patch to update the MAINTAINERS file with the appropriate information. Signed-off-by: Jesse Barnes Signed-off-by: Tony Luck commit 02a017a9f37ae6842e065da919b5952eb847e869 Author: David Mosberger-Tang Date: Tue May 10 11:35:00 2005 -0700 [IA64] Correct convert_to_non_syscall() convert_to_non_syscall() has the same problem that unwind_to_user() used to have. Fix it likewise. Signed-off-by: David Mosberger-Tang Signed-off-by: Tony Luck commit b2aeb9d565be5ef00fb9f921c6d2459c74d90cdf Author: Steve French Date: Tue May 17 13:16:18 2005 -0500 [CIFS] Fix oops in cifs_unlink. Caused in some cases when renaming over existing, newly created, file. Samba bugzilla: 2697 Signed-off-by: Steve French (sfrench@us.ibm.com) commit 67594feb4b68074d8807f5566536e06db9130679 Author: Steve French Date: Tue May 17 13:04:49 2005 -0500 [CIFS] missing break needed to handle < when mount option "mapchars" specified Signed-off-by: Steve French (sfrench@us.ibm.com) commit ff0d2f90fdc4b564d47a7c26b16de81a16cfa28e Author: Christoph Lameter Date: Tue May 17 08:48:16 2005 -0700 [PATCH] fix memory scribble in arch/i386/pci/fixup.c The GET_INDEX() macro should use just the low three bits of the devfn, otherwise we have a memory scribble in pcie_rootport_aspm_quirk that overwrites ptype_all Fix it to be more careful about its arguments while at it. Acked by Dely Sy Signed-off-by: Linus Torvalds commit 8c41a5f50deab01aca11155154d7e6737b3a1d9f Author: randy_dunlap Date: Tue May 17 07:12:56 2005 -0700 [PATCH] update CREDITS free agent Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 19bbdf0e510471ecebb3fe09bd8b00773cc63b88 Author: Paul Mackerras Date: Tue May 17 16:48:39 2005 +1000 [PATCH] ppc32: enable use of early_param We need to call parse_early_param() early on to allow usage of early_param() for command line parsing. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit d0dac8082cbc2b234917ec53eb591b1ddbec80bb Author: Tony Luck Date: Tue May 17 09:10:20 2005 -0700 Merge with linus commit ad542ef5b2296fa7a8518e6be67c4588b750d316 Author: Linus Torvalds Date: Tue May 17 08:55:00 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-2.6.git commit f3ac91cf521be4637236d2dcb7ad4aa91f8865f0 Author: Date: Tue May 17 11:30:39 2005 -0400 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git commit ff96b3d4b840e8aa126e0a60fd743417ffdee178 Author: Linus Torvalds Date: Tue May 17 08:11:04 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/ commit b82a96a7f28b9939576bf79a817c7a238d784b47 Author: Johannes Stezenbach Date: Mon May 16 21:54:49 2005 -0700 [PATCH] dvb: budget-av: CI fixes - remove enable_ci, ci interface is assumed to be present if the saa7113 is not found. - reduce the delay when checking for saa7113 - clean up the cam reset according to specifications - turn off Vcc to the cam slot if cam is removed or fails reset - remove cam reset in ciintf_init - clean up printks (KERN_) - move gpio setting into saa7113_init - clean up unreadable frontend_init (Kenneth Aafloy) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43f1a8f8c09aa1e368157039715812139a023d20 Author: Johannes Stezenbach Date: Mon May 16 21:54:49 2005 -0700 [PATCH] dvb: bt8xx: whitespace cleanup whitespace cleanup Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b98b79da032584b4c077568d28dde2d2fe226b54 Author: Johannes Stezenbach Date: Mon May 16 21:54:47 2005 -0700 [PATCH] dvb: DST: fixed CI debug output fixed CI debug output (Dominique Dumont) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42dc6617fe41ea65a94399821058353d0b12c0ab Author: Johannes Stezenbach Date: Mon May 16 21:54:47 2005 -0700 [PATCH] dvb: DST: fix a bug in the module parameter fix a bug in the module parameter (Dominique Dumont) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df481ae59074756f1d0b2712d8b3fe8d04eb16c1 Author: Johannes Stezenbach Date: Mon May 16 21:54:45 2005 -0700 [PATCH] dvb: bt8xx: updated documentation updated documentation (Manu Abraham) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a2cc1269b6c1404e6e882cee604d55c90927467 Author: Johannes Stezenbach Date: Mon May 16 21:54:45 2005 -0700 [PATCH] dvb: DST: misc. fixes removed unused module parameter session removed unnecesary delay for FTA cards (Manu Abraham) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b46dd4456f87fbad634d9a63d607fc54e4381cb4 Author: Johannes Stezenbach Date: Mon May 16 21:54:44 2005 -0700 [PATCH] dvb: DST: fix for descrambling failure fix for descrambling failure (Dominique Dumont, Manu Abraham) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8385e46fbf7c9b80008b915440f256ce88633eeb Author: Johannes Stezenbach Date: Mon May 16 21:54:43 2005 -0700 [PATCH] dvb: DST: fixed tuning problem fixed a tuning problem for cards based on the old firmware (Steffen Motzer, Manu Abraham) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6ac699a4f991e84b4bcdc07d9dfa8e019cf6116 Author: Johannes Stezenbach Date: Mon May 16 21:54:42 2005 -0700 [PATCH] dvb: DST: add support for Twinhan 200103A add support for the old Twinhan 200103A card (Steffen Motzer) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50b215a05878ce9636dace6cd21f7e91ff005058 Author: Johannes Stezenbach Date: Mon May 16 21:54:41 2005 -0700 [PATCH] dvb: DST: reorganize Twinhan DST driver to support CI - reorganize Twinhan DST driver to support CI - add support for more cards (Manu Abraham) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daeb6aa40be55b0750aea92dea78b8ebc40ca9a8 Author: Johannes Stezenbach Date: Mon May 16 21:54:40 2005 -0700 [PATCH] dvb: bt8xx: update documentation update bt8xx documentation (Uwe Bugla) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fdc53a6dbfea18e621dd23ed5cfb160837d7ce52 Author: Johannes Stezenbach Date: Mon May 16 21:54:39 2005 -0700 [PATCH] dvb: modified dvb_register_adapter() to avoid kmalloc/kfree Modified dvb_register_adapter() to avoid kmalloc/kfree. Drivers have to embed struct dvb_adapter into their private data struct from now on. (Andreas Oberritter) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b3f5a57bf110b519b706365c86ada199075f34e Author: Johannes Stezenbach Date: Mon May 16 21:54:38 2005 -0700 [PATCH] dvb: frontends: misc. minor cleanups misc. minor cleanups, select FW_LOADER and add a help text to DVB_OR51132 Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d91b730dfb46fa889c9c7a67d8bd6596e2ac8b21 Author: Johannes Stezenbach Date: Mon May 16 21:54:38 2005 -0700 [PATCH] dvb: make needlessly global code static or drop it - make needlessly global code static - #if 0 the following unused global functions: - ttpci/av7110_hw.c: av7110_reset_arm - ttpci/av7110_hw.c: av7110_send_ci_cmd - frontends/mt352.[ch]: drop mt352_read Signed-off-by: Adrian Bunk Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e9e7226c13135063707a0c82766a2dd748f59e5 Author: Johannes Stezenbach Date: Mon May 16 21:54:37 2005 -0700 [PATCH] dvb: dvb-pll.h: prevent multiple inclusion added missing #ifndef and #define to inhibit multiple inclusions (Patrick Boettcher) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71e3420111530273f2b26fabfac4d021c2a2b79f Author: Johannes Stezenbach Date: Mon May 16 21:54:36 2005 -0700 [PATCH] dvb: tda10046: support for different firmware versions added support for different tda10046 firmware versions. tested with v20, v21 and v25. (Andreas Oberritter) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1dfb800f9d0391dee86d692142745415f5f65f81 Author: Johannes Stezenbach Date: Mon May 16 21:54:35 2005 -0700 [PATCH] dvb: tda1004x: allow N_I2C to be overridden by the card driver allow N_I2C to be overridden by the card driver (Andreas Oberritter) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd102c752c17636b2aec7977b377c41156ed19c1 Author: Johannes Stezenbach Date: Mon May 16 21:54:35 2005 -0700 [PATCH] dvb: tda1004x: dont use bitfields use simple u8 instead of bitfields (Andreas Oberritter) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77b3bd0ccb2fae27e710b921f053ae16f34d70de Author: Johannes Stezenbach Date: Mon May 16 21:54:34 2005 -0700 [PATCH] dvb: mt352: embed struct mt352_config in mt352_state copying the mt352_config-struct to mt352_state instead of storing just the pointer to it (Patrick Boettcher) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd22d5c093faf3b123af33a8a0059f583c6b8cae Author: Johannes Stezenbach Date: Mon May 16 21:54:33 2005 -0700 [PATCH] dvb: ves1820: remove unnecessary msleep remove unnecessary msleep(10) in writereg (Tony Glader) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1471c4f67321c09359d6fa8eb5c72c2463db081 Author: Johannes Stezenbach Date: Mon May 16 21:54:32 2005 -0700 [PATCH] dvb: dib3000: add NULL pointer check prevent NULL pointer related Oopses (Patrick Boettcher) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8742700f13163ffa00cddce2a3c940b9ab2ab5a Author: Johannes Stezenbach Date: Mon May 16 21:54:31 2005 -0700 [PATCH] dvb: remove unnecessary casts in frontends remove unnecessary casts in frontends (Kenneth Aafloy) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 591ad98db3be2cd596ac5e0cfba7b164c3bdfb52 Author: Johannes Stezenbach Date: Mon May 16 21:54:31 2005 -0700 [PATCH] dvb: stv0299: fix FE_DISHNETWORK_SEND_LEGACY_CMD fix the current stv0299 code that handles FE_DISHNETWORK_SEND_LEGACY_CMD. (supports the legacy SW21, SW44, and SW64 switches) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f5e02db4a39c36e68878a14fae1fe7ee6dd6fcf Author: Johannes Stezenbach Date: Mon May 16 21:54:30 2005 -0700 [PATCH] dvb: tda1004x: formatting cleanups mostly formatting cleanups, no functional change (Andreas Oberritter) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a4a571124cdd04215e0f78bc53fe16bab58f32d Author: Johannes Stezenbach Date: Mon May 16 21:54:29 2005 -0700 [PATCH] dvb: nxt6000: support frontend status reads add support for read_ber, read_signal_strength and read_status (Greg Wickham) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3165dcb300ff60e794909f02b1fd3a41908682ea Author: Johannes Stezenbach Date: Mon May 16 21:54:28 2005 -0700 [PATCH] dvb: av7110: fix indentation fix indentation Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dbce49ea1c6885d07eb59d12889c059a868e6f5 Author: Johannes Stezenbach Date: Mon May 16 21:54:28 2005 -0700 [PATCH] dvb: av7110: fix comment fixed debugging instructions: av7110_debug -> debug (Oliver Endirss) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ab3f08b28676d365f3fb8600ead325fd235711a Author: Johannes Stezenbach Date: Mon May 16 21:54:27 2005 -0700 [PATCH] dvb: av7110: fix NTSC/PAL switching fix NTSC -> PAL switching (std->id is a bitmap!) (Oliver Endriss) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a65d3bb7177cbab1fca69dd97537766c2817b6b2 Author: Johannes Stezenbach Date: Mon May 16 21:54:26 2005 -0700 [PATCH] dvb: av7110: fix VIDEO_SET_DISPLAY_FORMAT VIDEO_SET_DISPLAY_FORMAT ioctl fixed: set videostate.display_format, not videostate.video_format (Oliver Endriss) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59142330aaea9d870d795065d8b91e21d5e55254 Author: Johannes Stezenbach Date: Mon May 16 21:54:25 2005 -0700 [PATCH] dvb: dvb_net: handle IPv6 and LLC/SNAP handle IPv6 and LLC/SNAP (Bertrand Mazieres, Matthieu Castet, Johannes Stezenbach) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c53c70f6afa2d3f4d416d8c0e9a219c2f6b7cb6 Author: Johannes Stezenbach Date: Mon May 16 21:54:24 2005 -0700 [PATCH] dvb: remove unnecessary casts in dvb-core remove unnecessary casts in dvb-core (Kenneth Aafloy) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d4f2c2e15795b93fa4da7a7cfac5e82df51b1f1 Author: Johannes Stezenbach Date: Mon May 16 21:54:23 2005 -0700 [PATCH] dvb: add support for KNC-1 cards Support KNC-1 Plus DVB-T and similar KNC-1 cards (Alexander Riedel) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6074b36715f036f56beb688f49a2a2fb5b28ad72 Author: Johannes Stezenbach Date: Mon May 16 21:54:22 2005 -0700 [PATCH] dvb: av7110: audio out fix Switch analog output of the Crystal sound chip to left/stereo/right mode. This will fix problems with some (most?) channels which do not encode 2-channel audio correctly. (Oliver Endriss) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4f009a776c1db9b27346846b0db052e04a6d5ad Author: Johannes Stezenbach Date: Mon May 16 21:54:21 2005 -0700 [PATCH] dvb: dvb_frontend: fix module param Remove incorrect "dvb_"-prefix from parameter description. Error detected with section2text.rb, see autoparam patch. Signed-off-by: Magnus Damm Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2c62d81430e907b6599d4be43a7ee6f74d2bd69 Author: Johannes Stezenbach Date: Mon May 16 21:54:20 2005 -0700 [PATCH] dvb: saa7146: no need to initialize static/global variables to 0 no need to initialize static/global variables to 0 Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dfaebdaa2a14c7ca1fbbafff08992489087e7f1 Author: Johannes Stezenbach Date: Mon May 16 21:54:19 2005 -0700 [PATCH] dvb: support for TT/Hauppauge Nexus-S Rev 2.3 Support for TT/Hauppauge Nexus-S Rev 2.3 (Oliver Endriss) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 958706c12d7e1b21ac46a8b3bc7eabb157b20bb7 Author: Johannes Stezenbach Date: Mon May 16 21:54:19 2005 -0700 [PATCH] dvb: flexcop: DiSeqC fix Fixed DiSeqC switching, which was wrongly taking over from skystar2.c. Thanks to Joerg Riechardt for finding the bug and testing the Fix. Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bdc7800122da0b6b008aa9bdafc01e32b6a4576a Author: Johannes Stezenbach Date: Mon May 16 21:54:18 2005 -0700 [PATCH] dvb: flexcop: i2c read fixes rewrote the i2c-reading-part (no more ack-error ignoring, which was inherited from the skystar2-driver) Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6ee197ccf4af454638c044706f0ba7ef6c1bb76 Author: Johannes Stezenbach Date: Mon May 16 21:54:17 2005 -0700 [PATCH] dvb: flexcop: readme update readme update Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59a7ad6c1ed3a058d375d2e679d73805e4f851ac Author: Johannes Stezenbach Date: Mon May 16 21:54:16 2005 -0700 [PATCH] dvb: flexcop: fix module refcount handling Corrected the THIS_MODULE handling for the flexcop-stuff and dvb-usb which lead to oopses because of misorganized module dependencies. Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4ee3fd469302884dda95e1f310d5ffcd9f5acf9 Author: Johannes Stezenbach Date: Mon May 16 21:54:15 2005 -0700 [PATCH] dvb: flexcop: use hw pid filter - enabled the HW PID by default for the PCI cards - correct the TS demux parsing when PID filter is enabled (and thus the timer IRQ) - rewrote the PID-filter and FULLTS control part in flexcop-hw-filter (thanks to Krzysztof Matula for pointing that out) Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4853f16ad881194ec4c49f73287ef1999b2585ea Author: Johannes Stezenbach Date: Mon May 16 21:54:15 2005 -0700 [PATCH] dvb: flexcop: fixed interrupt-sharing fixed interrupt-sharing and added a spinlock to the irq-callback (thanks to Pascal Riekenberg) Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 778241313819e17de3bdf91523c724b4704402c6 Author: Johannes Stezenbach Date: Mon May 16 21:54:14 2005 -0700 [PATCH] dvb: flexcop: fix MAC address reading read MAC address directly into dvb_adapter->proposed_mac Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ed8a31cb387b2ae3e4ca508f973931b61e6f6bd Author: Johannes Stezenbach Date: Mon May 16 21:54:13 2005 -0700 [PATCH] dvb: flexcop: add acknowledgements add acknowledgements Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7635acd2d927578495c692056d0e7dabd06afc89 Author: Johannes Stezenbach Date: Mon May 16 21:54:12 2005 -0700 [PATCH] dvb: flexcop: fix USB transfer handling - driver receives many null TS packets (pid=0x1fff). They occupy the limited USB bandwidth and this leads to loss of video packets. Enabling the null packet filter fixes this. - packets that flexcop sends to USB have a 2 byte header that has to be removed. - sometimes a TS packet is split between different urbs. These parts have to be combined in a temporary buffer. Signed-off-by: Vadim Catana Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2add87a95068d6457d4e5824d0417d39007665a4 Author: Johannes Stezenbach Date: Mon May 16 21:54:10 2005 -0700 [PATCH] dvb: b2c2/flexcop driver refactoring part 2: add modular Flexcop driver b2c2/flexcop driver refactoring to support PCI and USB based cards part 2: add modular Flexcop driver Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ec359729960f7896db8f642454e603d22519d20 Author: Johannes Stezenbach Date: Mon May 16 21:54:06 2005 -0700 [PATCH] dvb: b2c2/flexcop driver refactoring part 1: drop old b2c2-usb stuff b2c2/flexcop driver refactoring to support PCI and USB based cards, part 1: drop abandoned attempt to support USB devices Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6262d062a3fc803d1798365e745b39f4faa04b0e Author: Jody McIntyre Date: Mon May 16 21:54:05 2005 -0700 [PATCH] ieee1394: fix premature expiry of async packets Set the initial sendtime to be 10 seconds in the future, to avoid the packet timing out while it's still queued to be sent. This fixes furthur "no tlabel match" problems caused by premature expiry. Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74a01d11c92c06a0ceac88ca306d507a8186e7f6 Author: Jody McIntyre Date: Mon May 16 21:54:05 2005 -0700 [PATCH] ieee1394: fix cross_bound check for null ISO packets Fix cross_bound to not return 1 for zero-length regions. Fixes regression when sending null ISO packets. Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d98c5cd41d1932bb76a3945b4e8dea889224d87 Author: Jody McIntyre Date: Mon May 16 21:54:04 2005 -0700 [PATCH] ieee1394: single buffer fixes to video1394 Apply and fixup patch from Markus Tavenrath for video1394 to allow only a single buffer on receive and two buffers on transmit. Tested with libdc1394 and dvconnect (libdv). Signed-off-by: Dan Dennedy Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2554bd2a68e2c3ca7f2b953fe2860a9e84a5579a Author: Jody McIntyre Date: Mon May 16 21:54:03 2005 -0700 [PATCH] ieee1394: drivers/ieee1394/pcilynx.c: Use the DMA_32BIT_MASK constant Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() These patches include dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 616b859fbd0e59707a24612d5b5fec791156c822 Author: Jody McIntyre Date: Mon May 16 21:54:01 2005 -0700 [PATCH] ieee1394: remove NULL checks for kfree This patch removes redundant NULL pointer checks before kfree() in all of drivers/ieee1394/ Signed-off-by: Jesper Juhl Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ac485dc37b6336c5bf694f9933f43684fd1fd1e Author: Jody McIntyre Date: Mon May 16 21:54:00 2005 -0700 [PATCH] ieee1394: drivers/ieee1394/ieee1394_transactions.c: possible cleanups This patch contains the following possible cleanups: - #if 0 the following unused global functions: - hpsb_lock - hpsb_send_gasp - ieee1394_transactions.h: remove the stale hpsb_lock64 prototype Signed-off-by: Adrian Bunk Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f72cd138e6afc6d93a8e0aacb7e3160cf04d840b Author: Jody McIntyre Date: Mon May 16 21:53:59 2005 -0700 [PATCH] ieee1394: drivers/ieee1394/pcilynx.c: remove dead options The options CONFIG_IEEE1394_PCILYNX_LOCALRAM and CONFIG_IEEE1394_PCILYNX_PORTS are not available for some time. Signed-off-by: Adrian Bunk Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1446c7fb7610a7b417d8b2fadb6751f86ee833e Author: Jody McIntyre Date: Mon May 16 21:53:59 2005 -0700 [PATCH] ieee1394: feature removal notices drivers/ieee1394 feature removal notices: amdtp, cmp, legacy rawiso interface Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfaa9c94b13071c9b5f8578d0ae99acc76c60139 Author: William Lee Irwin III Date: Mon May 16 21:53:58 2005 -0700 [PATCH] profile.c: `schedule' parsing fix profile=schedule parsing is not quite what it should be. First, str[7] is 'e', not ',', but then even if it did fall through, prof_on = SCHED_PROFILING would be clobbered inside if (get_option(...)) So a small amount of rearrangement is done in this patch to correct it. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5418b6925c353c8286651b67fdb8559dd9e54e46 Author: Christoph Hellwig Date: Mon May 16 21:53:57 2005 -0700 [PATCH] kill These days handles everything, no need for an asm header on just two architectures. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afbf510d47c4009f5d67ec3c0e0b45eb0441bca3 Author: Randy Dunlap Date: Mon May 16 21:53:56 2005 -0700 [PATCH] pcmcia/ds: handle any error code register_chrdev() can return errors (negative) other then -EBUSY, so check for any negative error code. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24d568ed1b97cb93c2a917cd90296655a8b661a6 Author: Nishanth Aravamudan Date: Mon May 16 21:53:55 2005 -0700 [PATCH] alpha/osf_sys: use helper functions to convert between tv and jiffies Use helper functions to convert between timeval structure and jiffies rather than custom logic. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer Acked-by: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3407c0fec3456325826c31792e77a80a6dec0e20 Author: Yoichi Yuasa Date: Mon May 16 21:53:53 2005 -0700 [PATCH] mips: add resource management to pmu This patch had added resource management to vr41xx's pmu. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c443d1b558b21520bd8fd6140b85cee0756becd Author: Stephen Smalley Date: Mon May 16 21:53:52 2005 -0700 [PATCH] selinux: fix avc_alloc_node() oom with no policy loaded This patch should fix the avc_alloc_node() oom condition that Andrew reported when no policy is loaded in SELinux. Prior to this patch, when no policy was loaded, the SELinux "security server" (policy engine) was only returning allowed decisions for the requested permissions for each access check. This caused the cache to thrash when trying to use SELinux for real work with no policy loaded (typically, the no policy loaded state is only for bootstrapping to the point where we can load an initial policy). This patch changes the SELinux security server to return the complete allowed access vector at once, and then to reset the cache after the initial policy load to flush the initial cache state created during bootstrapping. Signed-off-by: Stephen Smalley Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b81074800b98ac50b64d4c8d34e8abf0fda5e3d1 Author: Kirill Korotaev Date: Mon May 16 21:53:50 2005 -0700 [PATCH] do_swap_page() can map random data if swap read fails There is a bug in do_swap_page(): when swap page happens to be unreadable, page filled with random data is mapped into user address space. The fix is to check for PageUptodate and send SIGBUS in case of error. Signed-Off-By: Kirill Korotaev Signed-Off-By: Alexey Kuznetsov Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c64610ba585fabb36be78782868277f3d9741a2e Author: Andrew Morton Date: Mon May 16 21:53:49 2005 -0700 [PATCH] block_read_full_page() get_block() error handling fix If block_read_full_page() detects an error when running get_block() it will run SetPageError(), then it will zero out the block in pagecache and will mark the buffer_head uptodate. So at the end of readahead we end up with a non-uptodate pagecache page which is marked PageError. But it has uptodate buffers. The pagefault code will run ClearPageError, will launch readpage a second time and block_read_full_page() will notice the uptodate buffers and will mark the page uptodate as well. We end up with an uptodate, !PageError page full of zeros and the error is lost. (It seems a little odd that filemap_nopage() runs ClearPageError(). I guess all of this adds up to meaning that for each attempted access to the page, the pagefault handler will retry the I/O. Which is good and bad. If the app is ignoring SIGBUS for some reason we could get a lot of back-to-back I/O errors.) Fix it by not marking the pagecache buffer_head as uptodate if the attempt to map that buffer to a disk block failed. Credit-to: Qu Fuping For reporting the bug and identifying its source. Signed-off-by: Qu Fuping Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c0547ba8b3bbd8b26ae35e33ac17ff51f67f78c Author: Matt Mackall Date: Mon May 16 21:53:47 2005 -0700 [PATCH] add_preferred_console() build fix Move add_preferred_console out of CONFIG_PRINTK so serial console does the right thing. Signed-off-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8f5bdb02ce06925e7fc5916125bdebc533d4299 Author: Rik van Riel Date: Mon May 16 21:53:46 2005 -0700 [PATCH] Makefile include path ordering The arch Makefile may override the include path order, which is used by Xen (and UML?) to make sure include/asm-xen is searched before include/asm-i386. The Makefile change to 2.6.12-rc4 made the top Makefile always override the value specified by the arch Makefile. This trivial patch makes the Xen kernel compile again. Signed-off-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 631330afdf9d29fe84526653674e8e061389d8f6 Author: Dominik Hackl Date: Mon May 16 21:53:45 2005 -0700 [PATCH] fix Philips SAA7130/7134 TV dependency problem Solve a dependency-problem related to the SAA7130/7134 TV-card driver. The driver won't compile with CRC32 disabled, so I added it to the select list. Signed-off-by: Dominik Hackl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1fc3990e2ffa14310cae89678c0b4ed1a3f094b Author: Petr Vandrovec Date: Mon May 16 21:53:44 2005 -0700 [PATCH] serial_cs device identification fix serial_cs's vendor/device identification got broken by Yum Rayan's change '[PATCH] serial_cs: Reduce stack usage in serial_event()' - it changed buf type from u_short* to char*, breaking device manufacturer & card number retrieval. Due to this my modem stopped from being recognized as special case. Code will work much better if we'll rely on first_tuple's parser instead of doing parse ourselves. Code also looks simpler after change. Signed-off-by: Petr Vandrovec Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f167fb491725ca0be9df0d76b4b2dd862cdfe0b Author: Zhang, Yanmin Date: Mon May 16 21:53:43 2005 -0700 [PATCH] spurious interrupt fix On my IA64 machine, after kernel 2.6.12-rc3 boots, an edge-triggered interrupt (IRQ 46) keeps triggered over and over again. There is no IRQ 46 interrupt action handler. It has lots of impact on performance. Kernel 2.6.10 and its prior versions have no the problem. Basically, kernel 2.6.10 will mask the spurious edge interrupt if the interrupt is triggered for the second time and its status includes IRQ_DISABLE|IRQ_PENDING. Originally, IA64 kernel has its own specific _irq_desc definitions in file arch/ia64/kernel/irq.c. The definition initiates _irq_desc[irq].status to IRQ_DISABLE. Since kernel 2.6.11, it was moved to architecture independent codes, i.e. kernel/irq/handle.c, but kernel/irq/handle.c initiates _irq_desc[irq].status to 0 instead of IRQ_DISABLE. Signed-off-by: Zhang Yanmin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7baeb6a5ccab2d472679a053e64a63ac423c3a42 Author: Peter Osterlund Date: Mon May 16 21:53:42 2005 -0700 [PATCH] CDRW/DVD packet writing data corruption fix I found a bug in the packet writing driver that could cause data corruption. The problem arised if the driver got a write request for a sector in a "zone" it was already working on. In that case it was supposed to queue the write request until it was done processing earlier requests for the same zone, and instead work on some other zone in the mean time. However, if there was no other zone to work on, the driver would initiate two packet_data objects for the same zone, causing unpredictable things to happen. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0856009dbaf8eca2269d4129bb83940c0d95054 Author: Patrick McHardy Date: Mon May 16 21:53:41 2005 -0700 [PATCH] crypto: fix null encryption/compression null_encrypt() needs to copy the data in case src and dst are disjunct, null_compress() needs to copy the data in any case as far as I can tell. I joined compress/decompress and encrypt/decrypt to avoid duplicating code. Without this patch ESP null_enc packets look like this: IP (tos 0x0, ttl 64, id 23130, offset 0, flags [DF], length: 128) 10.0.0.1 > 10.0.0.2: ESP(spi=0x0f9ca149,seq=0x4) 0x0000: 4500 0080 5a5a 4000 4032 cbef 0a00 0001 E...ZZ@.@2...... 0x0010: 0a00 0002 0f9c a149 0000 0004 0000 0000 .......I........ 0x0020: 0000 0000 0000 0000 0000 0000 0000 0000 ................ 0x0030: 0000 0000 0000 0000 0000 0000 0000 0000 ................ 0x0040: 0000 0000 0000 0000 0000 0000 0000 0000 ................ 0x0050: 0000 .. IP (tos 0x0, ttl 64, id 256, offset 0, flags [DF], length: 128) 10.0.0.2 > 10.0.0.1: ESP(spi=0x0e4f7b51,seq=0x2) 0x0000: 4500 0080 0100 4000 4032 254a 0a00 0002 E.....@.@2%J.... 0x0010: 0a00 0001 0e4f 7b51 0000 0002 a8a8 a8a8 .....O{Q........ 0x0020: a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 ................ 0x0030: a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 ................ 0x0040: a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 ................ 0x0050: a8a8 .. Signed-off-by: Patrick McHardy Signed-off-by: Herbert Xu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba32311eb73f624a85a5fc2e043cda8e076f86ef Author: McMullan, Jason Date: Mon May 16 21:53:40 2005 -0700 [PATCH] swapout oops fix Fix OOPS when swapping on a device that doesn't have an unplug_io_fn defined (eg, ATA Over Ethernet) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59afda786a58f2e8f74a48f2af90534d76d5338d Author: Horst Hummel Date: Mon May 16 21:53:39 2005 -0700 [PATCH] s390: dasd set online failure dasd driver changes: - The feature check in dasd_generic_online returns an error if the devmap entry for the device is not yet available. Check for the feature after the device has been created. - Do symmetric registration/deregistration of cdev->handler. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53b21689ba567ad437e4d7917dd9da54a8d6fd5c Author: Adrian Bunk Date: Mon May 16 21:53:38 2005 -0700 [PATCH] drivers/input/keyboard/atkbd.c: fix off by one errors This patch fixes two possible off by one errors found by the Coverity checker (look at the period[i] and delay[j] in the two first unchanged lines). Signed-off-by: Adrian Bunk Cc: Vojtech Pavlik Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a019225c797a1047470accee950d69cfe7c59c5 Author: Adrian Bunk Date: Mon May 16 21:53:37 2005 -0700 [PATCH] mm/nommu.c: try to fix __vmalloc Linus changed the second argument of __vmalloc from int to unsigned int breaking the compilation for CONFIG_MMU=n configurations (since he only changed vmalloc.c but not nommu.c). Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59db2e6ed080ac385f19b9f4329133d634215bfd Author: Andi Kleen Date: Mon May 16 21:53:36 2005 -0700 [PATCH] x86_64: Update defconfig Update defconfig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18a2b6471277c9ffbaa14a0c87a11a075eb354bd Author: Andi Kleen Date: Mon May 16 21:53:35 2005 -0700 [PATCH] x86_64: Don't assume BSP has ID 0 in new smp bootup This patch removes the assumption that LAPIC entries contain the BSP as its first entry. This is a slight improvement to the temporary fix submitted by Suresh Siddha. - Removes assumption that LAPIC entries contain BSP first. - Builds x86_acpiid_to_apicid[] and bios_cpu_apicid[] properly with BSP as first entry. - Made maxcpus=1 boot on these systems. Since the parsing earlier in arch/x86_64/kernel/mpparse.c stopped after maxcpus entries, other entries were not processed, this causes kernel not to boot on these systems. TBD: x86_acpiid_to_apicid and bios_cpu_apicid[] seem to be exactly the same. This could be removed, but might need more work to cleanup. Signed-off-by: Ashok Raj Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 751521149a05e308d863d01ced61080ce1a2ec99 Author: Andi Kleen Date: Mon May 16 21:53:34 2005 -0700 [PATCH] x86_64: Collected NMI watchdog fixes. Collected NMI watchdog fixes. - Fix call of check_nmi_watchdog - Remove earlier move of check_nmi_watchdog to later. It does not fix the race it was supposed to fix fully. - Remove unused P6 definitions - Add support for performance counter based watchdog on P4 systems. This allows to run it only once per second, which saves some CPU time. Previously it would run at 1000Hz, which was too much. Code ported from i386 Make this the default on Intel systems. - Use check_nmi_watchdog with local APIC based nmi - Fix race in touch_nmi_watchdog - Fix bug that caused incorrect performance counters to be programmed in a few cases on K8. - Remove useless check for local APIC - Use local_t and per_cpu variables for per CPU data. - Keep other CPUs busy during check_nmi_watchdog to make sure they really tick when in lapic mode. - Only check CPUs that are actually online. - Various other fixes. - Fix fallback path when MSRs are unimplemented Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3c5f5e7eeaf7c68ecc1d37200cd1ade0b3da7b9 Author: Andi Kleen Date: Mon May 16 21:53:33 2005 -0700 [PATCH] x86_64: Make vsyscall.c compile without CONFIG_SYSCTL Originally from Matt Tolentino Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 376ec33fcb246fdd7de1696d33739a0fd36f6537 Author: Suresh Siddha Date: Mon May 16 21:53:32 2005 -0700 [PATCH] x86_64: Fix OEM hpet check Use bitmap_zero instead of bitmap_empty to initialise cpu mask This makes it actually run reliable instead of relying on stack state. Signed-off-by: Suresh Siddha Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b9ba4d5e23fcab24dd4d2e46dce11f5863869b4 Author: Andi Kleen Date: Mon May 16 21:53:31 2005 -0700 [PATCH] x86_64: When checking vmalloc mappings don't use pte_page The PTEs can point to ioremap mappings too, and these are often outside mem_map. The NUMA hash page lookup functions cannot handle out of bounds accesses properly. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6b8d4778c04148729cc0b0dcd335a4411c44276 Author: Andi Kleen Date: Mon May 16 21:53:30 2005 -0700 [PATCH] x86_64: Fix canonical checking for segment registers in ptrace Allowed user programs to set a non canonical segment base, which would cause oopses in the kernel later. Credit-to: Alexander Nyberg For identifying and reporting this bug. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1099e8a18960693c04507bdd7b9403db70bfd97 Author: Andi Kleen Date: Mon May 16 21:53:29 2005 -0700 [PATCH] x86_64: check if ptrace RIP is canonical This works around an AMD Erratum. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 312df5f1a1da780e084b328bcabb02a6dcd044c3 Author: Andi Kleen Date: Mon May 16 21:53:28 2005 -0700 [PATCH] x86_64: Add pmtimer support There are unfortunately more and more multi processor Opteron systems which don't have HPET timer support in the southbridge. This covers in particular Nvidia and VIA chipsets. They also don't guarantee that the TSCs are synchronized between CPUs; and especially with MP powernow the systems are nearly unusable because the time gets very inconsistent between CPUs. The timer code for x86-64 was originally written under the assumption that we could fall back to the HPET timer on such systems. But this doesn't work there. Another alternative is to use the ACPI PM timer as primary time source. This patch does that. The kernel only uses PM timer when there is no other choice because it has some disadvantages. Ported over from i386. It should be faster than the i386 version because I dropped the "read three times" workaround, but is still considerable slower than HPET and also does not work together with vsyscalls which have to be disabled. Cc: Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0af2be0b721997512191e981a051fcb070b87260 Author: Andi Kleen Date: Mon May 16 21:53:27 2005 -0700 [PATCH] x86_64: Remove unique APIC/IO-APIC ID check It is unnecessary on modern Intel or AMD systems, and that is all we support on x86-64 Also causes problems on various systems Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 622dcaf974668f7dee252fc6a8f9a2710c2070f4 Author: Andi Kleen Date: Mon May 16 21:53:26 2005 -0700 [PATCH] x86_64: Don't print the internal k8c+ flag in /proc/cpuinfo It is not very useful to the user and more an kernel internal implementation detail. So hide it. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2942283e970b357c146ebdcbbcc0bdf5048615ff Author: Andi Kleen Date: Mon May 16 21:53:26 2005 -0700 [PATCH] x86_64: Remove x86_apicid field Remove x86_apicid field Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dda50e716dc9451f40eebfb2902c260e4f62cf34 Author: Andi Kleen Date: Mon May 16 21:53:25 2005 -0700 [PATCH] x86_64: Update TSC sync algorithm The new TSC sync algorithm recently submitted did not work too well. The result was that some MP machines where the TSC came up of the BIOS very unsynchronized and that did not have HPET support were nearly unusable because the time would jump forwards and backwards between CPUs. After a lot of research ;-) and some more prototypes I ended up with just using the one from IA64 which looks best. It has some internal self tuning that should adapt to changing interconnect latencies. It holds up in my tests so far. I believe it was originally written by David Mosberger, I just ported it over to x86-64. See the inline comment for a description. This cleans up the code because it uses smp_call_function for syncing instead of having custom hooks in SMP bootup. Please note that the cycle numbers it outputs are too optimistic because they do not take into account the latency of WRMSR and RDTSC, which can be hundreds of cycles. It seems to be able to sync a dual Opteron to 200-300 cycles, which is probably good enough. There is a timing window during AP bootup where interrupts can see inconsistent time before the TSC is synced. It is hard to avoid unfortunately because we can only do the TSC sync after some setup, and we need to enable interrupts before that. I just ignored it for now. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93ef70a217637ade3f335303a112b22a134a1ec2 Author: Andi Kleen Date: Mon May 16 21:53:24 2005 -0700 [PATCH] x86_64: Don't look up struct page pointer of physical address in iounmap It could be in a memory hole not mapped in mem_map and that causes the hash lookup to go off to nirvana. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f5ee8da005f50d9f46ae5a7edba9a9c2d37b32e Author: Andi Kleen Date: Mon May 16 21:53:22 2005 -0700 [PATCH] x86_64: Increase number of IO-APICs Needed by big systems and only costs a few K of memory. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a158608bf4c6260caf26089b00a000851e11357a Author: Andi Kleen Date: Mon May 16 21:53:21 2005 -0700 [PATCH] x86_64/i386: fix defaults for physical/core id in /proc/cpuinfo Last round hopefully of cpu_core_id changes hopefully fow now: - Always initialize cpu_core_id for all CPUs, even when no dual core setup is detected. This prevents funny /proc/cpuinfo output - Do the same with phys_proc_id[] even when no HyperThreading - dito. - Use the CPU APIC-ID from CPUID 1 instead of the linux virtual CPU number to identify the core for AMD dual core setups. Patch for i386/x86-64. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 637716a3825e186555361574aa1fa3c0ebf8018b Author: Andi Kleen Date: Mon May 16 21:53:20 2005 -0700 [PATCH] x86_64: Add a guard page at the end of the 47bit address space This works around a bug in the AMD K8 CPUs. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10ffdbb8d605be88b148f127ec86452f1364d4f0 Author: Andi Kleen Date: Mon May 16 21:53:19 2005 -0700 [PATCH] x86_64: Readd missing tests in entry.S Cleans up the system exit call slightly and synchronizes with my tree again. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac6b931c44fd9988eaa821c339d54ba06b212412 Author: Andi Kleen Date: Mon May 16 21:53:19 2005 -0700 [PATCH] x86_64: Reduce NMI watchdog stack usage NR_CPUs can be quite big these days. kmalloc the per CPU array instead of putting it onto the stack Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7179906293ebdc333f14a03d3e58b03604848f3c Author: Kirill Korotaev Date: Mon May 16 21:53:18 2005 -0700 [PATCH] mm acct accounting fix This patch fixes mm->total_vm and mm->locked_vm acctounting in case when move_page_tables() fails inside move_vma(). Signed-Off-By: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 202d182a92c60416680e31baa697faa60b0882f5 Author: Bjorn Steinbrink Date: Mon May 16 21:53:17 2005 -0700 [PATCH] mm: fix rss counter being incremented when unmapping This patch fixes a bug introduced by the "mm counter operations through macros" patch, which replaced a decrement operation in with an increment macro in try_to_unmap_one(). Signed-off-by: Björn Steinbrink Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a5febe9ffeecd1e78c5b505260ccc1ef18021b4 Author: NeilBrown Date: Mon May 16 21:53:16 2005 -0700 [PATCH] md: set the unplug_fn and issue_flush_fn for md devices *after* committed to creation We we set the too early, they may still be in place and possibly get called even though the array didn't get set up properly. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29ac8e056f2016a8404edc02749d095019aa1f82 Author: NeilBrown Date: Mon May 16 21:53:15 2005 -0700 [PATCH] md: fix splitting of md/linear request that cross a device boundary When a request crosses a boundary between devices, it needs to be split. But where we should calculate the amount of the request before the boundary to find the split-point, we care currently calculating the amount that is *after* the boundary !!! Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f332287bc3f2801ba43682fd79baf24dc8ac1ce Author: Paolo 'Blaisorblade' Giarrusso Date: Mon May 16 21:53:14 2005 -0700 [PATCH] uml: change memcpy to memmove Replace one memcpy() call with overlapping source and dest arguments with one call to memmove(), to avoid data corruption. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02048817a70ad04dda5b30ad876c42a232229c99 Author: Paolo 'Blaisorblade' Giarrusso Date: Mon May 16 21:53:14 2005 -0700 [PATCH] uml: remove elf.h Actually remove elf.h in the tree. The previous patch, due to a quilt bug/misuse, left it in the tree as a 0-length file, preventing the build to see it as missing and to generate a symlink in its place. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a123edab03ac39e08c2f9cb4fc1af07e099c68bc Author: Peter Lundkvist Date: Mon May 16 21:53:12 2005 -0700 [PATCH] Intel 6300ESB TCO timer support Additional i8xx_tco device support. Cc: David Hardeman Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 643bdc6fc0e1928f39b4a3f486447024216ca50f Author: Zhang, Yanmin Date: Mon May 16 21:53:11 2005 -0700 [PATCH] ide proc destroy error Kernel 2.6 has an ide proc destroy error. Run #modprobe ide-core and #rmmod ide-core, then kernel will dump stack information like below. **********Log****************** Badness in remove_proc_entry at fs/proc/generic.c:693 Call Trace: [] show_stack+0x80/0xa0 sp=3De0000003e05dfbe0 = bsp=3De0000003e05d0ea8 [] dump_stack+0x30/0x60 sp=3De0000003e05dfdb0 = bsp=3De0000003e05d0e90 [] remove_proc_entry+0x530/0x540 sp=3De0000003e05dfdb0 = bsp=3De0000003e05d0e20 [] proc_ide_destroy+0x120/0x140 [ide_core] sp=3De0000003e05dfdc0 = bsp=3De0000003e05d0df0 [] cleanup_module+0x50/0xa0 [ide_core] sp=3De0000003e05dfdc0 = bsp=3De0000003e05d0dd0 [] sys_delete_module+0x390/0x580 sp=3De0000003e05dfdc0 = bsp=3De0000003e05d0d50 [] ia64_ret_from_syscall+0x0/0x20 sp=3De0000003e05dfe30 = bsp=3De0000003e05d0d50 [] _stext+0xffffffff00010640/0x400 sp=3De0000003e05e0000 = bsp=3De0000003e05d0d50 Signed-off-by: Zhang Yanmin Cc: Bartlomiej Zolnierkiewicz Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64d13c00cf1f7c3d2c1ff449e2a0500ab568d319 Author: Hugh Dickins Date: Mon May 16 21:53:09 2005 -0700 [PATCH] fix impossible VmallocChunk VmallocTotal: 34359738367 kB VmallocUsed: 266288 kB VmallocChunk: 18014366299193295 kB is unsettling - x86_64 and some other architectures keep a separate address range for modules in vmalloc's vmlist, which /proc/meminfo should pass over. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit baae956100334ffbd101eea5eeea9a5ac9cf3abd Author: Dmitry Torokhov Date: Mon May 16 21:53:09 2005 -0700 [PATCH] serio 'id' attributes move serio port's id attributes into separate subdirectory: ..devices/serioX/id_type -> ..devices/serioX/id/type ..devices/serioX/id_proto -> ..devices/serioX/id/proto Signed-off-by: Dmitry Torokhov Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ff2c873ca11f9e6abffb004b908756b27597672 Author: Dmitry Torokhov Date: Mon May 16 21:53:07 2005 -0700 [PATCH] serport oops fix serport - avoid calling serio_interrupt or serio_write_wakeup on unregistered port. Also fix memory leak which could happen if serport was left unused by moving serio allocation down to serport_ldisc_read. Signed-off-by: Dmitry Torokhov Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3a5c73d5ecb40909db662c4d2ace497b25c5940 Author: Dmitry Torokhov Date: Mon May 16 21:53:06 2005 -0700 [PATCH] ALPS resume fix ALPS needs to be reset for detection to work reliably when reconnecting. Signed-off-by: Dmitry Torokhov Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64b14d375263019753dd1405e4edd91a1715301d Author: Andrew Morton Date: Mon May 16 21:53:06 2005 -0700 [PATCH] alps printk tidy Make the alps printk output look consistent. Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c3f2be423dafb9f914afe85e532e3fffd502fde Author: Dmitry Torokhov Date: Mon May 16 21:53:04 2005 -0700 [PATCH] serio resume fix serio - do not attempt to immediately disconnect port if resume failed, let kseriod take care of it. Otherwise we may attempt to unregister associated input devices which will generate hotplug events which are not handled well during swsusp. Signed-off-by: Dmitry Torokhov Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 135255605d089202bec61b4a000ee762e9bc9d9c Author: Pete Jewell Date: Mon May 16 21:53:03 2005 -0700 [PATCH] Fix for bttv driver (v0.9.15) for Leadtek WinFast VC100 XP capture cards This is a tiny patch that fixes bttv-cards.c so that Leadtek WinFast VC100 XP video capture cards work. I've been advised to post it here after having already posted it to the v4l mailing list. Acked-by: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 360b52b08972ada8fd4421e9a7bcbe1ea186c20e Author: Greg KH Date: Tue May 10 06:45:10 2005 -0700 [PATCH] USB: add modalias sysfs file for usb devices Signed-off-by: Greg Kroah-Hartman commit 25b6f08e3fa0d84e26a373a205cfdad208b54af7 Author: Lonnie Mendez Date: Tue May 10 17:09:52 2005 -0500 [PATCH] USB: cypress_m8: add support for the DeLorme Earthmate lt-20 This patch adds support for the DeLorme Earthmate lt-20 to the cypress_m8 driver. The device was tested and found to be compatible with the cypress_m8 driver. This is a resend with the complete patch which properly compiles. Adds support for the DeLorme Earthmate lt-20 to the cypress_m8 driver. Signed-off-by: Lonnie Mendez Signed-off-by: Greg Kroah-Hartman commit 4756ae5b5234e08150ac089f7d989613948f00e5 Author: David Brownell Date: Mon May 9 17:23:51 2005 -0700 [PATCH] USB: ehci suspend must stop timer Force the EHCI watchdog timer off during suspend, in case for some reason it was still running after the root hub suspended. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 80615f81534109a22a732d0328d63ced4432824e Author: David Brownell Date: Tue May 10 06:45:10 2005 -0700 [PATCH] USB: usbnet driver fixes Updates to the usbnet driver: - Remove a warning when built with Zaurus support but not CDC Ethernet; just moves an #ifdef to cover more code - Two tweaks to the pseudo-MDLM support: * correctly handle _either_ of the two GUIDs * ignore a padding bit that doesn't seem necessary - Remove ID for one Motorola phone that uses the MDLM stuff. It also updates the Kconfig helptext to make it clearer that the "Zaurus" configuration option supports an increasing (sigh) family of nonstandard peripheral protocols. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 118326e940bdecef6c459d42ccf05256ba86daa7 Author: Peter Osterlund Date: Sat May 14 00:58:30 2005 -0700 [PATCH] Fix root hole in pktcdvd ioctl_by_bdev may only be used INSIDE the kernel. If the "arg" argument refers to memory that is accessed by put_user/get_user in the ioctl function, the memory needs to be in the kernel address space (that's the set_fs(KERNEL_DS) doing in the ioctl_by_bdev). This works on i386 because even with set_fs(KERNEL_DS) the user space memory is still accessible with put_user/get_user. That is not true for s390. In short the ioctl implementation of the pktcdvd device driver is horribly broken. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 68f66feb300423bb9ee5daecb1951af394425a38 Author: Stephen Tweedie Date: Fri May 13 23:31:19 2005 -0400 [PATCH] Fix root hole in raw device [Patch] Fix raw device ioctl pass-through Raw character devices are supposed to pass ioctls through to the block devices they are bound to. Unfortunately, they are using the wrong function for this: ioctl_by_bdev(), instead of blkdev_ioctl(). ioctl_by_bdev() performs a set_fs(KERNEL_DS) before calling the ioctl, redirecting the user-space buffer access to the kernel address space. This is, needless to say, a bad thing. This was noticed first on s390, where raw IO was non-functioning. The s390 driver config does not actually allow raw IO to be enabled, which was the first part of the problem. Secondly, the s390 kernel address space is distinct from user, causing legal raw ioctls to fail. I've reproduced this on a kernel built with 4G:4G split on x86, which fails in the same way (-EFAULT if the address does not exist kernel-side; returns success without actually populating the user buffer if it does.) The patch below fixes both the config and address-space problems. It's based closely on a patch by Jan Glauber , which has been tested on s390 at IBM. I've tested it on x86 4G:4G (split address space) and x86_64 (common address space). Kernel-address-space access has been assigned CAN-2005-1264. Signed-off-by: Stephen Tweedie Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman commit a84a505956f5c795a9ab3d60d97b6b91a27aa571 Author: Greg Kroah-Hartman Date: Wed May 11 00:10:44 2005 -0700 [PATCH] fix Linux kernel ELF core dump privilege elevation As reported by Paul Starzetz Reference: CAN-2005-1263 Signed-off-by: Greg Kroah-Hartman commit d3f0fcec2d50a18a84c4f3dd7683206ed37ca009 Author: Linus Torvalds Date: Mon May 16 20:06:47 2005 -0700 Automatic merge of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git commit 8711a1b902e691c9b3bbd0d0624f836abe9641ca Author: Russell King Date: Mon May 16 23:36:22 2005 +0100 [PATCH] ARM: Fix build error Mainline kernels don't have VECTORS_HIGH nor COPYPAGE_MINICACHE yet. Signed-off-by: Russell King commit 768cbfbc5273bad91afe12b81471f563b288118a Author: Linus Torvalds Date: Mon May 16 10:34:52 2005 -0700 Automatic merge of master.kernel.org:/home/rmk/linux-2.6-serial.git commit 2a4a7e02e27b4f542473772d588f81759c209fb3 Author: Linus Torvalds Date: Mon May 16 10:27:11 2005 -0700 Automatic merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git commit c8920ba041c8934b29370f5d62ab9ea8f147966b Author: Daniel Andersen Date: Thu May 5 15:14:09 2005 -0700 [PATCH] wireless: 3CRWE154G72 Kconfig help fix Version 2 of the 3com OfficeConnect 11g Cardbus Card aka 3CRWE154G72 is not supported by the prism54 project. To stop confusion, the kernel documentation should state so as 3com made a good job hiding the version. Signed-off-by: Andrew Morton diff -puN drivers/net/wireless/Kconfig~wireless-3crwe154g72-kconfig-help-fix drivers/net/wireless/Kconfig commit c4cc26d3310a6614a20e32276228a5d44159fc9b Author: Jiri Benc Date: Wed Apr 27 12:48:56 2005 +0200 [PATCH] Typo in tulip driver This patch fixes a typo in tulip driver in 2.6.12-rc3. commit 562faf469f35bf63c0b021550811280c81bdc52e Author: James Harper Date: Thu May 5 15:14:18 2005 -0700 [PATCH] fix PROMISC/bridging in TLAN driver This has been a problem for me for ages. When using bridging, the driver is switched into promiscuous mode before the link init is complete. The init complete routine then resets the promisc bit on the card so the kernel still thinks the card is in promiscuous mode but the card isn't. doh. I think this bug only shows up in bridging when the bridge is started at boot time (or something else that sets promisc at the same time the card was started). If promisc is enabled later it works. Here's a trivial (and hopefully correct) patch that works for me. It just calls the promisc/multicast setup routine after init. Cc: Jeff Garzik Signed-off-by: Andrew Morton commit 99718699f5746cc365f3a9ab4769568a1da97635 Author: Geoff Levand Date: Thu Apr 14 11:20:32 2005 -0700 [PATCH] {PATCH] Fix IBM EMAC driver ioctl bug Fix IBM EMAC driver ioctl bug. I found IBM EMAC driver bug. So mii-tool command print wrong status. # mii-tool eth0: 10 Mbit, half duplex, no link eth1: 10 Mbit, half duplex, no link I can get correct status on fixed kernel. # mii-tool eth0: negotiated 100baseTx-FD, link okZZ eth1: negotiated 100baseTx-FD, link ok Hiroaki Fuse Signed-off-by: Geoff Levand for CELF commit c16ef1ceedff27c1b452724ca7f89b729651098f Author: Benjamin LaHaise Date: Wed Apr 6 11:17:59 2005 -0400 [PATCH] ns83820 update Changes: - improved DAC ifdefs from Andi Kleen - removal of dead code from Adrian Bunk - fix half duplex collision behaviour commit f7a3aae1723e7ffc9c4fcdb489365da7a3d81255 Author: Al Viro Date: Sun Apr 3 09:15:52 2005 +0100 [PATCH] drivers/net/wireless enabled by wrong option NET_WIRELESS is only a subset of the stuff in drivers/net/wireless; NET_RADIO is what covers all of them. Signed-off-by: Al Viro commit 4b40033ef110b833986c1a1d958a951b695f9fbc Author: Domen Puncer Date: Sun May 15 16:01:50 2005 -0700 [SPARC]: Eliminate local MIN/MAX macros in drivers/sbus/char/aurora.c From: Christophe Lucas min/max macros from kernel.h are safe, a lot of handcrafted MIN/MAX are not. Signed-off-by: Christophe Lucas Signed-off-by: Domen Puncer commit cdcca89e1a90fa9112260bd6384f20fcc4280e21 Author: Brett Russ Date: Mon Mar 28 15:10:27 2005 -0500 [PATCH] libata: flush COMRESET set and clear Updated patch to fix erroneous flush of COMRESET set and missing flush of COMRESET clear. Created a new routine scr_write_flush() to try to prevent this in the future. Also, this patch is based on libata-2.6 instead of the previous libata-dev-2.6 based patch. Signed-off-by: Brett Russ Index: libata-2.6/drivers/scsi/libata-core.c =================================================================== commit 21b1ed74ee3667dcabcba92e486988ea9119a085 Author: Albert Lee Date: Fri Apr 29 17:34:59 2005 +0800 [PATCH] libata: Prevent the interrupt handler from completing a command twice Problem: During the libata CD-ROM stress test, sometimes the "BUG: timeout without command" error is seen. Root cause: Unexpected interrupt occurs after the ata_qc_complete() is called, but before the SCSI error handler. The interrupt handler is invoked before the SCSI error handler, and it clears the command by calling ata_qc_complete() again. Later when the SCSI error handler is run, the ata_queued_cmd is already gone, causing the "BUG: timeout without command" error. Changes: - Use the ATA_QCFLAG_ACTIVE flag to prevent the interrupt handler from completing the command twice, before the scsi_error_handler. Signed-off-by: Albert Lee commit 15efa9bb2d4da7cd9feb1c67fcf3d9e0e1bd00c6 Author: Stephen Hemminger Date: Wed May 4 15:33:11 2005 -0700 [PATCH] tlan: restore deleted module parameters. The module parameter values got lost in the conversion to the new module_param interface. This should fix it. Signed-off-by: Stephen Hemminger Index: tlan/drivers/net/tlan.c =================================================================== commit 6da0f685935e13458a2206ac872d0d3c67a52f65 Author: Adrian Bunk Date: Sat Apr 30 13:52:49 2005 +0200 [PATCH] SIS900 must select MII This patch fixes the following compile error caused by bk-netdev: <-- snip --> ... LD .tmp_vmlinux1 drivers/built-in.o(.text+0x98528): In function `sis900_get_settings': : undefined reference to `mii_ethtool_gset' drivers/built-in.o(.text+0x98538): In function `sis900_set_settings': : undefined reference to `mii_ethtool_sset' drivers/built-in.o(.text+0x98517): In function `sis900_get_link': : undefined reference to `mii_link_ok' drivers/built-in.o(.text+0x98547): In function `sis900_nway_reset': : undefined reference to `mii_nway_restart' make: *** [.tmp_vmlinux1] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Daniele Venzano commit 1bcd315362e215a72b56d1330bbf32f1c74eefb5 Author: Don Fry Date: Fri Apr 29 14:51:17 2005 -0700 [PATCH] pcnet32: fix resource leak with loopback test When running the loopback test, resources are not properly released on completion. This patch frees all transmit resources after running the loopback test. Tested on ia32 and ppc64 hardware. Signed-off-by: Don Fry commit 41480af27a85d6008d9e11db8bc2730407c25e1d Author: Dan Williams Date: Tue May 10 09:45:51 2005 -0400 [PATCH] wireless/airo: WEXT and quality corrections This patch brings the airo driver into line with the current WEXT specification of signal quality. It also fixes the values used to determine signal quality and level for MPI & PCMCIA 350 cards. It turns out that BSSListRid.rssi was actually in dBm for 350 series cards, and that we can use the normalized signal strength reported by the card as our "quality" value, on a scale of 0 - 100. Since signal level values are in dBm for this driver, max_qual->level MUST be 0, as specified in the WEXT spec. This patch also uses the IW_QUAL constants new in WEXT version 17. Signed-off-by: Dan Williams commit 760f86d78d92f39e2ceb55b40f0885eb755c8c2f Author: Herbert Xu Date: Sat Apr 16 16:24:16 2005 +1000 [PATCH] Fw: [Bugme-new] [Bug 4482] New: natsemi: incorrect initialization of IPv6 Neighbor-discovery multicast On Wed, Apr 13, 2005 at 05:36:42PM +0000, Andrew Morton wrote: > Summary: natsemi: incorrect initialization of IPv6 Neighbor- > discovery multicast I've got a pair of FA312 cards and this problem has bothered me for ages. This has finally prompted me to do something about it :) Turns out that somebody wasn't following the documentation. We were doing 16-bit writes to 32-bit registers which led to some addresses working and others not so lucky. This patch should fix the problem. Signed-off-by: Herbert Xu commit e885b5e83965c320e8eff1ec3ebfbf821b375568 Author: simon@thekelleys.org.uk Date: Sat May 7 21:33:31 2005 +0100 [PATCH] atmel wireless Below is a one-liner for the atmel wireless driver, just adding another card to the table. commit 22c6d143f33f10721216a8cfa3a83f7edfc2bd4e Author: Manfred Spraul Date: Tue Apr 19 21:17:09 2005 +0200 [PATCH] forcedeth: Update error handling Ayaz wrote an update to the error handling for forcedeth (which I modified heavily, thus all bugs are mine): The ERROR4 bit is not a fatal error, it just indicates a mismatch between the actual packet len and the len according to the 802.3 header. The patch adds proper handling. The patch also removes the code that drops all packets with RX_ERROR & (!RX_FRAMINGERR): ERROR4 errors are also not fatal. commit b2e0852e1eee7c445b1789bef41204b64f981102 Author: Michael Ellerman Date: Thu May 12 18:09:45 2005 +1000 [PATCH] iseries_veth: Cleanup skbs to prevent unregister_netdevice() hanging Hi Andrew, Jeff, The iseries_veth driver is badly behaved in that it will keep TX packets hanging around forever if they're not ACK'ed and the queue never fills up. This causes the unregister_netdevice code to wait forever when we try to take the device down, because there's still skbs around with references to our struct net_device. There's already code to cleanup any un-ACK'ed packets in veth_stop_connection() but it's being called after we unregister the net_device, which is too late. The fix is to rearrange the module exit function so that we cleanup any outstanding skbs and then unregister the driver. Signed-off-by: Michael Ellerman commit 41664c03f6c96a1f8a91714309b36f1b5ca85610 Author: Michael Ellerman Date: Thu May 12 17:55:08 2005 +1000 [PATCH] iseries_veth: Don't leak skbs in RX path Hi Andrew, Jeff, Under some strange circumstances the iseries_veth driver can leak skbs. Fix is simply to call dev_kfree_skb() in the right place. Fix up the comment as well. Signed-off-by: Michael Ellerman commit eb235aef724568ae15af831968000cf9a3974b26 Author: Michael Ellerman Date: Thu May 12 17:53:18 2005 +1000 [PATCH] iseries_veth: Set dev->trans_start so watchdog timer works right Hi Andrew, Jeff, The iseries_veth driver doesn't set dev->trans_start in it's TX path. This will cause the net device watchdog timer to fire earlier than we want it to, which causes the driver to needlessly reset its connections to other LPARs. Signed-off-by: Michael Ellerman commit f27eff1ffd65236b8e421188f76ad1b0b94e06eb Author: Michael Ellerman Date: Thu May 12 17:47:27 2005 +1000 [PATCH] iseries_veth: Don't send packets to LPARs which aren't up Hi Andrew, Jeff, The iseries_veth driver has a logic bug which means it will erroneously send packets to LPARs for which we don't have a connection. This usually isn't a big problem because the Hypervisor call fails gracefully and we return, but if packets are TX'ed during the negotiation of the connection bad things might happen. Regardless, the right thing is to bail early if we know there's no connection. Signed-off-by: Michael Ellerman commit 05e08a2a297371564020f76d1bf8b3a931d5e1ed Author: Frank Pavlic Date: Thu May 12 20:39:09 2005 +0200 [PATCH] s390: qeth bug fixes [patch 10/10] s390: qeth bug fixes. From: Frank Pavlic qeth network driver related changes: - due to OSA hardware changes in TCP Segmentation Offload support we are able now to pack TSO packets too. This fits perfectly in design of qeth buffer handling and sending data respectively. - remove skb_realloc_headroom from the sending path since hard_header_len value provides enough headroom now. - device recovery behaviour improvement - bug fixed in Enhanced Device Driver Packing functionality Signed-off-by: Frank Pavlic commit 9a4558193662e933588ee53e0202c103a68c9366 Author: Frank Pavlic Date: Thu May 12 20:38:28 2005 +0200 [PATCH] s390: qeth bug fixes [patch 9/10] s390: qeth bug fixes. From: Frank Pavlic qeth network driver changes: - Use sizeof(__u16) instead of '2' in qeth_fill_header. Signed-off-by: Frank Pavlic commit e23dd9cdd676323c95fab47dc55123ba18f7e1ff Author: Frank Pavlic Date: Thu May 12 20:38:11 2005 +0200 [PATCH] s390: fakell for high speed token ring [patch 8/10] s390: fakell for high speed token ring. From: Michael Holzheu Implement fake-link-layer for high speed token ring. Without it token ring packages get leading ethernet headers, which confuses dhcp. Signed-off-by: Frank Pavlic commit d801145d910cc4a0fb418dda1dee227cec993cbd Author: Frank Pavlic Date: Thu May 12 20:37:53 2005 +0200 [PATCH] s390: qeth bug fixes [patch 7/10] s390: qeth bug fixes. From: Frank Pavlic qeth network driver changes: - Removed redundant code, use the same qeth_fill_buffer_frag for TSO path either - Using skb->frags solely is not correct since skb->data still points to the beginning of the whole data, even when it is a small portion we have to fill the qdio buffer with it. Signed-off-by: Frank Pavlic commit 5e39f2933f6707fc824b5e419dcac8ced67a57b6 Author: Frank Pavlic Date: Thu May 12 20:37:00 2005 +0200 [PATCH] s390: enable iucv_send2way_xxx functions [patch 6/10] s390: enable iucv_send2way_xxx functions. From: Ursula Braun-Krahl The SSL-Server of z/VM wants to use the iucv_send2way and iucv_send2way_array function. Enable them again. Signed-off-by: Frank Pavlic commit 7394c928c849fe2ea5c20b6d73cbe7f220810d94 Author: Frank Pavlic Date: Thu May 12 20:36:47 2005 +0200 [PATCH] s390: ctc code cleanup [patch 5/10] s390: ctc code cleanup. From: Peter Tiedemann ctc network driver changes: - Some code cleanup. Signed-off-by: Martin Schwidefsky commit 7f81947b46c3efacc084ac5033f3fed702e46532 Author: Frank Pavlic Date: Thu May 12 20:36:22 2005 +0200 [PATCH] s390: schedule_timeout cleanup in ctctty [patch 4/10] s390: schedule_timeout cleanup in ctctty. From: Domen Puncer Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Frank Pavlic Acked-by: Martin Schwidefsky commit b5f9d55b64a5c7193f8965c90ba62244ea3180b2 Author: Frank Pavlic Date: Thu May 12 20:35:57 2005 +0200 [PATCH] s390: set online race in the lcs driver [patch 3/10] s390: set online race in the lcs driver. From: Michael Holzheu There is a race between lcs_stopcard() and lcs_open_device() which can lead to the error 'lcs: Error in starting channel, rc=-16'. lcs_open_device() is invoked when 'ifconfig up' is called due to a hotplug event, which is caused by register_netdev(). In parallel lcs_stopcard() is executed. Both functions are sending lcs commands. The second invocation fails with -EBUSY (-16) as return value. Move invocation of register_netdev() after invocation of lcs_stopcard to avoid the race. Signed-off-by: Frank Pavlic commit 109a260b66bfbab7ba9f985495791af21f910218 Author: Frank Pavlic Date: Thu May 12 20:19:44 2005 +0200 [PATCH] s390: multicast address registration in lcs [patch 2/10] s390: multicast address registration in lcs. From: Michael Holzheu When setting lcs devices online you can run into an endless loop, because the code that registers the multicast addresses uses list_for_each_entry instead of list_for_each_entry_safe. Signed-off-by: Frank Pavlic commit 321de3c8cc12bdff073c23524aa1f6ed47cbeee4 Author: Frank Pavlic Date: Thu May 12 20:17:46 2005 +0200 [PATCH] s390: claw driver wiring [patch 1/10] s390: claw driver wiring. From: Andy Richter claw network driver changes: - Add an entry to the drivers/s390/net Makefile to build the claw driver. - Add claw channel type to cu3088. Signed-off-by: Frank Pavlic commit f85bdb9ce9e130ce00f7a91523931fdd8f96f102 Author: John W. Linville Date: Thu May 12 15:49:54 2005 -0400 [PATCH] libata: stop setting sdev->host->max_sectors for lba48 drives Avoid changing sdev->host->max_sectors because it can prevent use of non-lba48 drives on other ports of the same adapter. Signed-off-by: Stuart Hayes Signed-off-by: John W. Linville commit 042e2fb70006f135469d546726451b7d14768980 Author: Malli Chilakala Date: Thu Apr 28 19:20:14 2005 -0700 [PATCH] e100: Driver version, white space, comments, device id Driver version, white space, comments. Also enabled ICH-7 support Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 962082b6df11fe8cabafd2971b07c914cd52ee2a Author: Malli Chilakala Date: Thu Apr 28 19:19:46 2005 -0700 [PATCH] e100: Performance optimizations to e100 Tx Path Performance optimizations to e100 Tx Path Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 6bdacb1ad58bb6b772a4fc18f21684437bd5f439 Author: Malli Chilakala Date: Thu Apr 28 19:17:54 2005 -0700 [PATCH] e100: Fix Wake on lan related issues Fix Wake on lan related issues Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 0236ebb7ae85935b3b96eef7e8a4e203ea9958a0 Author: Malli Chilakala Date: Thu Apr 28 19:17:42 2005 -0700 [PATCH] e100: Synchronize interface link state with poll routine Synchronize interface link state with e100 poll routine Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 1f53367d5d75ba37f258f6e955d6fc24814051a0 Author: Malli Chilakala Date: Thu Apr 28 19:17:20 2005 -0700 [PATCH] e100: Render e100 NAPI state machine Render e100 NAPI state machine to be similar to the non-NAPI one. Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 2acdb1e05c1a92e05ee710ed8f226a8f3183d5a0 Author: Malli Chilakala Date: Thu Apr 28 19:16:58 2005 -0700 [PATCH] e100: Execute tx_timeout task outside interrupt context Execute tx_timeout task outside the interrupt context Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit ac79c82e793bc2440c4765e5eb1b834d2c18edf2 Author: Malli Chilakala Date: Thu Apr 28 19:05:32 2005 -0700 [PATCH] ixgb: Driver version, white space, comments, device id Driver version, white space, comments, device id & other Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit 37d16f823799918107440cb9e552b0709347f77c Author: Malli Chilakala Date: Thu Apr 28 19:05:12 2005 -0700 [PATCH] ixgb: Fixed msec_delay in osdep to use msleep Fixed msec_delay in osdep to use msleep Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_osdep.h net-drivers-2.6/drivers/net/ixgb.new/ixgb_osdep.h commit f404de1cd407c1f56fa478810c6c48e015d377bd Author: Malli Chilakala Date: Thu Apr 28 19:04:54 2005 -0700 [PATCH] ixgb: Code optimization Code optimization Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit c2eba932b14718e34ac2609e35c6d41e032a2478 Author: Malli Chilakala Date: Thu Apr 28 19:04:32 2005 -0700 [PATCH] ixgb: Remove hook for suspend, no power management Remove hook for suspend. No power management in 10GbE Controllers Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit 5e3c30deb21d0eb0da44830fb1c1fc7054e54229 Author: Malli Chilakala Date: Thu Apr 28 19:04:07 2005 -0700 [PATCH] ixgb: Support for ethtool -d ixgb support for ethtool -d Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_ethtool.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_ethtool.c commit abf481d6af8670c89f33f354c6fbd9977b23cebc Author: Malli Chilakala Date: Thu Apr 28 19:03:32 2005 -0700 [PATCH] ixgb: Fix EEPROM functions to be endian-aware Fix EEPROM functions to be endian-aware Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_ee.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_ee.c commit 41639fed1b32dde4ea3d94242a89308435d341be Author: Malli Chilakala Date: Thu Apr 28 18:51:54 2005 -0700 [PATCH] ixgb: Reset status in the Rx Reset status in the Rx descriptor prior to handing it to the controller. Leave three Rx descriptors unused Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit 6dfbb6dd391139be9f1cd333877c6e2b03da4bba Author: Malli Chilakala Date: Thu Apr 28 18:56:40 2005 -0700 [PATCH] ixgb: Mask RXO interrupt Disable RXO interrupt to decrease recovery time when system is overloaded with data Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit 0c73f58636385a4d3dc68d0d0829d4c39d61b621 Author: Malli Chilakala Date: Thu Apr 28 18:48:06 2005 -0700 [PATCH] ixgb: Change RDT write bump size to 4 Change RDT write bump size back to 4 Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb.h net-drivers-2.6/drivers/net/ixgb.new/ixgb.h commit 06c2f9ecb5b53f9d4fc1ef596da16683cc4af5ba Author: Malli Chilakala Date: Thu Apr 28 18:46:51 2005 -0700 [PATCH] ixgb: Do not set the RS bit on context descriptors Don't set the RS bit on context descriptors, causes un-necessary bus activity Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit 5633684d008b777ab169e8efcef39a898482f531 Author: Malli Chilakala Date: Thu Apr 28 18:45:50 2005 -0700 [PATCH] ixgb: Fix multi-cast packet count in statistics Fix multi-cast packet count in statistics Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit 2648345fcbadfae8e7113112ff9402e465a184dc Author: Malli Chilakala Date: Thu Apr 28 19:44:46 2005 -0700 [PATCH] e1000:Driver version,white space,comments,device id Driver version, white space, comments, device id & other Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_ethtool.c net-drivers-2.6/drivers/net/e1000.new/e1000_ethtool.c commit 1125ecbc0a89db07bb4eb1ba892a23367c3bdeb5 Author: Malli Chilakala Date: Thu Apr 28 19:44:25 2005 -0700 [PATCH] e1000:Adjust flow control watermarks for Jumbo Frames Adjust flow control watermarks for Jumbo Frames Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 0e6ef3e02b6f07e37ba1c1abc059f8bee4e0847f Author: Malli Chilakala Date: Thu Apr 28 19:44:14 2005 -0700 [PATCH] e1000:Fix Packet Buffer Allocation logic for 82547_rev_2 Fix Packet Buffer Allocation logic for 82547_rev_2 controller Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 2d7edb923a823660b081bd4c660300ee19adca8d Author: Malli Chilakala Date: Thu Apr 28 19:43:52 2005 -0700 [PATCH] e1000:82573 specific code & packet split code 82573 specific code & packet split code Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000.h net-drivers-2.6/drivers/net/e1000.new/e1000.h commit f0d11ed0b0650d2f93f56f65167c10a577c16c88 Author: Malli Chilakala Date: Thu Apr 28 19:43:28 2005 -0700 [PATCH] e1000: Modified e1000_clean: exit poll Modified e1000_clean:: exit poll if no Tx and work_done == 0 Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit f1d2e4905eed4b13c3ba56ac6d30c283be996963 Author: Malli Chilakala Date: Thu Apr 28 19:42:04 2005 -0700 [PATCH] e1000:Removed redundant statement in e1000_clean_tx_irq Removed redundant statement in e1000_clean_tx_irq Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 97338bde27d97347bc83203d6ac5e93be1ebcd03 Author: Malli Chilakala Date: Thu Apr 28 19:41:46 2005 -0700 [PATCH] e1000: Implement a workaround for 82546 errata 10 Implement 82546 errata 10 -- first Tx descriptor cannot have more than 2015 byte of data in it or it could hang the transmitter. Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit a4cb847dac40577dd751a4deb4085ed080780679 Author: Malli Chilakala Date: Thu Apr 28 19:41:28 2005 -0700 [PATCH] e1000: e1000 stops working after resume e1000 stops working after resume, call pci_enable_device after pci_restore_state - Modified Andrew Morton's patch Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 6d9157577d926d2a83fe8d4914c0cc216deb5842 Author: Malli Chilakala Date: Thu Apr 28 19:41:11 2005 -0700 [PATCH] e1000:Fix computation of netdev stats from controller stats counters Fix computation of netdev stats from controller stats counters - from sfeldma@pobox.com Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 70b8f1e16a788eccdd36f39679774b1a08a6ba55 Author: Malli Chilakala Date: Thu Apr 28 19:40:40 2005 -0700 [PATCH] e1000: Dump information on Tx ring Dump information on Tx ring when 'NETDEV: Watchdog' condition is reached Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 2701234fc0372630457e3da14e36cde53c57d12e Author: Malli Chilakala Date: Thu Apr 28 19:40:28 2005 -0700 [PATCH] e1000: Delay clean-up of last Tx packet Delay clean-up of last Tx packet to fix pre-mature writeback issue of Tx descriptors only when TSO is enabled Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 4e48a2b91d408357cb0747151d8db5368ac8f1d0 Author: Malli Chilakala Date: Thu Apr 28 19:39:53 2005 -0700 [PATCH] e1000: Fix kernel panic with 82541 LOM Fix kernel panic with 82541 LOM when using a 100M cable Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 5de556249fde97493a4c79dbf8979ace0f76789f Author: Malli Chilakala Date: Thu Apr 28 19:39:30 2005 -0700 [PATCH] e1000: Enable polling before enabling interrupts Enable polling before enabling interrupts -- avoids (in NAPI mode) entering the ISR and returning without doing any work because polling is not enabled. [romieu@fr.zoriel.com] Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit fa4f7ef3aaa6cee6b04ebe90266ee893e0b2ce07 Author: Malli Chilakala Date: Thu Apr 28 19:39:13 2005 -0700 [PATCH] e1000: MSI support for PCI-e adapters MSI support for PCI-e adapters Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000.h net-drivers-2.6/drivers/net/e1000.new/e1000.h commit df25e164878836196ee93d1a5757867da6eac30e Author: Malli Chilakala Date: Thu Apr 28 19:38:43 2005 -0700 [PATCH] e1000: Fix msec-delay definition to use msleep Fix msec-delay definition in e1000_osdep.h to use msleep Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_osdep.h net-drivers-2.6/drivers/net/e1000.new/e1000_osdep.h commit e4eff7291c977308989b24fdfc7215a501302e6a Author: Malli Chilakala Date: Thu Apr 28 19:38:30 2005 -0700 [PATCH] e1000: made loopback test robust Added enhanced functionality to the loopback diags to wrap the descriptor rings. Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_ethtool.c net-drivers-2.6/drivers/net/e1000.new/e1000_ethtool.c commit da369b01d49b34803265096eb92a2d6da61cf0d0 Author: Daniele Venzano Date: Thu May 12 20:13:14 2005 -0400 [PATCH] More ethtool support for sis900 and warning fix Add support to sis900 for the following ethtool ops: - get_link - get_settings - set_settings - nway_reset Signed-off-by: Daniele Venzano Signed-off-by: Jeff Garzik commit 126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c Author: Francois Romieu Date: Thu May 12 20:09:17 2005 -0400 [PATCH] r8169: incoming frame length check The size of the incoming frame is not correctly checked. The RxMaxSize register (0xDA) does not work as expected and incoming frames whose size exceeds the MTU actually end spanning multiple descriptors. The first Rx descriptor contains the size of the whole frame (or some garbage in its place). The driver does not expect something above the space allocated to the current skb and crashes loudly when it issues a skb_put. The fix contains two parts: - disable hardware Rx size filtering: so far it only proved to be able to trigger some new fancy errors; - drop multi-descriptors frame: as the driver allocates MTU sized Rx buffers, it provides an adequate filtering. As a bonus, wrong descriptors were not returned to the asic after their processing. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 2918c35d311263bc313b3da272783860ce573189 Author: Michal Schmidt Date: Thu May 12 19:42:06 2005 -0400 [PATCH] forcedeth: netpoll support commit dfa1b73ffb414b64dc0452260132a090eb25bf52 Author: Liu Tao Date: Thu May 12 19:40:38 2005 -0400 [PATCH] drivers/net/amd8111e.c: fix NAPI interrupt in poll This patch makes the netif_rx_complete() and rx_interrupt_enable atomic when exiting the poll() method, so to avoid interrupt in poll. It also fixes the rx interrupt check logic in interrupt handler. Signed-off-by: Liu Tao Signed-off-by: Jeff Garzik commit bfd4e0709fb977e64e27d9255be6e7aeadf4fcd4 Author: Ben Dooks Date: Thu May 12 19:27:14 2005 +0100 [PATCH] ARM: 2678/1: S3C2440 - cpu fixes, hdiv divisors and nand dev name Patch from Ben Dooks Fix the setting of hdiv when set to divide-by-2. Thanks to Jeonghoon Yoon for pointing this out. Change name of the NAND device to "s3c2440-nand" as it is not similar enough to the "s3c2410-nand" device. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 4ad3a443c9238c8df68f4519049c3c8d80fe62c2 Author: Ben Dooks Date: Thu May 12 19:27:13 2005 +0100 [PATCH] ARM: 2677/1: S3C2440 - UPLL frequency doubled Patch from Ben Dooks S3C2440 UPLL is the same as the S3C2410 UPLL, it is only the MPLL which has an extra multiplication factor of 2 in the multiplier. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 9dabf9da18018b99a51334c2ef168019389ed5bf Author: Ben Dooks Date: Thu May 12 19:27:13 2005 +0100 [PATCH] ARM: 2676/1: S3C2440 - NAND register additions Patch from Ben Dooks Add the register definitions for the s3c2440 NAND controller to the s3c2410 NAND register definitions Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 70489c88d0b7e5820ac37a039a910bb396e2a4e3 Author: Nicolas Pitre Date: Thu May 12 19:27:12 2005 +0100 [PATCH] ARM: 2680/1: refine TLS reg availability some more again Patch from Nicolas Pitre Not all ARMv6 processors implement the TLS register. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 104e50108c862b13da26850d4b469cc13418b66b Author: Rolf Eike Beer Date: Sun Mar 27 08:50:38 2005 -0500 [PATCH] typo fix in drivers/scsi/sata_svw.c comment Add missing brace. commit 4dbc30fb27ac4e647e6efadb382ff7d38c3d368e Author: David S. Miller Date: Wed May 11 11:37:00 2005 -0700 [SPARC64]: Add timeouts to streaming buffer synchronization. If some hardware error occurs and the flush flag never updates, we will hang forever in these routines. Add a timeout, and print out a diagnostic if it is reached. Signed-off-by: David S. Miller commit e4fdee8e3b41239242a8f421a28736ef8e08ca55 Author: David S. Miller Date: Wed May 11 11:34:32 2005 -0700 [SUNSAB]: Defer register updates until transmitter is idle. The chip can emit garbage characters if we touch the settings while characters are going out. Signed-off-by: David S. Miller commit bfd68594082d8384781c242aa72a7950b5cf51aa Author: David Mosberger-Tang Date: Wed May 4 06:42:00 2005 -0700 [IA64] Avoid .spillpsp directive in handcoded assembly Some time ago, GAS was fixed to bring the .spillpsp directive in line with the Intel assembler manual (there was some disagreement as to whether or not there is a built-in 16-byte offset). Unfortunately, there are two places in the kernel where this directive is used in handwritten assembly files and those of course relied on the "buggy" behavior. As a result, when using a "fixed" assembler, the kernel picks up the UNaT bits from the wrong place (off by 16) and randomly sets NaT bits on the scratch registers. This can be noticed easily by looking at a coredump and finding various scratch registers with unexpected NaT values. The patch below fixes this by using the .spillsp directive instead, which works correctly no matter what assembler is in use. Signed-off-by: David Mosberger-Tang Signed-off-by: Tony Luck commit d7def6c22dfa9f32b3d9e5546a7a6a90c644ff5f Author: Sascha Hauer Date: Tue May 10 19:01:35 2005 +0100 [PATCH] ARM: 2666/1: i.MX pwm controller defines Patch from Sascha Hauer This patch adds the defines for the i.MX PWM controller Signed-off-by: Steven Scholz Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit fa4354359f800ef9d68ed644438efd45b559b443 Author: Nicolas Pitre Date: Tue May 10 17:36:29 2005 +0100 [PATCH] ARM: 2663/2: I can't type Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 8d802d28c23122a57d7dddf4886b0486ca183d2d Author: Russell King Date: Tue May 10 17:31:43 2005 +0100 [PATCH] ARM: Add V6 aliasing cache flush Add cache flushing support for aliased V6 caches to flush_dcache_page. Signed-off-by: Russell King commit 08ee4e4c5fd3fb0857eeb6a5a0ff66881432e8a3 Author: Russell King Date: Tue May 10 17:30:47 2005 +0100 [PATCH] ARM: Use top_pmd for V6 copy/clear user_page Remove needless page table walking for v6 page operations. Signed-off-by: Russell King commit d2bab05ac1f9a2f5ddcd2f3256237e5c47fc127f Author: Russell King Date: Tue May 10 14:23:01 2005 +0100 [PATCH] ARM: Move copy/clear user_page locking into implementation Move the locking for copy_user_page() and clear_user_page() into the implementations which require locking. For simple memcpy/ memset based implementations, the locking is extra overhead which is not necessary, and prevents preemption occuring. Signed-off-by: Russell King commit c4e1f6f6bf82af89994a0ee760fc5e036c4d3c1f Author: Russell King Date: Tue May 10 10:40:19 2005 +0100 [PATCH] ARM: Add top_pmd, which points at the top-most page table Signed-off-by: Russell King commit a84f5770170232a48e753e02ee5f0f17ee17b791 Author: Tony Luck Date: Mon May 9 16:44:53 2005 -0700 Merge with /home/aegl/GIT/linus commit 05ab3014636ff60a319d37cdf37dca594b015eec Author: Russell King Date: Mon May 9 23:21:59 2005 +0100 [PATCH] Serial: Add uart_insert_char() Add uart_insert_char(), which handles inserting characters into the flip buffer. This helper function handles the correct semantics for handling overrun in addition to inserting normal characters. Signed-off-by: Russell King commit 155bb14482cc567761c13b4efc064de400c55e18 Author: Russell King Date: Mon May 9 20:52:51 2005 +0100 [PATCH] ARM: Add inline functions to find the pmd from virtual address Add pmd_off() and pmd_off_k() to obtain the pmd pointer for a virtual address, and use them throughout the mm initialisation. Signed-off-by: Russell King commit 66302f211a21bb9439a2ae7f7b6a4c386bb10ecd Author: David Mosberger-Tang Date: Tue Apr 12 11:04:00 2005 -0700 [IA64] fix "section mismatch" compile-time-error I noticed this typo when trying to compile a kernel which had CONFIG_HOTPLUG turned off. In that case, __devinit is no longer a no-op and the compiler then detects a section-conflict. Fix by using __devinitdata instead of __devinit. Same patch also submitted by Darren Williams to fix compilation error using sim_defconfig (which has CONFIG_HOTPLUG=n). Signed-off-by: David Mosberger-Tang Signed-off-by: Darren Williams Signed-off-by: Tony Luck commit 85bcc13072c54592596c5b41d40d1c6a18b04e19 Author: Pierre Ossman Date: Sun May 8 19:35:27 2005 +0100 [PATCH] MMC: wbsd update Updates to the wbsd driver. * Fix to handle DAT3 card detection. * Fixed bug which could cause large writes to stall in FIFO mode. * Plug 'n Play support. In most cases you need ACPI PNP for this to work. * Uses generic DMA API (ISA dependency removed). commit 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 Author: Linus Torvalds Date: Fri May 6 22:20:31 2005 -0700 Linux v2.6.12-rc4 commit 2d58cc9a437f3833d242e9d1617ec9b4044e26f3 Author: Jeff Dike Date: Fri May 6 21:30:55 2005 -0700 [PATCH] uml: x86_64 fixes This fixes some x86_64 bugs - - maybe_map returns -1 on error instead of 0, which is interpreted as physical address 0 - removed an include of ipc.h, which isn't needed - fixed the calculation of signal frame location - the signal delivery code is now immune to the stack expansion check - added a missing include Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f7e663dea7f0e22f3b2d07156c5e9d2e8656610 Author: Bodo Stroesser Date: Fri May 6 21:30:54 2005 -0700 [PATCH] uml: Fix process exit race tt-mode closes switch_pipes in exit_thread_tt and kills processes in switch_to_tt, if the exit_state is EXIT_DEAD or EXIT_ZOMBIE. In very rare cases the exiting process can be scheduled out after having set exit_state and closed switch_pipes (from release_task it calls proc_pid_flush, which might sleep). If this process is to be restarted, UML failes in switch_to_tt with: write of switch_pipe failed, err = 9 We fix this by closing switch_pipes not in exit_thread_tt, but later in release_thread_tt. Additionally, we set switch_pipe[0] = 0 after closing. switch_to_tt must not kill "from" process depending on its exit_state, but must kill it after release_thread was processed only, so it examines switch_pipe[0] for its decision. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8bd0220c1ac6273eda66e25d992654219f846b6 Author: Bodo Stroesser Date: Fri May 6 21:30:53 2005 -0700 [PATCH] uml: S390 preparation, arch_align_stack Only x86 and x86_64 use arch_align_stack(), all other subarches have: #define arch_align_stack(x) (x) So, if this definition is found, UML's own arch_align_stack() should be skipped. Signed-off-by: Bodo Stroesser Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f3be588b51e809476cdecd4eaf6fd04670d9c36 Author: Bodo Stroesser Date: Fri May 6 21:30:52 2005 -0700 [PATCH] uml: Use CONFIG variable for address space size tt/mem.c still uses hardcoded TOP for i386 instead of CONFIG_TOP_ADDR provided by subarch's Kconfig_XXXX, which would be right. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 675dffc914412a25d33bbc8baea30681c565c9c1 Author: Jeff Dike Date: Fri May 6 21:30:51 2005 -0700 [PATCH] uml: Turn literal numbers into symbolic constants So, there I was, looking at my own code, wondering what the magic setjmp return values did. This patch turns the constants that are used to make requests of the initial thread into meaningful symbols. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37f02b63bdc55147a32cedf7831452efd5a72748 Author: Jeff Dike Date: Fri May 6 21:30:51 2005 -0700 [PATCH] uml: Makefile cleanup This eliminates some stuff from arch/um/kernel/Makefile which refers to a file which has long since been deleted. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ccfcd37cb694fc71ddf16fa7faa9e06811a26e5b Author: Jeff Dike Date: Fri May 6 21:30:50 2005 -0700 [PATCH] uml: Eliminate unusable function Eliminate the non-inline version of switch_mm, which can't be used, considering the inline version in asm/mmu_context.h Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 804c2415c9182b95719cdf85913f6313f7ac042a Author: Bodo Stroesser Date: Fri May 6 21:30:49 2005 -0700 [PATCH] uml: S390 preparation, save an extra register s390 tt-mode needs to save not only syscall number, but an further register also. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82c1c11bdd92d94f8fd620a3ea6c894eba37d4ed Author: Bodo Stroesser Date: Fri May 6 21:30:46 2005 -0700 [PATCH] uml: S390 preparation, peekusr/pokeusr defined by subarch s390 needs to change some parts of arch/um/kernel/ptrace.c. Thus, the code regarding PEEKUSER and POKEUSER are shifted to arch/um/sys-/ptrace.c. Also s390 debug registers need to be updated, when singlestepping is switched on / off. Thus, setting/resetting of singlestepping is centralized in the new function set_singlestep(), which also inserts the macro SUBARCH_SET_SINGLESTEP(mode), if defined. Finally, s390 has the "ieee_instruction_pointer" in its registers, which also is allowed to be read via ptrace( PTRACE_PEEKUSER, getpid(), PT_IEEE_IP, 0); To implement this feature, sys_ptrace inserts the macro SUBARCH_PTRACE_SPECIAL, if defined. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 16c11163019879c0e1e69d3ec7d4574a80e9c77e Author: Jeff Dike Date: Fri May 6 21:30:45 2005 -0700 [PATCH] uml: command line handling cleanup Command line handling cleanups - a couple of things made static and an unused declaration removed from header. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bef3e0a06c00bd44760361f84b08e30cd1bff0e Author: Jeff Dike Date: Fri May 6 21:30:44 2005 -0700 [PATCH] uml: Remove include/asm-um/elf.h I accidentally included include/asm-um/elf.h as a real file in a previous patch. This patch eliminates it. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2a0f8b9301ca34034c4a2ec09a09ff4677e83dd Author: Jeff Dike Date: Fri May 6 21:30:43 2005 -0700 [PATCH] uml: __deprecated makes build unnecessarily noisy Remove the __deprecated from verify_area_skas and verify_area_tt. Since verify_area is itself marked __deprecated, and it is the only caller of these, then they don't need to be marked. Marking them only makes the build noisier. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c184ca3681ee9ae0bb63cb591e1e16f42536415c Author: Jiri Benc Date: Fri May 6 21:30:42 2005 -0700 [PATCH] video/tuner: add VIDEO_G_FREQUENCY and freq range to VIDIOC_G_TUNER This patch adds a VIDIOC_G_FREQUENCY command to tuner-core.c and sets lowest and highest tunable frequencies in v4l2_tuner structure returned by VIDIOC_G_TUNER command. Signed-off-by: Jiri Benc Cc: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e99d3438e4db1ef9e4cae5ad3946c76f4ffd268d Author: Jiri Benc Date: Fri May 6 21:30:42 2005 -0700 [PATCH] video/tuner: fix tuner->freq updating In VIDIOC_S_FREQUENCY command in tuner-core.c, t->freq is set to a new value before calling set_freq(). This is not necessary, as set_freq() sets t->freq itself. Moreover, it causes problems with Philips tuners, as they need to take into consideration difference between previous and new frequency. Signed-off-by: Jiri Benc Cc: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b272125273103458b9727df1868b81bae64f44cb Author: Kumar Gala Date: Fri May 6 21:30:41 2005 -0700 [PATCH] ppc32: Fix POWER3/POWER4 compiler error In separating out support for hardware floating point we missed the fact that both POWER3 and POWER4 have HW FP. Enable CONFIG_PPC_FPU for POWER3 and POWER4 fixes the issue. Signed-off-by: Kumar Gala Acked-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7c2b704bd78aa3665fc24100bd2d4f5f8305d7a Author: Paul Mackerras Date: Fri May 6 17:41:03 2005 -0700 [PATCH] ppc64: enable CONFIG_RTAS_PROC by default This patch enables CONFIG_RTAS_PROC by default on pSeries. This will preserve /proc/ppc64/rtas/rmo_buffer, which is needed by librtas. Signed-off-by: John Rose Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2411dd202e854d1f3be541135af8bb9872ea8b6 Author: Andrew Morton Date: Fri May 6 17:41:01 2005 -0700 [PATCH] revert msdos partitioning fix This change from March 3rd causes the partition parsing code to ignore partitions which have a signature byte of zero. Turns out that more people have such partitions than we expected, and their device numbering is coming up wrong in post-2.6.11 kernels. So revert the change while we think about the problem a bit more. Cc: Andries Brouwer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cccf25087f1cb24344b2140ca319b4afe4cf79a8 Author: Adrian Bunk Date: Sat May 7 01:28:45 2005 +0200 [PATCH] drivers/block/rd.c: rd_size shouldn't be static I somehow missed that there is external usage of rd_size on some architectures. Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 07342d623b8e1ac9501a36a0da55cbce1117aeaf Author: Linus Torvalds Date: Fri May 6 16:46:40 2005 -0700 Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git commit d4a1a7322c8c6b9899851f8358eb3842c67de6bc Author: Linus Torvalds Date: Fri May 6 15:41:11 2005 -0700 Merge of master.kernel.org:/home/rmk/linux-2.6-serial.git commit 22490eb80ceb4ac07ef36fff253904fb4adf57f2 Author: Linus Torvalds Date: Fri May 6 15:39:23 2005 -0700 Fix acpi_find_rsdp() - acpi_scan_rsdp takes length, not end Noticed by Jakub Jermar commit e4862fedbc37a2c242824b100101f8e6e8488748 Author: James Bottomley Date: Fri May 6 13:14:48 2005 -0500 [SCSI] correct the sym2 period setting routines There's a slight bug in the routines in that if the period requires dt, then the routine will unconditionally set it. DT may only be set if Wide is also set, so this turns back on the wide bit. For domain validation to work correctly, we need to observe the wide bit absolutely. Acked by: Matthew Wilcox Signed-off-by: James Bottomley commit 966dc11fcc48866a24d9b3fd16eeebb3f5e05931 Author: David Mosberger-Tang Date: Fri May 6 05:25:00 2005 -0700 [IA64] Fix stack placement when INIT hits in kernel mode. Without this patch, the stack is placed _below_ the current task structure, which is risky at best. Tony, I think this patch needs to go into 2.6.12, since it fixes a real bug. Without it, INIT may case secondary errors, which would be most unpleasant. Signed-off-by: David Mosberger-Tang Signed-off-by: Tony Luck commit b3214970abbe983cd89842ae24ea00e21bba79f6 Author: Jens Axboe Date: Fri May 6 08:37:44 2005 +0200 [PATCH] fix alsa via82xx resume Trying software suspend on my workstation makes it crash on resume. The problem is that via82xx marks the chip_init function as _devinit, but calls it on resume as well. Cc: Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 6c80a21cb1825e576ffff9df2302bf0fa1065ceb Author: Paul Mackerras Date: Fri May 6 16:28:56 2005 +1000 [PATCH] ppc64: global interrupt queue cleanup Move the code to set global interrupt queue membership to xics.c, and remove no longer needed extern declarations. Also call it on all cpus (even the boot cpu) to prepare for kexec. Signed-off-by: Milton Miller Signed-off-by: R Sharada Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit d3870398fafd4911bd84573b78be4b6b762f32b0 Author: Nathan Scott Date: Fri May 6 06:44:46 2005 -0700 [XFS] Fix directory inodes ioctl compat code, minor code consistency cleanups SGI Modid: xfs-linux:xfs-kern:21810a Signed-off-by: Nathan Scott Signed-off-by: Christoph Hellwig commit 68d1498c3a7e5223b587ad067111fbed12df52a1 Author: Russell Cattelan Date: Fri May 6 06:42:22 2005 -0700 [XFS] Fix a bug in xfs_iomap for extent handling of write cases This may be the cause of several open PV's of incorrect delay flags being set and then tripping asserts. Do not return a delay alloc extent when the caller is asking to do a write. SGI Modid: xfs-linux:xfs-kern:189616a Signed-off-by: Russell Cattelan Signed-off-by: Christoph Hellwig commit f1690f37a526d46aa4eb55e832346a531ba850dd Author: Russell King Date: Fri May 6 10:19:09 2005 +0100 [PATCH] 8250_pci.c: add comment about enum sorting order Signed-off-by: Russell King commit 2512809255d018744fe6c2f5e996c83769846c07 Author: Paul Mackerras Date: Fri May 6 14:31:31 2005 +1000 [PATCH] ppc64: remove explicit contig_page_data reference Trivial patch to remove our last direct reference to contig_page_data. This will make it just that much less hard to seperate NUMA and DISCONTIG. Please forward on. Against 2.6.12-rc1 Signed-off-by: Joel Schopp Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 8b3447db2e02f01f94b4bcd8584caccdada6fa4a Author: Paul Mackerras Date: Fri May 6 14:25:55 2005 +1000 [PATCH] ppc64: remove unused arch/ppc64/boot/start.c start.c is not referenced in the arch/ppc64/boot/Makefile compile tested with the defconfig. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit af4d4b34106b6e520e6b13350831b170d8bca117 Author: Paul Mackerras Date: Fri May 6 14:27:17 2005 +1000 [PATCH] ppc64: remove asm/bootinfo.h include The defines in bootinfo.h are not used, so the include can be removed. According to Ben, birecs are not used on ppc64: on ppc64, we made the decision of enforcing the presence of an OF device-tree and either an OF-like client interface or a kexec like flattened tree. so if your bootloader want to say things to the kernel, it can do so by adding properties to the device-tree compile-tested with defconfig Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 5e2afc1ddd2a22b290bc334c0deffdd6dcdebc80 Author: Paul Mackerras Date: Fri May 6 13:35:04 2005 +1000 [PATCH] ppc64: fix reloc_offset comment The code in reloc_offset is actually subtracting the address in the link register from the address calculated by the linker. Perhaps the extended mnemonic `sub' replaced an original `subf' and the comment just did not get updated. bl 1f 1: mflr r3 LOADADDR(r4,1b) sub r3,r4,r3 Signed-off-by: Amos Waterland Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 3892c5fa9455670466f9f5518b3b7ef12ef3ccd6 Author: Paul Mackerras Date: Fri May 6 13:29:34 2005 +1000 [PATCH] ppc64: fix prom.c compile warning The code in unflatten_device_tree knows that get_property is written to only return with lenp equal to 1 when also returning a valid pointer. The gcc 3.3.3 compiler is not able to prove this to itself, so it warns about a possible uninitialized pointer dereference: .../arch/ppc64/kernel/prom.c: In function `unflatten_device_tree': .../arch/ppc64/kernel/prom.c:828: warning: `p' might be used uninitialized in this function Unless it is desired to rework the interaction between the two functions, this will keep the existing behavior but quiet the compiler. Signed-off-by: Amos Waterland Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 6741f3a7f9922391cd02b3ca1329e669497dc22f Author: Tobias Klauser Date: Fri May 6 12:10:04 2005 +1000 [PATCH] arch/ppc64: Replace custom MIN macro Replace a custom MIN() macro with the min() macro from kernel.h This patch removes 4 lines of redundant code. Signed-off-by: Tobias Klauser Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit b6f0b0d016a254ff583fec26f2c9e21c1ae2fdf3 Author: Adrian Bunk Date: Thu May 5 16:16:22 2005 -0700 [PATCH] drivers/scsi/sym53c416.c: fix a wrong check The Coverity checker found that this for loop was wrong. This patch changes it to what seems to be intended. Signed-off-by: Adrian Bunk Cc: James Bottomley Cc: Matthew Wilcox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f59154c53fac0bfee52393247beadf0474770351 Author: Adrian Bunk Date: Thu May 5 16:16:21 2005 -0700 [PATCH] fs/udf/udftime.c: fix off by one error This patch fixes an off by one error found by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 252795264df50a6c9eee604d29989854d5558139 Author: walter harms Date: Thu May 5 16:16:20 2005 -0700 [PATCH] documentation for strncpy() this clarifies the documentation on the behavier of strncpy(). Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ebe8b54134314cc31331f6e26f42276cd947d1df Author: Domen Puncer Date: Thu May 5 16:16:19 2005 -0700 [PATCH] correctly name the Shell sort As per http://www.nist.gov/dads/HTML/shellsort.html, this should be referred to as a Shell sort. Shell-Metzner is a misnomer. Signed-off-by: Daniel Dickman Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d28c2bc8d192f606a4eb831978722107b20a9405 Author: Domen Puncer Date: Thu May 5 16:16:19 2005 -0700 [PATCH] fix lib/sort regression test The regression test in lib/sort.c is currently worthless because the array that is generated for sorting will be all zeros. This patch fixes things so that the array that is generated will contain unsorted integers (that are not all identical) as was probably intended. Signed-off-by Daniel Dickman Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cad359c68455d6870d053184bbb0ae208e207eef Author: Adrian Bunk Date: Thu May 5 16:16:18 2005 -0700 [PATCH] fix NCR53C9x.c compile warning drivers/scsi/NCR53C9x.c: In function `esp_do_data': drivers/scsi/NCR53C9x.c:1838: warning: unused variable `flags' Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4713741955736210511a5959bf13e92f8598dacd Author: Kianusch Sayah Karadji Date: Thu May 5 16:16:17 2005 -0700 [PATCH] x86: geode support fixes - Changed Name/defines from "Geode GX" to "Geode GX1" for clarification - Dropped "-march=i586" in favor of "-march=i486" - Dopped X86_OOSTORE support for Geode GX1 Signed-off-by: Kianusch Sayah Karadji Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02c30a84e6298b6b20a56f0896ac80b47839e134 Author: Jesper Juhl Date: Thu May 5 16:16:16 2005 -0700 [PATCH] update Ross Biro bouncing email address Ross moved. Remove the bad email address so people will find the correct one in ./CREDITS. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 125947f2ab8c45417feaa4a8800e89529ca4612f Author: Domen Puncer Date: Thu May 5 16:16:15 2005 -0700 [PATCH] CodingStyle: trivial whitespace fixups When I do a "diff -Nur arch/i386 arch/x86_64" to see what is different between these two architectures, I see some differences due to whitespace issues only. The attached patch removes some of the noise by fixing up the following files: - arch/i386/boot/bootsect.S - arch/i386/boot/video.S - arch/x86_64/boot/bootsect.S Signed-off-by: Daniel Dickman Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 845d34318f8acb0d92d18ccc72ef6db4c7baeaea Author: Domen Puncer Date: Thu May 5 16:16:14 2005 -0700 [PATCH] Spelling cleanups in shrinker code Just a few small cleanups to make this coherent english. Signed-Off-By: Martin Hicks Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fba478b1719c39ea67f15c6158ff4993933e9d18 Author: Domen Puncer Date: Thu May 5 16:16:13 2005 -0700 [PATCH] ixj* - compile warning cleanup compile warning cleanup - suggested by Adrian Bunk; remove unmaintained rcs char strings from source and handle the occurrences of their use, make sure kernel-userspace issues taken care of; break out into separate patch Signed-off-by: Stephen Biggs Signed-off-by: Domen Puncer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d67554895982f04d458e14c81b7b9843429719c Author: Jesper Juhl Date: Thu May 5 16:16:13 2005 -0700 [PATCH] fix up a comment still refering to verify_area Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3677209239ed71d2654e73eecfab1dbec2af11a9 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu May 5 16:16:12 2005 -0700 [PATCH] comments on locking of task->comm Add some comments about task->comm, to explain what it is near its definition and provide some important pointers to its uses. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 291c4a75ce7632ee5c565359fb875ba0597f76be Author: Randy.Dunlap Date: Thu May 5 16:16:11 2005 -0700 [PATCH] reiserfs: use NULL instead of 0 Use NULL instead of 0 for pointer (sparse warning): fs/reiserfs/namei.c:611:50: warning: Using plain integer as NULL pointer Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a27e951f1e9362411eba81e724fafca20f1b0563 Author: maximilian attems Date: Thu May 5 16:16:10 2005 -0700 [PATCH] cyrix: eliminate bad section references Fix cyrix section references: convert __initdata to __devinitdata. Error: ./arch/i386/kernel/cpu/mtrr/cyrix.o .text refers to 00000379 R_386_32 .init.data Error: ./arch/i386/kernel/cpu/mtrr/cyrix.o .text refers to 00000399 R_386_32 .init.data Error: ./arch/i386/kernel/cpu/mtrr/cyrix.o .text refers to 000003b3 R_386_32 .init.data Error: ./arch/i386/kernel/cpu/mtrr/cyrix.o .text refers to 000003b9 R_386_32 .init.data Error: ./arch/i386/kernel/cpu/mtrr/cyrix.o .text refers to 000003bf R_386_32 .init.data Signed-of-by: maximilian attems Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75c96f85845a6707b0f9916cb263cb3584f7d48f Author: Adrian Bunk Date: Thu May 5 16:16:09 2005 -0700 [PATCH] make some things static This patch makes some needlessly global identifiers static. Signed-off-by: Adrian Bunk Acked-by: Arjan van de Ven Acked-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e198d94dd0c3ec7f6138229e2e412c2c6268c38 Author: Alasdair G Kergon Date: Thu May 5 16:16:09 2005 -0700 [PATCH] device-mapper: Some missing statics This patch makes some needlessly global code static. Signed-Off-By: Alasdair G Kergon Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1daa40b638891a62e1be40f78d752c500265362 Author: Alasdair G Kergon Date: Thu May 5 16:16:08 2005 -0700 [PATCH] device-mapper dm-emc: Fix a memset The dm emc hardware handler code memset the hardware handler structure to zero AFTER it had initialized the structure's spinlock field. Signed-Off-By: Alasdair G Kergon From: Dave Olien Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c557308e1f4b6f7d6144a06e8f98c467814f3aed Author: Alasdair G Kergon Date: Thu May 5 16:16:07 2005 -0700 [PATCH] device-mapper multipath: Use private workqueue dm-mpath.c needs to use a private workqueue (like other dm targets already do) to avoid interfering with users of the default workqueue. Signed-Off-By: Alasdair G Kergon Acked-by: Jens Axboe Signed-off-by: Lars Marowsky-Bree Signed-off-by: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b84b0287a8ba618568a8bc9ac8847ac332abe90d Author: Alasdair G Kergon Date: Thu May 5 16:16:06 2005 -0700 [PATCH] device-mapper: tidy dm_suspend Tidy dm_suspend. Signed-Off-By: Alasdair G Kergon From: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 354e007121de546e50b5592c2557575117435522 Author: Alasdair G Kergon Date: Thu May 5 16:16:05 2005 -0700 [PATCH] device-mapper: handle __lock_fs error Handle error from __lock_fs() Signed-Off-By: Alasdair G Kergon From: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfbe03f6d09fcebf85ae2a2cbb4ceee9b0985e67 Author: Alasdair G Kergon Date: Thu May 5 16:16:04 2005 -0700 [PATCH] device-mapper: let freeze_bdev return error Allow freeze_bdev() to return an error. Signed-Off-By: Alasdair G Kergon From: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dcee8064bd36c547b45514dfd33df4c12695428 Author: Alasdair G Kergon Date: Thu May 5 16:16:04 2005 -0700 [PATCH] device-mapper: __unlock_fs void Make __unlock_fs() void. From: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1782a3b0a15d9ac497a8f47931c4536bfe8d18e Author: Alasdair G Kergon Date: Thu May 5 16:16:03 2005 -0700 [PATCH] device-mapper: store bdev while frozen Store the struct block_device while device is frozen, saving us one call to bdget_disk(). Signed-Off-By: Alasdair G Kergon From: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d17d7fa44dbe1f12031773e27eda9e939024a037 Author: Andrew Morton Date: Thu May 5 16:16:02 2005 -0700 [PATCH] revert ext3-writepages-support-for-writeback-mode This had a fatal lock ranking bug: we do journal_start outside mpage_writepages()'s lock_page(). Revert the whole thing, think again. Credit-to: Jan Kara For identifying the bug. Cc: Badari Pulavarty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ecffdde68ebefa1aa24411a91b12ae649f71f71c Author: Pavel Roskin Date: Thu May 5 16:16:01 2005 -0700 [PATCH] orinoco MAINTAINERS update Add mailing list addresses for Orinoco and update its homepage. Signed-off-by: Pavel Roskin Cc: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc9d53af37deeb830252f03c62724078d943686c Author: Manu Abraham Date: Thu May 5 16:16:01 2005 -0700 [PATCH] bttv: fix dst i2c read/write timeout failure. Attached is a patch to bttv which fixes the following problems. Affected cards and problems: ~~~~~~~~~~~~~~~~~~~~~~~~ o VP-1020 (200103A) Tuning problems, device detection. o VP-1020 (DST-MOT) Errors during tuning, device detection fails in a while. o VP-1030 (DST-CI) Tuning sometimes fails after CI commands. o VP-2031 (DCT-CI) Tuning problems The timeout happens before the actual timeout occured in the MCU on the board, and hence the problems. Changes: (bttv-i2c.diff) ~~~~~~~~~~~~~~~~~~~~~~~~ o Changed the custom wait queue to wait_event_interruptible_timeout() - Suggestion by Johannes Stezenbach. o Fixed the wait queue timeout problem - This fixes the timeout problem on various cards. - This problem was visible as many * Cannot tune to channels, when signal levels are very low. * app_info does not work in some conditions for CI based cards - Smaller values worked good for newer cards, but the older cards suffered, settled down to the worst case values that could happen in any eventuality. Signed-off-by: Manu Abraham Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ef41634def0fcb0def3e3c90220c651ca478cb3 Author: Christoph Hellwig Date: Thu May 5 16:15:59 2005 -0700 [PATCH] remove do_sync parameter from __invalidate_device The only caller that ever sets it can call fsync_bdev itself easily. Also update some comments. Signed-off-by: Christoph Hellwig Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91bb52416854dfd581efe6e2a0aca8dc655f043e Author: Christoph Hellwig Date: Thu May 5 16:15:59 2005 -0700 [PATCH] remove outdated comments from filemap.c Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b76ffd5d9f12ba850fc988188f55056204ad4e2 Author: Christoph Hellwig Date: Thu May 5 16:15:58 2005 -0700 [PATCH] DAC960: add support for Mylex AcceleRAID 4/5/600 This patch adds support for a new class of DAC960 controllers. It's based on the GPLed idac320 driver from IBM for Linux 2.4.18. That driver is a fork of the 2.4.18 version of DAC960 that adds support for this new type of controllers (internally called "GEM Series"), that differ from other DAC960 V2 firmware controllers only in the register offsets and removes support for all others. This patch instead integrates support for these controllers into the DAC960 driver. Thanks to Anders Norrbring for pointing me to the idac320 driver and testing this patch. No Signed-Off: line because all code is either copy & pasted from IBM's idac320 driver or support for other controllers in the 2.6 DAC960 driver. Note: the really odd formating matches the rest of the DAC960 driver. Cc: Dave Olien Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c835a388968f5437491e3fe6e9b0332bc3c52e0e Author: Daniel Ritz Date: Thu May 5 16:15:57 2005 -0700 [PATCH] pcmcia: yenta TI: align irq of func1 to func0 if INTRTIE is set Make sure that if the INTRTIE bit is set both functions of the cardbus bridge use the same IRQ before doing any probing... [ yes i hate the TI bridges for the fact that they are very flexible so that so many BIOS vendors get it wrong. ] Signed-off-by: Daniel Ritz Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c35e66a4216c99fe94868ed3f714bd2708d0032a Author: Dominik Brodowski Date: Thu May 5 16:15:56 2005 -0700 [PATCH] pcmcia: enable 32-bit memory windows on pd6729 Enable 32-bit memory windows on pd6729 PCI-PCMCIA bridges. Signed-off-by: Jarkko Raja Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a4c9c93c2fb5d09259136531d3e8e70fdcd6027 Author: Frederic CAND Date: Thu May 5 16:15:52 2005 -0700 [PATCH] saa6752hs: resolutions handling This patch handles the VIDIOC_S_FMT and VIDIOC_G_FMT ioctls for the saa6752hs. As only 4 preset video formats are supported (SIF, 1/2D1, 2/3D1, D1), we compute to which the asked resolution is the nearest and apply it. Signed-off-by: Frederic Cand Acked-by: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac5f34c028a043405de087e43699195ab3974dbf Author: Matt Porter Date: Thu May 5 16:15:52 2005 -0700 [PATCH] Update dontdiff Additions to the dontdiff list. Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfc1e148542f6f4951fd59e32c14a7368356db9d Author: Adrian Bunk Date: Thu May 5 16:15:51 2005 -0700 [PATCH] remove BK documentation There's no longer a reason to document the obsolete BK usage. Signed-off-by: Adrian Bunk Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d769a66970a947613f7c638c362f237583bd141b Author: Andrew Morton Date: Thu May 5 16:15:50 2005 -0700 [PATCH] uninline tty_paranoia_check() Has lots of callsites. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b0c4bed77041bf64e26b502cd2a767e355c3342 Author: Adrian Bunk Date: Thu May 5 16:15:49 2005 -0700 [PATCH] drivers/ide/pci/sis5513.c: section fixes These three functions are referenced from the __devinitdata sis5513_chipset. Signed-off-by: Adrian Bunk Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7e4e85337060354f8b860cc38066725559313a4 Author: Paulo Marques Date: Thu May 5 16:15:49 2005 -0700 [PATCH] setitimer timer expires too early It seems that the code responsible for this is in kernel/itimer.c:126: p->signal->real_timer.expires = jiffies + interval; add_timer(&p->signal->real_timer); If you request an interval of, lets say 900 usecs, the interval given by timeval_to_jiffies will be 1. If you request this when we are half-way between two timer ticks, the interval will only give 400 usecs. If we want to guarantee that we never ever give intervals less than requested, the simple solution would be to change that to: p->signal->real_timer.expires = jiffies + interval + 1; This however will produce pathological cases, like having a idle system being requested 1 ms timeouts will give systematically 2 ms timeouts, whereas currently it simply gives a few usecs less than 1 ms. The complex (and more computationally expensive) solution would be to check the gettimeofday time, and compute the correct number of jiffies. This way, if we request a 300 usecs timer 200 usecs inside the timer tick, we can wait just one tick, but not if we are 800 usecs inside the tick. This would also mean that we would have to lock preemption during these computations to avoid races, etc. I've searched the archives but couldn't find this particular issue being discussed before. Attached is a patch to do the simple solution, in case anybody thinks that it should be used. Signed-Off-By: Paulo Marques Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0fbd5fc09b20f7ba7bc8c80be33e39925bb38e1 Author: Andrew Morton Date: Thu May 5 16:15:48 2005 -0700 [PATCH] __block_write_full_page() simplification The `last_bh' logic probably isn't worth much. In those situations where only the front part of the page is being written out we will save some looping but in the vastly more common case of an all-page writeout if just adds more code. Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05937baae9fc27b64bcd4378da7d2b14edf7931c Author: Andrew Morton Date: Thu May 5 16:15:47 2005 -0700 [PATCH] __block_write_full_page speedup Remove all those get_bh()'s and put_bh()'s by extending lock_page() to cover the troublesome regions. (get_bh() and put_bh() happen every time whereas contention on a page's lock in there happens basically never). Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad576e63e0c8b274a8558b8e05a6d0526e804dc0 Author: Nick Piggin Date: Thu May 5 16:15:46 2005 -0700 [PATCH] __block_write_full_page race fix When running fsstress -v -d $DIR/tmp -n 1000 -p 1000 -l 2 on an ext2 filesystem with 1024 byte block size, on SMP i386 with 4096 byte page size over loopback to an image file on a tmpfs filesystem, I would very quickly hit BUG_ON(!buffer_async_write(bh)); in fs/buffer.c:end_buffer_async_write It seems that more than one request would be submitted for a given bh at a time. What would happen is the following: 2 threads doing __mpage_writepages on the same page. Thread 1 - lock the page first, and enter __block_write_full_page. Thread 1 - (eg.) mark_buffer_async_write on the first 2 buffers. Thread 1 - set page writeback, unlock page. Thread 2 - lock page, wait on page writeback Thread 1 - submit_bh on the first 2 buffers. => both requests complete, none of the page buffers are async_write, end_page_writeback is called. Thread 2 - wakes up. enters __block_write_full_page. Thread 2 - mark_buffer_async_write on (eg.) the last buffer Thread 1 - finds the last buffer has async_write set, submit_bh on that. Thread 2 - submit_bh on the last buffer. => oops. So change __block_write_full_page to explicitly keep track of the last bh we need to issue, so we don't touch anything after issuing the last request. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3ddbdc6267c32223035ea9bb8456a2d86f65ba1 Author: Nick Piggin Date: Thu May 5 16:15:45 2005 -0700 [PATCH] fix race in __block_prepare_write Fix a race where __block_prepare_write can leak out an in-flight read against a bh if get_block returns an error. This can lead to the page becoming unlocked while the buffer is locked and the read still in flight. __mpage_writepage BUGs on this condition. BUG sighted on a 2-way Itanium2 system with 16K PAGE_SIZE running fsstress -v -d $DIR/tmp -n 1000 -p 1000 -l 2 where $DIR is a new ext2 filesystem with 4K blocks that is quite small (causing get_block to fail often with -ENOSPC). Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c8fad1829cc33e903500b41d989fa50ab196378 Author: Daniel Ritz Date: Thu May 5 16:15:44 2005 -0700 [PATCH] 3c59x: only put the device into D3 when we're actually using WOL During a warm boot the device is in D3 and has troubles coming out of it. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1922163c8dfe717c089bdcc18ade4a65350a09c8 Author: Randy.Dunlap Date: Thu May 5 16:15:43 2005 -0700 [PATCH] patch-kernel: support non-incremental 2.6.x.y 'stable' patches Add better support for (non-incremental) 2.6.x.y patches; If an ending version number if not specified, the script automatically increments the SUBLEVEL (x in 2.6.x.y) until no more patch files are found; however, EXTRAVERSION (y in 2.6.x.y) is never automatically incremented but must be specified fully. patch-kernel does not normally support reverse patching, but does so when applying EXTRAVERSION (x.y) patches, so that moving from 2.6.11.y to 2.6.11.z is easy and handled by the script (reverse 2.6.11.y and apply 2.6.11.z). Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64f562c6df3cfc5d1b2b4bdbcb7951457df9c237 Author: Ananth N Mavinakayanahalli Date: Thu May 5 16:15:42 2005 -0700 [PATCH] kprobes: Allow multiple kprobes at the same address Allow registration of multiple kprobes at an address in an architecture agnostic way. Corresponding handlers will be invoked in a sequence. But, a kprobe and a jprobe can't (yet) co-exist at the same address. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04dea5f93231204cc3ca0ab793ce76dbb10c86ba Author: Prasanna S Panchamukhi Date: Thu May 5 16:15:41 2005 -0700 [PATCH] Kprobes: Oops! in unregister_kprobe() kernel oops! when unregister_kprobe() is called on a non-registered kprobe. This patch fixes the above problem by checking if the probe exists before unregistering. Signed-off-by: Prasanna S Panchamukhi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b9e2cac8a56e197d0a9e06268db4c8652d23dd5 Author: Prasanna S Panchamukhi Date: Thu May 5 16:15:40 2005 -0700 [PATCH] Kprobes: Incorrect handling of probes on ret/lret instruction Kprobes could not handle the insertion of a probe on the ret/lret instruction and used to oops after single stepping since kprobes was modifying eip/rip incorrectly. Adjustment of eip/rip is not required after single stepping in case of ret/lret instruction, because eip/rip points to the correct location after execution of the ret/lret instruction. This patch fixes the above problem. Signed-off-by: Prasanna S Panchamukhi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a0a64e6c917b2ccc311cf978cc9d7eef7b31c47 Author: Bodo Stroesser Date: Thu May 5 16:15:40 2005 -0700 [PATCH] uml: header and code cleanup Remove some definitions and declarations from arch/um/include/skas_ptrace.h, as they have moved to arch/um/include/sysdep/skas_ptrace.h Also, remove PTRACE_SIGPENDING support in UML at all. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c5131a501e9e8549f74d807c37fde76008ef95a Author: Bodo Stroesser Date: Thu May 5 16:15:39 2005 -0700 [PATCH] uml: remove a dangling symlink UML: remove no longer needed arch-signal.h Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51a6b0c59a6170fc6a40221ef9b261b82856d315 Author: Bodo Stroesser Date: Thu May 5 16:15:38 2005 -0700 [PATCH] uml: s390 preparation, sighandler interface abstraction s390 passes parameters in registers. So the only safe way to find out the address of signal context, error-address and error-type (trap_no), which are passed to signal handlers as parameters, is to declare these parameters. So I inserted an subarch-specific macro which holds the declaration of parameters for signal handlers. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fd861b682785f650114f4df53060d1be7fedecd Author: Bodo Stroesser Date: Thu May 5 16:15:37 2005 -0700 [PATCH] uml: s390 preparation, delay moved to arch s390 has fast read access to realtime clock (nanosecond resolution). So it makes sense to have an arch-specific implementation not only of __delay, but __udelay also. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d37c6d52fce13008f20344790a81a6a5a0003b3 Author: Bodo Stroesser Date: Thu May 5 16:15:36 2005 -0700 [PATCH] uml: s390 preparation, checksumming done in arch code Checksum handling largely depends on the subarch. Thus, I renamed i386 arch_csum_partial in arch/um/sys-i386/checksum.S back to csum_partial, removed csum_partial from arch/um/kernel/checksum.c and shifted EXPORT_SYMBOL(csum_partial) to arch/um/sys-i386/ksyms.c. Then, csum_partial_copy_to and csum_partial_copy_from were shifted from arch/um/kernel/checksum.c to arch/um/include/sysdep-i386/checksum.h and inserted in the calling functions csum_partial_copy_from_user() and csum_and_copy_to_user(). Now, arch/um/kernel/checksum.c is empty and removed. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c52ac046757deebc514483e407dca39a9c774aa3 Author: Bodo Stroesser Date: Thu May 5 16:15:36 2005 -0700 [PATCH] uml: s390 preparation, linkage.h inherited from host This patch replaces the contents of include/asm-um/linkage.h by #include "asm/arch/linkage.h" Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbc35cc73f2edd6e39d7e814dbb6eddad6294665 Author: Bodo Stroesser Date: Thu May 5 16:15:35 2005 -0700 [PATCH] uml: s390 preparation, elf.h This patch make elh.h a symlink to the new arch-specific include files of the form elf-.h, as in the same way already is done for some other includes. Also moves Elf-stuff from archparam-.h and elf.h to the new elf-.h files. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51a141104a37369be2822f423ed4444aa34d26a2 Author: Jeff Dike Date: Thu May 5 16:15:34 2005 -0700 [PATCH] uml: hostfs failed mount handling This cleans up the error handling and fixes a crash if a hostfs mount fails. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0b8d32020681535700e7bd4dac29ecf25d944ae Author: Jeff Dike Date: Thu May 5 16:15:33 2005 -0700 [PATCH] uml: inclusion cleanup The completion cleanup got rid of some semaphores, but didn't remove the inclusion of asm/semaphore.h from xterm_kern.c. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ba491759fd74bfadf656c55a3695e98b6074439 Author: Jeff Dike Date: Thu May 5 16:15:33 2005 -0700 [PATCH] uml: tidy Makefile.rules Just some breaking of some overly-long lines. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd2ee4a30cc0775d8b54e5b958613361a7cacfec Author: Jeff Dike Date: Thu May 5 16:15:32 2005 -0700 [PATCH] uml: Fix SIGWINCH relaying This makes SIGWINCH work again, and fixes a couple of SIGWINCH-associated crashes. First, the sigio thread disables SIGWINCH because all hell breaks loose if it ever gets one and tries to call the signal handling code. Second, there was a problem with deferencing tty structs after they were freed. The SIGWINCH support for a tty wasn't being turned off or freed after the tty went away. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c578455a3eccf4dd7bd111e77129c301d6d67914 Author: Bodo Stroesser Date: Thu May 5 16:15:31 2005 -0700 [PATCH] uml: S390 preparation, abstract host page fault data This patch removes the arch-specific fault/trap-infos from thread and skas-regs. It adds a new struct faultinfo, that is arch-specific defined in sysdep/faultinfo.h. The structure is inserted in thread.arch and thread.regs.skas and thread.regs.tt Now, segv and other trap-handlers can copy the contents from regs.X.faultinfo to thread.arch.faultinfo with one simple assignment. Also, the number of macros necessary is reduced to FAULT_ADDRESS(struct faultinfo) extracts the faulting address from faultinfo FAULT_WRITE(struct faultinfo) extracts the "is_write" flag SEGV_IS_FIXABLE(struct faultinfo) is true for the fixable segvs, i.e. (TRAP == 14) on i386 UPT_FAULTINFO(regs) result is (struct faultinfo *) to the faultinfo in regs->skas.faultinfo GET_FAULTINFO_FROM_SC(struct faultinfo, struct sigcontext *) copies the relevant parts of the sigcontext to struct faultinfo. On SIGSEGV, call user_signal() instead of handle_segv(), if the architecture provides the information needed in PTRACE_FAULTINFO, or if PTRACE_FAULTINFO is missing, because segv-stub will provide the info. The benefit of the change is, that in case of a non-fixable SIGSEGV, we can give user processes a SIGSEGV, instead of possibly looping on pagefault handling. Since handle_segv() sikked arch_fixup() implicitly by passing ip==0 to segv(), I changed segv() to call arch_fixup() only, if !is_user. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea66e8a3b6c4760e8fbf59b1becb6bd8e3dd5376 Author: Jeff Dike Date: Thu May 5 16:15:30 2005 -0700 [PATCH] uml: fix a ptrace call This fixes write_ldt_entry to treat userspace_pid as an array. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd7aab9c1a4705ed45fe01a7ff108ce9823b0830 Author: Al Viro Date: Thu May 5 16:15:29 2005 -0700 [PATCH] uml: finish cross-build support O=... builds support. Very easy, actually. Signed-off-by: Al Viro Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04fe392378c818fb60bd817495ecb266d2cebe68 Author: Al Viro Date: Thu May 5 16:15:28 2005 -0700 [PATCH] uml: fix missing subdir in x86_64 make distclean et.al. are missing arch/um/sys-x86_64/utils; fixed the same way we have it done for sys-i386 counterpart. Signed-off-by: Al Viro Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da998a2aecd3f15eca5385e1122610890039c4df Author: Al Viro Date: Thu May 5 16:15:27 2005 -0700 [PATCH] uml: cross-build support : mk_task and mk_constants helpers in arch/um/util (mk_task and mk_constants) converted. That's it - none of the helpers depends on build and target being the same architecture anymore. Signed-off-by: Al Viro Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b8b611e9a4725ae558af4fa48cf7d9e2193e7ed Author: Al Viro Date: Thu May 5 16:15:26 2005 -0700 [PATCH] uml: cross-build support : mk_thread mk_thread converted Signed-off-by: Al Viro Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a31769ed3ee82198fd530cb1d79ee9c7f8eeb1d1 Author: Al Viro Date: Thu May 5 16:15:25 2005 -0700 [PATCH] uml: cross-build support : kernel_offsets The next group of helpers is a bit trickier - they want the constants similar to those in user-offsets.h, but we need target sc.h for it. So we can't put that into user-offsets (sc.h depends on it) and need the second generated header for that stuff (kernel-offsets.h. BFD... Signed-off-by: Al Viro Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6bae32d395b532959703462c21248fbeb9894e95 Author: Al Viro Date: Thu May 5 16:15:25 2005 -0700 [PATCH] uml: cross-build support: mk_sc Ditto for mk_sc Signed-off-by: Al Viro Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1cd3bc1c810c83fb8955035675165a644e0c9a84 Author: Al Viro Date: Thu May 5 16:15:24 2005 -0700 [PATCH] uml: cross-build support : mk_ptregs mk_ptregs converted. Nothing new here, it's the same situation as with mk_user_constants. Signed-off-by: Al Viro Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d0b9dc9be3919e9979eac59fd12e8f82b098325 Author: Al Viro Date: Thu May 5 16:15:23 2005 -0700 [PATCH] uml: start cross-build support : mk_user_constants Beginning of cross-build fixes. Instead of expecting that mk_user_constants (compiled and executed on the build box) will see the sizeof, etc. for target box, we do what every architecture already does for asm-offsets. Namely, have user-offsets.c compiled *for* *target* into user-offsets.s and sed it into the header with relevant constants. We don't need to reinvent any wheels - all tools are already there. This patch deals with mk_user_constants. It doesn't assume any relationship between target and build environment anymore - we pick all defines we need from user-offsets.h. Later patches will deal with the rest of mk_... helpers in the same way. Signed-off-by: Al Viro Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fcddd72e3e2565f8b838ae71a3e716a67f616160 Author: Al Viro Date: Thu May 5 16:15:22 2005 -0700 [PATCH] uml: use variables rather than symlinks in dependencies Use explicit os-... in make dependencies instead of playing with symlinks (symlink in question is still created - it's needed for other things; however, there's no reason to complicate ordering here). Signed-off-by: Al Viro Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03f81dc50caf6360aa5343264fed8868e22d9058 Author: Al Viro Date: Thu May 5 16:15:19 2005 -0700 [PATCH] uml: include the linker script rather than symlink it Make vmlinux.lds.S include appopriate script instead of playing games with symlinks. Signed-off-by: Al Viro Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 776cfebb430c7b22c208b1b17add97f354d97cab Author: Paolo 'Blaisorblade' Giarrusso Date: Thu May 5 16:15:18 2005 -0700 [PATCH] uml kbuild: avoid useless rebuilds - Fix some problems with usage of $(targets) (sometimes missing, sometimes used badly) that trigger partial rebuilds when doing a rebuild. - At that purpose, also factor out some common code for symlinks creation. - Fix a x86-64 build warning, caused by -L/usr/lib, which is anyway useless, and invalid in the x86-64 case. Tested on x86_64 and x86. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c28130b5c9e8f0b153436d3dae39482e5a70af1 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu May 5 16:15:17 2005 -0700 [PATCH] x86_64: make string func definition work as intended In include/asm-x86_64/string.h there are such comments: /* Use C out of line version for memcmp */ #define memcmp __builtin_memcmp int memcmp(const void * cs,const void * ct,size_t count); This would mean that if the compiler does not decide to use __builtin_memcmp, it emits a call to memcmp to be satisfied by the C out-of-line version in lib/string.c. What happens is that after preprocessing, in lib/string.i you may find the definition of "__builtin_strcmp". Actually, by accident, in the object you will find the definition of strcmp and such (maybe a trick intended to redirect calls to __builtin_memcmp to the default memcmp when the definition is not expanded); however, this particular case is not a documented feature as far as I can see. Also, the EXPORT_SYMBOL does not work, so it's duplicated in the arch. I simply added some #undef to lib/string.c and removed the (now duplicated) exports in x86-64 and UML/x86_64 subarchs (the second ones are introduced by another patch I just posted for -mm). Signed-off-by: Paolo 'Blaisorblade' Giarrusso CC: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23352fc252495fdc072b3bd29f57c4c6b7a6bd83 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu May 5 16:15:16 2005 -0700 [PATCH] uml: kludgy compilation fixes for x86-64 subarch modules support These are some trivial fixes for the x86-64 subarch module support. The only potential problem is that I have to modify arch/x86_64/kernel/module.c, to avoid copying the whole of it. I can't use it verbatim because it depends on a special vmalloc-like area for modules, which for now (maybe that's to fix, I guess not) UML/x86-64 has not. I went the easy way and reused the i386 vmalloc()-based allocator. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7fe8781749bf2de2ca03147a1691244a7d93ec7 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu May 5 16:15:15 2005 -0700 [PATCH] uml: obvious compile fixes for x86-64 Subarch and x86 regression fixes This patch does some totally trivial compilation fixes. It also restores the debugregs manipulation, which was commented out simply because it doesn't compile on x86_64 (we haven't yet implemented there debugregs handling). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f8d419e291f7f7f7f3ffd4f0ba00834621690c8 Author: David Gibson Date: Thu May 5 16:15:13 2005 -0700 [PATCH] ppc64: pgtable.h and other header cleanups This patch started as simply removing a few never-used macros from asm-ppc64/pgtable.h, then kind of grew. It now makes a bunch of cleanups to the ppc64 low-level header files (with corresponding changes to .c files where necessary) such as: - Abolishing never-used macros - Eliminating multiple #defines with the same purpose - Removing pointless macros (cases where just expanding the macro everywhere turns out clearer and more sensible) - Removing some cases where macros which could be defined in terms of each other weren't - Moving imalloc() related definitions from pgtable.h to their own header file (imalloc.h) - Re-arranging headers to group things more logically - Moving all VSID allocation related things to mmu.h, instead of being split between mmu.h and mmu_context.h - Removing some reserved space for flags from the PMD - we're not using it. - Fix some bugs which broke compile with STRICT_MM_TYPECHECKS. Signed-off-by: David Gibson Acked-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e685752de107201432a055f7c45c396a5b04dc17 Author: Jesper Juhl Date: Thu May 5 16:15:12 2005 -0700 [PATCH] ppc64: add missing Kconfig help text There's no help text for CONFIG_DEBUG_STACKOVERFLOW - add one. Signed-off-by: Jesper Juhl Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d12e522ba13ce718b7ec32b75803dece8adb072 Author: Anton Blanchard Date: Thu May 5 16:15:11 2005 -0700 [PATCH] ppc64: remove hidden -fno-omit-frame-pointer for schedule.c While looking at code generated by gcc4.0 I noticed some functions still had frame pointers, even after we stopped ppc64 from defining CONFIG_FRAME_POINTER. It turns out kernel/Makefile hardwires -fno-omit-frame-pointer on when compiling schedule.c. Create CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER and define it on architectures that dont require frame pointers in sched.c code. (akpm: blame me for the name) Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 696c2b9f97c2439e9fb299650041ec750df46865 Author: Kumar Gala Date: Thu May 5 16:15:10 2005 -0700 [PATCH] ppc32: Simplified PPC core revision report We can identify new Freescale PPC cores by the fact that the MSB of the PVR is set. If we are a new Freescale core the decode of major/minor revision numbers is simplified so we dont have to add new case checks for a every new Freescale core. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 075d6eb16d273dab7b7b4b83fcee8bce4ee387ed Author: David Woodhouse Date: Thu May 5 16:15:09 2005 -0700 [PATCH] ppc32: platform-specific functions missing from kallsyms. The PPC32 kernel puts platform-specific functions into separate sections so that unneeded parts of it can be freed when we've booted and actually worked out what we're running on today. This makes kallsyms ignore those functions, because they're not between _[se]text or _[se]inittext. Rather than teaching kallsyms about the various pmac/chrp/etc sections, this patch adds '_[se]extratext' markers for kallsyms. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit becf3aec2608d6807a58d0677661cb23c388d67f Author: Herbert Xu Date: Thu May 5 16:15:08 2005 -0700 [PATCH] Add CXT48 to modem black list in ac97 The following patch works around the misdetection of the CXT48 codec as a modem by the OSS ac97 driver. Signed-off-by: Herbert Xu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60d300c02fe2e0be9bb02904361e41e0307264b2 Author: Stuart Brady Date: Thu May 5 16:15:07 2005 -0700 [PATCH] include/linux/soundcard.h: endianness fix Fixes for big-endian systems in soundcard.h and awe_voice.h This patch fixes the AFMT_S16_NE (include/linux/soundcard.h) and AWE_PATCH (awe_voice.h) macros on big-endian systems. It also moves _PATCHKEY into a new file, patchkey.h, in order to remove a duplicate definition of it from awe_voice.h. Signed-off-by: Stuart Brady Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42d77c70177b2f7535766bce938d965fd863f0fd Author: Andrew Morton Date: Thu May 5 16:15:06 2005 -0700 [PATCH] interwave needs isa pnp Fix bug #4509 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3437c5df6f9c00b6a9b7dcb7a30c5e3e1e5de189 Author: Jason Gaston Date: Thu May 5 16:15:05 2005 -0700 [PATCH] intel8x0: fix for Intel AC'97 audio driver This patch fixes a typo in the Intel AC'97 audio driver intel8x0.c for Intel ESB2. Signed-off-by: Jason Gaston Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e422fd2c965ad1b0e4eadaabd0adb77e8a93e74e Author: Andrea Arcangeli Date: Thu May 5 16:15:04 2005 -0700 [PATCH] avoid -ENOMEM due reclaimable slab caches This makes sure that reclaimable buffer headers and reclaimable inodes are accounted properly during the overcommit checks. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f48d9663f19afb88ac0e45b825da523180f1f9c0 Author: Alexander Nyberg Date: Thu May 5 16:15:03 2005 -0700 [PATCH] x86 stack initialisation fix The recent change fix-crash-in-entrys-restore_all.patch childregs->esp = esp; p->thread.esp = (unsigned long) childregs; - p->thread.esp0 = (unsigned long) (childregs+1); + p->thread.esp0 = (unsigned long) (childregs+1) - 8; p->thread.eip = (unsigned long) ret_from_fork; introduces an inconsistency between esp and esp0 before the task is run the first time. esp0 is no longer the actual start of the stack, but 8 bytes off. This shows itself clearly in a scenario when a ptracer that is set to also ptrace eventual children traces program1 which then clones thread1. Now the ptracer wants to modify the registers of thread1. The x86 ptrace implementation bases it's knowledge about saved user-space registers upon p->thread.esp0. But this will be a few bytes off causing certain writes to the kernel stack to overwrite a saved kernel function address making the kernel when actually running thread1 jump out into user-space. Very spectacular. The testcase I've used is: /* start with strace -f ./a.out */ #include #include void *do_thread(void *p) { for (;;); } int main() { pthread_t one; pthread_create(&one, NULL, &do_thread, NULL); for (;;); return 0; } So, my solution is to instead of just adjusting esp0 that creates an inconsitent state I adjust where the user-space registers are saved with -8 bytes. This gives us the wanted extra bytes on the start of the stack and esp0 is now correct. This solves the issues I saw from the original testcase from Mateusz Berezecki and has survived testing here. I think this should go into -mm a round or two first however as there might be some cruft around depending on pt_regs lying on the start of the stack. That however would have broken with the first change too! It's actually a 2-line diff but I had to move the comment of why the -8 bytes are there a few lines up. Thanks to Zwane for helping me with this. Signed-off-by: Alexander Nyberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47c297529bd23d93d2a088d9620bb220763e9cb1 Author: Linus Torvalds Date: Thu May 5 16:23:24 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git commit fd4e5f29f7354c3e3edaa03d37a7bf83b0cbae36 Author: Linus Torvalds Date: Thu May 5 16:22:23 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git commit 4adb18173aba217a7ce7f261427914d1350c4e18 Author: Linus Torvalds Date: Thu May 5 16:06:47 2005 -0700 Automatic merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git commit 41e46d6ab0ca1908bff4e77ad9eeb6bf7afeb5c0 Author: Nicolas Pitre Date: Thu May 5 23:24:45 2005 +0100 [PATCH] ARM: 2665/1: kill warnings in entry-armv.S Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 4b0e07a5566a4e3f141e52c1f17e683e4a5bba91 Author: Nicolas Pitre Date: Thu May 5 23:24:45 2005 +0100 [PATCH] ARM: 2663/1: straightify TLS register emulation a bit more Patch from Nicolas Pitre This better express things, and should cover RMK's weird SMP toys. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 3b9fa0931dd86a1fe5507311ee8031650f5d0e8c Author: Arnaldo Carvalho de Melo Date: Thu May 5 15:09:46 2005 -0700 [PATCH] Kconfig i18n support This patch adds i18n support for make *config, allowing users to have the config process in their own language. No printk was harmed in the process, don't worry, so all the bug reports, kernel messages, etc, remain in english, just the user tools to configure the kernel are internationalized. Users not interested in translations can just unset the related LANG, LC_ALL, etc env variables and have the config process in plain english, something like: LANG= make menuconfig is enough for having the whole config process in english. Or just don't install any translation file. Translations for brazilian portuguese are being done by a team of volunteers at: http://www.visionflex.inf.br/kernel_ptbr/pmwiki.php/Principal/Traducoes To start the translation process: make update-po-config This will generate the pot template named scripts/kconfig/linux.pot, copy it to, say, ~/es.po, to start the translation for spanish. To test your translation, as root issue this command: msgfmt -o /usr/share/locale/es/LC_MESSAGES/linux.mo ~/es.po Replace "es" with your language code. Then execute, for instance: make menuconfig The current patch doesn't use any optimization to reduce the size of the generated .mo file, it is possible to use the config option as a key, but this doesn't prevent the current patch from being used or the translations done under the current scheme to be in any way lost if we chose to do any kind of keying. Thanks to Fabricio Vaccari for starting the pt_BR (brazilian portuguese) translation effort, Thiago Maciera for helping me with the gconf.cc (QT frontent) i18n coding and to all the volunteers that are already working on the first translation, to pt_BR. I left the question on whether to ship the translations with the stock kernel sources to be discussed here, please share your suggestions. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7cc1712b8a778c8077048969848857895d242009 Author: Coywolf Qi Hunt Date: Thu May 5 14:53:01 2005 -0700 [SPARC]: Remove legacy stuff from cpu_idle(). Currently sparc and sparc64's UP cpu_idle() checks current pid. This is old time legacy. Now it's paranoia. Signed-off-by: Coywolf Qi Hunt Acked-by: William Irwin Signed-off-by: David S. Miller commit b6d31e80f0d6a722bf85b3a7090df473fc545980 Author: David S. Miller Date: Thu May 5 14:46:21 2005 -0700 [TG3]: Update driver version and reldate. Signed-off-by: David S. Miller commit e6de8ad1fae8385eca4bf288e7a6ea2664ce0458 Author: Michael Chan Date: Thu May 5 14:42:41 2005 -0700 [TG3]: Ignore tg3_stop_block() errors. tg3_stop_block() errors can be safely ignored since tg3_chip_reset() always follows tg3_stop_block() calls. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit b3b7d6be54f919556148946adb4ece91820ad210 Author: David S. Miller Date: Thu May 5 14:40:20 2005 -0700 [TG3]: Elide tg3_stop_block messages when such events are normal. Signed-off-by: David S. Miller commit 60d530655334369b62f260296a5ed1646a9529f0 Author: Patrick McHardy Date: Thu May 5 14:30:15 2005 -0700 [IPV4]: multipath_wrandom.c GPF fixes multipath_wrandom needs to use GFP_ATOMIC. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 8edf72ebce06d52e855438ec18fe20dea7a4cc04 Author: Christoph Hellwig Date: Thu May 5 14:27:56 2005 -0700 [SPARC64]: Kill useless __pte_alloc_one_kernel indirection warning: untested, but it there's not too much chance for screwups Signed-off-by: David S. Miller commit 3ef4e9a8db6c65de7c7f4bc013d62b0d73f50dce Author: Christoph Hellwig Date: Thu May 5 14:25:59 2005 -0700 [ATALK]: Add alloc_ltalkdev(). this matches the API used by other link layer like ethernet or token ring. Signed-off-by: Christoph Hellwig Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 949bf797595fc99d4cadf9a294fe6fd32a4474e6 Author: James Bottomley Date: Sun May 1 18:58:15 2005 -0500 [SCSI] fix command retries in spi_transport class The premise is that domain validation is likely to trigger errors which it wants to know about, so the only time it should be retrying them is when it gets a unit attention (likely as the result of a previous bus or device reset). Ironically, the previous coding retried three times in all cases except those of unit attention. The attached fixes this to do the right thing. Signed-off-by: James Bottomley commit 476e19cfa131e2b6eedc4017b627cdc4ca419ffb Author: Arnaldo Carvalho de Melo Date: Thu May 5 13:35:15 2005 -0700 [IPV6]: Fix OOPS when using IPV6_ADDRFORM This causes sk->sk_prot to change, which makes the socket release free the sock into the wrong SLAB cache. Fix this by introducing sk_prot_creator so that we always remember where the sock came from. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit f403b7f452e4347f6af14c1f3c47bce758eb6337 Author: Nathan Scott Date: Thu May 5 13:33:40 2005 -0700 [XFS] Cleanup use of loff_t vs xfs_off_t in the core code. SGI Modid: xfs-linux:xfs-kern:22378a Signed-off-by: Nathan Scott Signed-off-by: Christoph Hellwig commit 24e17b5fb99d4d1b47fe0847a3a801e36d431ff6 Author: Nathan Scott Date: Thu May 5 13:33:20 2005 -0700 [XFS] Use the right offset when ensuring a delayed allocate conversion has covered the offset originally requested. Can cause data corruption when multiple processes are performing writeout on different areas of the same file. Quite difficult to hit though. SGI Modid: xfs-linux:xfs-kern:22377a Signed-off-by: Nathan Scott Signed-off-by: Christoph Hellwig . commit 775bf6c99a4ebde13bdb8dfa528ed241483b49ef Author: Nathan Scott Date: Thu May 5 13:33:01 2005 -0700 [XFS] Do not do delalloc conversion on pages beyond EOF ever, not just sometimes SGI Modid: xfs-linux:xfs-kern:22376a Signed-off-by: Nathan Scott Signed-off-by: Christoph Hellwig commit 18e0a926ad7c5ab4ef05334230671c6975dac26b Author: Eric Sandeen Date: Thu May 5 13:32:18 2005 -0700 [XFS] remove noisy printk at vnode trace allocation SGI Modid: xfs-linux:xfs-kern:191625a Signed-off-by: Eric Sandeen Signed-off-by: Christoph Hellwig commit 3ba0815a4b0709ef5e7b481067573d10806bbe2c Author: Daniel Moore Date: Thu May 5 13:31:34 2005 -0700 [XFS] stop background sync from waiting for in-use inodes SGI Modid: xfs-linux:xfs-kern:191586a Signed-off-by: Daniel Moore Signed-off-by: Christoph Hellwig commit 3f243766660da3df4a75ea1892c310d6080646c8 Author: Nathan Scott Date: Thu May 5 13:30:34 2005 -0700 [XFS] Disable the combination of XFS direct IO and AIO until the IO completion handling for unwritten extents can be moved out of interrupt context. SGI Modid: xfs-linux:xfs-kern:22343a Signed-off-by: Nathan Scott Signed-off-by: Christoph Hellwig commit abd0cf7aeaaf8a15d9777e65606b6076868b6186 Author: Nathan Scott Date: Thu May 5 13:30:13 2005 -0700 [XFS] Resolve an issue with xfsbufd not getting along with swsusp. SGI Modid: xfs-linux:xfs-kern:22342a Signed-off-by: Nathan Scott Signed-off-by: Christoph Hellwig commit 764433b7f1cf5d7b5e27ceb4f5546042e1f4acc7 Author: Eric Sandeen Date: Thu May 5 13:29:17 2005 -0700 [XFS] Fix up warnings SGI Modid: xfs-linux:xfs-kern:191411a Signed-off-by: Eric Sandeen Signed-off-by: Christoph Hellwig commit 1f443ad70d3afa6bc74019ade2d664eadd7d505a Author: Nathan Scott Date: Thu May 5 13:28:29 2005 -0700 [XFS] Allow initial XFS delayed allocation size to be increased beyond 64KB. SGI Modid: xfs-linux:xfs-kern:22261a Signed-off-by: Nathan Scott Signed-off-by: Christoph Hellwig commit 5fcbab355e1528545671a5221666ef640b8250c8 Author: Dean Roehrich Date: Thu May 5 13:27:19 2005 -0700 [XFS] Add ATTR_NOLOCK for xfs_setattr to indicate that XFS_IOLOCK is held SGI Modid: xfs-linux:xfs-kern:190711a Signed-off-by: Dean Roehrich Signed-off-by: Christoph Hellwig . commit 9effd8e62570c6e47b91734770e6122002c33ed5 Author: Eric Sandeen Date: Thu May 5 13:26:18 2005 -0700 [XFS] Enable XFS_VNODE_TRACE SGI Modid: xfs-linux:xfs-kern:190725a Signed-off-by: Eric Sandeen Signed-off-by: Christoph Hellwig . commit 31b084aef3f088962f56c100b31bb8479c5dd769 Author: Nathan Scott Date: Thu May 5 13:25:00 2005 -0700 [XFS] Fix up uses of nlink_t incorrectly restricting us to 2^16 links for some platforms SGI Modid: xfs-linux:xfs-kern:22032a Signed-off-by: Nathan Scott Signed-off-by: Christoph Hellwig commit de20614b351e4d4d23af0a105baa8fd2d7cd4f26 Author: Nathan Scott Date: Thu May 5 13:24:13 2005 -0700 [XFS] Block mount attempts for filesystems with version 1 directories. SGI Modid: xfs-linux:xfs-kern:21937a Signed-off-by: Nathan Scott Signed-off-by: Christoph Hellwig commit 71bce256bf2e2aaddf54a2f4ac216329c74be3ad Author: Nathan Scott Date: Thu May 5 13:23:27 2005 -0700 [XFS] Move the XFS inode to the front of its hash list on a cache hit SGI Modid: xfs-linux:xfs-kern:21915a Signed-off-by: Nathan Scott Signed-off-by: Christoph Hellwig commit 25ae3f59b10dbd5e2b9b192ecc90ea935cc23e68 Author: Rafael J. Wysocki Date: Thu May 5 13:13:29 2005 -0700 [DECNET]: Fix build after C99 netlink initializer change. Signed-off-by: Rafael J. Wysocki commit f7e68bbf405a45d6e7c5b8fc384ff1ba20dd7aa4 Author: Russell King Date: Thu May 5 14:49:01 2005 +0100 [PATCH] ARM: select PCI, ISA and ISA_DMA Rather than using a long "depends on..." and "default y" lines for these options, use select instead. Signed-off-by: Russell King commit 53d7ad1ea3acb4a626edec179aa52e72ea216647 Author: Russell King Date: Thu May 5 14:06:31 2005 +0100 ARM: Add missed imxfb include file This file got missed in the commit of patch 2661/1 thanks to a buggy script. Signed-off-by: Russell King commit bfd4bda097f8758d28e632ff2035e25577f6b060 Author: David Woodhouse Date: Thu May 5 13:59:37 2005 +0100 Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit 4f7a18124c1a44858fb74a1c4234015009952959 Author: Russell King Date: Thu May 5 13:11:00 2005 +0100 [PATCH] ARM: Fix kernel stack offset calculations Various places in the ARM kernel implicitly assumed that kernel stacks are always 8K due to hard coded constants. Replace these constants with definitions. Correct the allowable range of kernel stack pointer values within the allocation. Arrange for the entire kernel stack to be zeroed, not just the upper 4K if CONFIG_DEBUG_STACK_USAGE is set. Signed-off-by: Russell King commit b2d84f078a8be40f5ae3b4d2ac001e2a7f45fe4f Author: Roman Kagan Date: Wed Apr 13 21:40:17 2005 +0400 [PATCH] drivers/base/bus.c: fix iteration in driver_detach() With 2.6.11 and 2.6.12-rc2 (and perhaps a few versions before) usb drivers for multi-interface devices, which do usb_driver_release_interface() in their disconnect(), make rmmod hang. It turns out to be due to a bug in drivers/base/bus.c:driver_detach(), that iterates over the list of attached devices with list_for_each_safe() under an assumption that device_release_driver() only releases the current device, while it may also call device_release_driver() for other devices on the same list. The following patch fixes it. Please consider applying. Signed-off-by: Roman Kagan Signed-off-by: Greg Kroah-Hartman commit 177a4324944478f2799ce4ede2797cb0f602f274 Author: Alexander Nyberg Date: Sat Feb 26 13:38:51 2005 +0100 [PATCH] Hotplug: Make dev->bus checking consistent Earlier in the same function dev->bus is checked before dereferenced, make consistent although I honestly don't know if dev->bus could ever be NULL Found by the Coverity tool Signed-off-by: Alexander Nyberg Signed-off-by: Greg Kroah-Hartman commit 897f5ab2cd733a77a2279268262919caa8154b9d Author: Linus Torvalds Date: Wed May 4 19:52:45 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git commit 1d42a0ecf478962e8aede355a0be41365c117ff0 Author: Linus Torvalds Date: Wed May 4 14:23:14 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/ commit b48fc7bb3868abffc89ce70d4baf324574338d8e Author: Dean Nelson Date: Wed Mar 23 19:05:00 2005 -0700 [IA64-SGI] convert some sn SAL_CALLs to ia64_sal_oemcall calls Convert some sn SAL_CALLs to ia64_sal_oemcall calls so that they can be called by kernel modules. Signed-off-by: Dean Nelson Signed-off-by: Tony Luck commit 9b48b46678989b67cd00658ea88964163eaab616 Author: Dean Nelson Date: Tue Mar 22 16:00:00 2005 -0700 [IA64-SGI] move nodepda pointer out of pda Remove the p_nodepda and p_subnodepda pointers from the pda_s structure. And then define a new per-cpu pointer to the nodepda and export it so that it can be accessed by kernel modules. Signed-off-by: Dean Nelson Signed-off-by: Tony Luck commit 836eeed6cea8ca8138e9deff7571857923541604 Author: Denis Vlasenko Date: Wed May 4 08:07:16 2005 +0300 [PATCH] i810fb: fix __initdata access [hv]sync[12] are __initdata, causing mplayer to oops with the previous i810fb fix. My fault, this fixes it. Sorry. Signed-off-by: Linux Torvalds commit 1b75d8ba5ea96e174dc2674e01d87ce0d382ee44 Author: Al Viro Date: Wed May 4 05:40:22 2005 +0100 [PATCH] ipmi iomem annotations and fixes annotated, a bunch of direct dereferencing replaced with readb(). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b1ecb4c3a9e33cc8b93ac9cb046b535b72a15f68 Author: Al Viro Date: Wed May 4 05:40:12 2005 +0100 [PATCH] asm/signal.h unification New file - asm-generic/signal.h. Contains declarations of __sighandler_t, __sigrestore_t, SIG_DFL, SIG_IGN, SIG_ERR and default definitions of SIG_BLOCK, SIG_UNBLOCK and SIG_SETMASK. asm-*/signal.h switched to including it. The only exception is asm-parisc/signal.h that wants its own declaration of __sighandler_t; that one is left as-is. asm-ppc64/signal.h required one more thing - unlike everybody else it used __sigrestorer_t instead of usual __sigrestore_t. PPC64 switched to common spelling. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0555985d046348b39e44ff1da2719d73409d7981 Author: Al Viro Date: Wed May 4 05:40:02 2005 +0100 [PATCH] sonypi trivial user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 56c3b7d788c21eecf5641020fcf8e4e15d0c5eb0 Author: Al Viro Date: Wed May 4 05:39:52 2005 +0100 [PATCH] ISA DMA Kconfig fixes - part 4 (irda) * net/irda/irda_device.c::irda_setup_dma() made conditional on ISA_DMA_API (it uses helpers in question and irda is usable on platforms that don't have them at all - think of USB IRDA, for example). * irda drivers that depend on ISA DMA marked as dependent on ISA_DMA_API Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a553260618d88c4790daec7975c88f3db1080b5b Author: Al Viro Date: Wed May 4 05:39:42 2005 +0100 [PATCH] ISA DMA Kconfig fixes - part 3 Drivers that expect ISA DMA API are marked as such in Kconfig. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7fbacd5213a03b262bb17a826b166900e8b168ac Author: Al Viro Date: Wed May 4 05:39:32 2005 +0100 [PATCH] ISA_DMA Kconfig fixes - part 2 (parport_pc) Part of parport_pc that uses ISA DMA helpers made conditional on CONFIG_ISA_DMA_API. As the result, driver got usable for boxen that do not have ISA DMA stuff and have normal PCI parport card stuck into them - these never use DMA anyway. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5cae841b13f23ccdf7e38b2400b5cf57deb57ccf Author: Al Viro Date: Wed May 4 05:39:22 2005 +0100 [PATCH] ISA DMA Kconfig fixes - part 1 A bunch of drivers use ISA DMA helpers or their equivalents for platforms that have ISA with different DMA controller (a lot of ARM boxen). Currently there is no way to put such dependency in Kconfig - CONFIG_ISA is not it (e.g. it is not set on platforms that have no ISA slots, but have on-board devices that pretend to be ISA ones). New symbol added - ISA_DMA_API. Set when we have functional enable_dma()/set_dma_mode()/etc. set of helpers. Next patches in the series will add missing dependencies for drivers that need them. I'm very carefully staying the hell out of the recurring flamefest on what exactly CONFIG_ISA would mean in ideal world - added symbol has a well-defined meaning and for now I really want to treat it as completely independent from the mess around CONFIG_ISA. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9b52523aff51e3b245e6ec8887e3fcf190da4711 Author: Al Viro Date: Wed May 4 05:39:01 2005 +0100 [PATCH] mbcs trivial user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3c51f196b658fa1920c84b0752a55ed251d22d52 Author: Al Viro Date: Wed May 4 05:38:51 2005 +0100 [PATCH] sparc NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6b6bf51081a27e80334e7ebe2993ae1d046a3222 Author: Dave Kleikamp Date: Wed May 4 09:11:49 2005 -0500 JFS: Endian errors Thanks sparse! Signed-off-by: Dave Kleikamp commit e6600d800fead3e895f16bf9b426578a6301af44 Author: Linus Torvalds Date: Wed May 4 07:08:43 2005 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/ commit a1d4ebdbb3806e9d2c37f32a043ec54f4534977c Author: Linus Torvalds Date: Wed May 4 07:08:10 2005 -0700 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6.git/ commit 742b0c905d970fd60893cce14a3c68b523504bc4 Author: Linus Torvalds Date: Wed May 4 07:07:22 2005 -0700 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6.git/ commit 235bd6140dad7c08261abdc1f8056485c5344a74 Author: Linus Torvalds Date: Wed May 4 07:06:38 2005 -0700 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git commit 9171078ab5a0bbb516029cfc61378e0350a7b30d Author: Adrian Bunk Date: Sun May 1 15:53:08 2005 +0200 [PATCH] PCI: drivers/pci/pci.c: remove pci_dac_set_dma_mask pci_dac_set_dma_mask is currently completely unused. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit b308240b49ff5a1bddc6e10513c2c83f37a0bc78 Author: Dely Sy Date: Thu Apr 28 18:08:53 2005 -0700 [PATCH] PCI Hotplug: fix pciehp regression I fogot to remove the code that freed the memory in cleanup_slots(). Here is the new patch, which I have also taken care of the comment by Eike to remove the cast in hotplug_slot->private. Signed-off-by: Dely Sy Signed-off-by: Greg Kroah-Hartman commit eaae4b3a84a3781543a32bcaf0a33306ae915574 Author: Steven Cole Date: Tue May 3 18:38:30 2005 -0600 [PATCH] PCI: Spelling fixes for drivers/pci. Here are some spelling corrections for drivers/pci. CONTROLER -> CONTROLLER Regisetr -> Register harware -> hardware inital -> initial Initilize -> Initialize funtion -> function funciton -> function occured -> occurred Signed-off-by: Steven Cole Signed-off-by: Greg Kroah-Hartman commit 3aa8c4febf74b1f23bd9fc329321af6d531fe4dd Author: R.Marek@sh.cvut.cz Date: Thu Apr 21 10:49:06 2005 +0000 [PATCH] PCI: Rapid Hance quirk This patch just adds Intel's Hance Rapid south bridge IDs to ICH4 region quirk. Patch was successfuly tested by Chunhao Huang from Winbond. Signed-Off-By: Rudolf Marek Signed-off-by: Greg Kroah-Hartman commit 034ecc724cc6ba662d0b2b5a1e11e7e66a768596 Author: Rolf Eike Beer Date: Mon Apr 11 15:01:54 2005 +0200 [PATCH] PCI Hotplug ibmphp_pci.c: Fix masking out needed information too early here is the patch that fixes the bug introduced by my previous patch which already went into 2.6.12-rc2 and is likely to cause trouble is someone hits one the else case here by accident. Using the &= operation before the if statement destroys the information the if asks for so we always go into the else branch. Signed-off-by: Rolf Eike Beer Signed-off-by: Greg Kroah-Hartman commit c8958177224622411b9979eabb5610e30b06034b Author: Greg KH Date: Fri Apr 8 14:53:31 2005 +0900 [PATCH] PCI: Add pci shutdown ability Now pci drivers can know when the system is going down without having to add a reboot notifier event. Signed-off-by: Greg Kroah-Hartman commit 4c0619add8c3a8b28e7fae8b15cc7b62de2f8148 Author: ssant@in.ibm.com Date: Fri Apr 8 14:53:31 2005 +0900 [PATCH] PCI: fix up word-aligned 16-bit PCI config access through sysfs This patch adds the possibility to do word-aligned 16-bit atomic PCI configuration space accesses via the sysfs PCI interface. As a result, problems with Emulex LFPC on IBM PowerPC64 are fixed. Patch is present in SLES 9 SP1. Signed-off-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit bc56b9e01190b9f1ad6b7c5c694b61bfe34c7aa5 Author: Greg KH Date: Fri Apr 8 14:53:31 2005 +0900 [PATCH] PCI: Clean up a lot of sparse "Should it be static?" warnings. Signed-off-by: Greg Kroah-Hartman commit 92df516e6264f9caff4be49718926d6884fa50ed Author: Pavel Machek Date: Tue Apr 5 23:49:49 2005 +0200 [PATCH] PCI: fix stale PCI pm docs This fixes u32 vs. pm_message_t confusion in documentation, and removes references to no-longer-existing (*save_state), too. With exception of USB (I hope David will fix/apply my patch), this should fix last piece of this confusion... famous last words.