commit 02b3e4e2d71b6058ec11cc01c72ac651eb3ded2b Author: Linus Torvalds Date: Sun Aug 28 16:41:01 2005 -0700 Linux v2.6.13 commit 20b1730af3ae05450b0e03f5aed40c4313f65db6 Author: Heiko Carstens Date: Sun Aug 28 13:22:37 2005 -0700 [PATCH] zfcp: bugfix and compile fixes Bugfix (usage of uninitialized pointer in zfcp_port_dequeue) and compile fixes for the zfcp device driver. Signed-off-by: Heiko Carstens Acked-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f84f226389fc5f47b3cb36818972e2e171607de Author: Alexey Dobriyan Date: Sun Aug 28 15:33:53 2005 +0400 [PATCH] zfcp: fix compilation due to rports changes struct zfcp_port::scsi_id was removed by commit 3859f6a248cbdfbe7b41663f3a2b51f48e30b281 Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit 3d52acb34247816c453f94596e6c7fc4499b76dc Merge: f786648b89f00d4e66fe6b19beffd30e764651fc 214838a2108b4b1e18abce2e28d37996e9bf7c68 Author: Linus Torvalds Date: Sat Aug 27 18:05:14 2005 -0700 Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit f786648b89f00d4e66fe6b19beffd30e764651fc Author: Paul Mackerras Date: Sun Aug 28 09:40:01 2005 +1000 [PATCH] Remove race between con_open and con_close [ Same race and same patch also by Steven Rostedt ] I have a laptop (G3 powerbook) which will pretty reliably hit a race between con_open and con_close late in the boot process and oops in vt_ioctl due to tty->driver_data being NULL. What happens is this: process A opens /dev/tty6; it comes into con_open() (drivers/char/vt.c) and assign a non-NULL value to tty->driver_data. Then process A closes that and concurrently process B opens /dev/tty6. Process A gets through con_close() and clears tty->driver_data, since tty->count == 1. However, before process A can decrement tty->count, we switch to process B (e.g. at the down(&tty_sem) call at drivers/char/tty_io.c line 1626). So process B gets to run and comes into con_open with tty->count == 2, as tty->count is incremented (in init_dev) before con_open is called. Because tty->count != 1, we don't set tty->driver_data. Then when the process tries to do anything with that fd, it oopses. The simple and effective fix for this is to test tty->driver_data rather than tty->count in con_open. The testing and setting of tty->driver_data is serialized with respect to the clearing of tty->driver_data in con_close by the console_sem. We can't get a situation where con_open sees tty->driver_data != NULL and then con_close on a different fd clears tty->driver_data, because tty->count is incremented before con_open is called. Thus this patch eliminates the race, and in fact with this patch my laptop doesn't oops. Signed-off-by: Paul Mackerras [ Same patch Signed-off-by: Steven Rostedt in http://marc.theaimsgroup.com/?l=linux-kernel&m=112450820432121&w=2 ] Signed-off-by: Linus Torvalds commit 3859f6a248cbdfbe7b41663f3a2b51f48e30b281 Author: Andreas Herrmann Date: Sat Aug 27 11:07:54 2005 -0700 [PATCH] zfcp: add rports to enable scsi_add_device to work again This patch fixes a severe problem with 2.6.13-rc7. Due to recent SCSI changes it is not possible to add any LUNs to the zfcp device driver anymore. With registration of remote ports this is fixed. Signed-off-by: Andreas Herrmann Acked-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 729d70f5dfd663b44bca68a4479c96bde7e535d6 Author: Jan Blunck Date: Sat Aug 27 11:07:52 2005 -0700 [PATCH] sg.c: fix a memory leak in devices seq_file implementation I know that scsi procfs is legacy code but this is a fix for a memory leak. While reading through sg.c I realized that the implementation of /proc/scsi/sg/devices with seq_file is leaking memory due to freeing the pointer returned by the next() iterator method. Since next() might return NULL or an error this is wrong. This patch fixes it through using the seq_files private field for holding the reference to the iterator object. Here is a small bash script to trigger the leak. Use slabtop to watch the size-32 usage grow and grow. #!/bin/sh while true; do cat /proc/scsi/sg/devices > /dev/null done Signed-off-by: Jan Blunck Acked-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8126fdbc76351bdf99c6737ef4fecf88a22fa538 Author: Patrick Boettcher Date: Sat Aug 27 19:30:30 2005 +0200 [PATCH] fix for race problem in DVB USB drivers (dibusb) Fixed race between submitting streaming URBs in the driver and starting the actual transfer in hardware (demodulator and USB controller) which sometimes lead to garbled data transfers. URBs are now submitted first, then the transfer is enabled. Dibusb devices and clones are now fully functional again. Signed-off-by: Patrick Boettcher Signed-off-by: Linus Torvalds commit 820d220de400cfaaf846a2d8b5de93f9ea5a9b80 Author: James Morris Date: Sat Aug 27 13:47:06 2005 +0200 [PATCH] Fix capifs bug in initialization error path. This fixes a bug in the capifs initialization code, where the filesystem is not unregistered if kern_mount() fails. Signed-off-by: James Morris Signed-off-by: Karsten Keil Signed-off-by: Linus Torvalds commit 8dbddf17824861f2298de093549e6493d9844835 Author: Eric W. Biederman Date: Sat Aug 27 00:56:18 2005 -0600 [PATCH] acpi_shutdown: Only prepare for power off on power_off When acpi_sleep_prepare was moved into a shutdown method we started calling it for all shutdowns. It appears this triggers some systems to power off on reboot. Avoid this by only calling acpi_sleep_prepare if we are going to power off the system. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 6a029a90f5b93e2b50bcbbaef05ef91fa0c1d6b3 Author: Al Viro Date: Sat Aug 27 06:48:15 2005 +0100 [PATCH] mmaper_kern.c fixes [buffer overruns] - copy_from_user() can fail; ->write() must check its return value. - severe buffer overruns both in ->read() and ->write() - lseek to the end (i.e. to mmapper_size) and if (count + *ppos > mmapper_size) count = count + *ppos - mmapper_size; will do absolutely nothing. Then it will call copy_to_user(buf,&v_buf[*ppos],count); with obvious results (similar for ->write()). Fixed by turning read to simple_read_from_buffer() and by doing normal limiting of count in ->write(). - gratitious lock_kernel() in ->mmap() - it's useless there. - lots of gratuitous includes. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 214838a2108b4b1e18abce2e28d37996e9bf7c68 Author: Ralf Baechle Date: Wed Aug 24 18:01:33 2005 +0100 [PATCH] Fix 6pack setting of MAC address Don't check type of sax25_family; dev_set_mac_address has already done that before and anyway, the type to check against would have been ARPHRD_AX25. We only got away because AF_AX25 and ARPHRD_AX25 both happen to be defined to the same value. Don't check sax25_ndigis either; it's value is insignificant for the purpose of setting the MAC address and the check has shown to break some application software for no good reason. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: Jeff Garzik commit 84a2ea1c2cee0288f96e0c6aa4f975d4d26508c7 Author: Ralf Baechle Date: Thu Aug 25 19:38:30 2005 +0100 [PATCH] 6pack Timer initialization I dropped the timer initialization bits by accident when sending the p-persistence fix. This patch gets the driver to work again on halfduplex links. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: Jeff Garzik commit 36676bcbf9f6bcbea9d06e67ee8d04eacde54952 Author: James Bottomley Date: Fri Aug 26 18:34:17 2005 -0700 [PATCH] Fix oops in sysfs_hash_and_remove_file() The problem arises if an entity in sysfs is created and removed without ever having been made completely visible. In SCSI this is triggered by removing a device while it's initialising. The problem appears to be that because it was never made visible in sysfs, the sysfs dentry has a null d_inode which oopses when a reference is made to it. The solution is simply to check d_inode and assume the object was never made visible (and thus doesn't need deleting) if it's NULL. (akpm: possibly a stopgap for 2.6.13 scsi problems. May not be the long-term fix) Signed-off-by: James Bottomley Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 657390d25d4241705cb4fc5b3b4ba5b30575dc17 Author: NeilBrown Date: Fri Aug 26 18:34:16 2005 -0700 [PATCH] md: clear the 'recovery' flags when starting an md array. It's possible for this to still have flags in it and a previous instance has been stopped, and that confused the new array using the same mddev. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72008652dae7d10fa668d7b2ada3bddff7403d86 Author: NeilBrown Date: Fri Aug 26 18:34:15 2005 -0700 [PATCH] md: create a MODULE_ALIAS for md corresponding to its block major number. I just discovered this is needed for module auto-loading. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1bcfcaa0b3bec2a67b22c565a0bf508ea90db1d Author: Roland Dreier Date: Fri Aug 26 18:34:14 2005 -0700 [PATCH] IB: fix use-after-free in user verbs cleanup Fix a use-after-free bug in userspace verbs cleanup: we can't touch mr->device after we free mr by calling ib_dereg_mr(). Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c9cf6f9861f8d27303ee2531b3b7686269c71ce Author: Deepak Saxena Date: Fri Aug 26 18:34:11 2005 -0700 [PATCH] arm: fix IXP4xx flash resource range We are currently reserving one byte more than actually needed by the flash device and overlapping into the next I/O expansion bus window. This a) causes us to allocate an extra page of VM due to ARM ioremap() alignment code and b) could cause problems if another driver tries to request the next expansion bus window. Signed-off-by: Deepak Saxena Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 485761bd6a72d33b3d4fa884927b2b0d983b701e Author: Andi Kleen Date: Fri Aug 26 18:34:10 2005 -0700 [PATCH] x86_64: Tell VM about holes in nodes Some nodes can have large holes on x86-64. This fixes problems with the VM allowing too many dirty pages because it overestimates the number of available RAM in a node. In extreme cases you can end up with all RAM filled with dirty pages which can lead to deadlocks and other nasty behaviour. This patch just tells the VM about the known holes from e820. Reserved (like the kernel text or mem_map) is still not taken into account, but that should be only a few percent error now. Small detail is that the flat setup uses the NUMA free_area_init_node() now too because it offers more flexibility. (akpm: lotsa thanks to Martin for working this problem out) Cc: Martin Bligh Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bebf4688e9dbbfdd421736685d607bced91a3c91 Author: Mark M. Hoffman Date: Fri Aug 26 18:34:08 2005 -0700 [PATCH] I2C hwmon: kfree fixes This patch fixes several instances of hwmon drivers kfree'ing the "wrong" pointer; the existing code works somewhat by accident. (akpm: plucked from Greg's queue based on lkml discussion. Finishes off the patch from Jon Corbet) Signed-off-by: Mark M. Hoffman Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32818c2eb6b83ea5065c89e0c3cf774abc4dc02b Author: Anton Blanchard Date: Fri Aug 26 18:34:07 2005 -0700 [PATCH] ppc64: Fix issue with gcc 4.0 compiled kernels I recently had a BUG_ON() go off spuriously on a gcc 4.0 compiled kernel. It turns out gcc-4.0 was removing a sign extension while earlier gcc versions would not. Thinking this to be a compiler bug, I submitted a report: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23422 It turns out we need to cast the input in order to tell gcc to sign extend it. Thanks to Andrew Pinski for his help on this bug. Signed-off-by: Anton Blanchard Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 212d6d2237f60bc28c1518f8abf9d3ed6c17574a Author: Paul Jackson Date: Thu Aug 25 12:47:56 2005 -0700 [PATCH] completely disable cpu_exclusive sched domain At the suggestion of Nick Piggin and Dinakar, totally disable the facility to allow cpu_exclusive cpusets to define dynamic sched domains in Linux 2.6.13, in order to avoid problems first reported by John Hawkes (corrupt sched data structures and kernel oops). This has been built for ppc64, i386, ia64, x86_64, sparc, alpha. It has been built, booted and tested for cpuset functionality on an SN2 (ia64). Dinakar or Nick - could you verify that it for sure does avoid the problems Hawkes reported. Hawkes is out of town, and I don't have the recipe to reproduce what he found. Signed-off-by: Paul Jackson Acked-by: Nick Piggin Signed-off-by: Linus Torvalds commit ca2f3daf779f5e89d14e9783fcfd7920842df9e9 Author: Paul Jackson Date: Thu Aug 25 12:47:50 2005 -0700 [PATCH] undo partial cpu_exclusive sched domain disabling The partial disabling of Dinakar's new facility to allow cpu_exclusive cpusets to define dynamic sched domains doesn't go far enough. At the suggestion of Nick Piggin and Dinakar, let us instead totally disable this facility for 2.6.13, in order to avoid problems first reported by John Hawkes (corrupt sched data structures and kernel oops). This patch removes the partial disabling code in 2.6.13-rc7, in anticipation of the next patch, which will totally disable it instead. Signed-off-by: Paul Jackson Signed-off-by: Linus Torvalds commit 13142341ac867bb67e88204cbfcb8d90f9a861b7 Merge: 3fd1bb9baa394856b112e5edbfd3893d92dd1149 d4ef16088913002255eab9958fff4e98b3b507d6 Author: Linus Torvalds Date: Fri Aug 26 16:32:31 2005 -0700 Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git commit 3fd1bb9baa394856b112e5edbfd3893d92dd1149 Author: Jean Delvare Date: Thu Aug 25 18:43:37 2005 +0200 [PATCH] hwmon: Off-by-one error in fscpos driver Coverity uncovered an off-by-one error in the fscpos driver, in function set_temp_reset(). Writing to the temp3_reset sysfs file will lead to an array overrun, in turn causing an I2C write to a random register of the FSC Poseidon chip. Additionally, writing to temp1_reset and temp2_reset will not work as expected. The fix is straightforward. Signed-off-by: Jean Delvare Signed-off-by: Linus Torvalds commit 566ecb9b258ec4da3c7e1c6ca6fca8a5bb0c8eba Author: Marcelo Tosatti Date: Tue Aug 23 17:20:44 2005 -0300 [PATCH] ppc32 8xx: fix m8xx_ide_init() #ifdef Be more precise on deciding whether to call m8xx_ide_init() at m8xx_setup.c:platform_init(). Compilation fails if CONFIG_BLK_DEV_IDE is defined but CONFIG_BLK_DEV_MPC8xx_IDE isnt. Signed-off-by: Marcelo Tosatti Signed-off-by: Linus Torvalds commit 3515d0161d55d2fa1a340932625f94240a68c262 Author: Al Viro Date: Thu Aug 25 23:13:14 2005 +0100 [PATCH] late spinlock initialization in ieee1394/ohci spinlock used in irq handler should be initialized before registering irq, even if we know that our device has interrupts disabled; handler is registered shared and taking spinlock is done unconditionally. As it is, we can and do get oopsen on boot for some configuration, depending on irq routing - I've got a reproducer. Signed-off-by: Al Viro Signed-off-by: Ben Collins Signed-off-by: Linus Torvalds commit a46206e74e1897bf34d6b58f0991a0d6f3797e27 Author: Al Viro Date: Thu Aug 25 23:03:35 2005 +0100 [PATCH] bogus function type in qdio In qdio_get_micros() volatile in return type is plain noise (even with old gccisms it would make no sense - noreturn function returning __u64 is a bit odd ;-) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b6a9ad73897acb7ea4cf56aae0fc39ba1c471fba Author: Al Viro Date: Thu Aug 25 22:59:48 2005 +0100 [PATCH] bogus iounmap() in emac Dumb typo: iounmap(&local_pointer_variable). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1f57ff89fee47a317e9e8ca63bf0f139802cc116 Author: Alexey Dobriyan Date: Fri Aug 26 01:49:14 2005 +0400 [PATCH] drivers/hwmon/*: kfree() correct pointers The adm9240 driver, in adm9240_detect(), allocates a structure. The error path attempts to kfree() ->client field of it (second one), resulting in an oops (or slab corruption) if the hardware is not present. ->client field in adm1026, adm1031, smsc47b397 and smsc47m1 is the first in ${HWMON}_data structure, but fix them too. Signed-off-by: Jonathan Corbet Signed-off-by: Linus Torvalds commit d634cc15e8f33332038dc9c078beae79f9382ada Author: Steve French Date: Fri Aug 26 14:42:59 2005 -0500 [PATCH] Fix oops in fs/locks.c on close of file with pending locks The recent change to locks_remove_flock code in fs/locks.c changes how byte range locks are removed from closing files, which shows up a bug in cifs. The assumption in the cifs code was that the close call sent to the server would remove any pending locks on the server on this file, but that is no longer safe as the fs/locks.c code on the client wants unlock of 0 to PATH_MAX to remove all locks (at least from this client, it is not possible AFAIK to remove all locks from other clients made to the server copy of the file). Note that cifs locks are different from posix locks - and it is not possible to map posix locks perfectly on the wire yet, due to restrictions of the cifs network protocol, even to Samba without adding a new request type to the network protocol (which we plan to do for Samba 3.0.21 within a few months), but the local client will have the correct, posix view, of the lock in most cases. The correct fix for cifs for this would involve a bigger change than I would like to do this late in the 2.6.13-rc cycle - and would involve cifs keeping track of all unmerged (uncoalesced) byte range locks for each remote inode and scanning that list to remove locks that intersect or fall wholly within the range - locks that intersect may have to be reaquired with the smaller, remaining range. Signed-off-by: Steve French Signed-off-by: Dave Kleikamp Signed-off-by: Linus Torvalds commit fd589e0b662c1ea8cfb1e0d20d60a2510979865b Author: Paolo 'Blaisorblade' Giarrusso Date: Fri Aug 26 16:57:53 2005 +0200 [PATCH] hppfs: fix symlink error path While touching this code I noticed the error handling is bogus, so I fixed it up. I've removed the IS_ERR(proc_dentry) check, which will never trigger and is clearly a typo: we must check proc_file instead. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit d7a60d50d7713b65a3fd88f11d5717b83a6b6a97 Author: Paolo 'Blaisorblade' Giarrusso Date: Fri Aug 26 16:57:44 2005 +0200 [PATCH] Fixup symlink function pointers for hppfs [for 2.6.13] Update hppfs for the symlink functions prototype change. Yes, I know the code I leave there is still _bogus_, see next patch for this. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 7c657f2f25d50c602df9291bc6242b98fc090759 Author: John McCutchan Date: Fri Aug 26 14:02:04 2005 -0400 [PATCH] Document idr_get_new_above() semantics, update inotify There is an off by one problem with idr_get_new_above. The comment and function name suggest that it will return an id > starting_id, but it actually returned an id >= starting_id, and kernel callers other than inotify treated it as such. The patch below fixes the comment, and fixes inotifys usage. The function name still doesn't match the behaviour, but it never did. Signed-off-by: John McCutchan Signed-off-by: Linus Torvalds commit 755528c860b05fcecda1c88a2bdaffcb50760a7f Author: Linus Torvalds Date: Fri Aug 26 10:49:22 2005 -0700 Ignore disabled ROM resources at setup Writing even a disabled value seems to mess up some matrox graphics cards. It may be a card-related issue, but we may also be writing reserved low bits in the result. This was a fall-out of switching x86 over to the generic PCI resource allocation code, and needs more debugging. In particular, the old x86 code defaulted to not doing any resource allocations at all for ROM resources. In the meantime, this has been reported to make X happier by Helge Hafting . Signed-off-by: Linus Torvalds commit 26aad69e3dd854abe9028ca873fb40b410a39dd7 Author: Linus Torvalds Date: Fri Aug 26 10:40:10 2005 -0700 Only pre-allocate 256 bytes of cardbio IO range It may seem small, but most cards need much less, if any, and this not only makes the code adhere to the comment, it seems to fix a boot-time lockup on a ThinkPad 380XD laptop reported by Tero Roponen Signed-off-by: Linus Torvalds commit d4ef16088913002255eab9958fff4e98b3b507d6 Author: Michael Chan Date: Thu Aug 25 15:31:41 2005 -0700 [TG3]: Fix ethtool loopback test lockup The tg3_abort_hw() call in tg3_test_loopback() is causing lockups on some devices. tg3_abort_hw() disables the memory arbiter, causing tg3_reset_hw() to hang when it tries to write the pre-reset signature. tg3_abort_hw() should only be called after the pre-reset signature has been written. This is all done in tg3_reset_hw() so the tg3_abort_hw() call is unnecessary and can be removed. [ Also bump driver version and release date. -DaveM ] Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 9c2c38a122cc23d6a09b8004d60a33913683eedf Author: Jens Axboe Date: Wed Aug 24 14:57:54 2005 +0200 [PATCH] cfq-iosched.c: minor fixes One critical fix and two minor fixes for 2.6.13-rc7: - Max depth must currently be 2 to allow barriers to function on SCSI - Prefer sync request over async in choosing the next request - Never allow async request to preempt or disturb the "anticipation" for a single cfq process context. This is as-designed, the code right now is buggy in that area. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 41290c14640bc9312bf63202d14ebef075b6171a Author: Keith Owens Date: Wed Aug 24 16:06:25 2005 +1000 [PATCH] Export pcibios_bus_to_resource pcibios_bus_to_resource is exported on all architectures except ia64 and sparc. Add exports for the two missing architectures. Needed when Yenta socket support is compiled as a module. Signed-off-by: Keith Owens Signed-off-by: Linus Torvalds commit b7561524765a30334bf31c56b523aeb3c1a04c7d Author: Andi Kleen Date: Wed Aug 24 07:37:37 2005 +0200 [PATCH] x86_64: update defconfig - reenable fusion I mistakedly disabled fusion support in an earlier update. Fusion is commonly used on many x86-64 systems, so this was a problem. This patch fixes that. Signed-off-by: And Kleen Signed-off-by: Linus Torvalds commit 5477d30e841e0f707fd2daddc8cb6949858476ee Author: Benjamin Herrenschmidt Date: Wed Aug 24 14:18:53 2005 +1000 [PATCH] ppc64: Export machine_power_off for therm_pm72 module This patch puts back the export of machine_power_off() that was removed by some janitor as it's used for emergency shutdown by the G5 thermal control driver. Wether that driver should use kernel_power_off() instead is debatable and a post-2.6.13 decision. In the meantime, please commit that patch that fixes the driver for now. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 3725822f7c7134249addcd4549aff086950c8090 Author: Paul Jackson Date: Wed Aug 24 04:15:10 2005 -0700 [PATCH] cpu_exclusive sched domains build fix As reported by Paul Mackerras , the previous patch "cpu_exclusive sched domains fix" broke the ppc64 build with CONFIC_CPUSET, yielding error messages: kernel/cpuset.c: In function 'update_cpu_domains': kernel/cpuset.c:648: error: invalid lvalue in unary '&' kernel/cpuset.c:648: error: invalid lvalue in unary '&' On some arch's, the node_to_cpumask() is a function, returning a cpumask_t. But the for_each_cpu_mask() requires an lvalue mask. The following patch fixes this build failure by making a copy of the cpumask_t on the stack. Signed-off-by: Paul Jackson Signed-off-by: Linus Torvalds commit 40bb0c3ef52d872de348e10000eb5432a43a147d Author: Andreas Schwab Date: Wed Aug 24 17:36:21 2005 +0200 [PATCH] m68k: fix broken macros causing compile errors Add parens around macro parameters. Signed-off-by: Andreas Schwab Signed-off-by: Linus Torvalds commit 06c7427021f1cc83703f14659d8405ca773ba1ef Author: Patrick McHardy Date: Tue Aug 23 22:06:09 2005 -0700 [FIB_TRIE]: Don't ignore negative results from fib_semantic_match When a semantic match occurs either success, not found or an error (for matching unreachable routes/blackholes) is returned. fib_trie ignores the errors and looks for a different matching route. Treat results other than "no match" as success and end lookup. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf Author: Linus Torvalds Date: Tue Aug 23 20:39:14 2005 -0700 Linux v2.6.13-rc7 Too many changes to release a final 2.6.13. commit 9138dccbb9f39f12474554ef93dcc24de2e9c8f6 Author: Deepak Saxena Date: Tue Aug 23 13:30:29 2005 -0700 [PATCH] Fix IXP4xx CLOCK_TICK_RATE As pointed out in the following thread, the CLOCK_TICK_RATE setting for IXP4xx is incorrect b/c the HW ignores the lowest 2 bits of the LATCH value. http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2005-August/030950.html Tnx to George Anziger and Egil Hjelmeland for finding the issue. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit d10689b68aff7b48e3de1a3f7fcd6567bd2905af Author: Paul Jackson Date: Tue Aug 23 01:04:27 2005 -0700 [PATCH] cpu_exclusive sched domains on partial nodes temp fix This keeps the kernel/cpuset.c routine update_cpu_domains() from invoking the sched.c routine partition_sched_domains() if the cpuset in question doesn't fall on node boundaries. I have boot tested this on an SN2, and with the help of a couple of ad hoc printk's, determined that it does indeed avoid calling the partition_sched_domains() routine on partial nodes. I did not directly verify that this avoids setting up bogus sched domains or avoids the oops that Hawkes saw. This patch imposes a silent artificial constraint on which cpusets can be used to define dynamic sched domains. This patch should allow proceeding with this new feature in 2.6.13 for the configurations in which it is useful (node alligned sched domains) while avoiding trying to setup sched domains in the less useful cases that can cause the kernel corruption and oops. Signed-off-by: Paul Jackson Acked-by: Ingo Molnar Acked-by: Dinakar Guniguntala Acked-by: John Hawkes Signed-off-by: Linus Torvalds commit ae75784bc576a1af70509c2f3ba2b70bb65a0c58 Merge: 005940ead619c2867e0465c8e0fffb9e5989b57e 7087e295543d3f6e161530e07982fd979e2d9efc Author: Linus Torvalds Date: Tue Aug 23 20:00:48 2005 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 commit 005940ead619c2867e0465c8e0fffb9e5989b57e Merge: d3813fcf105814d06b47fa586f6b61f3cff1cefc 6885433c25aaca2cb13ee52a94be156163d6aa23 Author: Linus Torvalds Date: Tue Aug 23 20:00:17 2005 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit d3813fcf105814d06b47fa586f6b61f3cff1cefc Author: Andi Kleen Date: Tue Aug 23 03:14:27 2005 +0200 [PATCH] x86_64: Don't oops at boot when empty Opteron node has IO The code to detect IO links on Opteron would not check if the node had actually memory. This could lead to pci_bus_to_node returning an invalid node, which might cause crashes later when dma_alloc_coherent passes it to page_alloc_node(). The bug has been there forever but for some reason it is causing now crashes. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2bbfb16bf345acd81ab1e6e3d4b35964650517ac Author: lepton Date: Mon Aug 22 17:06:14 2005 -0700 [PATCH] usbnet oops fix There's a "return the wrong SKB" error in the GL620A cable minidriver (for "usbnet") which can oops. This would not appear when talking Linux-to-Linux, only Linux-to-Windows (for recent Linuxes). Signed-off-by: David Brownell Signed-off-by: Linus Torvalds commit b1daec3089a129a67169d3ae975985a7480fe17f Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Tue Aug 23 21:36:40 2005 -0400 [PATCH] i386: fix incorrect FP signal code i386 floating-point exception handling has a bug that can cause error code 0 to be sent instead of the proper code during signal delivery. This is caused by unconditionally checking the IS and c1 bits from the FPU status word when they are not always relevant. The IS bit tells whether an exception is a stack fault and is only relevant when the exception is IE (invalid operation.) The C1 bit determines whether a stack fault is overflow or underflow and is only relevant when IS and IE are set. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Linus Torvalds commit 11532cc6aa73a47023268d718bf43b646494615c Merge: 17566c3c5ed3ea8f941a135cf960387214c4f6ac c1cc168442a943ed3997f6543db87c061987f9d7 Author: Linus Torvalds Date: Tue Aug 23 19:21:44 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 17566c3c5ed3ea8f941a135cf960387214c4f6ac Author: Al Viro Date: Tue Aug 23 22:48:22 2005 +0100 [PATCH] s390 __CHECKER__ ifdefs remove the bogus games with explicit ifdefs on __CHECKER__ Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8032230694ec56c168a1404c67a54d281536cbed Author: Al Viro Date: Tue Aug 23 22:48:17 2005 +0100 [PATCH] %t... in vsnprintf handling of %t... (ptrdiff_t) in vsnprintf Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit acd3bd82c08d1a399760605706a86821148243d9 Author: Al Viro Date: Tue Aug 23 22:48:12 2005 +0100 [PATCH] ad1980 makefile fix ac97_plugin_ad1980 should trigger build of ac97_codec Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fa53bb650e6747628276e3ab6d98f51d9bfb0573 Author: Al Viro Date: Tue Aug 23 22:48:07 2005 +0100 [PATCH] Kconfig fix (non-modular SCSI drivers) non-modular scsi drivers depend on built-in scsi Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0e6d0d89343ab24ddeb39f8b2ffdd2d4c194427c Author: Al Viro Date: Tue Aug 23 22:48:02 2005 +0100 [PATCH] Kconfig fix (missing dependencies on PCI in sound/*) a bunch of PCI-only drivers didn't have the right dependency Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit eaaece266a78b8f56ade48fe23147b8b933364de Author: Al Viro Date: Tue Aug 23 22:47:57 2005 +0100 [PATCH] missing exports on m32r missing exports on m32r Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 33215652e4a75dfa8adb20f4d741517457b0da2b Author: Al Viro Date: Tue Aug 23 22:47:52 2005 +0100 [PATCH] qualifiers in return types - easy cases a bunch of functions switched from volatile to __attribute__((noreturn)) and from const to __attribute_pure__ Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ade31f38f2ef61900e901d26061deff0c4dba085 Author: Al Viro Date: Tue Aug 23 22:47:47 2005 +0100 [PATCH] typo fix in qdio.c dumb typo: u32 volatile * mistyped as u32 * volatile Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 530d8e97384fd2a6805fa4515a4e6828d7b53ee2 Author: Al Viro Date: Tue Aug 23 22:47:42 2005 +0100 [PATCH] emac netpoll fix netpoll is void(struct net_device *), not int(struct net_device *) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 791cdc7c561e2e72596388533f959e6d74dc6231 Author: Al Viro Date: Tue Aug 23 22:47:37 2005 +0100 [PATCH] vidc gcc4 fix removes an extern for a static variable. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0cbdff4f7fc642deb1f36bc035cf60b7bdc497d5 Author: Al Viro Date: Tue Aug 23 22:47:32 2005 +0100 [PATCH] broken inline asm on s390 (misuse of labels) use of explicit labels in inline asm is a Bad Idea(tm), since gcc can decide to inline the function in several places. Fixed by use of 1f/f: instead of .Lfitsin/.Lfitsin: Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a828b8e4e699b5e3ce0dcbb708ecb099b86f3126 Author: Al Viro Date: Tue Aug 23 22:47:27 2005 +0100 [PATCH] m32r_sio gcc4 fixes extern declaration followed by static in drivers/serial/m32r_sio.c Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c51d9943b11441fd1ea42c7e70cfb5eed33fe97b Author: Al Viro Date: Tue Aug 23 22:47:22 2005 +0100 [PATCH] m32r icu_data gcc4 fixes either icu_data declaration for SMP case should be taken out of m32102.h, or its declarations for m32700ut and opsput should not be static for SMP. Patch does the latter - judging by comments in m32102.h it is intended to be non-static. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e231a9c4fdf402bcfd5a7c27be49050882631a95 Author: Al Viro Date: Tue Aug 23 22:47:17 2005 +0100 [PATCH] m32r smp.h gcc4 fixes extern on physid_2_cpu[] does not belong in smp.h - the thing is static. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 719e5985cf79bb60f4a28816547efd27dde178f5 Author: Al Viro Date: Tue Aug 23 22:47:12 2005 +0100 [PATCH] alpha spinlock code and bogus constraints "=m" (lock->lock) / "1" (lock->lock) makes gcc4 unhappy; fixed by s/1/m/, same as in case of i386 rwsem.h where such variant had been accepted by both Linus and rth. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 79fb7bdce363685b336e3f0fb8207312fd1f02fc Author: Al Viro Date: Tue Aug 23 22:47:07 2005 +0100 [PATCH] alpha xchg fix alpha xchg has to be a macro - alpha disables always_inline and if that puppy does not get inlined, we immediately blow up on undefined reference. Happens even on gcc3; with gcc4 that happens a _lot_. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 531e5ca62bd9aabef6bd8340d8ae93bac1b5caa2 Author: Al Viro Date: Tue Aug 23 22:47:01 2005 +0100 [PATCH] missing include in pcmcia_resource.c missing include of asm/irq.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 18415e923e90b986db316abd078f6d863cee7b18 Author: Al Viro Date: Tue Aug 23 22:46:56 2005 +0100 [PATCH] alpha gcc4 warnings on UP smp_call_function() is expanded to expression. Alpha oprofile calls that puppy and ignores the return value. And has -Werror for arch/*... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a238b563502a7f458624b9c6404742e441b2f9e8 Author: Al Viro Date: Tue Aug 23 22:46:51 2005 +0100 [PATCH] Kconfig fix (sparc32 drivers/char dependencies) since sparc32 Kconfig includes drivers/char/Kconfig (instead of duplicating its parts) we need several new dependencies there to exclude the stuff broken on sparc32 and not excluded by existing dependencies. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 997183dc2a8992374d93e66f5ea0d58fa1022a47 Author: Al Viro Date: Tue Aug 23 22:46:46 2005 +0100 [PATCH] Kconfig fix (emac dependencient) emac doesn't build modular; ibm_emac_debug doesn't build at all (missing headers). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6299afc40c8612a87358ecea80882395fe67111f Author: Al Viro Date: Tue Aug 23 22:46:41 2005 +0100 [PATCH] Kconfig fix (CONFIG_PM on 44x) CONFIG_PM is broken on 44x; removed duplicate entry for CONFIG_PM, made the inclusion of generic one conditional on BROKEN || !44x. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit f08243a491f3e21feabbb04476a03fb0cbc975ff Author: Al Viro Date: Tue Aug 23 22:46:36 2005 +0100 [PATCH] Kconfig fix (ppc 4xx and early serial) a bunch of ppc 4xx variants unconditionally calls early_serial_setup() and therefore needs SERIAL_8250 Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c4457fb9010765620faebccf4daf83b288295154 Author: Al Viro Date: Tue Aug 23 22:46:31 2005 +0100 [PATCH] Kconfig fix (IRQ_ALL_CPUS vs. MV64360) MV64360 does not support IRQ_ALL_CPUS - see arch/ppc/kernel/mv64360_pic.c. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ee449f514d2af21f3422c29702e6b0995c4c2a9c Author: Al Viro Date: Tue Aug 23 22:46:26 2005 +0100 [PATCH] Kconfig fix (ppc32 SMP dependencies) ppc SMP is supported only for 6xx/POWER3/POWER4 - i.e. ones that have PPC_STD_MMU. Dependency fixed. Signed-off-by: Al Viro Acked-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 51583cf108b27baf81c6db3ec718f932314986ea Author: Al Viro Date: Tue Aug 23 22:46:21 2005 +0100 [PATCH] Kconfig fix (VGA console on arm/versatile) VGA console doesn't exist (or build) on arm/versatile; dependency fixed. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 84b6a2323a2b9482958965bc66bbfbd2711cde71 Author: Al Viro Date: Tue Aug 23 22:46:16 2005 +0100 [PATCH] Kconfig fix (amba on arm/versatile) AMBA_PL010 is broken on arm/versatile; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a838e543db8f65ccbc710548916f20c23e51a363 Author: Al Viro Date: Tue Aug 23 22:46:11 2005 +0100 [PATCH] Kconfig fix (acornscsi) acornscsi had been broken for a long time; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9ff658589b8549a9142708d34625c7db6e34a672 Author: Al Viro Date: Tue Aug 23 22:46:06 2005 +0100 [PATCH] Kconfig fix (M32R_PLDSIO dependecies) M32R_PLDSIO depends on subarchitecture providing PLD_ESIO0CR and friends. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 14d891d20374c139acfaa379e61a7091b00df8fa Author: Al Viro Date: Tue Aug 23 22:46:01 2005 +0100 [PATCH] Kconfig fix (parport_pc on m32r) parport_pc shouldn't be picked on m32r (no asm/parport.h, for starters) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ab62c1e1dae0dedfc300c9f8e5c74227a8e26665 Author: Al Viro Date: Tue Aug 23 22:45:56 2005 +0100 [PATCH] Kconfig fix (airo_cs on m32r) airo_cs is broken on m32r; marked as such. [Proper fix would involve separating PCI-dependent parts and making sure they don't get in the way _and_ arranging for asm/scatterlist.h getting picked on m32r] Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a4d544fdd30111a1183ab92ea25febb8b6460214 Author: Al Viro Date: Tue Aug 23 22:45:51 2005 +0100 [PATCH] Kconfig fix (tms380tr and ISA_DMA_API) ISA parts of tms380tr are using ISA DMA helpers and should depend on ISA_DMA_API. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b545d48ca0e41803a19864c924d2efcdd4839df2 Author: Al Viro Date: Tue Aug 23 22:45:46 2005 +0100 [PATCH] Kconfig fix (arv) arv uses constants provided only by include/asm-m32r/m32700ut/m32700ut_lan.h It won't build for any subarchitecture other than M32700UT; marked as such. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a2b2f45be7e9138bde7fcba3b8e9257fea04d087 Author: Al Viro Date: Tue Aug 23 22:45:41 2005 +0100 [PATCH] Kconfig fix (infiniband and PCI) infiniband uses PCI helpers all over the place (including the core parts) and won't build without PCI. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 697ae16ac0482283741f42378108b67b492870e8 Author: Al Viro Date: Tue Aug 23 22:45:36 2005 +0100 [PATCH] Kconfig fix (DEBUG_PAGEALLOC on m32r) DEBUG_PAGEALLOC is broken on m32r - the option had been blindly copied from i386; kernel_map_pages() had not and that's what is needed for DEBUG_PAGEALLOC to work (or link, while we are at it). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c3a0f7718c84737440a621f6a8600f2e7b896a44 Author: Al Viro Date: Tue Aug 23 22:45:31 2005 +0100 [PATCH] Kconfig fix (PCI on m32r) PCI support is broken on m32r (pci_map_... missing, etc.); marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 897874fa9c58898767f081e12d70a1855b66331d Author: Al Viro Date: Tue Aug 23 22:45:26 2005 +0100 [PATCH] Kconfig fix (PMAC_BACKLIGHT on ppc64) PMAC_BACKLIGHT is broken on ppc64; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6622b8c780366f21c6bfaeebc6db8e591aa9ca2b Author: Al Viro Date: Tue Aug 23 22:45:21 2005 +0100 [PATCH] Kconfig fix (HISAX_FRITZPCI on ppc64) HISAX_FRITZPCI is broken on ppc64; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 253a9c3308dd931e35f8527d9bda7dba591601d3 Author: Al Viro Date: Tue Aug 23 22:45:16 2005 +0100 [PATCH] Kconfig fix (m32r genrtc) genrtc is not for m32r; marked as such. Probably ought to put that into arch/* - list of "don't build it on " is getting too long. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c5596b267a95bdea865b966a3d6cc6e52e7feae7 Author: Al Viro Date: Tue Aug 23 22:45:11 2005 +0100 [PATCH] Kconfig fix (m32r NUMA) NUMA is broken on m32r; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 276bd31ce5af01350465861af7aa6a25864eb108 Author: Al Viro Date: Tue Aug 23 22:45:06 2005 +0100 [PATCH] Kconfig fix (ISA_DMA_API and sound/*) fixed kconfig dependencies on ISA_DMA_API for parts of sound/* that rely on it. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e9bcb173dd1747075214a1ccdb65dc6320cae49d Author: Al Viro Date: Tue Aug 23 22:45:01 2005 +0100 [PATCH] Kconfig fix (epca on 64bit) epca is broken on 64bit; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ac6babd26ce514e0017ec5809051ea6cdc44c8f6 Author: Al Viro Date: Tue Aug 23 22:44:55 2005 +0100 [PATCH] Kconfig fix (arm SMP) SMP is broken on arm; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6df7c994a0090bf1e9604d690cde8e76b2618e4a Author: Al Viro Date: Tue Aug 23 22:44:50 2005 +0100 [PATCH] Kconfig fix (alpha NUMA) NUMA is broken on alpha; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c1cc168442a943ed3997f6543db87c061987f9d7 Author: David S. Miller Date: Tue Aug 23 14:55:32 2005 -0700 [ROSE]: Fix typo in rose_route_frame() locking fix. Signed-off-by: David S. Miller commit 81065e2f415af6c028eac13f481fb9e60a0b487b Author: Alexey Dobriyan Date: Mon Aug 22 13:11:09 2005 -0700 [PATCH] zd1201 kmalloc size fix Noticed by Coverity checker. (akpm: I stole this from Greg's tree and used the (IMO) tidier sizeof(*p) construct). Signed-off-by: Alexey Dobriyan Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 005eca5e74b222db4360f8938140eb843d283325 Author: NeilBrown Date: Mon Aug 22 13:11:08 2005 -0700 [PATCH] md: make sure resync gets started when array starts. We weren't actually waking up the md thread after setting MD_RECOVERY_NEEDED when assembling an array, so it is possible to lose a race and not actually start resync. So add a call to md_wakeup_thread, and while we are at it, remove all the "if (mddev->thread)" guards as md_wake_thread does its own checking. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c5640cb5f5a6fd780d99397eca028b575cb1206 Author: David Meybohm Date: Mon Aug 22 13:11:08 2005 -0700 [PATCH] preempt race in getppid With CONFIG_PREEMPT && !CONFIG_SMP, it's possible for sys_getppid to return a bogus value if the parent's task_struct gets reallocated after current->group_leader->real_parent is read: asmlinkage long sys_getppid(void) { int pid; struct task_struct *me = current; struct task_struct *parent; parent = me->group_leader->real_parent; RACE HERE => for (;;) { pid = parent->tgid; #ifdef CONFIG_SMP { struct task_struct *old = parent; /* * Make sure we read the pid before re-reading the * parent pointer: */ smp_rmb(); parent = me->group_leader->real_parent; if (old != parent) continue; } #endif break; } return pid; } If the process gets preempted at the indicated point, the parent process can go ahead and call exit() and then get wait()'d on to reap its task_struct. When the preempted process gets resumed, it will not do any further checks of the parent pointer on !CONFIG_SMP: it will read the bad pid and return. So, the same algorithm used when SMP is enabled should be used when preempt is enabled, which will recheck ->real_parent in this case. Signed-off-by: David Meybohm Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f024c1a4bc8ef9a149879351ce8b3aa749e0c2f Merge: a4cce10492358b33d33bb43f98284c80482037e8 dc16aaf29d64b8c5e0b88f49a4d541edf5b61e42 Author: Linus Torvalds Date: Tue Aug 23 11:06:56 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit dc16aaf29d64b8c5e0b88f49a4d541edf5b61e42 Author: David S. Miller Date: Tue Aug 23 10:50:09 2005 -0700 [ROSE]: Fix missing unlocks in rose_route_frame() Noticed by Coverity checker. Signed-off-by: David S. Miller commit d5d283751ef3c05b6766501a46800cbee84959d6 Author: David S. Miller Date: Tue Aug 23 10:49:54 2005 -0700 [TCP]: Document non-trivial locking path in tcp_v{4,6}_get_port(). This trips up a lot of folks reading this code. Put an unlikely() around the port-exhaustion test for good measure. Signed-off-by: David S. Miller commit 89ebd197eb2cd31d6187db344d5117064e19fdde Author: David S. Miller Date: Tue Aug 23 10:13:06 2005 -0700 [TCP]: Unconditionally clear TCP_NAGLE_PUSH in skb_entail(). Intention of this bit is to force pushing of the existing send queue when TCP_CORK or TCP_NODELAY state changes via setsockopt(). But it's easy to create a situation where the bit never clears. For example, if the send queue starts empty: 1) set TCP_NODELAY 2) clear TCP_NODELAY 3) set TCP_CORK 4) do small write() The current code will leave TCP_NAGLE_PUSH set after that sequence. Unconditionally clearing the bit when new data is added via skb_entail() solves the problem. Signed-off-by: David S. Miller commit 0fbbeb1ba43bd04f0f1d4f161b7f72437a1c8a03 Author: Thomas Graf Date: Tue Aug 23 10:12:44 2005 -0700 [PKT_SCHED]: Fix missing qdisc_destroy() in qdisc_create_dflt() qdisc_create_dflt() is missing to destroy the newly allocated default qdisc if the initialization fails resulting in leaks of all kinds. The only caller in mainline which may trigger this bug is sch_tbf.c in tbf_create_dflt_qdisc(). Note: qdisc_create_dflt() doesn't fulfill the official locking requirements of qdisc_destroy() but since the qdisc could never be seen by the outside world this doesn't matter and it can stay as-is until the locking of pkt_sched is cleaned up. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit d2287f844187158e5eddd0d5de8e95bd607abcb7 Author: Vlad Yasevich Date: Tue Aug 23 10:12:04 2005 -0700 [SCTP]: Add SENTINEL to SCTP MIB stats Add SNMP_MIB_SENTINEL to the definition of the sctp_snmp_list so that the output routine in proc correctly terminates. This was causing some problems running on ia64 systems. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 01d7dd0e9f8c5f1888619d2649c7da389232b408 Author: Ralf Baechle Date: Tue Aug 23 10:11:45 2005 -0700 [AX25]: UID fixes o Brown paperbag bug - ax25_findbyuid() was always returning a NULL pointer as the result. Breaks ROSE completly and AX.25 if UID policy set to deny. o While the list structure of AX.25's UID to callsign mapping table was properly protected by a spinlock, it's elements were not refcounted resulting in a race between removal and usage of an element. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 53b924b31fa53ac3007df3fef6870d5074a9adf8 Author: Ralf Baechle Date: Tue Aug 23 10:11:30 2005 -0700 [NET]: Fix socket bitop damage The socket flag cleanups that went into 2.6.12-rc1 are basically oring the flags of an old socket into the socket just being created. Unfortunately that one was just initialized by sock_init_data(), so already has SOCK_ZAPPED set. As the result zapped sockets are created and all incoming connection will fail due to this bug which again was carefully replicated to at least AX.25, NET/ROM or ROSE. In order to keep the abstraction alive I've introduced sock_copy_flags() to copy the socket flags from one sockets to another and used that instead of the bitwise copy thing. Anyway, the idea here has probably been to copy all flags, so sock_copy_flags() should be the right thing. With this the ham radio protocols are usable again, so I hope this will make it into 2.6.13. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 66a79a19a7c582efd99bb143c3a59fbda006eb39 Author: Patrick McHardy Date: Tue Aug 23 10:10:35 2005 -0700 [NETFILTER]: Fix HW checksum handling in ip_queue/ip6_queue The checksum needs to be filled in on output, after mangling a packet ip_summed needs to be reset. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 1344a41637114485fac7afa1505bce2ff862807a Author: Dave Johnson Date: Tue Aug 23 10:10:15 2005 -0700 [IPV4]: Fix negative timer loop with lots of ipv4 peers. From: Dave Johnson Found this bug while doing some scaling testing that created 500K inet peers. peer_check_expire() in net/ipv4/inetpeer.c isn't using inet_peer_gc_mintime correctly and will end up creating an expire timer with less than the minimum duration, and even zero/negative if enough active peers are present. If >65K peers, the timer will be less than inet_peer_gc_mintime, and with >70K peers, the timer duration will reach zero and go negative. The timer handler will continue to schedule another zero/negative timer in a loop until peers can be aged. This can continue for at least a few minutes or even longer if the peers remain active due to arriving packets while the loop is occurring. Bug is present in both 2.4 and 2.6. Same patch will apply to both just fine. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c3a20692ca5c8eb8cf5d0f489d4fc839ce7593d1 Author: Herbert Xu Date: Tue Aug 23 10:09:53 2005 -0700 [RPC]: Kill bogus kmap in krb5 While I was going through the crypto users recently, I noticed this bogus kmap in sunrpc. It's totally unnecessary since the crypto layer will do its own kmap before touching the data. Besides, the kmap is throwing the return value away. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 14869c388673e8db3348ab3706fa6485d0f0cf95 Author: Dmitry Yusupov Date: Tue Aug 23 10:09:27 2005 -0700 [TCP]: Do TSO deferral even if tail SKB can go out now. If the tail SKB fits into the window, it is still benefitical to defer until the goal percentage of the window is available. This give the application time to feed more data into the send queue and thus results in larger TSO frames going out. Patch from Dmitry Yusupov . Signed-off-by: David S. Miller commit a4cce10492358b33d33bb43f98284c80482037e8 Author: Peter Chubb Date: Mon Aug 22 17:50:00 2005 -0700 [IA64] Fix simulator boot (for real this time). Thanks to Stephane, we've now worked out the real cause of the `Linux will not boot on simulator' problem. Turns out it's a stack overflow because the stack pointer wasn't being initialised properly in boot_head.S (it was being initialised to the lowest instead of the highest address of the stack, so the first push started to overwrite data in the BSS). Signed-off-by: Peter Chubb Signed-off-by: Tony Luck commit 62d75f3753647656323b0365faa43fc1a8f7be97 Author: Tony Luck Date: Tue Aug 23 07:39:15 2005 -0700 [IA64] backout incorrect fix for simulator boot issue Earlier fix in 4aec0fb12267718c750475f3404337ad13caa8f5 just masked the real problem. Signed-off-by: Tony Luck commit 034e5356a4c0401d1227393de4c756e9c414be35 Merge: 729c80c6ffd7633210a09d4b55fdfab3c8d1866b c1ffb910f7a4e1e79d462bb359067d97ad1a8a25 Author: Tony Luck Date: Tue Aug 23 07:27:28 2005 -0700 Pull prarit-bus-sysdata into release branch commit 6885433c25aaca2cb13ee52a94be156163d6aa23 Author: Jeff Garzik Date: Tue Aug 23 02:53:51 2005 -0400 libata: release prep (bump versions, etc.) - bump versions where necessary - remove two duplicated+outdated doc comments - add MODULE_VERSION() to AHCI driver commit 7087e295543d3f6e161530e07982fd979e2d9efc Author: John W. Linville Date: Thu Aug 4 14:40:25 2005 -0400 [PATCH] i810_audio: fix release_region misordering in error exit from i810_probe Re-order release_region calls in i810_probe to properly unwind preceding allocations. Signed-off-by: John W. Linville Signed-off-by: Jeff Garzik commit 729c80c6ffd7633210a09d4b55fdfab3c8d1866b Merge: 4eaefb39528b3a78fb6a784162200b198d3e16ee f6fdd7d9c273bb2a20ab467cb57067494f932fa3 Author: Tony Luck Date: Mon Aug 22 14:31:36 2005 -0700 Auto-update from upstream commit f6fdd7d9c273bb2a20ab467cb57067494f932fa3 Author: Linus Torvalds Date: Sat Aug 20 18:51:29 2005 -0700 Don't allow normal users to set idle IO priority It has all the normal priority inversion problems. Signed-off-by: Linus Torvalds commit 7e71af49d46e4c25f17a2c8f53d62ffd14f01007 Author: Patrick McHardy Date: Sat Aug 20 17:40:41 2005 -0700 [NETFILTER]: Fix HW checksum handling in TCPMSS target Most importantly, remove bogus BUG() in receive path. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f93592ff4fa4a55aa7640d435fa93338e190294d Author: Patrick McHardy Date: Sat Aug 20 17:39:15 2005 -0700 [NETFILTER]: Fix HW checksum handling in ECN target Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit fd841326d73096ad79be9c3fa348f9ad04541cc2 Author: Patrick McHardy Date: Sat Aug 20 17:38:40 2005 -0700 [NETFILTER]: Fix ECN target TCP marking An incorrect check made it bail out before doing anything. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a5ea169c9581553662bb79a1c8c98fed1ee84246 Author: Alexey Dobriyan Date: Sun Aug 21 01:08:36 2005 +0400 [PATCH] freevxfs: fix breakage introduced by symlink fixes Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit db873896d168217e213902c7163fda7ee798781b Author: Linus Torvalds Date: Sat Aug 20 13:20:01 2005 -0700 befs: fix up missed follow_link declaration change We'd updated the prototype and the return value, but not the function declaration itself. commit 1eecd73cce4e11ba9d67ad767f92069cfba7b589 Author: Andi Kleen Date: Fri Aug 19 06:56:40 2005 +0200 [PATCH] x86_64: Fix race in TSC synchronization Plug a race in TSC synchronization We need to do tsc_sync_wait() before the CPU is set online to prevent multiple CPUs from doing it in parallel - which won't work because TSC sync has global unprotected state. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5e5ec10499a00bf4ce3440d5a9e1a5a176c5a640 Author: Andi Kleen Date: Fri Aug 19 06:56:04 2005 +0200 [PATCH] x86_64: Don't print exceptions for ltrace Don't printk exceptions for ltrace Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 916fa469ab2248d86473577dda72003df599879b Merge: b8d9598c41e999fb094d3811019248197c54274a 034ea6388a51f571b45ef1f0fa4ed4298691768e Author: Linus Torvalds Date: Fri Aug 19 19:15:57 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit b8d9598c41e999fb094d3811019248197c54274a Merge: 01c314a0c0f6367960a7cb1ffb5796560ccaa1c1 83c4e43722a2c8a8438b8d165047720fd36aaea4 Author: Linus Torvalds Date: Fri Aug 19 18:59:49 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 01c314a0c0f6367960a7cb1ffb5796560ccaa1c1 Author: Steve Dickson Date: Fri Aug 19 17:57:48 2005 -0700 [PATCH] NFSv4: unbalanced BKL in nfs_atomic_lookup() Added missing unlock_kernel() to NFSv4 atomic lookup. Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd3716ab40c6049479d29a74b29107fd7e0e1153 Author: Steven Rostedt Date: Fri Aug 19 17:57:46 2005 -0700 [PATCH] Mobil Pentium 4 HT and the NMI I'm trying to get the nmi working with my laptop (IBM ThinkPad G41) and after debugging it a while, I found that the nmi code doesn't want to set it up for this particular CPU. Here I have: $ cat /proc/cpuinfo processor : 0 vendor_id : GenuineIntel cpu family : 15 model : 4 model name : Mobile Intel(R) Pentium(R) 4 CPU 3.33GHz stepping : 1 cpu MHz : 3320.084 cache size : 1024 KB physical id : 0 siblings : 2 core id : 0 cpu cores : 1 fdiv_bug : no hlt_bug : no f00f_bug : no coma_bug : no fpu : yes fpu_exception : yes cpuid level : 3 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni monitor ds_cpl est tm2 cid xtpr bogomips : 6642.39 processor : 1 vendor_id : GenuineIntel cpu family : 15 model : 4 model name : Mobile Intel(R) Pentium(R) 4 CPU 3.33GHz stepping : 1 cpu MHz : 3320.084 cache size : 1024 KB physical id : 0 siblings : 2 core id : 0 cpu cores : 1 fdiv_bug : no hlt_bug : no f00f_bug : no coma_bug : no fpu : yes fpu_exception : yes cpuid level : 3 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni monitor ds_cpl est tm2 cid xtpr bogomips : 6637.46 And the following code shows: $ cat linux-2.6.13-rc6/arch/i386/kernel/nmi.c [...] void setup_apic_nmi_watchdog (void) { switch (boot_cpu_data.x86_vendor) { case X86_VENDOR_AMD: if (boot_cpu_data.x86 != 6 && boot_cpu_data.x86 != 15) return; setup_k7_watchdog(); break; case X86_VENDOR_INTEL: switch (boot_cpu_data.x86) { case 6: if (boot_cpu_data.x86_model > 0xd) return; setup_p6_watchdog(); break; case 15: if (boot_cpu_data.x86_model > 0x3) return; Here I get boot_cpu_data.x86_model == 0x4. So I decided to change it and reboot. I now seem to have a working NMI. So, unless there's something know to be bad about this processor and the NMI. I'm submitting the following patch. Signed-off-by: Steven Rostedt Acked-by: Zwane Mwaikambo Acked-by: Mikael Pettersson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 008b150a3c4d971cd65d02d107b8fcc860bc959c Author: Al Viro Date: Sat Aug 20 00:17:39 2005 +0100 [PATCH] Fix up symlink function pointers This fixes up the symlink functions for the calling convention change: * afs, autofs4, befs, devfs, freevxfs, jffs2, jfs, ncpfs, procfs, smbfs, sysvfs, ufs, xfs - prototype change for ->follow_link() * befs, smbfs, xfs - same for ->put_link() Signed-off-by: Linus Torvalds commit cc314eef0128a807e50fa03baf2d0abc0647952c Author: Linus Torvalds Date: Fri Aug 19 18:02:56 2005 -0700 Fix nasty ncpfs symlink handling bug. This bug could cause oopses and page state corruption, because ncpfs used the generic page-cache symlink handlign functions. But those functions only work if the page cache is guaranteed to be "stable", ie a page that was installed when the symlink walk was started has to still be installed in the page cache at the end of the walk. We could have fixed ncpfs to not use the generic helper routines, but it is in many ways much cleaner to instead improve on the symlink walking helper routines so that they don't require that absolute stability. We do this by allowing "follow_link()" to return a error-pointer as a cookie, which is fed back to the cleanup "put_link()" routine. This also simplifies NFS symlink handling. Signed-off-by: Linus Torvalds commit 2fb1e3086df9b454538491fba8121298da37cd23 Author: Al Viro Date: Fri Aug 19 22:42:16 2005 +0100 [PATCH] jffs2: fix symlink error handling The current calling conventions for ->follow_link() are already fairly complex. What we have is 1) you can return -error; then you must release nameidata yourself and ->put_link() will _not_ be called. 2) you can do nd_set_link(nd, ERR_PTR(-error)) and return 0 3) you can do nd_set_link(nd, path) and return 0 4) you can return 0 (after having moved nameidata yourself) jffs2 follow_link() is broken - it has an exit where it returns -EIO and leaks nameidata. Signed-off-by: Linus Torvalds commit 83c4e43722a2c8a8438b8d165047720fd36aaea4 Author: Al Viro Date: Fri Aug 19 15:56:37 2005 -0700 [SPARC]: Fix weak aliases sparc_ksyms.c used to declare weak alias to several gcc intrinsics. It doesn't work with gcc4 anymore - it wants a declaration for the thing we are aliasing to and that's not going to happen for something like .mul, etc. Replaced with direct injection of weak alias on the assembler level - .weak followed by = ; that works on all gcc versions. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit a3f9985843b674cbcb58f39fab8416675e7ab842 Author: David S. Miller Date: Fri Aug 19 15:55:33 2005 -0700 [SPARC64]: Move kernel unaligned trap handlers into assembler file. GCC 4.x really dislikes the games we are playing in unaligned.c, and the cleanest way to fix this is to move things into assembler. Noted by Al Viro. Signed-off-by: David S. Miller commit 8d5290149ee1c6a4cea5f5146d64e2a0d48f4988 Author: Ben Colline Date: Fri Aug 19 13:44:57 2005 -0700 [SPARC]: Deal with glibc changing macro names in modpost.c GLIBC 2.3.4 and later changed the STT_REGISTER macro to STT_SPARC_REGISTER, so we need to cope with that somehow. Original patch from fabbione, reposted by Ben Collins. Signed-off-by: David S. Miller commit 034ea6388a51f571b45ef1f0fa4ed4298691768e Author: David S. Miller Date: Fri Aug 19 12:57:31 2005 -0700 [TG3]: Update driver version and reldate. Signed-off-by: David S. Miller commit da6b2d01d6bd2e79fd4f7a08acd37dc4e8fcdce8 Author: Michael Chan Date: Fri Aug 19 12:54:29 2005 -0700 [TG3]: Fix SerDes detection A problem was reported by Grant Grundler on an HP rx8620 using IOX Core LAN partno(A7109-6) 5701 copper NIC. The tg3 driver mistakenly detects this NIC as having a SerDes PHY and link does not come up as a result. The problem was caused by an incorrectly programmed eeprom that set the NIC_SRAM_DATA_CFG_PHY_TYPE_FIBER bit in the NIC_SRAM_DATA_CFG location. This patch will override the NIC_SRAM_DATA_CFG_PHY_TYPE_FIBER bit if a valid PHY ID is read from the MII registers on older 570x chips where the MII interface is not used on SerDes chips. On newer chips such as the 5780 that use MII for both copper and SerDes, SerDes detection must rely on the eeprom. This patch will make the SerDes detection identical to versions 3.25 and older. Signed-off-by: Michael Chan Acked-by: Grant Grundler Signed-off-by: David S. Miller commit 4eaefb39528b3a78fb6a784162200b198d3e16ee Merge: 3a931d4cca1b6dabe1085cc04e909575df9219ae 30d5b64b63fa69af31b2cba32e6d71d68526eec9 Author: Tony Luck Date: Thu Aug 18 16:44:15 2005 -0700 Auto-update from upstream commit 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 Merge: 5fdf193b15a08f6c32ca4eb5913fa9be788e790e 84f57fbc724e3b56dc87c37dddac89f82cf75ef6 Author: Linus Torvalds Date: Thu Aug 18 15:16:12 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 commit 5fdf193b15a08f6c32ca4eb5913fa9be788e790e Merge: f3ed8b444781158c9c10f48a8eba6795ecec7023 2ae2d77cfa424587014cb34a89eed0ff2149fd5c Author: Linus Torvalds Date: Thu Aug 18 14:58:21 2005 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit f3ed8b444781158c9c10f48a8eba6795ecec7023 Merge: 6fc8b9e7c60d4a3d4d7f1189f74e37651f5610e6 2cab224d1f6557e7014601f251d6a41982963e6b Author: Linus Torvalds Date: Thu Aug 18 14:57:53 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 3a931d4cca1b6dabe1085cc04e909575df9219ae Author: Tony Luck Date: Thu Aug 18 14:40:00 2005 -0700 [IA64] remove unused function __ia64_get_io_port_base Not only was this unused, but its somewhat eccentric declaration of "static inline const unsigned long" gives gcc4 heartburn. Signed-off-by: Tony Luck commit 6fc8b9e7c60d4a3d4d7f1189f74e37651f5610e6 Author: Herbert Xu Date: Thu Aug 18 14:36:59 2005 -0700 [IPCOMP]: Fix false smp_processor_id warning This patch fixes a false-positive from debug_smp_processor_id(). The processor ID is only used to look up crypto_tfm objects. Any processor ID is acceptable here as long as it is one that is iterated on by for_each_cpu(). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 2cab224d1f6557e7014601f251d6a41982963e6b Author: David S. Miller Date: Thu Aug 18 14:35:38 2005 -0700 [SPARC64]: Fix 2 bugs in cpufreq drivers. 1) cpufreq wants frequenceis in KHZ not MHZ 2) provide ->get() method so curfreq node is created Signed-off-by: David S. Miller commit 4aec0fb12267718c750475f3404337ad13caa8f5 Author: Ian Wienand Date: Tue Jul 19 22:32:00 2005 -0700 [IA64] Simulator bootloader fails with gcc 4 After building a fresh tree with gcc 4 I can't boot the simulator as the bootloader loader dies with loading /home/ianw/kerntest/kerncomp//build/sim_defconfig/vmlinux... failed to read phdr After some investigation I believe this is do with differences between the alignment of variables on the stack between gcc 3 and 4 and the ski simulator. If you trace through with the simulator you can see that the disk_stat structure value returned from the SSC_WAIT_COMPLETION call seems to be only half loaded. I guess it doesn't like the alignment of the input. Signed-off-by: Ian Wienand Signed-off-by: Tony Luck commit cb94c62c252796f42bb83fe40960d12f3ea5a82a Author: Patrick McHardy Date: Thu Aug 18 14:05:44 2005 -0700 [IPV4]: Fix DST leak in icmp_push_reply() Based upon a bug report and initial patch by Ollie Wild. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 22783649568a28839c5a362f47da7819ecfcbb9f Author: Ralf Baechle Date: Thu Aug 18 14:05:18 2005 -0700 [NET]: Fix comment in loopback driver. Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 001dd250c1c68667a5c3b74979fa614e2edc9ceb Author: Jay Vosburgh Date: Thu Aug 18 14:04:51 2005 -0700 [TOKENRING]: Use interrupt-safe locking with rif_lock. Change operations on rif_lock from spin_{un}lock_bh to spin_{un}lock_irq{save,restore} equivalents. Some of the rif_lock critical sections are called from interrupt context via tr_type_trans->tr_add_rif_info. The TR NIC drivers call tr_type_trans from their packet receive handlers. Signed-off-by: Jay Vosburgh Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit 2ae2d77cfa424587014cb34a89eed0ff2149fd5c Author: Ben Dooks Date: Sat Jul 23 17:29:38 2005 +0100 [PATCH] DM9000 - incorrect ioctl() handling The DM9000 driver is responding to ioctl() calls it should not be. This can cause problems with the wireless tools incorrectly indentifying the device as wireless capable, and crashing under certain operations. This patch also moves the version printk() to the init call, so that you only get it once for multiple devices, and to show it is loaded if there are no defined dm9000s Signed-off-by: Ben Dooks Signed-off-by: Jeff Garzik commit 9ef9ac51cc5fa5f5811230b5fb242536b636ff47 Author: Ben Dooks Date: Sat Jul 23 17:25:18 2005 +0100 [PATCH] DM9000 - spinlock fixes Fix DM9000 driver usage of spinlocks, which mainly came to light when running a kernel with spinlock debugging. These come down to: 1) Un-initialised spin lock 2) Several cases of using spin_xxx(lock) and not spin_xxx(&lock) 3) move the locking around the phy reg for read/write to only keep the lock when actually reading or writing to the phy. Signed-off-by: Ben Dooks Signed-off-by: Jeff Garzik commit a4cf0761493495681d72dcc0b34efb86e94a5527 Author: Pierre Ossman Date: Mon Jul 4 00:22:53 2005 +0200 [PATCH] 8139cp - redetect link after suspend After suspend the driver needs to retest link status in case the cable has been inserted or removed during the suspend. Signed-off-by: Pierre Ossman Signed-off-by: Jeff Garzik commit 852ea22ab24df4c64c0211c3b6d6358eb0e759f9 Author: Ralf Baechle Date: Tue Aug 2 11:01:27 2005 +0100 [PATCH] IOC3 fixes - Using the right register clearly improves chances of getting the MII code and thus the driver working at all. - On startup check the media type before setting up duplex or we might spend the first 1.2s with a wrong duplex setting. - Get rid of whitespace lines. Signed-off-by: Jeff Garzik commit 84f57fbc724e3b56dc87c37dddac89f82cf75ef6 Author: Narendra Sankar Date: Thu Aug 18 22:30:35 2005 +0200 [PATCH] serverworks: add support for new southbridge IDE BCM5785 (HT1000) is a Opteron Southbridge from Serverworks/Broadcom that incorporates a single channel ATA100 IDE controller that is functionally identical to the Serverworks CSB6 IDE controller. This patch adds support for the new PCI device ID and also the support for this controller. Signed-off-by: Narendra Sankar Acked-by: Jeff Garzik commit 2f09a7f4af131bf23c013ead89373deba1c7593c Author: Matt Gillette Date: Thu Aug 18 22:27:07 2005 +0200 [PATCH] ide: add support for Netcell Revolution to pci-ide generic driver Adds support for Netcell Revolution to pci-ide generic driver by including it in the list of devices matched. Includes the Revolution in the list of simplex devices forced into DMA mode. Signed-off-by: Matt Gillette Cc: Bartlomiej Zolnierkiewicz Cc: Jeff Garzik Signed-off-by: Andrew Morton commit b07e5eccaf512ae3209beae5cd2e3a27c92c300b Author: Grant Coady Date: Thu Aug 18 22:19:55 2005 +0200 [PATCH] ide: fix PCI_DEVIEC_ID_APPLE_UNI_N_ATA spelling Signed-off-by: Grant Coady commit 0ac72b351bdf29252e4181b07fa7feed8501b5d2 Author: Juha-Matti Tapio Date: Thu Aug 18 22:13:44 2005 +0200 [PATCH] ide: fix the BLK_DEV_IDEDMA_PCI dependency for drivers/ide/ppc/pmac.c drivers/ide/ppc/pmac.c uses symbols ide_build_sglist, __ide_dma_off_quietly, __ide_dma_on and __ide_dma_timeout when CONFIG_BLK_DEV_IDEDMA_PMAC is defined. The declarations for these symbols (in ide.h) depend on CONFIG_BLK_DEV_IDEDMA_PCI. There is a missing dependency for this in drivers/ide/Kconfig which causes drivers/ide/ppc/pmac.c to fail to build if CONFIG_BLK_DEV_IDEDMA_PMAC is selected but CONFIG_BLK_DEV_IDEDMA_PCI is not. Signed-off-by: Juha-Matti Tapio commit c40d3d38a8f04fff4394c7323db239bce780db60 Author: Bartlomiej Zolnierkiewicz Date: Thu Aug 18 22:09:21 2005 +0200 [PATCH] ide-floppy: fix IDEFLOPPY_TICKS_DELAY * IDEFLOPPY_TICKS_DELAY assumed HZ == 100, fix it * increase the delay to 50ms (to match comment in the code) Thanks to Manfred Scherer for reporting the problem and testing the patch. commit 6be382ea0c767a81be0e7980400b9b18167b3261 Author: Andi Kleen Date: Thu Aug 18 11:24:27 2005 -0700 [PATCH] x86: Remove obsolete get_cpu_vendor call Since early CPU identify is in this information is already available Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6a3ea22af7a2ed36afa4672a86b3a86d604db33 Author: Matt Porter Date: Thu Aug 18 11:24:26 2005 -0700 [PATCH] ppc32: Fix PPC440SP SRAM controller DCRs Fixes the incorrect DCR base value for the 440SP SRAM controller. Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28cd1d17801774561c81a5be53bfb2d632aee2a2 Author: Matt Porter Date: Thu Aug 18 11:24:25 2005 -0700 [PATCH] ppc32: fix ppc4xx stb03xxx dma build Fixes build on 4xx stb03xxx when general purpose dma engine support is enabled. Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2eaa297ca234eb518673b28dd6f3715d4b292e09 Author: Jeff Dike Date: Thu Aug 18 11:24:25 2005 -0700 [PATCH] uml: fix a crash under screen Running UML inside a detached screen delivers SIGWINCH when UML is not expecting it. This patch ignores them. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 718d8989bca49761daf65f77249b0067c40756b2 Author: Al Viro Date: Thu Aug 18 11:24:23 2005 -0700 [PATCH] uml: fix the x86_64 build asm/elf.h breaks the x86_64 build. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 024f474795af7a0d41bd6d60061d78bd66d13f56 Author: Matt Mackall Date: Thu Aug 18 11:24:19 2005 -0700 [PATCH] Make RLIMIT_NICE ranges consistent with getpriority(2) As suggested by Michael Kerrisk , make RLIMIT_NICE consistent with getpriority before it becomes available in released glibc. Signed-off-by: Matt Mackall Acked-by: Ingo Molnar Acked-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cbe9de7a4353d1a1b77887b5459ac5304c0984a Author: Michael Iatrou Date: Thu Aug 18 11:24:18 2005 -0700 [PATCH] disable debug info in radeonfb old driver This driver spams the user. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d86c390ffbf5746df9a3cc2c5f7b75d27704580f Author: Jan Kara Date: Thu Aug 18 11:24:17 2005 -0700 [PATCH] reiserfs+acl+quota deadlock fix When i_acl_default is set to some error we do not hold the lock (hence we are not allowed to drop it and reacquire later). Signed-off-by: Jan Kara Cc: Jeff Mahoney Cc: Chris Mason Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9223214e8d757663f366133ba5f9b58aa6b28efb Author: NeilBrown Date: Thu Aug 18 11:24:16 2005 -0700 [PATCH] md: make sure mddev->bitmap_offset gets cleared between array instantiations. ... otherwise we might try to load a bitmap from an array which hasn't one. The bug is that if you create an array with an internal bitmap, shut it down, and then create an array with the same md device, the md drive will assume it should have a bitmap too. As the array can be created with a different md device, it is mostly an inconvenience. I'm pretty sure there is no risk of data corruption. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60d7603a18a5c07252e7aa0b0e2424315195d4dc Author: Robert Love Date: Thu Aug 18 11:24:14 2005 -0700 [PATCH] SH64: inotify and ioprio syscalls Add inotify and ioprio syscall stubs to SH64. Signed-off-by: Robert Love Acked-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2926b7953c5f23265c062992516fed6674105db Author: Robert Love Date: Thu Aug 18 11:24:13 2005 -0700 [PATCH] SH: inotify and ioprio syscalls Add inotify and ioprio syscall stubs to SH. Signed-off-by: Robert Love Acked-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc59250c6ebed099a9bc0a11298e2281dd896657 Author: Chuck Lever Date: Thu Aug 18 11:24:12 2005 -0700 [PATCH] NFS: Introduce the use of inode->i_lock to protect fields in nfsi Down the road we want to eliminate the use of the global kernel lock entirely from the NFS client. To do this, we need to protect the fields in the nfs_inode structure adequately. Start by serializing updates to the "cache_validity" field. Note this change addresses an SMP hang found by njw@osdl.org, where processes deadlock because nfs_end_data_update and nfs_revalidate_mapping update the "cache_validity" field without proper serialization. Test plan: Millions of fsx ops on SMP clients. Run Nick Wilson's breaknfs program on large SMP clients. Signed-off-by: Chuck Lever Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 412d582ec1dd59aab2353f8cb7e74f2c79cd20b9 Author: Chuck Lever Date: Thu Aug 18 11:24:11 2005 -0700 [PATCH] NFS: use atomic bitops to manipulate flags in nfsi->flags Introduce atomic bitops to manipulate the bits in the nfs_inode structure's "flags" field. Using bitops means we can use a generic wait_on_bit call instead of an ad hoc locking scheme in fs/nfs/inode.c, so we can remove the "nfs_i_wait" field from nfs_inode at the same time. The other new flags field will continue to use bitmask and logic AND and OR. This permits several flags to be set at the same time efficiently. The following patch adds a spin lock to protect these flags, and this spin lock will later cover other fields in the nfs_inode structure, amortizing the cost of using this type of serialization. Test plan: Millions of fsx ops on SMP clients. Signed-off-by: Chuck Lever Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5529680981807b44abf3be30fb6d612ff04f68ff Author: Chuck Lever Date: Thu Aug 18 11:24:09 2005 -0700 [PATCH] NFS: split nfsi->flags into two fields Certain bits in nfsi->flags can be manipulated with atomic bitops, and some are better manipulated via logical bitmask operations. This patch splits the flags field into two. The next patch introduces atomic bitops for one of the fields. Test plan: Millions of fsx ops on SMP clients. Signed-off-by: Chuck Lever Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c7bf1eaee1255315fc7c2c4c300295e556ef768 Author: Zwane Mwaikambo Date: Thu Aug 18 11:24:07 2005 -0700 [PATCH] Update email addresses for Zwane Some folks have been emailing me and having trouble due to these stale addresses; Signed-off-by: Zwane Mwaikambo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30d5b64b63fa69af31b2cba32e6d71d68526eec9 Author: Jaroslav Kysela Date: Thu Aug 18 13:16:11 2005 +0200 [PATCH] broken error path in drivers/pnp/card.c The error path in pnp_request_card_device() is broken (one variable is left initialized and the semaphore is not unlocked). This fixes it (and has been tested). Signed-off-by: Jaroslav Kysela Signed-off-by: Linus Torvalds commit 518e6540831c69422faecceee8f964bd439ac9d0 Author: Greg KH Date: Wed Aug 17 17:33:11 2005 -0700 [PATCH] Fix manual binding infinite loop Fix for manual binding of drivers to devices. Problem is if you pass in a valid device id, but the driver refuses to bind. Infinite loop as write() tries to resubmit the data it just sent. Thanks to Michal Ostrowski for pointing the problem out. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 099d44e869f1886b5eb02a5145ca97b5e4142e28 Merge: 4e6a06eec46067df3c30fe1fbc2e1a7cc37b9678 481d0374217f3fefaf98efbd8d21d73c138dd928 Author: Linus Torvalds Date: Wed Aug 17 14:56:22 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6 commit 4e6a06eec46067df3c30fe1fbc2e1a7cc37b9678 Author: David Woodhouse Date: Wed Aug 17 11:36:35 2005 +0100 [PATCH] Stop snd-powermac oopsing on non-pmac hardware. We shouldn't be assuming that ppc_md.feature_call will be present. Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit ac9af7cba9e642961bfdee1a1fac6060405597e5 Author: Brian King Date: Thu Aug 18 07:32:18 2005 +1000 [PATCH] ppc64: iommu vmerge fix This fixes a bug in the PPC64 iommu vmerge code which results in the potential for iommu_unmap_sg to go off unmapping more than it should. This was found on a test system which resulted in PCI bus errors due to PCI memory being unmapped while DMAs were still in progress. Signed-off-by: Brian King Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 75e8727fbb3749075b6df36be636a3045ed9d515 Merge: d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b 1f07247de51efd30c88ad8e3e06a8b5382fc7d35 Author: Linus Torvalds Date: Wed Aug 17 13:09:38 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b Merge: c231c7db30faf93419fc22d680f74d816bea70e2 c149ec05dcd09d525e6778e339122827c7cd79b8 Author: Linus Torvalds Date: Wed Aug 17 13:08:17 2005 -0700 Merge head 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 commit c231c7db30faf93419fc22d680f74d816bea70e2 Author: Linus Torvalds Date: Wed Aug 17 13:07:28 2005 -0700 Revert unnecessary zlib_inflate/inftrees.c fix It turns out that empty distance code tables are not an error, and that a compressed block with only literals can validly have an empty table and should not be flagged as a data error. Some old versions of gzip had problems with this case, but it does not affect the zlib code in the kernel. Analysis and explanations thanks to Sergey Vlasov Signed-off-by: Linus Torvalds commit 7974b1cc7879141962999e78a6fc9a136dc4479e Merge: c4f92dba97f4e3aa757500896f87001569f4604b 62ee914ef27fded9d1c5da41e1e05c3bd175c529 Author: Linus Torvalds Date: Wed Aug 17 13:02:22 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit c4f92dba97f4e3aa757500896f87001569f4604b Author: Steven Rostedt Date: Wed Aug 17 14:25:23 2005 -0400 [PATCH] nfsd to unlock kernel before exiting The nfsd holds the big kernel lock upon exit, when it really shouldn't. Not to mention that this breaks Ingo's RT patch. This is a trivial fix to release the lock. Ingo, this patch also works with your kernel, and stops the problem with nfsd. Note, there's a "goto out;" where "out:" is right above svc_exit_thread. The point of the goto also holds the kernel_lock, so I don't see any problem here in releasing it. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit dd12f48d4e8774415b528d3991ae47c28f26e1ac Author: Bhavesh P. Davda Date: Wed Aug 17 12:26:33 2005 -0600 [PATCH] NPTL signal delivery deadlock fix This bug is quite subtle and only happens in a very interesting situation where a real-time threaded process is in the middle of a coredump when someone whacks it with a SIGKILL. However, this deadlock leaves the system pretty hosed and you have to reboot to recover. Not good for real-time priority-preemption applications like our telephony application, with 90+ real-time (SCHED_FIFO and SCHED_RR) processes, many of them multi-threaded, interacting with each other for high volume call processing. Acked-by: Roland McGrath Signed-off-by: Linus Torvalds commit 1f07247de51efd30c88ad8e3e06a8b5382fc7d35 Author: Paul E. McKenney Date: Wed Aug 17 12:05:27 2005 -0700 [DECNET]: Fix RCU race condition in dn_neigh_construct(). Signed-off-by: Paul E. McKenney Signed-off-by: David S. Miller commit bfd272b1ca1164382eabaa9986aad822adb91eb2 Author: Patrick McHardy Date: Wed Aug 17 12:04:22 2005 -0700 [IPV6]: Fix SKB leak in ip6_input_finish() Changing it to how ip_input handles should fix it. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 35d59efd105b3b7c1b5878dcc9d1749f41f9740f Author: Herbert Xu Date: Wed Aug 17 12:03:59 2005 -0700 [TCP]: Fix bug #5070: kernel BUG at net/ipv4/tcp_output.c:864 1) We send out a normal sized packet with TSO on to start off. 2) ICMP is received indicating a smaller MTU. 3) We send the current sk_send_head which needs to be fragmented since it was created before the ICMP event. The first fragment is then sent out. At this point the remaining fragment is allocated by tcp_fragment. However, its size is padded to fit the L1 cache-line size therefore creating tail-room up to 124 bytes long. This fragment will also be sitting at sk_send_head. 4) tcp_sendmsg is called again and it stores data in the tail-room of of the fragment. 5) tcp_push_one is called by tcp_sendmsg which then calls tso_fragment since the packet as a whole exceeds the MTU. At this point we have a packet that has data in the head area being fed to tso_fragment which bombs out. My take on this is that we shouldn't ever call tcp_fragment on a TSO socket for a packet that is yet to be transmitted since this creates a packet on sk_send_head that cannot be extended. So here is a patch to change it so that tso_fragment is always used in this case. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 97077c4a9868fce8ac151512cde5d24fc1144f24 Author: Patrick McHardy Date: Wed Aug 17 12:03:32 2005 -0700 [IPV6]: Fix raw socket hardware checksum failures When packets hit raw sockets the csum update isn't done yet, do it manually. Packets can also reach rawv6_rcv on the output path through ip6_call_ra_chain, in this case skb->ip_summed is CHECKSUM_NONE and this codepath isn't executed. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c149ec05dcd09d525e6778e339122827c7cd79b8 Author: Tony Luck Date: Wed Aug 17 10:24:17 2005 -0700 [IA64] Updated tiger defconfig Signed-off-by: Tony Luck commit ade6648b3b11a5d81f6f28135193ab6d85d621db Merge: 2ad56496627630ebc99f06af5f81ca23e17e014e fad87acaea7b0965fe91f0351fdd688fc9761cbe Author: Linus Torvalds Date: Wed Aug 17 08:21:00 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 62ee914ef27fded9d1c5da41e1e05c3bd175c529 Author: Dimitry Andric Date: Wed Aug 17 13:01:19 2005 +0100 [ARM] 2850/1: Remove duplicate UART I/O mapping from s3c2410_iodesc Patch from Dimitry Andric This patch removes the initial UART I/O mapping from s3c2410_iodesc, since the same mapping is already done in the function s3c24xx_init_io in the file arch/arm/mach-s3c2410/cpu.c, through the s3c_iodesc array. I'm not sure if duplicate mappings do any harm, but it's simply redundant. Also, in s3c2440.c the UART I/O mapping is NOT done. Additionally, I put a comma behind the last mapping, to ease copy/pasting stuff around, and make the style consistent with s3c2440.c and other files. Signed-off-by: Dimitry Andric Signed-off-by: Russell King commit 22d8be866ee23bf3ad9fe867587eef5f4200bf84 Author: Sean Lee Date: Wed Aug 17 09:28:26 2005 +0100 [ARM] 2852/1: Correct the mistake in arch/arm/mm/Kconfig file Patch from Sean Lee In the arch/arm/mm/Kconfig file, the CPU_DCACHE_WRITETHROUGH option is depend on the CPU_DISABLE_DCACHE, but the "Disable D-Cache" option is configured as CPU_DCACHE_DISABLE. The CPU_DISABLE_DCACHE should be CPU_DCACHE_DISABLE Signed-off-by: Sean Lee Signed-off-by: Russell King commit 2ad56496627630ebc99f06af5f81ca23e17e014e Author: Stephen Rothwell Date: Wed Aug 17 13:01:50 2005 +1000 [PATCH] iSeries build with newer assemblers and compilers Paulus suggested that we put xLparMap in its own .c file so that we can generate a .s file to be included into head.S. This doesn't get around the problem of having it at a fixed address, but it makes it more palatable. It would be good if this could be included in 2.6.13 as it solves our build problems with various versions of binutils and gcc. In particular, it allows us to build an iSeries kernel on Debian unstable using their biarch compiler. This has been built and booted on iSeries and built for pSeries and g5. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit da5ca008933b3b28303ba44d0be3372fbac7748b Author: Pete Zaitcev Date: Tue Aug 16 15:16:46 2005 -0700 [PATCH] USB: usbmon: Copyrights and a typo Add copyright statements and fix a typo. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit dc1d97e466c2836adebe5618759bfb5b35b3bc0a Author: Ping Cheng Date: Tue Aug 16 15:16:32 2005 -0700 [PATCH] USB: fix usb wacom tablet driver bug This patch fixes bug 4905 and a Cintiq 21UX bug. Signed-off-by: Ping Cheng Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 33a5c72432ef3e75dcf546bf41bcbfce697903ff Author: Jiri Slaby Date: Tue Aug 16 15:16:26 2005 -0700 [PATCH] PCI: update documentation This removes very old functions from pci docs, which are no longer in the kernel. Signed-off-by: Jiri Slaby Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 8cf4c19523b7694c88bba716d88fb659fa702411 Author: Kristen Accardi Date: Tue Aug 16 15:16:10 2005 -0700 [PATCH] PCI Hotplug: new contact info Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 4b47b0eefc37fe3bf6bffb4507c8b6df5b14348d Author: Andrew Morton Date: Tue Aug 16 15:16:05 2005 -0700 [PATCH] PCI: fix quirk-6700-fix.patch drivers/built-in.o(.text+0x32c3): In function `quirk_pcie_pxh': /usr/src/25/drivers/pci/quirks.c:1312: undefined reference to `disable_msi_mode' Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 4602b88d9743b5f20655de8078fb42e9fd25581f Author: Kristen Accardi Date: Tue Aug 16 15:15:58 2005 -0700 [PATCH] PCI: 6700/6702PXH quirk On the 6700/6702 PXH part, a MSI may get corrupted if an ACPI hotplug driver and SHPC driver in MSI mode are used together. This patch will prevent MSI from being enabled for the SHPC as part of an early pci quirk, as well as on any pci device which sets the no_msi bit. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 208f3d6175cb17772c5af202fe12373f90894ff4 Author: Maneesh Soni Date: Tue Aug 16 15:15:48 2005 -0700 [PATCH] Driver core: potentially fix use after free in class_device_attr_show This moves the code to free devt_attr from class_device_del() to class_dev_release() which is called after the last reference to the corresponding kobject() is gone. This allows us to keep the devt_attr alive while the corresponding sysfs file is open. Signed-off-by: Maneesh Soni Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit fad87acaea7b0965fe91f0351fdd688fc9761cbe Author: Patrick McHardy Date: Tue Aug 16 21:03:41 2005 -0700 [IPV6]: Fix SKB leak in ip6_input_finish() Changing it to how ip_input handles should fix it. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c8ac37746489f05a32a958b048f29ae45487e81e Author: Herbert Xu Date: Tue Aug 16 20:43:40 2005 -0700 [TCP]: Fix bug #5070: kernel BUG at net/ipv4/tcp_output.c:864 1) We send out a normal sized packet with TSO on to start off. 2) ICMP is received indicating a smaller MTU. 3) We send the current sk_send_head which needs to be fragmented since it was created before the ICMP event. The first fragment is then sent out. At this point the remaining fragment is allocated by tcp_fragment. However, its size is padded to fit the L1 cache-line size therefore creating tail-room up to 124 bytes long. This fragment will also be sitting at sk_send_head. 4) tcp_sendmsg is called again and it stores data in the tail-room of of the fragment. 5) tcp_push_one is called by tcp_sendmsg which then calls tso_fragment since the packet as a whole exceeds the MTU. At this point we have a packet that has data in the head area being fed to tso_fragment which bombs out. My take on this is that we shouldn't ever call tcp_fragment on a TSO socket for a packet that is yet to be transmitted since this creates a packet on sk_send_head that cannot be extended. So here is a patch to change it so that tso_fragment is always used in this case. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 793245eeb97bd28e363f2b0f2e766fdbff0c9619 Author: Patrick McHardy Date: Tue Aug 16 20:39:38 2005 -0700 [IPV6]: Fix raw socket hardware checksum failures When packets hit raw sockets the csum update isn't done yet, do it manually. Packets can also reach rawv6_rcv on the output path through ip6_call_ra_chain, in this case skb->ip_summed is CHECKSUM_NONE and this codepath isn't executed. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7f09d6f935aaa91f71fe64d64013ad3bd2a9d2f4 Author: Peter Chubb Date: Tue Aug 16 17:27:00 2005 -0700 [IA64] Updated zx1 defconfig Just `make oldconfig' doesn't help for the zx1 defconfig --- because we need the MPT Fusion drivers, which are picked up as not selected. Tested on HP ZX2000 and ZX2600. Signed-off-by: Peter Chubb Signed-off-by: Tony Luck commit 7b1a843f4630867c1d686885e7af94eac137e888 Author: Greg Edwards Date: Tue Aug 16 13:06:00 2005 -0700 [IA64] Refresh arch/ia64/configs/sn2_defconfig. Signed-off-by: Greg Edwards Signed-off-by: Tony Luck commit 71841b8fe7dd8caffd07482cbed4a99874bfbb70 Author: Keith Owens Date: Sat Jul 30 17:52:00 2005 -0700 [IA64] Initialize some spinlocks Some IA64 spinlocks are not being initialized, make it so. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit c1ffb910f7a4e1e79d462bb359067d97ad1a8a25 Author: Prarit Bhargava Date: Tue Aug 2 10:08:00 2005 -0700 [IA64]: SN fix bus->sysdata pointer and memory cleanups The main issue is that bus_fixup calls may potentially call functions that require a valid bus->sysdata pointer. Since this is the case, we must set the bus->sysdata pointer before calling the bus_fixup functions. The remaining changes are simple fixes to make sure memory is cleaned up in the function. Signed-off-by: Prarit Bhargava Signed-off-by: Tony Luck commit 12aaa0855b39b5464db953fedf399fa91ee365ed Author: Zachary Amsden Date: Tue Aug 16 12:05:09 2005 -0700 [PATCH] i386 / desc_empty macro is incorrect Chuck Ebbert noticed that the desc_empty macro is incorrect. Fix it. Thankfully, this is not used as a security check, but it can falsely overwrite TLS segments with carefully chosen base / limits. I do not believe this is an issue in practice, but it is a kernel bug. Signed-off-by: Zachary Amsden Signed-off-by: Chris Wright [ x86-64 had the same problem, and the same fix. Linus ] Signed-off-by: Linus Torvalds commit 5153f7e6dba37390902c8fd3edc9a8cc19358ece Merge: ca27ea487ea10bd22459dbc367cf263f1e8d5228 2d610b80e954045ccfc27558f84e482709e5e5b7 Author: Linus Torvalds Date: Tue Aug 16 12:12:30 2005 -0700 Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6 commit 481d0374217f3fefaf98efbd8d21d73c138dd928 Author: Anton Altaparmakov Date: Tue Aug 16 19:42:56 2005 +0100 NTFS: Complete the previous fix for the unset device when mapping buffers for mft record writing. I had missed the writepage based mft record write code path. Signed-off-by: Anton Altaparmakov commit f7001e8f1fa5369ee24f58255726a04a2019e4bd Merge: 85f265d887d2389376f1caa191e9682085feb76e cf59001235c5a36f3e3701bd593a78cf955a4242 Author: Tony Luck Date: Tue Aug 16 11:29:57 2005 -0700 Auto-update from upstream commit ca27ea487ea10bd22459dbc367cf263f1e8d5228 Merge: cf59001235c5a36f3e3701bd593a78cf955a4242 fb80cbee4c4bfeaeb2ff6611beecfb9a2443da90 Author: Linus Torvalds Date: Tue Aug 16 09:43:13 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus commit cf59001235c5a36f3e3701bd593a78cf955a4242 Merge: 65e4308d2500e7daf60c3dccc202c61ffb066c63 e74589ac250e463973361774a90fee2c9d71da02 Author: Linus Torvalds Date: Tue Aug 16 09:31:28 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6 commit 65e4308d2500e7daf60c3dccc202c61ffb066c63 Author: Trond Myklebust Date: Tue Aug 16 11:49:44 2005 -0400 [PATCH] NFS: Ensure we always update inode->i_mode when doing O_EXCL creates When the client performs an exclusive create and opens the file for writing, a Netapp filer will first create the file using the mode 01777. It does this since an NFSv3/v4 exclusive create cannot immediately set the mode bits. The 01777 mode then gets put into the inode->i_mode. After the file creation is successful, we then do a setattr to change the mode to the correct value (as per the NFS spec). The problem is that nfs_refresh_inode() no longer updates inode->i_mode, so the latter retains the 01777 mode. A bit later, the VFS notices this, and calls remove_suid(). This of course now resets the file mode to inode->i_mode & 0777. Hey presto, the file mode on the server is now magically changed to 0777. Duh... Fixes http://bugzilla.linux-nfs.org/show_bug.cgi?id=32 Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit 367ae3cd74bdc2ad32d71293427fec570b14ddcd Author: John Hawkes Date: Tue Aug 16 17:59:20 2005 +1000 [PATCH] fix for ia64 sched-domains code Fix for ia64 sched domain building triggered by cpuset code. Acked-by: Nick Piggin Acked-by: Dinakar Guniguntala Signed-off-by: Linus Torvalds commit 58fcb8df0bf663bb6b8f46cd3010bfe8d13d97cf Author: Trond Myklebust Date: Wed Aug 10 18:15:12 2005 -0400 [PATCH] NFS: Ensure ACL xdr code doesn't overflow. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit e74589ac250e463973361774a90fee2c9d71da02 Author: Anton Altaparmakov Date: Tue Aug 16 16:38:28 2005 +0100 NTFS: Fix bug in mft record writing where we forgot to set the device in the buffers when mapping them after the VM had discarded them. Thanks to Martin MOKREJÅ  for the bug report. Signed-off-by: Anton Altaparmakov commit 75cd968ab251ac84dd3a5dc252af7036dc4a64f4 Author: Linus Torvalds Date: Mon Aug 15 17:40:46 2005 -0700 um: fix __pa/__va macro expansion problem Proper parentheses around arguments needed, especially as the macros use a high-precedence cast operator on the argument. commit 85f265d887d2389376f1caa191e9682085feb76e Author: Christoph Hellwig Date: Tue Aug 9 13:38:00 2005 -0700 [IA64] update CONFIG_PCI description The current one doesn't even make sense anymore on i386 where it apparently came from. Follow-up wordsmithing by Matthew Wilcox and Tony Luck. Signed-off-by: Christoph Hellwig Signed-off-by: Tony Luck commit fb80cbee4c4bfeaeb2ff6611beecfb9a2443da90 Merge: b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae 3edea4833a1efcd43e1dff082bc8001fdfe74b34 Author: Len Brown Date: Mon Aug 15 16:02:50 2005 -0400 Merge ../from-linus commit b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae Merge: 2ba84684e8cf6f980e4e95a2300f53a505eb794e 30e332f3307e9f7718490a706e5ce99f0d3a7b26 Author: Len Brown Date: Mon Aug 15 15:49:00 2005 -0400 Merge ../to-linus-stable/ commit 30e332f3307e9f7718490a706e5ce99f0d3a7b26 Author: Luming Yu Date: Fri Aug 12 00:31:00 2005 -0400 [ACPI] re-enable platform-specific hotkey drivers by default When both platform-specific and generic drivers exist, enable generic over-ride with "acpi_generic_hotkey". http://bugzilla.kernel.org/show_bug.cgi?id=4953 Signed-off-by: Luming Yu Signed-off-by: Len Brown commit 54738e82755f73080e779ba0c8052e232df24d78 Author: Richard Purdie Date: Mon Aug 15 20:42:32 2005 +0100 [PATCH] ARM: 2851/1: Fix NWFPE extended precision exception handling Patch from Richard Purdie The exception handling code fails to compile if the extended precision mode is enabled. This patch fixes those compile errors and also stops _quiet functions from incorrectly raising exceptions. Reported-by: Ralph Siemsen Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 3edea4833a1efcd43e1dff082bc8001fdfe74b34 Author: Antonino A. Daplas Date: Mon Aug 15 21:29:11 2005 +0800 [PATCH] intelfb/fbdev: Save info->flags in a local variable Reported by: Pavel Kysilka (Bugzilla Bug 5059) The intelfb driver does not keep resolution set with fbset after switching to anot console and back. Steps to reproduce: initial options: tty1,tty2 - 1024x768-60 1) tty1 - fbset after booting (1024x768-60) 2) tty1 - fbset 800x600-100 tty1: 800x600-100 3) swith to tty2, swith to tty1 tty1: 1024x768-60 (the same resolution as default from kernel booting) This bug is caused by intelfb unintentionally destroying info->flags in set_par(). Therefore the flag, FBINFO_MISC_USEREVENT used to notify fbcon of a mode change was cleared causing the above problem. This bug though is not intelfb specific, as other drivers may also be affected. The fix is to save info->flags in a local variable before calling any of the driver hooks. A more definitive fix (for post 2.6.13) is to separate info->flags into one that is set by the driver and another that is set by core fbdev/fbcon. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 6bd49341f2806168c877e12cefca77b93437bac2 Author: Sylvain Meyer Date: Mon Aug 15 21:27:13 2005 +0800 [PATCH] intelfb: Do not ioremap entire graphics aperture Reported by: Pavel Kysilka (Bugzilla Bug 4738) modprobe of intelfb results in the following error message: intelfb: Framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G chi intelfb: Version 0.9.2 ACPI: PCI Interrupt 0000:00:02.0[A] -> GSI 16 (level, low) -> IRQ 16 allocation failed: out of vmalloc space - use vmalloc= to increase siz intelfb: Cannot remap FB region. This will fail if the graphics aperture size is greater than 128 MB. Fix is to ioremap only from the beginning of graphics aperture to the end of the used framebuffer memory. Signed-off-by: Sylvain Meyer Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 89204c40a03346cd951e698d854105db4cfedc28 Author: John McCutchan Date: Mon Aug 15 12:13:28 2005 -0400 [PATCH] inotify: add MOVE_SELF event This adds a MOVE_SELF event to inotify. It is sent whenever the inode you are watching is moved. We need this event so that we can catch something like this: - app1: watch /etc/mtab - app2: cp /etc/mtab /tmp/mtab-work mv /etc/mtab /etc/mtab~ mv /tmp/mtab-work /etc/mtab app1 still thinks it's watching /etc/mtab but it's actually watching /etc/mtab~. Signed-off-by: John McCutchan Signed-off-by: Robert Love Signed-off-by: Linus Torvalds commit 0bf955ce98cb3cf40e20d0cc435299eb76e8819e Author: Robert Love Date: Mon Aug 15 12:27:54 2005 -0400 [PATCH] inotify: fix idr_get_new_above usage We are saving the wrong thing in ->last_wd. We want the wd, not the return value. Signed-off-by: Robert Love Signed-off-by: Linus Torvalds commit d93742f5a73c3dff641732c029836170f86392d2 Author: Russell King Date: Mon Aug 15 16:53:38 2005 +0100 [ARM] Remove extraneous whitespace introduced in previous ARMv6 patch Signed-off-by: Russell King commit 498de0cc5ea3009af762dc968a46d6f5df96b67a Author: Robert Love Date: Mon Aug 15 10:57:08 2005 +0100 [ARM] Add syscall stubs for inotify and ioprio system calls Signed-off-by: Robert Love Signed-off-by: Russell King commit 2ba84684e8cf6f980e4e95a2300f53a505eb794e Author: Linus Torvalds Date: Sun Aug 14 18:21:30 2005 -0700 Revert PCIBIOS_MIN_IO changes for 2.6.13 This reverts commits 71db63acff69618b3d9d3114bd061938150e146b [PATCH] increase PCIBIOS_MIN_IO on x86 and 0b2bfb4e7ff61f286676867c3508569bea6fbf7a ACPI: increase PCIBIOS_MIN_IO on x86 since Lukas Sandströ reports that this breaks his on-board nvidia audio. We should re-visit this later. For now we revert the change Signed-off-by: Linus Torvalds commit b4b08e581fac8e0ba9ae348bdc13246c9798c99e Author: Linus Torvalds Date: Sun Aug 14 15:43:39 2005 -0700 Revert "dc395x: Fix support for highmem" It introduces a repeatable oops in the driver, which is a bigger problem than the patch tries to solve. From the original description: Author: Jamie Lenehan Date: Thu Mar 3 14:41:40 2005 +0200 [PATCH] dc395x: Fix support for highmem From: Guennadi Liakhovetski Removes the page_to_virt and maps sg lists dynamically. This makes the driver work with highmem pages. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Jamie Lenehan Signed-off-by: James Bottomley Signed-off-by: Guennadi Liakhovetski Signed-off-by: Linus Torvalds commit 27876d02b30aa34bb1ad35b81ccc40c174282f31 Author: Steve French Date: Sun Aug 14 16:55:23 2005 -0500 [PATCH] CIFS: Fix path name conversion for long filenames Fix path name conversion for long filenames when mapchars mount option was specified at mount time. Signed-off-by: Steve French (sfrench@us.ibm.com) Signed-off-by: Linus Torvalds commit d024709deb4997aced6140a62e8ee82b10666c5f Author: Steve French Date: Sun Aug 14 16:55:23 2005 -0500 [PATCH] CIFS: Fix missing entries in search results Fix missing entries in search results when very long file names and more than 50 (or so) of such long search entries in the directory. FindNext could send corrupt last byte of resume name when resume key was a few hundred bytes long file name or longer. Fixes Samba Bug # 2932 Signed-off-by: Steve French (sfrench@us.ibm.com) Signed-off-by: Linus Torvalds commit 1b0a74d1c002320d5488333dd9c72126af1aab02 Author: Jan Kara Date: Sat Aug 13 13:15:34 2005 +0200 [PATCH] Fix error handling in reiserfs Initialize key object ID in inode so that we don't try to remove the inode when we fail on some checks even before we manage to allocate something. Signed-off-by: Jan Kara Signed-off-by: Linus Torvalds commit f73bc8cae3481adc4188a5f34a89025c10133b0a Author: Paul Mundt Date: Sat Aug 13 20:28:06 2005 +0300 [PATCH] sh: Make _syscall6() do the right thing. There was a rather silly and embarrassing typo in the sh _syscall6(). For the syscall ABI we have the trapa value specified as 0x10 + number of arguments, this was being set incorrectly in the _syscall6() case which ended up causing some problems for users. Signed-off-by: Paul Mundt Signed-off-by: Linus Torvalds commit 4bb82551e165f887448f6f61055d7bcd90aefa2a Author: Linus Torvalds Date: Sat Aug 13 14:22:59 2005 -0700 Fix up mmap of /dev/kmem This leaves the issue of whether we should deprecate the whole thing (or if we should check the whole mmap range, for that matter) open. Just do the minimal fix for now. commit fc464476aa8356f7aae8787d9b8c14aa15d166eb Merge: 691241315116b962f2161e6190f1678cc65bbe26 2da5bf80f754e28cc153362e5ed1edaa9740897a Author: Tony Luck Date: Fri Aug 12 15:13:06 2005 -0700 Auto-update from upstream commit 2da5bf80f754e28cc153362e5ed1edaa9740897a Author: Evgeniy Polyakov Date: Fri Aug 12 11:46:22 2005 -0700 [PATCH] w1: more debug level decrease. Do not spam syslog each 10 seconds when there is nothing on the wire. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 63788ea9245688772d13b979bea05bd72b239aad Merge: 349188f66da2fd88f8cb2407763051d8e136c9aa d7b9dfc8ea43936e6e8eec3040dcf4f110563868 Author: Linus Torvalds Date: Fri Aug 12 09:22:34 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 349188f66da2fd88f8cb2407763051d8e136c9aa Author: Eric W. Biederman Date: Thu Aug 11 22:26:25 2005 -0600 [PATCH] x86_64: Fix apicid versus cpu# confusion. Oops. I knew I didn't have the physical versus logical cpu identifiers right when I generated that patch. It's not nearly as bad as I feared at the time though. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit d7b9dfc8ea43936e6e8eec3040dcf4f110563868 Author: Matt Mackall Date: Thu Aug 11 19:28:05 2005 -0700 [NETPOLL]: remove unused variable Remove unused variable Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 53fb95d3c14290fd6ee808b221e35493f096246f Author: Matt Mackall Date: Thu Aug 11 19:27:43 2005 -0700 [NETPOLL]: fix initialization/NAPI race This fixes a race during initialization with the NAPI softirq processing by using an RCU approach. This race was discovered when refill_skbs() was added to the setup code. Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 2652076507b662fc88ba16c27b59c7bdd9ccd956 Author: Ingo Molnar Date: Thu Aug 11 19:26:42 2005 -0700 [NETPOLL]: pre-fill skb pool we could do one thing (see the patch below): i think it would be useful to fill up the netlogging skb queue straight at initialization time. Especially if netpoll is used for dumping alone, the system might not be in a situation to fill up the queue at the point of crash, so better be a bit more prepared and keep the pipeline filled. [ I've modified this to be called earlier - mpm ] Signed-off-by: Ingo Molnar Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 0db1d6fc1ea051af49ebe03c503d23996a7c5bbb Author: Matt Mackall Date: Thu Aug 11 19:25:54 2005 -0700 [NETPOLL]: add retry timeout Add limited retry logic to netpoll_send_skb Each time we attempt to send, decrement our per-device retry counter. On every successful send, we reset the counter. We delay 50us between attempts with up to 20000 retries for a total of 1 second. After we've exhausted our retries, subsequent failed attempts will try only once until reset by success. Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit f0d3459d0722782c7d9d0e35a1ed0815e75fcde5 Author: Matt Mackall Date: Thu Aug 11 19:25:11 2005 -0700 [NETPOLL]: netpoll_send_skb simplify Minor netpoll_send_skb restructuring Restructure to avoid confusing goto and move some bits out of the retry loop. Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 6b0b31572985c2e64f7216c798766302fb782281 Author: Matt Mackall Date: Thu Aug 11 19:24:33 2005 -0700 [NETPOLL]: e1000 netpoll tweak Suggested by Steven Rostedt, matches his patch included in e100. Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit a636e1357911afdea7c8344ee65f78d36caf3c16 Author: Jeff Moyer Date: Thu Aug 11 19:23:50 2005 -0700 [NETPOLL]: deadlock bugfix This fixes an obvious deadlock in the netpoll code. netpoll_rx takes the npinfo->rx_lock. netpoll_rx is also the only caller of arp_reply (through __netpoll_rx). As such, it is not necessary to take this lock. Signed-off-by: Jeff Moyer Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 11513128bb66b0b09d5d0df069b58afdb01752a2 Author: Jeff Moyer Date: Thu Aug 11 19:23:04 2005 -0700 [NETPOLL]: rx_flags bugfix Initialize npinfo->rx_flags. The way it stands now, this will have random garbage, and so will incur a locking penalty even when an rx_hook isn't registered and we are not active in the netpoll polling code. Signed-off-by: Jeff Moyer Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit a0d3bea3cf6c7c1b53a46432bd490b5dc784ca42 Author: Alexey Dobriyan Date: Thu Aug 11 16:05:50 2005 -0700 [NET]: Make skb->protocol __be16 There are many instances of skb->protocol = htons(ETH_P_*); skb->protocol = __constant_htons(ETH_P_*); and skb->protocol = *_type_trans(...); Most of *_type_trans() are already endian-annotated, so, let's shift attention on other warnings. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 7d69fa6266770eeb6317eddd46b64456e8a515bf Author: Johannes Stezenbach Date: Thu Aug 11 11:54:24 2005 +0200 [PATCH] Fix DVB URL Signed-off-by: Johannes Stezenbach Signed-off-by: Linus Torvalds commit 691241315116b962f2161e6190f1678cc65bbe26 Merge: 1c53e4357ec72d6114c58d20c26d00a904f55da3 6bf11e8c708f0e512ed733fc65a50770c5bc7b54 Author: Tony Luck Date: Thu Aug 11 09:43:50 2005 -0700 pull perfmon context load into release tree commit b5da623ae9be680ea59f268eeb339f0acb2d88c4 Author: Herbert Xu Date: Wed Aug 10 18:32:36 2005 -0700 [TCP]: Adjust {p,f}ackets_out correctly in tcp_retransmit_skb() Well I've only found one potential cause for the assertion failure in tcp_mark_head_lost. First of all, this can only occur if cnt > 1 since tp->packets_out is never zero here. If it did hit zero we'd have much bigger problems. So cnt is equal to fackets_out - reordering. Normally fackets_out is less than packets_out. The only reason I've found that might cause fackets_out to exceed packets_out is if tcp_fragment is called from tcp_retransmit_skb with a TSO skb and the current MSS is greater than the MSS stored in the TSO skb. This might occur as the result of an expiring dst entry. In that case, packets_out may decrease (line 1380-1381 in tcp_output.c). However, fackets_out is unchanged which means that it may in fact exceed packets_out. Previously tcp_retrans_try_collapse was the only place where packets_out can go down and it takes care of this by decrementing fackets_out. So we should make sure that fackets_out is reduced by an appropriate amount here as well. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 6bf11e8c708f0e512ed733fc65a50770c5bc7b54 Author: stephane.eranian@hp.com Date: Thu Jul 28 05:18:00 2005 -0700 [IA64] fix perfmon context load The PFM_LOAD_CONTEXT may fail silently and cause a session to remain reserved even though it should not. This can happen when the commands succeeds in reserving the session but fails when it actually tries to attach to the load_pid. In that case, the command has failed but will return 0. More importantly, the session will remain reserved. This patch fixes the problem. Signed-off-by: Signed-off-by: Tony Luck commit 1c53e4357ec72d6114c58d20c26d00a904f55da3 Author: Kenji Kaneshige Date: Wed Aug 10 02:49:00 2005 -0700 [IA64] fix iosapic_remove build error for !HOTPLUG This patch removes the following stupid compile error that happens when CONFIG_HOTPLUG is not defined on ia64. arch/ia64/kernel/built-in.o(.text+0x712): In function `acpi_unregister_ioapic': : undefined reference to `iosapic_remove' Signed-off-by: Kenji Kaneshige Signed-off-by: Tony Luck commit bc68552faad0e134eb22281343d5ae5a4873fa80 Merge: 0893dd327ffacb83dcca9033d2891d57b4024d6b 001ab02a8c04f0b4dc773c474da698ad7405ae68 Author: Linus Torvalds Date: Wed Aug 10 12:21:25 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 0893dd327ffacb83dcca9033d2891d57b4024d6b Merge: 606867443764edac5a2c542f2fa0a12ef7a7c7fd 42517438f9c1011a03e49a542cba32ac5a80dd8e Author: Linus Torvalds Date: Wed Aug 10 11:56:19 2005 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 606867443764edac5a2c542f2fa0a12ef7a7c7fd Author: James Bottomley Date: Wed Aug 10 11:29:15 2005 -0700 [PATCH] remove name length check in a workqueue We have a chek in there to make sure that the name won't overflow task_struct.comm[], but it's triggering for scsi with lots of HBAs, only scsi is using single-threaded workqueues which don't append the "/%d" anyway. All too hard. Just kill the BUG_ON. Cc: Ingo Molnar Signed-off-by: Andrew Morton [ kthread_create() uses vsnprintf() and limits the thing, so no actual overflow can actually happen regardless ] Signed-off-by: Linus Torvalds commit 001ab02a8c04f0b4dc773c474da698ad7405ae68 Author: Steven Whitehouse Date: Wed Aug 10 11:32:57 2005 -0700 [DECNET]: Use sk_stream_error function rather than DECnet's own Signed-off-by: Steven Whitehouse Signed-off-by: David S. Miller commit 3462b925414a146d4c2252de97d20f89218d1ffb Author: Pierre Ossman Date: Mon Jul 11 14:19:35 2005 +0200 [PATCH] wbsd version bump Even though the changes are minor for the next release an increasing version number simplifies my support issues. Signed-off-by: Pierre Ossman Signed-off-by: Linus Torvalds commit e62b8b2bc73b2433239a2ac394c2fafd50c43d9e Author: Benjamin Herrenschmidt Date: Wed Aug 10 11:12:09 2005 +0200 [PATCH] ppc64: Fix Fan control for new PowerMac G5 2.7GHz machines The workaround for broken device-tree that prevents fan control from working on recent G5 models need to be "enabled" for machines with revision 0x37 of the bridge in addition to machines with revision 0x35. Signed-off-by: Geoff Levand Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 70679ee34f244499cf1c6775647895123eb1a326 Merge: 435d444a532af652ba8bdfd4db4424982bea2f69 b876386ee47e3ac9375a36e9107b8bd32e0599fc Author: Linus Torvalds Date: Wed Aug 10 11:05:56 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp commit 435d444a532af652ba8bdfd4db4424982bea2f69 Merge: 22d0def9d09111513f5a8d38583210620f97d710 484ae6bd9506488089c33784eff35b190fa80e03 Author: Linus Torvalds Date: Wed Aug 10 11:05:28 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 22d0def9d09111513f5a8d38583210620f97d710 Author: Alexander Nyberg Date: Wed Aug 10 10:11:36 2005 -0700 [PATCH] ns558 list handling fix Need to use list_for_entry_safe(), as we're removing items during the traversal. list_for_each_entry() uses the first ptr also as an iterator, if you kfree() it slab takes it, might poison it and then you try to use it to iterate to the next object in list. Cc: Vojtech Pavlik Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0438174e8272d23fe43a5d3f23d777f5b412e87 Author: Ralf Baechle DL5RB Date: Wed Aug 10 10:03:20 2005 -0700 [PATCH] 6pack persistence fix Fix the p-persistence CSMA algorithm which in simplex mode was starting with a slottime delay before doing anything else as if there was carrier collision resulting in bad performance on simplex links. Signed-off-by: Ralf Baechle DL5RB Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42517438f9c1011a03e49a542cba32ac5a80dd8e Author: Tejun Heo Date: Wed Aug 10 13:38:27 2005 -0400 libata: fix EH-related lockup by properly cleaning EH command list Yet another hack due to the fact that libata is the only user of SCSI's ->eh_strategy_handler() hook. commit fae009847c9ea3d668bbee21ce1d76764eca5039 Author: Tejun Heo Date: Sun Aug 7 14:53:40 2005 +0900 [PATCH] sata: fix sata_sx4 dma_prep to not use sg->length sata_sx4 directly references sg->length to calculate total_len in pdc20621_dma_prep(). This is incorrect as dma_map_sg() could have merged multiple sg's into one and, in such case, sg->length doesn't reflect true size of the entry. This patch makes it use sg_dma_len(sg). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 48d28fd55e7fd349fb16a50244379b4da3a4943c Merge: 86b3786078d63242d3194ffc58ae8dae1d1bbef3 5bb8345db8f2aef367e0fddf99a42b7a6029b31f Author: Linus Torvalds Date: Wed Aug 10 09:36:02 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 commit 2d610b80e954045ccfc27558f84e482709e5e5b7 Merge: 8a9cd6d676728792aaee31f30015d284acd154a3 86b3786078d63242d3194ffc58ae8dae1d1bbef3 Author: Dave Kleikamp Date: Wed Aug 10 11:15:13 2005 -0500 Merge with /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp commit 8a9cd6d676728792aaee31f30015d284acd154a3 Author: Dave Kleikamp Date: Wed Aug 10 11:14:39 2005 -0500 JFS: Fix race in txLock TxAnchor.anon_list is protected by jfsTxnLock (TXN_LOCK), but there was a place in txLock() that was removing an entry from the list without holding the spinlock. Signed-off-by: Dave Kleikamp commit 484ae6bd9506488089c33784eff35b190fa80e03 Author: Ben Dooks Date: Wed Aug 10 16:45:14 2005 +0100 [PATCH] ARM: 2849/1: S3C24XX - USB host update (2848/1) Patch from Ben Dooks Rename the s3c2410_report_oc() to s3c2410_usb_report_oc() as this is an usb specific function. Change port power on the usb-simtec implementation to only power up the output if both are set, as per the usb 1.1 specification Signed-off-by: Ben Dooks Signed-off-by: Russell King commit c59d071d4a32e1c45cac6d47f5b59ec36a9a997b Author: Ben Dooks Date: Wed Aug 10 16:45:14 2005 +0100 [PATCH] ARM: 2847/1: S3C24XX - Documentation for USB OHCI host Patch from Ben Dooks Documentation for the in-built OHCI host controller and the support for it in Linux. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 8d3722667762af1490db18ba927386d3be89a32b Author: Nicolas Pitre Date: Wed Aug 10 16:45:13 2005 +0100 [PATCH] ARM: 2846/1: proper handling of CKEN for pxafb Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 6626a7076d39f0a18156cdd97d4e2cbef91ad701 Author: Russell King Date: Wed Aug 10 16:18:35 2005 +0100 [ARM] Control v6 'global' bit via Linux PTE entries Unfortunately, we can't use the "user" bit in the page tables to control whether a page table entry is "global" or "asid" specific, since the vector page is mapped as "user" accessible but is not process specific. Therefore, give direct control of the ARMv6 "nG" (not global) bit to the mm layers. Signed-off-by: Russell King commit 1b9749e7f15bf2db19f5d201f88401c7517910b7 Author: Russell King Date: Wed Aug 10 16:15:32 2005 +0100 [ARM] Use #defined constants for manipulating v6 hardware PTE bits Signed-off-by: Russell King commit b876386ee47e3ac9375a36e9107b8bd32e0599fc Author: Russell King Date: Wed Aug 10 14:52:52 2005 +0100 [ARM SMP] Clear the exclusive monitor on ARMv6 CPUs on context switch Ensure that the exclusive monitor is cleared on context switch with ARMv6 CPUs. Signed-off-by: Russell King commit 3c4ee4e2520775896efc6ab850c4c27971fbcf2a Author: Russell King Date: Wed Aug 10 14:41:45 2005 +0100 [ARM SMP] Only enable V6K instructions on V6 MP core CPUs Signed-off-by: Russell King commit 86b3786078d63242d3194ffc58ae8dae1d1bbef3 Author: Christoph Lameter Date: Tue Aug 9 19:59:21 2005 -0700 [PATCH] Fix ide-disk.c oops caused by hwif == NULL 1. Move hwif_to_node to ide.h 2. Use hwif_to_node in ide-disk.c Signed-off-by: Christoph Lameter Signed-off-by: Linus Torvalds commit aeb3f76350e78aba90653b563de6677b442d21d6 Author: Michael Krufky Date: Tue Aug 9 17:48:54 2005 -0700 [PATCH] DVB: lgdt330x frontend: some bug fixes & add lgdt3303 support This patch removes the tda9887 stuff from lgdt330x.c. It's experimental code which wasn't supposed to leak out and we don't want it in 2.6.13. Signed-off-by: Michael Krufky Acked-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e179d8b0552e2fdb45c6022c589af945f8cbecbe Author: Michael Krufky Date: Tue Aug 9 17:48:54 2005 -0700 [PATCH] dvb: lgdt330x frontend: trivial text cleanups Two trivial text changes in Kconfig and lgdt330x.c Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc9352a42c6de578c932313448257cf246b2b75f Author: Markus Lidel Date: Tue Aug 9 14:30:57 2005 -0700 [PATCH] I2O: added pci_request_regions() before using the controller Added pci_request_regions() before using the controller to avoid duplicate usage of the I2O controller when the dpt_i2o driver and I2O subsystem is loaded at the same time. Signed-off-by: Markus Lidel Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7df26da158ad64d56cc32934aa38a07d03a6fc9 Merge: 68e681e87faa142bde356aeefe619c42275ac98e fb573856b2d82926b36ed059899d883474a3b9eb Author: Linus Torvalds Date: Tue Aug 9 16:03:19 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 68e681e87faa142bde356aeefe619c42275ac98e Merge: 25f13053651569bd0c87927ff49d07d9225feadb 38c1844b3120e04b7f5bb9c18ebbc19883d1e1d6 Author: Linus Torvalds Date: Tue Aug 9 16:02:15 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 25f13053651569bd0c87927ff49d07d9225feadb Merge: db29e85a7ece62de1899917c1ec0ffe55cf1d3a0 d64d3873721cfe870d49d73c3744f06260779ce7 Author: Linus Torvalds Date: Tue Aug 9 16:00:05 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit d64d3873721cfe870d49d73c3744f06260779ce7 Author: Andrew Morton Date: Tue Aug 9 15:29:19 2005 -0700 [NET]: Fix memory leak in sys_{send,recv}msg() w/compat From: Dave Johnson sendmsg()/recvmsg() syscalls from o32/n32 apps to a 64bit kernel will cause a kernel memory leak if iov_len > UIO_FASTIOV for each syscall! This is because both sys_sendmsg() and verify_compat_iovec() kmalloc a new iovec structure. Only the one from sys_sendmsg() is free'ed. I wrote a simple test program to confirm this after identifying the problem: http://davej.org/programs/testsendmsg.c Note that the below fix will break solaris_sendmsg()/solaris_recvmsg() as it also calls verify_compat_iovec() but expects it to malloc internally. [ I fixed that. -DaveM ] Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 3501466941347f0e1992b2672affb3feb92925fd Author: David S. Miller Date: Tue Aug 9 14:57:12 2005 -0700 [SUNRPC]: Fix nsec --> usec conversion. We need to divide, not multiply. While we're here, use NSEC_PER_USEC instead of a magic constant. Based upon a report from Josip Loncaric and a patch by Andrew Morton. Signed-off-by: David S. Miller commit 38c1844b3120e04b7f5bb9c18ebbc19883d1e1d6 Author: David S. Miller Date: Tue Aug 9 14:43:14 2005 -0700 [SPARC]: envctrl: ERR_PTR() --> PTR_ERR() Fix thinko in Christoph's changes. Signed-off-by: David S. Miller commit 4875ccdb304775e9fd830f644643a1513357e043 Author: Christoph Hellwig Date: Tue Aug 9 14:39:10 2005 -0700 [SPARC]: remove ifdef CONFIG_PCI from envctrl.c The driver already depends on CONFIG_PCI in Kconfig. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit bc2406684b5929cea5d40b9cc4fd872816956779 Author: Christoph Hellwig Date: Tue Aug 9 13:32:25 2005 -0700 [SPARC]: Use kthread infrastructure in bbc_envctrl Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 218b29e0c3995ee15782de55ad1dd74cce1a728d Author: Christoph Hellwig Date: Tue Aug 9 12:30:07 2005 -0700 [SPARC]: Use kthread infrastructure in envctrl envctrl currently uses very odd ways to stop a thread, using various things that should be exposed to drivers at all. This patch (which is untested as I don't have sparc hardware) switches it to use the proper kthread infrastructure. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit db29e85a7ece62de1899917c1ec0ffe55cf1d3a0 Author: Markus Lidel Date: Tue Aug 9 10:08:03 2005 -0700 [PATCH] i2o: remove new configuration API Remove new configuration API from i2o_config The API-patch is still available from the I2O website (which is mentioned in the kernel config now). It is removed because it creates a new binary sysfs-attribute, which doesn't have the limitiation of 4k. Expect for the Adaptec controllers, which has a limitation in the hardware this attribute doesn't make sense anywhere else. Until the sysfs API provides an attribute which doesn't buffer (like firmware) and let access to at least 64k blocks i provide a separate patch... (akpm: basically, this API was introduced post-2.6.12 and Markus wants to pull it out before 2.6.13). Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36d2f5a18205dfc2fac1e3541d324ce186f418cb Author: Kumar Gala Date: Tue Aug 9 10:08:02 2005 -0700 [PATCH] cpm_uart: needs some love to compile with GCC4.0.1 Fixed problems so we can build with gcc-4.0.1 Signed-off-by: Peter Schaefer-Hutter Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 311c46273f0e8b140d4cc68e13128cbc22114807 Author: Kumar Gala Date: Tue Aug 9 10:08:00 2005 -0700 [PATCH] cpm_uart: Fix dpram allocation and non-console uarts * Makes dpram allocations work * Makes non-console UART work on both 8xx and 82xx * Fixed whitespace in files that were touched Signed-off-by: Vitaly Bordug Signed-off-by: Pantelis Antoniou Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3077a260e9f316b611436b1506eec9cc5c4f8aa6 Author: Paul Jackson Date: Tue Aug 9 10:07:59 2005 -0700 [PATCH] cpuset release ABBA deadlock fix Fix possible cpuset_sem ABBA deadlock if 'notify_on_release' set. For a particular usage pattern, creating and destroying cpusets fairly frequently using notify_on_release, on a very large system, this deadlock can be seen every few days. If you are not using the cpuset notify_on_release feature, you will never see this deadlock. The existing code, on task exit (or cpuset deletion) did: get cpuset_sem if cpuset marked notify_on_release and is ready to release: compute cpuset path relative to /dev/cpuset mount point call_usermodehelper() forks /sbin/cpuset_release_agent with path drop cpuset_sem Unfortunately, the fork in call_usermodehelper can allocate memory, and allocating memory can require cpuset_sem, if the mems_generation values changed in the interim. This results in an ABBA deadlock, trying to obtain cpuset_sem when it is already held by the current task. To fix this, I put the cpuset path (which must be computed while holding cpuset_sem) in a temporary buffer, to be used in the call_usermodehelper call of /sbin/cpuset_release_agent only _after_ dropping cpuset_sem. So the new logic is: get cpuset_sem if cpuset marked notify_on_release and is ready to release: compute cpuset path relative to /dev/cpuset mount point stash path in kmalloc'd buffer drop cpuset_sem call_usermodehelper() forks /sbin/cpuset_release_agent with path free path The sharp eyed reader might notice that this patch does not contain any calls to kmalloc. The existing code in the check_for_release() routine was already kmalloc'ing a buffer to hold the cpuset path. In the old code, it just held the buffer for a few lines, over the cpuset_release_agent() call that in turn invoked call_usermodehelper(). In the new code, with the application of this patch, it returns that buffer via the new char **ppathbuf parameter, for later use and freeing in cpuset_release_agent(), which is called after cpuset_sem is dropped. Whereas the old code has just one call to cpuset_release_agent(), right in the check_for_release() routine, the new code has three calls to cpuset_release_agent(), from the various places that a cpuset can be released. This patch has been build and booted on SN2, and passed a stress test that previously hit the deadlock within a few seconds. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a242b44da6feb604c4c659b78f63dedb69b2d4a3 Author: Ralf Baechle Date: Tue Aug 9 10:07:57 2005 -0700 [PATCH] Build fix for the Sibyte I2C driver Compile fix for the BCM1250 I2C driver. Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01df0e3a79d3913df178e9a1047ade425a7c118f Author: Wim Van Sebroeck Date: Tue Aug 9 10:07:56 2005 -0700 [PATCH] i8xx_tco.c: arm watchdog only when started i8xx_tco.c v0.08: only "arm" the watchdog when the watchdog has been started. (Kernel Bug 4251: system reset when battery is read and i8xx_tco driver loaded) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bb8345db8f2aef367e0fddf99a42b7a6029b31f Author: Salyzyn, Mark Date: Tue Aug 9 12:57:58 2005 -0400 [SCSI] dpt_i2o pci_request_regions fix Originally From: Andrew Morton Altered By: "Salyzyn, Mark" There is an additional 'build fix' patch that Andrew Morton submitted on the kernel list (I have changed out his dpr_i2o with dpt_i2o below though). Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 00dd1e433967872f3997a45d5adf35056fdf2f56 Author: John McCutchan Date: Mon Aug 8 22:13:05 2005 -0400 [PATCH] fsnotify-cleanups This removes the now unused fsnotify_unlink & fsnotify_rmdir code. Compile tested. Signed-off-by: John McCutchan Signed-off-by: Linus Torvalds commit dc836b5b6fcde95f750a4790d8200fabaf563dc9 Author: Linus Torvalds Date: Mon Aug 8 18:46:09 2005 -0700 Revert "[PATCH] PCI: restore BAR values..." Revert commit fec59a711eef002d4ef9eb8de09dd0a26986eb77, which is breaking sparc64 that doesn't have a working pci_update_resource. We'll re-do this after 2.6.13 when we'll do it all properly. commit 138b9dd1fd7b44176af4f3b672060c790b0eaf55 Author: Dave Jones Date: Mon Aug 8 16:13:15 2005 -0700 [PATCH] icn driver fails to unload when no hardware present Fix a null dereference in module unload path. Found by a simple modprobe icn ; rmmod icn Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98 Merge: 03c6b749b364fe7b8e47ed8e1ce26baca167c322 ca9334523c853e407da7b3a0bd02f54d0fa59414 Author: Linus Torvalds Date: Mon Aug 8 16:06:01 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit fb573856b2d82926b36ed059899d883474a3b9eb Author: Ken Chen Date: Mon Aug 8 15:25:00 2005 -0700 [IA64] fix nohalt boot option this changeset broke the "nohalt" kernel boot option. 8df5a500a3e97f7811cdce0f553ca1917ccd4220 default_idle() is looking at new variable can_do_pal_halt. However, that variable did not get cleared upon "nohalt" boot option. Result is that "nohalt" option is ignored until perfmon is exercised. Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit 03c6b749b364fe7b8e47ed8e1ce26baca167c322 Author: Olaf Hering Date: Mon Aug 8 14:49:18 2005 -0700 [PATCH] x86_64: add MODULE_ALIAS for aes modprobe aes does not work on x86_64. i386 has a similar line, this could be the right fix. Would be nice to have in 2.6.13 final. Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e708484d710bcbb44893400f429579f5728cd7d Author: Kumar Gala Date: Mon Aug 8 14:49:17 2005 -0700 [PATCH] ppc32: Fix MPC834x USB memory map offsets The memory mappings for MPC8349 USB MPH and DR modules were reversed. Signed-off-by: Li Yang Signed-off-by: Jiang Bo Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c44cd2afad3f7b015542187e147a820600172f1 Author: James.Smart@Emulex.Com Date: Fri Jun 10 22:24:30 2005 -0400 [SCSI] fix target scanning oops with fc transport class We have some nasty issues with 2.6.12-rc6. Any request to scan on the lpfc or qla2xxx FC adapters will oops. What is happening is the system is defaulting to non-transport registered targets, which inherit the parent of the scan. On this second scan, performed by the attribute, the parent becomes the shost instead of the rport. The slave functions in the 2 FC adapters use starget_to_rport() routines, which incorrectly map the shost as an rport pointer. Additionally, this pointed out other weaknesses: - If the target structure is torn down outside of the transport, we have no method for it to be regenerated at the proper parent. - We have race conditions on the target being allocated by both the midlayer scan (parent=shost) and by the fc transport (parent=rport). Signed-off-by: James Bottomley commit ca9334523c853e407da7b3a0bd02f54d0fa59414 Author: Heikki Orsila Date: Mon Aug 8 14:26:52 2005 -0700 [IPV4]: Debug cleanup Here's a small patch to cleanup NETDEBUG() use in net/ipv4/ for Linux kernel 2.6.13-rc5. Also weird use of indentation is changed in some places. Signed-off-by: Heikki Orsila Signed-off-by: David S. Miller commit 4d479e40e1748a877a24015fc6727b27b77110cd Author: David S. Miller Date: Mon Aug 8 13:48:02 2005 -0700 [NETLINK]: Allocate and kill some netlink numbers. NETLINK_ARPD is unused, allocate it to the Open-iSCSI folks. NETLINK_ROUTE6 and NETLINK_TAPBASE are no longer used, delete them. Signed-off-by: David S. Miller commit b612cacb02f0fb58f07a9002c7719a901882718c Merge: 7a91bf7f5c22c8407a9991cbd9ce5bb87caa6b4a 71abe99980e6d7ff8aee8acc7da817b3ad7d8a89 Author: Linus Torvalds Date: Mon Aug 8 12:19:24 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 7a91bf7f5c22c8407a9991cbd9ce5bb87caa6b4a Author: John McCutchan Date: Mon Aug 8 13:52:16 2005 -0400 [PATCH] fsnotify_name/inoderemove The patch below unhooks fsnotify from vfs_unlink & vfs_rmdir. It introduces two new fsnotify calls, that are hooked in at the dcache level. This not only more closely matches how the VFS layer works, it also avoids the problem with locking and inode lifetimes. The two functions are - fsnotify_nameremove -- called when a directory entry is going away. It notifies the PARENT of the deletion. This is called from d_delete(). - inoderemove -- called when the files inode itself is going away. It notifies the inode that is being deleted. This is called from dentry_iput(). Signed-off-by: John McCutchan Signed-off-by: Linus Torvalds commit 1963c907b21e140082d081b1c8f8c2154593c7d7 Author: Michael Krufky Date: Mon Aug 8 09:22:43 2005 -0700 [PATCH] dvb: lgdt330x frontend: some bug fixes & add lgdt3303 support - Structural changes within lgdt330x driver, framework now supports both chips... tested OK on lgdt3302 and lgdt3303. - Add LG/TUA6034 dvb_pll_desc for ATSC with LG TDVS-H062F & DViCO FusionHDTV5. - Fixed LGDT330X signal strength: For now, always set it to 0. - Corrected LGDT330X boundary condition error in read_snr: dB calculation. Signed-off-by: Mac Michaels Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66aea23ff84ca81bfaeaf7d63e248b873f5c2616 Author: Cornelia Huck Date: Mon Aug 8 09:22:36 2005 -0700 [PATCH] s390: use klist in qeth driver From: Martin Schwidesky Convert qeth to the new klist interface and make it compiling again. Signed-off-by: Frank Pavlic Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b83bc77bf77cc8459cb94e52b08e775104c4c48 Author: Harald Welte Date: Mon Aug 8 11:50:55 2005 +0200 [PATCH] don't try to do any NAT on untracked connections With the introduction of 'rustynat' in 2.6.11, the old tricks of preventing NAT of 'untracked' connections (e.g. NOTRACK target in 'raw' table) are no longer sufficient. The ip_conntrack_untracked.status |= IPS_NAT_DONE_MASK effectively prevents iteration of the 'nat' table, but doesn't prevent nat_packet() to be executed. Since nr_manips is gone in 'rustynat', nat_packet() now implicitly thinks that it has to do NAT on the packet. This patch fixes that problem by explicitly checking for ip_conntrack_untracked in ip_nat_fn(). Signed-off-by: Harald Welte Signed-off-by: Linus Torvalds commit 48de5beeb0ee821859c79ba5b9462654604d8bf3 Author: James Morris Date: Mon Aug 8 10:29:08 2005 -0400 [PATCH] Update contact info for James Morris commit 6d85f29bb54235d2e184e7155dcd4de908324fe6 Author: Ivan Kokshaysky Date: Mon Aug 8 12:55:54 2005 +0400 [PATCH] VIA VT8235 PCI quirk Like many other southbridges from different manufacturers, VIA VT8235 chip has two non-standard BARs for power management and SMBus registers (see the datasheet at http://www.via.com.tw). This new quirk routine fixes boot problem with 2.6.13-rc2/rc6 kernels on Targa Visionary 811 Athlon64 laptop, as reported by Mikael Pettersson . Signed-off-by: Ivan Kokshaysky Signed-off-by: Linus Torvalds commit db6778db7eb1d974e1ae0da326530f09c13585ac Author: Antonino Daplas Date: Mon Aug 8 14:22:43 2005 +0800 [PATCH] nvidiafb: Fix initial display corruption on certain laptops Reported by:Vincent Fortier (Bugzilla Bug 4768) "At boot time the screen appears moved to the mid right portion of the actual video pannel making the end of the line appears at the left edge... It simply looks like moved half way to the right" His particular hardware has a display with an unusual dimension (1920x1200) but unfortunately has no EDID block. None of the entries in the global mode database is correct for this particular display, and it particularly has difficulty scaling up 640x480 (the default startup mode of nvidiafb) to 1920x1200 which causes the above described problem. 1, Add 1920x1200 to the global mode database. 2. Let nvidiafb base the startup mode from the flatpanel dimensions only if the EDID block is absent, no boot mode parameter is specified by the user, and a flatpanel/LCD display is attached. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 0f0767c67a497173294bdf6725a3d85f7f29e397 Author: Paul Mackerras Date: Mon Aug 8 14:16:43 2005 +1000 [PATCH] ppc64: update defconfigs Update the default/example configs for ppc64. Pretty boring... Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 2c875bbda9303b359af94f671d25639840ce2a59 Author: Arnd Bergmann Date: Mon Aug 8 14:12:42 2005 +1000 [PATCH] ppc64: add default config for BPA This adds a bpa_defconfig file and make target. The config settings are made for the current version of the Cell Processor Based Blade, so there are not too many drivers enabled. A few more drivers might get added in the future though. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 9c472dd9197429a37691e91c938660a062bf20b0 Author: James Bottomley Date: Mon Aug 8 11:51:38 2005 -0500 [SCSI] Bug 4940 Repeatable Kernel Panic on Adaptec 2015S I20 device on bootup From: "Salyzyn, Mark" Prevent driver from loading if another driver (i2o) has already claimed the resources associated with the card. Discussion associated with this bug can be referenced at http://bugzilla.kernel.org/show_bug.cgi?id=4940 where it was agreed to use pci_request_regions in both the dpt_i2o and the i2o driver to prevent both drivers loading on the same adapter(s). Signed-off-by: Mark Salyzyn Rejections fixed up and Signed-off-by: James Bottomley commit 6fc32179de9e14c542e0b1760e412bc670611c53 Author: Linus Torvalds Date: Sun Aug 7 11:18:56 2005 -0700 Linux 2.6.13-rc6 Last (?) -rc, partly brought on by the aic7xxx performance fixes (ie get them tested in an -rc release before the real 2.6.13). commit cfc646fa848dfa124fe4d6e0e44ef6940f7f9e6d Author: Dominik Hackl Date: Sun Aug 7 09:42:53 2005 -0700 [PATCH] crc32.c typo fix This patch fixes a typo in lib/crc32.c which results in incorrect debug output. Signed-off-by: Dominik Hackl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b0271eb9da5170ab5cadf2edf97c84712c82550 Author: Ravikiran G Thirumalai Date: Sun Aug 7 09:42:50 2005 -0700 [PATCH] Move the fix to align node_end_pfns to a proper location Move the fix to align node_end_pfns to a proper location. The earlier fix made the node_remap_start_vaddr to get misaligned causing remap_numa_kva to barf again :-/ Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 079da354db3473b56eb938ca53a2cb0804ea9c8c Author: Marcelo Tosatti Date: Sun Aug 7 09:42:47 2005 -0700 [PATCH] ppc32: 8xx commproc avoid direct pte manipulation, use dma coherent API instead Touching the pte directly causes the 8Mbyte TLB entry to be invalidated. This has been fixed in v2.4 for ages. Signed-off-by: Marcelo Tosatti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 204085c52aa9975a90a894cb385360a141f1e4a3 Author: Aristeu Sergio Rozanski Filho Date: Sun Aug 7 09:42:46 2005 -0700 [PATCH] ppc32: 8xx kill unused variable in commproc 8xx: commproc.c: kill unused variable Signed-off-by: Aristeu Sergio Rozanski Filho Signed-off-by: Marcelo Tosatti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff085c1cc26532294e91f69c1747994fa2283369 Author: Aristeu Sergio Rozanski Filho Date: Sun Aug 7 09:42:43 2005 -0700 [PATCH] ppc32: 8xx restrict ENET_BIG_BUFFERS option 8xx: restrict ENET_BIG_BUFFERS option to drivers which actually use it Signed-off-by: Aristeu Sergio Rozanski Filho Signed-off-by: Marcelo Tosatti Signed-off-by: Linus Torvalds commit b7f08aabb1cdc0d714d312e2ad2feefb498daf77 Author: Aristeu Sergio Rozanski Filho Date: Sun Aug 7 09:42:40 2005 -0700 [PATCH] ppc32: 8xx fix CPM ethernet description 8xx: fix CPM Ethernet description Signed-off-by: Marcelo Tosatti Signed-off-by: Aristeu Sergio Rozanski Filho Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fbccb3d7f56654dbc407f757c884f22d26264e42 Author: Aristeu Sergio Rozanski Filho Date: Sun Aug 7 09:42:36 2005 -0700 [PATCH] ppc32: 8xx: fec: fix interrupt handler prototypes 8xx: fec: fix interrupt handler prototypes Signed-off-by: Aristeu Sergio Rozanski Filho Signed-off-by: Marcelo Tosatti Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc007ddd609ccfce1cd392e65eed05aba8db32ce Author: Aristeu Sergio Rozanski Filho Date: Sun Aug 7 09:42:33 2005 -0700 [PATCH] ppc32: 8xx: using dma_alloc_coherent() instead consistent_alloc() 8xx: using dma_alloc_coherent() instead consistent_alloc() Signed-off-by: Aristeu Sergio Rozanski Filho Signed-off-by: Marcelo Tosatti Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b0ed2fbdbea3f0d34404f1cbfdf02c4a673ca56 Author: Aristeu Sergio Rozanski Filho Date: Sun Aug 7 09:42:28 2005 -0700 [PATCH] ppc32: 8xx: convert fec driver to use work_struct 8xx: convert fec driver to use work_struct Signed-off-by: Aristeu Sergio Rozanski Filho Signed-off-by: Marcelo Tosatti Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68b47139ea94ab6d05e89c654db8daa99e9a232c Author: Miklos Szeredi Date: Sun Aug 7 09:42:25 2005 -0700 [PATCH] namespace.c: fix bind mount from foreign namespace I'm resending this patch, because I still believe it's the correct fix. Tested before/after applying the patch with a test application available from: http://www.inf.bme.hu/~mszeredi/nstest.c Bind mount from a foreign namespace results in an un-removable mount. The reason is that mnt->mnt_namespace is copied from the old mount in clone_mnt(). Because of this check_mnt() in sys_umount() will fail. The solution is to set mnt->mnt_namespace to current->namespace in clone_mnt(). clone_mnt() is either called from do_loopback() or copy_tree(). copy_tree() is called from do_loopback() or copy_namespace(). When called (directly or indirectly) from do_loopback(), always current->namspace is being modified: check_mnt(nd->mnt). So setting mnt->mnt_namespace to current->namspace is the right thing to do. When called from copy_namespace(), the setting of mnt_namespace is irrelevant, since mnt_namespace is reset later in that function for all copied mounts. Jamie said: This patch is correct. The old code was buggy for more fundamental and serious reason: it broke the invariant that a tree of vfsmnts all have the same value of mnt_namespace (and the same for the mnt_list list). Signed-off-by: Miklos Szeredi Acked-by: Jamie Lokier Cc: Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ae5b3c703cce89a7d8ccf25fe16955ec6f016c0 Author: Olaf Hering Date: Sun Aug 7 09:42:24 2005 -0700 [PATCH] remove linux/pagemap.h from linux/swap.h sparc can not include linux/pagemap.h because of the following circular dependency: asm-sparc/pgtable include linux/swap.h linux/swap.h include now linux/pagemap.h linux/pagemap.h include linux/mm.h linux/mm.h include asm/pgtable.h It needs to have the swp_entry_t type fully visible in pgtable.h, we can't work around this using macros. Signed-off-by: Olaf Hering Cc: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46bdac99382dd36e2d8c36cfb35d879b5c136965 Author: Tom Duffy Date: Sun Aug 7 09:42:23 2005 -0700 [PATCH] visws: linkage fix This patch add stubs to allow the visws subarch to link again. Signed-off-by: Tom Duffy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c79d7260a8522a54374fa10dd2838eaef492cf2 Author: Tom Duffy Date: Sun Aug 7 09:42:16 2005 -0700 [PATCH] Make visws compile again In file included from linux-2.6.13-rc5/arch/i386/kernel/timers/timer_pit.c:20: linux-2.6.13-rc5/include/asm-i386/mach-visws/do_timer.h: In function `do_timer_overflow': linux-2.6.13-rc5/include/asm-i386/mach-visws/do_timer.h:32: error: `i8259A_lock' undeclared (first use in this function) linux-2.6.13-rc5/include/asm-i386/mach-visws/do_timer.h:32: error: (Each undeclared identifier is reported only once linux-2.6.13-rc5/include/asm-i386/mach-visws/do_timer.h:32: error: for each function it appears in.) make[3]: *** [arch/i386/kernel/timers/timer_pit.o] Error 1 make[2]: *** [arch/i386/kernel/timers] Error 2 make[1]: *** [arch/i386/kernel] Error 2 make: *** [_all] Error 2 Signed-off-by: Tom Duffy Cc: Andrey Panin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e525e153c7a99fc64af68e7f50a2660babd6752b Author: Andrew Morton Date: Sun Aug 7 09:42:12 2005 -0700 [PATCH] __bio_clone() dead comment Remove a very wrong comment. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d5172f263f76ca6d588f533c0989b22521fcbac2 Author: Andi Kleen Date: Sun Aug 7 09:42:07 2005 -0700 [PATCH] x86_64: ignore machine checks from boot time Don't log machine check events left over from boot. Too many BIOSes leave bogus events in there. This unfortunately also makes it impossible to log events that caused a reboot. For people with non broken BIOS there is mce=bootlog Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf7bee5a0bf270a4eace0be39329d6ac0136cc47 Author: Ivan Kokshaysky Date: Sun Aug 7 13:49:59 2005 +0400 [PATCH] Fix restore of 64-bit PCI BAR's For 64-bit BAR[i] only pci_dev->resource[i] is valid, ->resource[i+1] slot is unused and contains zeroes in all fields. So when we update a PCI BAR, all we need is just to check that we're going to update a _valid_ resource. Also make sure to write high bits - use "x >> 16 >> 16" (rather than the simpler ">> 32") to avoid warnings on 32-bit architectures where we're not going to have any high bits. Signed-off-by: Linus Torvalds commit 71abe99980e6d7ff8aee8acc7da817b3ad7d8a89 Author: Christoph Hellwig Date: Sun Aug 7 14:23:42 2005 +0100 [PATCH] ARM: switch fd1772.c from sleep_on to wait_event Doesn't make the local irq disabling around it less buggy, but at least we replace the offender with the right kind of primitive. Signed-off-by: Christoph Hellwig Signed-off-by: Russell King commit fc1df37e3b195cb73ecb14c30d41b7aace3f844a Author: Russell King Date: Sun Aug 7 14:20:26 2005 +0100 [PATCH] ARM: Make sa1100fb_display_dma_period() an inline function This function produces a warning when CPU_FREQ=n. Since it's a very simple calculation, make it inline instead of adding preprocessor directives around it. Signed-off-by: Russell King commit 0d317fb72fe3cf0f611608cf3a3015bbe6cd2a66 Author: Eric W. Biederman Date: Sat Aug 6 13:47:36 2005 -0600 [PATCH] x86_64 bootmem: sparse_mem/kexec merge bug. When the sparse mem changes and the kexec changes were merged into setup.c they came in, in the wrong order. This patch changes the order so we don't run sparse_init which uses the bootmem allocator until we all of the reserve_bootmem calls has been made. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 36cf446c2c4be6bae01517ea539dcebaf85c9fdf Author: Eric W. Biederman Date: Sat Aug 6 13:45:10 2005 -0600 [PATCH] i386 visws: Add machine_shutdown and emergency_restart Another x86 subarchitecture bit I missed. This adds both machine_emergency_restart missed in my reboot fixes and machine_shutdown needed for kexec support. Signed-off-by: Linus Torvalds commit 094528a7fb3f75a83673e5cc3271fd466f2e278d Author: Eric W. Biederman Date: Sat Aug 6 13:42:45 2005 -0600 [PATCH] i386 voyager: Add machine_shutdown Here is one more bit of breakage my x86 sub-architecture confusion caused. Add machine_shutdown to voyager so it will compile with CONFIG_KEXEC. Signed-off-by: Linus Torvalds commit cd5098d254a28a5980bc6dec9644f99ee884a548 Merge: d8588ee5b87226d96e07add42027246746357fe3 576c7d858f36cab6110b29db7b53964d5132cf30 Author: Linus Torvalds Date: Sat Aug 6 10:18:48 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 commit d8588ee5b87226d96e07add42027246746357fe3 Author: Linus Torvalds Date: Sat Aug 6 09:44:37 2005 -0700 ppc: Export __handle_mm_fault for MOL When we did the handle_mm_fault cleanup and get_user_page() race fixes, handle_mm_fault turned into an inline function that called the real __handle_mm_fault() code. The export needed for MOL on ppc wasn't updated to match the new world order, though. Turn it into a GPL export while at it, since this is all about internal interfaces and MOL is GPL'd anwyay. commit fab5a60a29f98f17256a4183e34a414f6db67569 Author: Linus Torvalds Date: Sat Aug 6 09:42:06 2005 -0700 Check input buffer size in zisofs This uses the new deflateBound() thing to sanity-check the input to the zlib decompressor before we even bother to start reading in the blocks. Problem noted by Tim Yamin commit 243393c90f2b7cb781fd794e22786e9c8547901a Author: Linus Torvalds Date: Sat Aug 6 09:39:57 2005 -0700 Add fakey 'deflateBound()' function to the in-kernel zlib routines It's not the real deflateBound() in newer zlib libraries, partly because the upcoming usage of it won't have the "stream" available, so we can't have the same interfaces anyway. commit 021a52ac70802a94e699badb52af9d0fa728d5cd Author: Matt Porter Date: Sat Aug 6 07:21:06 2005 -0700 [PATCH] ppc32: ppc440 pagetable attributes (comments updates) Here's an incremental patch with comment updates and some additional grammar cleanups. Signed-off-by: Matt Porter Signed-off-by: Linus Torvalds commit 7d3f4c97723c4ec4e5d85e6e70084b02e6be8788 Author: David S. Miller Date: Sat Aug 6 06:35:48 2005 -0700 [TG3]: Save initial PCI state before registering the netdevice. Else on SMP systems it is possible for hotplug to execute, invoke tg3_open(), and end up loading the uninitialized PCI register save area into the card. Signed-off-by: David S. Miller commit 6fc0b4a7a73a81e74d0004732df358f4f9975be2 Author: Herbert Xu Date: Sat Aug 6 06:33:15 2005 -0700 [IPSEC]: Restrict socket policy loading to CAP_NET_ADMIN. The interface needs much redesigning if we wish to allow normal users to do this in some way. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 576c7d858f36cab6110b29db7b53964d5132cf30 Author: Marcel Holtmann Date: Sat Aug 6 12:36:54 2005 +0200 [Bluetooth] Add direction and timestamp to stack internal events This patch changes the direction to incoming and adds the timestamp to all stack internal events. Signed-off-by: Marcel Holtmann commit 66e8b6c31b9254243afaac8af4135e84e11dd38e Author: Marcel Holtmann Date: Sat Aug 6 12:36:51 2005 +0200 [Bluetooth] Remove unused functions and cleanup symbol exports This patch removes the unused bt_dump() function and it also removes its BT_DMP macro. It also unexports the hci_dev_get(), hci_send_cmd() and hci_si_event() functions. Signed-off-by: Adrian Bunk Signed-off-by: Marcel Holtmann commit e9a3e671c09d419f29710d8620ed916d3bf7d7ab Author: Marcel Holtmann Date: Sat Aug 6 12:36:47 2005 +0200 [Bluetooth] Kill redundant NULL checks before kfree() There's no need to check for NULL before calling kfree() on a pointer. Signed-off-by: Jesper Juhl Signed-off-by: Marcel Holtmann commit dcc365d8f28d6a2332fa37e64d669858a8d017e8 Author: Marcel Holtmann Date: Sat Aug 6 12:36:42 2005 +0200 [Bluetooth] Revert session reference counting fix The fix for the reference counting problem of the signal DLC introduced a race condition which leads to an oops. The reason for it is not fully understood by now and so revert this fix, because the reference counting problem is not crashing the RFCOMM layer and its appearance it rare. Signed-off-by: Marcel Holtmann commit cad0f6270c0bae5bcae6af3c7ac7bd3ae5d9b618 Author: Marcel Holtmann Date: Sat Aug 6 12:36:36 2005 +0200 [Bluetooth] Send HCI_Reset for Kensington dongle The Kensington Bluetooth USB adapter is based on a Broadcom chip with the HID proxy support. To initialize these kind of devices correctly it is necessary to send HCI_Reset as the first command. Signed-off-by: Marcel Holtmann commit 534afb90a9cd0b9643f62d660c164e1d924f39cf Author: Matt Porter Date: Fri Aug 5 16:10:10 2005 -0700 [PATCH] ppc32: fix ppc440 pagetable attributes This patch fixes a bug in the PPC440 pagetable attributes that breaks swap support. It also adds some notes on the PPC440 attribute fields. Signed-off-by: Geoff Levand for CELF Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4aad724d3e52238e1ce005f166fbba5b4072a7f6 Author: Tim Yamin Date: Mon Jul 25 23:16:13 2005 +0100 [PATCH] Update in-kernel zlib routines These bugs have been fixed in the standard zlib for a while. See for example a) http://sources.redhat.com/ml/bug-gnu-utils/1999-06/msg00183.html b) http://bugs.gentoo.org/show_bug.cgi?id=94584 Signed-off-by: Tim Yamin Signed-off-by: Tavis Ormandy Signed-off-by: Linus Torvalds commit 00a5dfdb93f74e4d95fb0d83c890728e331f8810 Author: Ingo Molnar Date: Fri Aug 5 23:05:27 2005 +0200 [PATCH] Fix semundo lock leakage semundo->lock can leak if semundo->refcount goes from 2 to 1 while another thread has it locked. This causes major problems for PREEMPT kernels. The simplest fix for now is to undo the single-thread optimization. This bug was found via relentless testing by Dominik Karall. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit ba02508248e90a9d696aebd18b48a3290235b53c Author: Tejun Heo Date: Fri Aug 5 13:28:11 2005 -0700 [PATCH] blk: fix tag shrinking (revive real_max_size) My patch in commit fa72b903f75e4f0f0b2c2feed093005167da4023 incorrectly removed blk_queue_tag->real_max_depth. The original resize implementation was incorrect in the following points. * actual allocation size of tag_index was shorter than real_max_size, but assumed to be of the same size, possibly causing memory access beyond the allocated area. * bits in tag_map between max_deptn and real_max_depth were initialized to 1's, making the tags permanently reserved. In an attempt to fix above two bugs, I had removed allocation optimization in init_tag_map and real_max_size. Tag map/index were allocated and freed immediately during resize. Unfortunately, I wasn't considering that tag map/index can be resized dynamically with tags beyond new_depth active. This led to accessing freed area after shrinking tags and led to the following bug reporting thread on linux-scsi. http://marc.theaimsgroup.com/?l=linux-scsi&m=112319898111885&w=2 To fix the problem, I've revived real_max_depth without allocation optimization in init_tag_map, and Andrew Vasquez confirmed that the problem was fixed. As Jens is not going to be available for a week, he asked me to make sure that this patch reaches you. http://marc.theaimsgroup.com/?l=linux-scsi&m=112325778530886&w=2 Also, a comment was added to make sure that real_max_size is needed for dynamic shrinking. Signed-off-by: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7546f8f03f5a4fa612605b6be930234d6026860 Author: David Gibson Date: Fri Aug 5 11:59:35 2005 -0700 [PATCH] Fix hugepage crash on failing mmap() This patch fixes a crash in the hugepage code. unmap_hugepage_area() was assuming that (due to prefault) PTEs must exist for all the area in question. However, this may not be the case, if mmap() encounters an error before the prefault and calls unmap_region() to clean up any partial mapping. Depending on the hugepage configuration, this crash can be triggered by an unpriveleged user. Signed-off-by: David Gibson Cc: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6cb99413da42af413c11a394538ddc8b9d201e1 Author: James Bottomley Date: Fri Aug 5 11:59:34 2005 -0700 [PATCH] fix voyager compile after machine_emergency_restart breakage [PATCH] i386: Implement machine_emergency_reboot introduced this new function into arch/i386/reboot.c. However, subarchitectures are entitled to implement their own copies of reboot.c from which this new function is now missing. It looks like visws will also need a similar fixup Signed-off-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9abb020405c94edb0717315f1510086b1574a22 Author: Marcel Selhorst Date: Fri Aug 5 11:59:33 2005 -0700 [PATCH] tpm_infineon: Support for new TPM 1.2 and PNPACPI This patch includes support for the new Infineon Trusted Platform Module SLB 9635 TT 1.2 and does further include ACPI-support for both chip versions (SLD 9630 TT 1.1 and SLB9635 TT 1.2). Since the ioports and configuration registers are not correctly set on some machines, the configuration is now done via PNPACPI, which reads out the correct values out of the DSDT-table. Note that you have to have CONFIG_PNP, CONFIG_ACPI_BUS and CONFIG_PNPACPI enabled to run this driver (assuming that mainboards including a TPM do have the need for ACPI anyway). Signed-off-by: Marcel Selhorst Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30e835e36648b15fb80797ace0a0e2afcf97618d Author: Andrew Morton Date: Fri Aug 5 11:59:32 2005 -0700 [PATCH] REPORTING-BUGS: track regressions Add a new record to the REPORTING-BUGS template: "Most recent kernel version which did not have the bug:". So we can spot regressions more easily. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a866a5f4eab10080ca25785fcf53ad67cde28bed Merge: 107207aa8576963861e9f0c66b439d233f02a97d b7656e7f2944984befa3ab99a5b99f99a23b302b Author: Linus Torvalds Date: Fri Aug 5 07:49:30 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 107207aa8576963861e9f0c66b439d233f02a97d Merge: 403fe5ae57c831968c3dbbaba291ae825a1c5aaa 3873658be7b3896e88648664e480a44d12083ad8 Author: Linus Torvalds Date: Fri Aug 5 07:42:20 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 403fe5ae57c831968c3dbbaba291ae825a1c5aaa Author: Petr Vandrovec Date: Fri Aug 5 15:50:07 2005 +0200 [PATCH] rtc: msleep() cannot be used from interrupt Since the beginning of July my Opteron box was randomly crashing and being rebooted by hardware watchdog. Today it finally did it in front of me, and this patch will hopefully fix it. The problem is that at the end of June (the 28th, to be exact: commit 47f176fdaf8924bc83fddcf9658f2fd3ef60d573, "[PATCH] Using msleep() instead of HZ") rtc_get_rtc_time was converted to use msleep() instead of busy waiting. But rtc_get_rtc_time is used by hpet_rtc_interrupt, and scheduling is not allowed during interrupt. So I'm reverting this part of original change, replacing msleep() back with busy loop. The original code was busy waiting for up to 20ms, but on my hardware in the worst case update-in-progress bit was asserted for at most 363 passes through loop (on 2GHz dual Opteron), much less than even one jiffie, not even talking about 20ms. So I changed code to just wait only as long as necessary. Otherwise when RTC was set to generate 8192Hz timer, it stopped doing anything for 20ms (160 pulses were skipped!) from time to time, and this is rather suboptimal as far as I can tell. Signed-off-by: Petr Vandrovec Signed-off-by: Linus Torvalds commit b7656e7f2944984befa3ab99a5b99f99a23b302b Author: David S. Miller Date: Fri Aug 5 04:12:48 2005 -0700 [IPV4]: Fix memory leak during fib_info hash expansion. When we grow the tables, we forget to free the olds ones up. Noticed by Yan Zheng. Signed-off-by: David S. Miller commit 2f60f8d3573ff90fe5d75a6d11fd2add1248e7d6 Author: Simon Derr Date: Thu Aug 4 19:52:03 2005 -0700 [PATCH] __vm_enough_memory() signedness fix We have found what seems to be a small bug in __vm_enough_memory() when sysctl_overcommit_memory is set to OVERCOMMIT_NEVER. When this bug occurs the systems fails to boot, with /sbin/init whining about fork() returning ENOMEM. We hunted down the problem to this: The deferred update mecanism used in vm_acct_memory(), on a SMP system, allows the vm_committed_space counter to have a negative value. This should not be a problem since this counter is known to be inaccurate. But in __vm_enough_memory() this counter is compared to the `allowed' variable, which is an unsigned long. This comparison is broken since it will consider the negative values of vm_committed_space to be huge positive values, resulting in a memory allocation failure. Signed-off-by: Signed-off-by: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b68e9f857271189bd7a59b74c99890de9195b0e1 Author: Herbert Xu Date: Thu Aug 4 19:52:02 2005 -0700 [PATCH] tcp: fix TSO cwnd caching bug tcp_write_xmit caches the cwnd value indirectly in cwnd_quota. When tcp_transmit_skb reduces the cwnd because of tcp_enter_cwr, the cached value becomes invalid. This patch ensures that the cwnd value is always reread after each tcp_transmit_skb call. Signed-off-by: Herbert Xu Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 846998ae87a80b0fd45b4cf5cf001a159d746f27 Author: David S. Miller Date: Thu Aug 4 19:52:01 2005 -0700 [PATCH] tcp: fix TSO sizing bugs MSS changes can be lost since we preemptively initialize the tso_segs count for an SKB before we %100 commit to sending it out. So, by the time we send it out, the tso_size information can be stale due to PMTU events. This mucks up all of the logic in our send engine, and can even result in the BUG() triggering in tcp_tso_should_defer(). Another problem we have is that we're storing the tp->mss_cache, not the SACK block normalized MSS, as the tso_size. That's wrong too. Signed-off-by: David S. Miller Cc: Herbert Xu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c3dba1534569734ba353afdf3f11def497ff2ac Author: John McCutchan Date: Thu Aug 4 21:12:54 2005 -0400 [PATCH] Clean up inotify delete race fix This avoids the whole #ifdef mess by just getting a copy of dentry->d_inode before d_delete is called - that makes the codepaths the same for the INOTIFY/DNOTIFY cases as for the regular no-notify case. I've been running this under a Gnome session for the last 10 minutes. Inotify is being used extensively. Signed-off-by: John McCutchan Signed-off-by: Linus Torvalds commit f10eff26831159f52353e8f15c37cdb2935d5fbf Author: Olav Kongas Date: Thu Aug 4 18:06:47 2005 -0700 [PATCH] USB: Fix setup packet initialization in isp116x-hcd When recently addressing remarks by Alexey Dobriyan about the isp116x-hcd, I introduced a bug in the driver. Please apply the attached patch to fix it. Signed-off-by: Olav Kongas Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 7dedacf4270a810fadcca887ac85d267b5f1882d Author: David Brownell Date: Thu Aug 4 18:06:41 2005 -0700 [PATCH] USB: ehci: microframe handling fix This patch has a one line oops fix, plus related cleanups. - The bugfix uses microframe scheduling data given to the hardware to test "is this a periodic QH", rather than testing for nonzero period. (Prevents an oops by providing the correct answer.) - The cleanup going along with the patch should make it clearer what's going on whenever those bitfields are accessed. The bug came about when, around January, two new kinds of EHCI interrupt scheduling operation were added, involving both the high speed (24 KBytes per millisec) and low/full speed (1-64 bytes per millisec) microframe scheduling. A driver for the Edirol UA-1000 Audio Capture Unit ran into the oops; it used one of the newly supported high speed modes. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 003ba5153582427b1df2347553529299872961e5 Author: Pete Zaitcev Date: Thu Aug 4 18:06:36 2005 -0700 [PATCH] USB: ub documentation update The patch which went in was correct, but not quite what I had in mind. Here is a patch to update that a little bit. Original patch is at: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4749f32da939d4e4160541b2cadc22492bb507ec Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 43c34735524d5b1c9b9e5d63b49dd4c1b394bde4 Author: Dominik Brodowski Date: Thu Aug 4 18:06:21 2005 -0700 [PATCH] pci and yenta: pcibios_bus_to_resource In yenta_socket, we default to using the resource setting of the CardBus bridge. However, this is a PCI-bus-centric view of resources and thus needs to be converted to generic resources first. Therefore, add a call to pcibios_bus_to_resource() call in between. This function is a mere wrapper on x86 and friends, however on some others it already exists, is added in this patch (alpha, arm, ppc, ppc64) or still needs to be provided (parisc -- where is its pcibios_resource_to_bus() ?). Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit fec59a711eef002d4ef9eb8de09dd0a26986eb77 Author: John W. Linville Date: Thu Aug 4 18:06:10 2005 -0700 [PATCH] PCI: restore BAR values after D3hot->D0 for devices that need it Some PCI devices (e.g. 3c905B, 3c556B) lose all configuration (including BARs) when transitioning from D3hot->D0. This leaves such a device in an inaccessible state. The patch below causes the BARs to be restored when enabling such a device, so that its driver will be able to access it. The patch also adds pci_restore_bars as a new global symbol, and adds a correpsonding EXPORT_SYMBOL_GPL for that. Some firmware (e.g. Thinkpad T21) leaves devices in D3hot after a (re)boot. Most drivers call pci_enable_device very early, so devices left in D3hot that lose configuration during the D3hot->D0 transition will be inaccessible to their drivers. Drivers could be modified to account for this, but it would be difficult to know which drivers need modification. This is especially true since often many devices are covered by the same driver. It likely would be necessary to replicate code across dozens of drivers. The patch below should trigger only when transitioning from D3hot->D0 (or at boot), and only for devices that have the "no soft reset" bit cleared in the PM control register. I believe it is safe to include this patch as part of the PCI infrastructure. The cleanest implementation of pci_restore_bars was to call pci_update_resource. Unfortunately, that does not currently exist for the sparc64 architecture. The patch below includes a null implemenation of pci_update_resource for sparc64. Some have expressed interest in making general use of the the pci_restore_bars function, so that has been exported to GPL licensed modules. Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c306895167c8384b88bc02945a0d226a04218fa5 Author: Andrew Morton Date: Thu Aug 4 16:49:32 2005 -0700 [PATCH] revert "timer exit cleanup" Revert this June 17 patch: it broke persistence of timers across execve(). Cc: Roland McGrath Cc: george anzinger Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8ed11b9dc07df0134248542ca8e7d40751a6052 Author: Daniel Jacobowitz Date: Thu Aug 4 13:41:09 2005 -0700 [PATCH] x86_64: fix 32-bit thread debugging The IA32 ptrace emulation currently returns the wrong registers for fs/gs; it's returning what x86_64 calls gs_base. We need regs.gsindex in order for GDB to correctly locate the TLS area. Without this patch, the 32-bit GDB testsuite bombs on a 64-bit kernel. With it, results look about like I'd expect, although there are still a handful of kernel-related failures (vsyscall related?). Signed-off-by: Daniel Jacobowitz Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c91096d85c95c6b7fe8d7065e2aa6825e0bdaca9 Author: Venkatesh Pallipadi Date: Thu Aug 4 15:36:10 2005 -0700 [PATCH] remove special HPET_EMULATE_RTC config option We had a user whose apps weren't working correctly because his "rtc" wasn't working fully. For the sake of simplicity, it seems sensible to always enable HPET RTC emulation. Remove a special config option for HPET_EMULATE_RTC and make it directly depend on HPET_TIMER and RTC. This will avoid the hangs when EMULATE_RTC is not configured and when some userlevel script depends on RTC interrupt, as in: http://bugzilla.kernel.org/show_bug.cgi?id=4904 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5c96cab8f3c4ca9b2177dceb5de5a0edb31418e Merge: 30db1ae8640d3527ca7ac8df4bcbf14ccc6ae9cd 1c5ad84516ae7ea4ec868436a910a6bd8d20215a Author: Dave Kleikamp Date: Thu Aug 4 15:56:15 2005 -0500 Merge with /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp commit 1c5ad84516ae7ea4ec868436a910a6bd8d20215a Author: Hugh Dickins Date: Thu Aug 4 13:07:09 2005 -0700 [PATCH] fix VmSize and VmData after mremap mremap's move_vma is applying __vm_stat_account to the old vma which may have already been freed: move it to just before the do_munmap. mremapping to and fro with CONFIG_DEBUG_SLAB=y showed /proc//status VmSize and VmData wrapping just like in kernel bugzilla #4842, and fixed by this patch - worth including in 2.6.13, though not yet confirmed that it fixes that specific report from Frank van Maarseveen. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e234f35c54a30d040313e40833dcf623d14629b4 Author: John McCutchan Date: Thu Aug 4 13:07:08 2005 -0700 [PATCH] inotify delete race fix The included patch fixes a problem where a inotify client would receive a delete event before the file was actually deleted. The bug affects both dnotify & inotify. Signed-off-by: John McCutchan Signed-off-by: Robert Love Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3de11748c1b312833e8a148ab7ec47669ecc99dc Author: Robert Love Date: Thu Aug 4 13:07:08 2005 -0700 [PATCH] inotify: update help text The inotify help text still refers to the character device. Update it. Fixes kernel bug #4993. Signed-off-by: Robert Love Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94efe72f762e2c147d8146d637d5ece5614c8d94 Author: David Howells Date: Thu Aug 4 13:07:07 2005 -0700 [PATCH] Destruction of failed keyring oopses The attached patch makes sure that a keyring that failed to instantiate properly is destroyed without oopsing [CAN-2005-2099]. The problem occurs in three stages: (1) The key allocator initialises the type-specific data to all zeroes. In the case of a keyring, this will become a link in the keyring name list when the keyring is instantiated. (2) If a user (any user) attempts to add a keyring with anything other than an empty payload, the keyring instantiation function will fail with an error and won't add the keyring to the name list. (3) The keyring's destructor then sees that the keyring has a description (name) and tries to remove the keyring from the name list, which oopses because the link pointers are both zero. This bug permits any user to take down a box trivially. Signed-Off-By: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bcf945d36fa0598f41ac4ad46a9dc43135460263 Author: David Howells Date: Thu Aug 4 13:07:06 2005 -0700 [PATCH] Error during attempt to join key management session can leave semaphore pinned The attached patch prevents an error during the key session joining operation from hanging future joins in the D state [CAN-2005-2098]. The problem is that the error handling path for the KEYCTL_JOIN_SESSION_KEYRING operation has one error path that doesn't release the session management semaphore. Further attempts to get the semaphore will then sleep for ever in the D state. This can happen in four situations, all involving an attempt to allocate a new session keyring: (1) ENOMEM. (2) The users key quota being reached. (3) A keyring name that is an empty string. (4) A keyring name that is too long. Any user may attempt this operation, and so any user can cause the problem to occur. Signed-Off-By: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fb0caa42308923d9e4ed7b36ec077b97c107e24 Merge: 7cfa132cd06639c8ac5fe9ef776a7650f1d8c3e6 fdd0edf2aca72e374d10e7a0957a006f18bffaf4 Author: Linus Torvalds Date: Thu Aug 4 13:08:29 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6 commit 7cfa132cd06639c8ac5fe9ef776a7650f1d8c3e6 Merge: 6d22d85a852b72398a81b8e476977b28b4400f7c c80f90ba15ed56ae36d1fb51f81a88f9ba0d8c8b Author: Linus Torvalds Date: Thu Aug 4 13:02:31 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 6d22d85a852b72398a81b8e476977b28b4400f7c Author: Paul Mackerras Date: Thu Aug 4 12:53:37 2005 -0700 [PATCH] ppc64: fix for kexec boot issue The kexec boot is not successful on some power machines since all CPUs are getting removed from global interrupt queue (GIQ) before kexec boot. Some systems always expect at least one CPU in GIQ. Hence, this patch will make sure that only secondary CPUs are removed from GIQ. Signed-off-by: Haren Myneni Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48f1f5328267f52a34e61b8b0e6fc55a23c1348a Author: Alasdair G Kergon Date: Thu Aug 4 12:53:37 2005 -0700 [PATCH] dm-raid locking fix This code was never designed to handle more than one instance of do_work() running at once. Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d27a4dddd96f4ee898f8d1d597d38f8f4079bbb0 Author: Jim Keniston Date: Thu Aug 4 12:53:35 2005 -0700 [PATCH] Add Documentation/kprobes.txt Acked-by: Prasanna S Panchamukhi Signed-off-by: Jim Keniston Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b8b3e8a8b3e62b4209eaa36697e3c9df457e196 Author: NeilBrown Date: Thu Aug 4 12:53:35 2005 -0700 [PATCH] md: make sure md bitmap updates are flushed when array is stopped. The recent change to never ignore the bitmap, revealed that the bitmap isn't begin flushed properly when an array is stopped. We call bitmap_daemon_work three times as there is a three-stage pipeline for flushing updates to the bitmap file. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3b9703e27aab3839dcdb76b00d98428b67d25b0 Author: NeilBrown Date: Thu Aug 4 12:53:34 2005 -0700 [PATCH] md: yet another attempt to get bitmap-based resync to do the right thing in all cases... Firstly, R1BIO_Degraded was being set in a number of places in the resync code, but is never used there, so get rid of those settings. Then: When doing a resync, we want to clear the bit in the bitmap iff the array will be non-degraded when the sync has completed. However the current code would clear the bitmap if the array was non-degraded when the resync *started*, which obviously isn't right (it is for 'resync' but not for 'recovery' - i.e. rebuilding a failed drive). This patch calculated 'still_degraded' and uses the to tell bitmap_start_sync whether this sync should clear the corresponding bit. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 193f1c931517592ec4188d15bf261e4bff368207 Author: NeilBrown Date: Thu Aug 4 12:53:33 2005 -0700 [PATCH] md: always honour md bitmap being read from disk The code currently will ignore the bitmap if the array seem to be in-sync. This is wrong if the array is degraded, and probably wrong anyway. If the bitmap says some chunks are not in in-sync, and the superblock says everything IS in sync, then something is clearly wrong, and it is safer to trust the bitmap. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa1595e9f3d0d731bcfc6c2680d5483b78f663dc Author: NeilBrown Date: Thu Aug 4 12:53:32 2005 -0700 [PATCH] md: make 'md' and alias for 'md-mod' Until the bitmap code was added, modprobe md would load the md module. But now the md module is called 'md-mod', so we really need an alias for backwards comparability. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit efd8be2a4280f334be9309fa4ca1fb8f4e29475d Author: NeilBrown Date: Thu Aug 4 12:53:32 2005 -0700 [PATCH] md: remove a stray debugging printk. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4dcef52400fa6b9eb2de589300ae0151a1c65b3b Author: Mauro Carvalho Chehab Date: Thu Aug 4 12:53:30 2005 -0700 [PATCH] v4l: oopsfix for BTTV on badly behaved PCI chipsets no_overlay bttv parameter implemented to fix OOPS on some PCI chipsets (like some VIA) with these behaviors: 1) If pci_quicks does identify the chip as having troubles to handle PCI2PCI transfers, no_overlay defaults to 1. The user may force it to 0, to reenable (not recommended). 2) For newer chipsets not blacklisted, no_overlay=1 is provided as a workaround until PCI chipset included on /drivers/pci/quirks.c Thanks to Bodo Eggert <7eggert@gmx.de> Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75eedfed3e2d05563f44d2f69efb991fad95d7f1 Author: Olof Johansson Date: Thu Aug 4 12:53:29 2005 -0700 [PATCH] ppc64: Fix UP kernel build CONFIG_KEXEC breaks UP builds because of a misspelled smp_release_cpus(). Also, the function isn't defined unless built with CONFIG_SMP but it is needed if we are to go from a UP to SMP kernel. Enable it and document it. Thanks to Steven Winiecki for reporting this and to Milton for remembering how it's supposed to work and why. Signed-off-by: Olof Johansson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 556e58febf90c8cb1da25669d0892bf5fd2ddac2 Author: Ravikiran G Thirumalai Date: Thu Aug 4 12:53:26 2005 -0700 [PATCH] ide: fix kmalloc_node breakage in ide driver Patch fixes oops caused by ide interfaces not on pci. pcibus_to_node causes the kernel to crash otherwise. Patch also adds a BUG_ON to check if hwif is NULL. Signed-off-by: Christoph Lameter Signed-off-by: Shai Fultheim Signed-off-by: Ravikiran Thirumalai Cc: Andi Kleen Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c80f90ba15ed56ae36d1fb51f81a88f9ba0d8c8b Author: Michael Gernoth Date: Thu Aug 4 20:43:40 2005 +0100 [PATCH] ARM: 2844/1: Add maintainer for Jornada 720 Patch from Michael Gernoth As discussed on the handhelds.org Jornada mailinglist, I take over maintainership of the currently unmaintained Jornada 720-port in the mainline kernel. Signed-off-by: Michael Gernoth Signed-off-by: Russell King commit fdd0edf2aca72e374d10e7a0957a006f18bffaf4 Author: James Bottomley Date: Thu Aug 4 13:28:40 2005 -0500 [SCSI] fix aic7xxx performance issues since 2.6.12-rc2 Several people noticed we dropped quite a bit on benchmark figures. OK, it was my fault but unfortunately I discovered I ran out of brown paper bags a while ago and forgot to reorder them. The issue is that a construct introduced in the conversion of the driver to use the transport class keyed off whether the block request was tagged or not. However, the aic7xxx driver doesn't properly set up the block layer TCQ (it uses the wrong API), so the driver now things all requests are untagged and we keep it to a queue depth of a single element. Oops. The fix is to use the correct TCQ API. Signed-off-by: James Bottomley commit fd6f31c31825f62eb91f491e8316129e5ce81fc6 Merge: 9d343219e33e8b49d754ea9b2e45f6c7da87f4fb 8edc81cc0b80b3ec8645711e1110a84235c7030d Author: Linus Torvalds Date: Thu Aug 4 10:36:25 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus commit 9d343219e33e8b49d754ea9b2e45f6c7da87f4fb Merge: ea48e705be4f886c16313c882a6623b442bab0eb ff2afb9df607dfcaacdaf67ea84b773c6fb08f4c Author: Linus Torvalds Date: Thu Aug 4 09:30:50 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit ea48e705be4f886c16313c882a6623b442bab0eb Merge: 6e346228c76506e07e297744a28464022c6806ad 0dca0f7bf82face7b700890318d5550fd542cabf Author: Linus Torvalds Date: Thu Aug 4 09:20:23 2005 -0700 Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband commit 6e346228c76506e07e297744a28464022c6806ad Author: Linus Torvalds Date: Thu Aug 4 08:33:38 2005 -0700 It wasn't just x86-64 that had hardcoded VM_FAULT_xxx numbers Fix up arm26, cris, frv, m68k, parisc and sh64 too.. commit 968002166cce2ef4ead8c9441a9dd5b945c9ed1e Author: Alexander Nyberg Date: Thu Aug 4 16:14:57 2005 +0200 [PATCH] x86-64: use proper VM_FAULT_xxx macros x86_64 had hardcoded the VM_ numbers so it broke down when the numbers were changed. Signed-off-by: Alexander Nyberg Signed-off-by: Linus Torvalds commit 1260f801b4e4ba7be200886b4a53d730de05ca19 Author: David Howells Date: Thu Aug 4 11:50:01 2005 +0100 [PATCH] Keys: Fix key management syscall interface bugs This fixes five bugs in the key management syscall interface: (1) add_key() returns 0 rather than EINVAL if the key type is "". Checking the key type isn't "" should be left to lookup_user_key(). (2) request_key() returns ENOKEY rather than EPERM if the key type begins with a ".". lookup_user_key() can't do this because internal key types begin with a ".". (3) Key revocation always returns 0, even if it fails. (4) Key read can return EAGAIN rather than EACCES under some circumstances. A key is permitted to by read by a process if it doesn't grant read access, but it does grant search access and it is in the process's keyrings. That search returns EAGAIN if it fails, and this needs translating to EACCES. (5) request_key() never adds the new key to the destination keyring if one is supplied. The wrong macro was being used to test for an error condition: PTR_ERR() will always return true, whether or not there's an error; this should've been IS_ERR(). Signed-Off-By: David Howells Signed-Off-By: Linus Torvalds commit c36f19e02a96488f550fdb678c92500afca3109b Author: Benjamin Herrenschmidt Date: Thu Aug 4 11:36:26 2005 +0200 [PATCH] Remove suspend() calls from shutdown path This removes the calls to device_suspend() from the shutdown path that were added sometime during 2.6.13-rc*. They aren't working properly on a number of configs (I got reports from both ppc powerbook users and x86 users) causing the system to not shutdown anymore. I think it isn't the right approach at the moment anyway. We have already a shutdown() callback for the drivers that actually care about shutdown and the suspend() code isn't yet in a good enough shape to be so much generalized. Also, the semantics of suspend and shutdown are slightly different on a number of setups and the way this was patched in provides little way for drivers to cleanly differenciate. It should have been at least a different message. For 2.6.13, I think we should revert to 2.6.12 behaviour and have a working suspend back. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit c013622d5fe0ffeb0c74b2af4c2b1aad6164f709 Author: Richard Purdie Date: Thu Aug 4 15:06:59 2005 +0100 [PATCH] ARM: 2838/1: Fix arm oprofile backtrace warning Patch from Richard Purdie Fix a typo causing a warning in the arm oprofile backtrace code. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 3873658be7b3896e88648664e480a44d12083ad8 Author: Christoph Hellwig Date: Thu Aug 4 07:05:37 2005 -0700 [SPARC]: Fix up sleep_on() removal in vfc driver. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit ff2afb9df607dfcaacdaf67ea84b773c6fb08f4c Author: Russell King Date: Thu Aug 4 14:17:33 2005 +0100 [PATCH] ARM: Fix ARM fault handler for get_user_pages() fixes. The ARM fault handler is optimised to make the fast path, err, fast. The renumbering of the VM_FAULT_* codes broke this because numbers were used instead of the definitions. Fix this. Signed-off-by: Russell King commit 8edc81cc0b80b3ec8645711e1110a84235c7030d Merge: 11e981f1e02c2a36465cbb208b21cb8b6480f399 62778ba1aa2589dc78c36a32edc6f5a6ccaf50c6 Author: Len Brown Date: Wed Aug 3 23:53:50 2005 -0400 Merge ../to-linus-stable commit 62778ba1aa2589dc78c36a32edc6f5a6ccaf50c6 Merge: 8066eff0a1a0703ad901dbe5646a47dbfc089ef2 d4ab025b73a2d10548e17765eb76f3b7351dc611 Author: Len Brown Date: Wed Aug 3 23:53:35 2005 -0400 /home/lenb/src/to-linus-stable branch 'acpi-2.6.12' commit 11e981f1e02c2a36465cbb208b21cb8b6480f399 Author: David Shaohua Li Date: Wed Aug 3 23:46:33 2005 -0400 [ACPI] S3 resume: avoid kmalloc() might_sleep oops symptom ACPI now uses kmalloc(...,GPF_ATOMIC) during suspend/resume. http://bugzilla.kernel.org/show_bug.cgi?id=3469 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit d4ab025b73a2d10548e17765eb76f3b7351dc611 Author: Len Brown Date: Wed Aug 3 23:20:58 2005 -0400 [ACPI] delete Warning: Encountered executable code at module level, [AE_NOT_CONFIGURED] http://bugzilla.kernel.org/show_bug.cgi?id=4923 Signed-off-by: Len Brown commit d95a1b4818f2fe38a3cfc9a7d5817dc9a1a69329 Merge: 194d0710e1a7fe92dcf860ddd31fded8c3103b7a 8066eff0a1a0703ad901dbe5646a47dbfc089ef2 Author: Linus Torvalds Date: Wed Aug 3 16:50:19 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus commit 8066eff0a1a0703ad901dbe5646a47dbfc089ef2 Merge: 9a351e30d72d409ec62c83f380e330e0baa584b4 79cda7d0e1c8629996242c036d6fe0466038d8ba Author: Len Brown Date: Wed Aug 3 18:15:15 2005 -0400 /home/lenb/src/to-linus branch 'acpi-2.6.12' commit 79cda7d0e1c8629996242c036d6fe0466038d8ba Author: Luming Yu Date: Wed Aug 3 18:07:59 2005 -0400 [ACPI] CONFIG_ACPI_HOTKEY is now "n" by default For 2.6.12 behaviour, this (EXPERIMENTAL) driver should not be built. Update the driver source with latest from Luming. Signed-off-by: Luming Yu Signed-off-by: Len Brown commit b34a8030eeab4d59dcdd86de38f6927b9edd441f Author: Alexey Starikovskiy Date: Wed Aug 3 17:55:21 2005 -0400 [ACPI] restore /proc/acpi/button/ (ala 2.6.12) Signed-off-by Alexey Starikovskiy Signed-off-by Len Brown commit 7b15f5e7bb180ac7bfb8926dbbd8835fecc07fad Author: Luming Yu Date: Wed Aug 3 17:38:04 2005 -0400 [ACPI] revert Embedded Controller to polling-mode by default (ala 2.6.12) Burst mode isn't ready for prime time, but can be enabled for test via "ec_burst=1" Signed-off-by: Luming Yu Signed-off-by: Len Brown commit 194d0710e1a7fe92dcf860ddd31fded8c3103b7a Merge: a68d2ebc1581a3aec57bd032651e013fa609f530 9bbd03758945858c9303f3258b418b94c4ffd735 Author: Linus Torvalds Date: Wed Aug 3 13:09:43 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 9bbd03758945858c9303f3258b418b94c4ffd735 Author: Ian Campbell Date: Wed Aug 3 20:34:52 2005 +0100 [PATCH] ARM: 2833/2: Remove support for WDIOF_MAGICCLOSE from sa1100-wdt Patch from Ian Campbell On PXA255 there is no way to disable the watchdog. Turning off OIER[E3] as suggested in the existing comment does not work. I posted a note to the ARM mailing list a little while ago asking for opinions from people using SA1100. There was one reponse from Nico who believes that the SA1100 is the same as the PXA255 in this respect. You also asked me to involve the watchdog maintainer which I tried to do but didn't hear anything back. There are only a couple of other drivers which can't stop the watchdog and there seems to be no consistancy regarding printing an error etc. I decided to print something since that matches the case for all the other drivers when NOWAYOUT is turned on. Also, I changed the device .name to "watchdog" like most of the other watchdogs. udev uses it as the device name (by default) and spaces etc. get in the way. Superceded 2833/1 because 2.6.13-rc4 caused rejects. Signed-off-by: Ian Campbell Signed-off-by: Russell King commit 8c741ed74d121dbc97c9fb7f9a66c768d4c547c4 Author: Deepak Saxena Date: Wed Aug 3 19:58:21 2005 +0100 [PATCH] ARM: 2835/1: Add UPF_SKIP_TEST to IXP4xx serial ports Patch from Deepak Saxena This allows the serial driver autconf to work properly on all the IXP serial ports. W/o it we basically put the serial port in an unrecoverable state and lose console. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 7b1fbf292bb4c855ddae8add8c459e94684f7543 Author: Catalin Marinas Date: Wed Aug 3 19:53:25 2005 +0100 [PATCH] ARM: 2841/1: Fix VFP +/-0 case for doubles addition Patch from Catalin Marinas The IEEE 754 standard specifies that the result of (x - x), where x is a valid number, should be -0 if the rounding mode is towards minus infinity or +0 otherwise. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 858297509590ef4aa5690e30c2f5505077b4f369 Author: Michael Burian Date: Wed Aug 3 19:49:18 2005 +0100 [PATCH] ARM: 2840/1: Add mach-types to Documentation/dontdiff Patch from Michael Burian This file is maintained by RMK's machine registry, it should not be patched. Signed-off-by: Michael Burian Signed-off-by: Russell King commit 975ad141eecccb24fc8db1e0f4a08f5580f4a9a9 Author: Deepak Saxena Date: Wed Aug 3 19:49:17 2005 +0100 [PATCH] ARM: 2839/1: Remove XScale cache and TLB locking code Patch from Deepak Saxena The XScale locking code is not something that has been validated on 2.6 and needs to be replaced with a more generic API to use with other ARMs that support locking features. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit f148af2593ef76ac705d1cc6abe48f455c9912cc Author: Richard Purdie Date: Wed Aug 3 19:49:17 2005 +0100 [PATCH] ARM: 2837/2: Re: ARM: Make NWFPE preempt safe Patch from Richard Purdie NWFPE used global variables which meant it wasn't safe for use with preemptive kernels. This patch removes them and communicates the information between functions in a preempt safe manner. Generation of some exceptions was broken and this has also been corrected. Tests with glibc's maths test suite show no change in the results before/after this patch. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 1fcf844861eb08ee05e05dba13b5436f2f2e29ed Author: Ben Dooks Date: Wed Aug 3 19:49:16 2005 +0100 [PATCH] ARM: 2832/1: BAST - limit clock-rate for IIC bus Patch from Ben Dooks The default clock rate does not specify a maximum, so the default of 400KHz is used. This rate is too fast for the PMU on the EB2410ITX, so we now specify platform data with a rate of around 100KHz. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a68d2ebc1581a3aec57bd032651e013fa609f530 Author: Linus Torvalds Date: Wed Aug 3 10:07:09 2005 -0700 Fix up recent get_user_pages() handling The VM_FAULT_WRITE thing is an extra bit, not a valid return value, and has to be treated as such by get_user_pages(). Signed-off-by: Linus Torvalds commit f33ea7f404e592e4563b12101b7a4d17da6558d7 Author: Nick Piggin Date: Wed Aug 3 20:24:01 2005 +1000 [PATCH] fix get_user_pages bug Checking pte_dirty instead of pte_write in __follow_page is problematic for s390, and for copy_one_pte which leaves dirty when clearing write. So revert __follow_page to check pte_write as before, and make do_wp_page pass back a special extra VM_FAULT_WRITE bit to say it has done its full job: once get_user_pages receives this value, it no longer requires pte_write in __follow_page. But most callers of handle_mm_fault, in the various architectures, have switch statements which do not expect this new case. To avoid changing them all in a hurry, make an inline wrapper function (using the old name) that masks off the new bit, and use the extended interface with double underscores. Yes, we do have a call to do_wp_page from do_swap_page, but no need to change that: in rare case it's needed, another do_wp_page will follow. Signed-off-by: Hugh Dickins [ Cleanups by Nick Piggin ] Signed-off-by: Linus Torvalds commit ecc21ebe603af31f172c43b8b261df79040790ef Author: David Shaohua Li Date: Wed Aug 3 11:00:11 2005 -0400 [ACPI] PCI interrupt link suspend/resume - revert to 2.6.12 behaviour This patch disables the PCI Interrupt Link refernece counts, which should not co-exist with the 2.6.12 irq_router.resume method or else a double acpi_pci_link_set() could result on resume. Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit 5cb4cc0d8211c490537c8568001958fc76741312 Author: Haren Myneni Date: Wed Aug 3 15:08:18 2005 +1000 [PATCH] Xmon bug fix for soft-reset For soft reset during system hang, got an error "CPU did not take control" for some CPUs even though they responded to soft-reset (called SystemReset, die and called debugger - xmon). First these CPUs entered into xmon by IPI callback and then got a soft-reset exception and re-entered into xmon again. The first CPU which re-entered into xmon got the output lock and made into xmon successfully without unlocking. Hence, the next CPU(s) which re-entered into xmon try to acquire a lock (get_output_lock). Therefore, we can not view state of those CPU(s). [This is a simple, very low risk, obvious fix for an obvious bug, and should go into 2.6.13. -- paulus] Signed-off-by: Haren Myneni Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 3d35600a9de8e2816d0e3726f64b7271af6fdda4 Author: Len Brown Date: Wed Aug 3 00:22:52 2005 -0400 [ACPI] fix 64-bit build warning in processor_idle.c Signed-off-by: Len Brown commit 0b2bfb4e7ff61f286676867c3508569bea6fbf7a Author: Ivan Kokshaysky Date: Wed Aug 3 03:09:03 2005 +0400 [PATCH] ACPI: increase PCIBIOS_MIN_IO on x86 We have increased PCIBIOS_MIN_IO to 0x4000, but still want motherboard resources to be allocated properly. So we need to state 0x1000 (according to the comment) limit explicitely. Signed-off-by: Ivan Kokshaysky Signed-off-by: Linus Torvalds commit 71db63acff69618b3d9d3114bd061938150e146b Author: Ivan Kokshaysky Date: Wed Aug 3 02:59:47 2005 +0400 [PATCH] increase PCIBIOS_MIN_IO on x86 There is a number of x86 laptops that have some non-PCI IO ports in the 0x1000-0x1fff range, and it's quite hard to control the correct order of resource allocation between PCI and other subsystems controlling these ports. Especially with modular kernel. So just increase PCIBIOS_MIN_IO to 0x4000 to prevent any new PCI resource allocations in the problematic range (this limitation must apply _only_ to the root bus resources - see Linus' change in pci_bus_alloc_resource). As PCIBIOS_MIN_IO and PCIBIOS_MIN_CARDBUS_IO are the same now on i386 and x86-64, we can remove the latter. Signed-off-by: Ivan Kokshaysky Signed-off-by: Linus Torvalds commit 688d191821de7893043f5a37970472627aaffa4e Author: Linus Torvalds Date: Tue Aug 2 14:55:40 2005 -0700 pci: make bus resource start address override minimum IO address The reason we have PCIBIOS_MIN_IO and PCIBIOS_MIN_CARDBUS_IO is because we want to protect badly documented motherboard PCI resources and thus don't want to allocate new resources in low IO/MEM space. However, if we have already discovered a PCI bridge with a specified resource base, that should override that decision. This change will allow us to move the "careful" region upwards without resulting in problems allocating resources in low mappings. This was brought on by us having allocated a bus resource at 0x1000, conflicting with a undocumented VAIO Sony PI resources. commit d7ed538a02c219119adb20f1dccbf0f8015e53f3 Author: Jens Axboe Date: Tue Aug 2 20:08:02 2005 +0200 [PATCH] cfq-iosched: fix problem with barriers and max_depth == 1 CFQ will currently stall when using write barriers and the default max_depth setting of 1, since we artificially need a depth of 2 when pre-pending the first flush. So never deny the barrier request going to the device. This is a regression since 2.6.12, it was found in SUSE testing. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 84e66ee7ec7aaa789945403b7cbde7a0b08c15ef Author: James Bottomley Date: Tue Aug 2 09:32:17 2005 -0500 [SCSI] aic7xxx: final fixes for DT handling The aic7xxx can support Data Group transfers at periods > 12.5, so eliminate that restriction. Additionally wide is a requirement for DT so ensure wide is set if users request DT. Signed-off-by: James Bottomley commit f7c80c9f77b0e8a59a19506fd3caf323408a5166 Author: Olaf Hering Date: Tue Jul 19 20:04:24 2005 +0200 [PATCH] aic byteorder fixes after recent cleanup Rebuild the aic7xxx firmware doesn't work anymore after this change which appeared int 2.6.13-rc1: [SCSI] aic7xxx/aic79xx: remove useless byte order macro cruft Two files did not include byteorder.h, resulting in aic dying with a panic "Unknown opcode encountered in seq program" This fixes it for me. Signed-off-by: Olaf Hering Acked-by: Christoph Hellwig Signed-off-by: Linus Torvalds commit f7d1d23c301e0ce82c801f3b5800be6341752a1f Author: Paul Mackerras Date: Tue Aug 2 21:51:36 2005 +1000 [PATCH] Obvious bugfix for yenta resource allocation Recent changes (well, dating from 12 July) have broken cardbus on my powerbook: I get 3 messages saying "no resource of type xxx available, trying to continue", and if I plug in my wireless card, it complains that there are no resources allocated to the card. This all worked in 2.6.12. Looking at the code in yenta_socket.c, function yenta_allocate_res, it's obvious what is wrong: if we get to line 639 (i.e. there wasn't a usable preassigned resource), we will always flow through to line 668, which is the printk that I was seeing, even if a resource was successfully allocated. It looks to me as though there should be a return statement after the two config_writel's in each of the 3 branches of the if statements, so that the function returns after successfully setting up the resource. The patch below adds these return statements, and with this patch, cardbus works on my powerbook once again. Signed-off-by: Paul Mackerras Acked-by: Dominik Brodowski Signed-off-by: Linus Torvalds commit c2c96f46f46df072e49200a1181b3086cd2f08a6 Author: Kai Makisara Date: Tue Aug 2 12:21:51 2005 +0300 [SCSI] Fix SCSI tape oops at module removal Removing the SCSI tape module results in an oops in class_device_destroy if any devices are present. The patch at the end of this message fixes the bug by moving class_destroy() later in exit_st() so that the class still exists when devices are removed. (The bug is old but class_simple_device_remove() did nothing when the class did not exist.) The patch also fixes a "class leak" in init_st() error path. I would like to get this into 2.6.13 but it may be too late? Signed-off-by: Kai Makisara Signed-off-by: James Bottomley commit c1a15468d58e75debc5437b2e4e12d02a89bb3a2 Author: Jack Hammer Date: Tue Jul 26 10:20:33 2005 -0400 [SCSI] ServeRAID V7.12.02 I am resubmitting the 2.6 kernel patch for the Version 7.12.02 ips driver. I have eliminated a couple of inappropriate changes pointed out by Arjan. Signed-off-by: Jack Hammer Signed-off-by: James Bottomley commit 9a351e30d72d409ec62c83f380e330e0baa584b4 Author: Linus Torvalds Date: Mon Aug 1 21:45:48 2005 -0700 Linux v2.6.13-rc5 Ok, let's get it right this time commit 96cd5b0856a25e2ec366702e1923070ffca53dae Author: Mike Kravetz Date: Mon Aug 1 21:11:48 2005 -0700 [PATCH] ppc64: POWER 4 fails to boot with NUMA If CONFIG_NUMA is set, some POWER 4 systems will fail to boot. This is because of special processing needed to handle invalid node IDs (0xffff) on POWER 4. My previous patch to handle memory 'holes' within nodes forgot to add this special case for POWER 4 in one place. In reality, I'm not sure that configuring the kernel for NUMA on POWER 4 makes much sense. Are there POWER 4 based systems with NUMA characteristics that are presented by the firmware? But, distros want one kernel for all systems so NUMA is on by default in their kernels. The patch handles those cases. Signed-off-by: Mike Kravetz Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 842bbaaa7394820c8f1fe0629cd15478653caf86 Author: Rusty Russell Date: Mon Aug 1 21:11:47 2005 -0700 [PATCH] Module per-cpu alignment cannot always be met The module code assumes noone will ever ask for a per-cpu area more than SMP_CACHE_BYTES aligned. However, as these cases show, gcc asks sometimes asks for 32-byte alignment for the per-cpu section on a module, and if CONFIG_X86_L1_CACHE_SHIFT is 4, we hit that BUG_ON(). This is obviously an unusual combination, as there have been few reports, but better to warn than die. See: http://www.ussg.iu.edu/hypermail/linux/kernel/0409.0/0768.html And more recently: http://bugs.gentoo.org/show_bug.cgi?id=97006 Signed-off-by: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 561fb765b97f287211a2c73a844c5edb12f44f1d Author: Anton Blanchard Date: Mon Aug 1 21:11:46 2005 -0700 [PATCH] ppc64: topology API fix Dont include asm-generic/topology.h unconditionally, we end up overriding all the ppc64 specific functions when NUMA is on. Signed-off-by: Anton Blanchard Acked-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ade43fbbcc3c12f0ddba112351d14d6c82ae476 Author: Andrew Morton Date: Mon Aug 1 21:11:45 2005 -0700 [PATCH] shm: CONFIG_SHMEM=n build fix Fix bug found by Grant Coady 's autobuild setup. shmem_set_policy() and shmem_get_policy() are macros if !CONFIG_SHMEM, so this doesn't work. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39bbb07d7c0cf3e374831d1474e2246d9cabd931 Author: Andrew Morton Date: Mon Aug 1 21:11:44 2005 -0700 [PATCH] transmeta: CONFIG_PROC_FS=n build fix Fix bug found by Grant Coady 's autobuild setup. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba17101b41977f124948e0a7797fdcbb59e19f3e Author: Eric Dumazet Date: Mon Aug 1 21:11:43 2005 -0700 [PATCH] sys_set_mempolicy() doesnt check if mode < 0 A kernel BUG() is triggered by a call to set_mempolicy() with a negative first argument. This is because the mode is declared as an int, and the validity check doesnt check < 0 values. Alternatively, mode could be declared as unsigned int or unsigned long. Signed-off-by: Eric Dumazet Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 690dbe1ced143876d8fa56b72310738dbe079d0a Author: Hugh Dickins Date: Mon Aug 1 21:11:42 2005 -0700 [PATCH] x86_64: access of some bad address x86_64 has a large sparse gate area between VSYSCALL_START and VSYSCALL_END, not all of it presently backed by pmds. Alexander Nyberg has found that in some circumstances gdb may try to ptrace here, and hit get_user_pages BUG_ON. It seems odd that gdb should be accessing here, but it certainly shouldn't crash in this way: relax BUG_ON to -EFAULT. Fixes kernel bugzilla #4801. Signed-off-by: Hugh Dickins Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74f9c9c258249fba3e2e78f70691528426a6c010 Author: Roman Zippel Date: Mon Aug 1 21:11:41 2005 -0700 [PATCH] hfs: don't reference missing page If there was a read error, the bnode might miss some pages, so skip them. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f76d28d235cf777dd2e1c1d48c16ee10c1d1587f Author: Roman Zippel Date: Mon Aug 1 21:11:40 2005 -0700 [PATCH] hfs: don't dirty unchanged inode If inode size hasn't changed, don't do anything further in truncate, which also prevents a dirty inode, what might upset some readonly devices quite badly. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0072b1389c25355ccc01048114adb9652c13fd9f Author: Adrian Bunk Date: Mon Aug 1 21:11:39 2005 -0700 [PATCH] include/linux/dcookies.h: dummy functions must be "static inline" We don't want these to be global functions. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 001abc93bf83f95737cd455b6ec875e6412f7d53 Author: Mauro Carvalho Chehab Date: Mon Aug 1 21:11:38 2005 -0700 [PATCH] v4l: bug fix to correct tea5767 autodetection This patch does correct radio chip autodetection to avoid misdetecting mt20xx microtune as tea5767 chip. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43f2f3d343f9d00a94a9242547a59d9dfb2338c4 Author: Mark Haverkamp Date: Mon Aug 1 21:11:37 2005 -0700 [PATCH] aacraid: Fix for controller load based timeouts Martin Drab found that he could get aacraid timeouts with high load on his controller / disk drive combinations. After some experimentation Mark Salyzyn has come up with a patch to reduce the default max_sectors to something that will keep the controller from being overloaded and will eliminate the timeout issues. Signed-off-by: Mark Haverkamp Cc: James Bottomley Acked-by: Mark Salyzyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2757a71c3122c7653e3dd8077ad6ca71efb1d450 Author: Hirokazu Takata Date: Mon Aug 1 21:11:35 2005 -0700 [PATCH] m32r: Fix local-timer event handling There was a scheduling problem of the m32r SMP kernel; A process rarely stopped and gave no responding but the other process have been handled by the other CPU still lives, then if we did something in the other terminal or something like that, the stopped process came back to life and continued its operation... (ex. LMbench: lat_sig) In the m32r SMP kernel, a local-timer event is delivered by using an IPI(inter processor interrupts); LOCAL_TIMER_IPI. And a function smp_send_timer() is prepared to send the LOCAL_TIMER_IPI from the current CPU to the other CPUs. The funtion smp_send_timer() was placed and used in do_IRQ() in former times (before 2.6.10-rc3-mm1 kernel), however, it was unintentionally removed when arch/m32r/kernel/irq.c was modified to employ the generic hardirq framework (CONFIG_GENERIC_HARDIRQ) in my previous patch. [PATCH 2.6.10-rc3-mm1] m32r: Use generic hardirq framework http://www.ussg.iu.edu/hypermail/linux/kernel/0412.2/0358.html The following patch fixes the above problem. Signed-off-by: Hitoshi Yamamoto Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2013485a52fb7ece48e5688b443cc098f4dbbdf Author: Martin Schwidefsky Date: Mon Aug 1 21:11:34 2005 -0700 [PATCH] s390: ioprio & inotify system calls. Add system calls for io priorities and inotify. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d3f229fcd4409d3e182b204defc122eb7833535 Author: Heiko Carstens Date: Mon Aug 1 21:11:33 2005 -0700 [PATCH] s390: kexec fixes and improvements. Disable pseudo page fault handling before starting the new kernel and try to use diag308 to reset the machine. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4374ae10e5ef577d8fd73fdadcdb37149d8b3953 Author: Eugene Surovegin Date: Sun Jul 31 22:34:54 2005 -0700 [PATCH] ppc32: add missing 4xx EMAC sysfs nodes Add missing 4xx EMAC data sysfs nodes. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61d44c777a02245a5032a2ca77a12f915416572d Author: Matt Porter Date: Sun Jul 31 22:34:53 2005 -0700 [PATCH] ppc32: add bamboo defconfig Add Bamboo platform defconfig Signed-off-by: Wade Farnsworth Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 497799d368b2106c3266a20d75ff221eed068cad Author: Matt Porter Date: Sun Jul 31 22:34:53 2005 -0700 [PATCH] ppc32: add bamboo platform Add Bamboo platform support. This is an AMCC 440EP-based reference platform. Signed-off-by: Wade Farnsworth Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9cf73aee140baa425429902aaed2c758401343f Author: Matt Porter Date: Sun Jul 31 22:34:52 2005 -0700 [PATCH] ppc32: add 440ep support Add PPC440EP core support. PPC440EP is a PPC440-based SoC with a classic PPC FPU and another set of peripherals. Signed-off-by: Wade Farnsworth Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8be1c8e065691c332fd8e9bae70c7096a69c31d Author: Kumar Gala Date: Sun Jul 31 22:34:51 2005 -0700 [PATCH] ppc32: Mark boards that don't build as BROKEN Marked APUS and GEMINI as BROKEN since they do not build at the platform level. We have requested that the maintainers of these boards/platforms fix them by the time 2.6.15 is released or we plan on concerning them unmaintained and thus removing them. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01bdc0336f8f42b32b9be9ace7775329b25202a5 Author: Denis Vlasenko Date: Sun Jul 31 22:34:50 2005 -0700 [PATCH] silence cs89x0 cs89x0 talks a lot at boot. Seems like debug leftover. This patch downgrades printks to KERN_DEBUG. While we're at it, make these messages a bit less obscure. Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1581566183f310abbd2d384a9079d4039faca05 Author: NeilBrown Date: Sun Jul 31 22:34:50 2005 -0700 [PATCH] md: make sure raid5/raid6 resync uses correct 'max_sectors' The default resync_max_sector is set to "mddev->size << 1". If the raid-personality-module updates mddev->size, it must update resync_max_sectors too. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57ee67af35183c60e924ebb6d6b3e1d2d9c03366 Author: Benjamin Herrenschmidt Date: Sun Jul 31 22:34:49 2005 -0700 [PATCH] ppc64: Fix CONFIG_ALTIVEC not set The code that sets the altivec capability of the CPU based on firmware informations can enable altivec when the kernel has CONFIG_ALTIVEC disabled. This results in "interesting" crashes. Signed-off-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1caf1f0f187d99eb898bdc216de5a761740fe814 Author: Paul Jackson Date: Sun Jul 31 22:34:48 2005 -0700 [PATCH] plug MAN-PAGES maintainer in Documentation/SubmittingPatches Improve the likelihood that someone submitting a patch will notify the MAN-PAGES maintainer. This is a follow-up to comments on the July 29 lkml email thread: "Broke nice range for RLIMIT NICE" Signed-off-by: Paul Jackson Cc: "Michael Kerrisk" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit faf1668c954d24285d7b213cf1ff38fe93569f01 Author: Michael Kerrisk Date: Sun Jul 31 22:34:47 2005 -0700 [PATCH] MAINTAINERS record -- MAN-PAGES Michael maintains the kernel manpages. He wants us to tell him when we change or augment the userspace API. Add his contact details to MAINTAINERS. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9fef07ca8574bff104d506c07f9161fe7fbaba57 Author: Michael Krufky Date: Sun Jul 31 22:34:46 2005 -0700 [PATCH] v4l: cx88 card support and documentation finishing touches Peter Missel: - Add support for the SVideo input on the GDI Black Gold. Mauro Carvalho Chehab: - Linux/version.h removed. Replaced by linux/utsname.h Michael Krufky: - Added analog support for DViCO FusionHDTV5 Gold. CC: Peter Missel Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd3113e84e188781aa2935fbc4351d64ccdd171b Author: Mauro Carvalho Chehab Date: Sun Jul 31 22:34:43 2005 -0700 [PATCH] V4L: Miscellaneous fixes - Fixed some bttv card numbers. - BTTV and SAA7134 version numbers incremented to reflect changes. - pci_dma_supported() is called after pci_set_dma_mask() which already did check that for us. This patch removes the unneeded call to pci_dma_supported() at bttv-driver.c - Ensure a sufficient I2C bus idle time between 2 messages for saa7134-i2c.c - It is important to write at first to MO_GP3_IO for cx88-tvaudio.c - Use try_to_freeze() instead of refrigerator at msp3400.c - Recognizing the MFPE05-2 Tuner at tveeprom.c - Add new parameter to help identify radio chipsets at tuner module: show_i2c=1 will show 16 reading bytes from detected tuners. - BTTV does generate some Unimplemented IOCTL log at tuner module: 0x40046d11(dir=1,tp=0x6d,nr=17,sz=4) means that it is sending MSP3400 calls to non-msp3400 tuners. Warning eliminated. VIDIOSAUDIO is also called, so debug messages updated. It is still requiring IOCTL implementation. - Added two more tuners. - Add support for the SVideo input on the GDI Black Gold. Signed-off-by: Peter Missel Signed-off-by: Graham Bevan Signed-off-by: Torsten Seeboth Signed-off-by: Hartmut Hackmann Signed-off-by: Tobias Klauser Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cdf32eaa4e601b15146e21b6470de00f149ce37f Author: Eric Lammerts Date: Sun Jul 31 22:34:42 2005 -0700 [PATCH] disable addres space randomization default on transmeta CPUs We know that the randomisation slows down some workloads on Transmeta CPUs by quite large amounts. We think it's because the CPU needs to recode the same x86 instructions when they pop up at a different virtual address after a fork+exec. So disable randomization by default on those CPUs. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fef3fa24d8d1bb6d82cad195f73917fa6534dac Author: Andrew Morton Date: Sun Jul 31 22:34:40 2005 -0700 [PATCH] skge build fix Make it compile with CONFIG_PM=n Cc: "Rafael J. Wysocki" Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de5b31101fdefab2a7858a17601c1a35aadf237f Author: Andrew Morton Date: Sun Jul 31 22:34:40 2005 -0700 [PATCH] i2c-mpc.c: revert duplicate patch Seems that both Greg and I submitted the same patch and it just kept on applying... Cc: Greg KH Cc: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30db1ae8640d3527ca7ac8df4bcbf14ccc6ae9cd Author: Dave Kleikamp Date: Mon Aug 1 16:54:26 2005 -0500 JFS: Check for invalid inodes in jfs_delete_inode Some error paths may iput an invalid inode with i_nlink=0. jfs should not try to actually delete such an inode. Signed-off-by: Dave Kleikamp commit 697a2d63a3844caaa2b6565ab7f3d69086af94d4 Author: Linus Torvalds Date: Mon Aug 1 12:37:54 2005 -0700 Revert ACPI interrupt resume changes If there are devices that use interrupts over a suspend event, ACPI must restore the PCI interrupt links on resume. Anything else breaks any device that hasn't been converted to the new (dubious) PM rules. Drivers that need the irq free/re-aquire sequence can be done one by one independently of this one. commit 4ceb5db9757aaeadcf8fbbf97d76bd42aa4df0d6 Author: Linus Torvalds Date: Mon Aug 1 11:14:49 2005 -0700 Fix get_user_pages() race for write access There's no real guarantee that handle_mm_fault() will always be able to break a COW situation - if an update from another thread ends up modifying the page table some way, handle_mm_fault() may end up requiring us to re-try the operation. That's normally fine, but get_user_pages() ended up re-trying it as a read, and thus a write access could in theory end up losing the dirty bit or be done on a page that had not been properly COW'ed. This makes get_user_pages() always retry write accesses as write accesses by making "follow_page()" require that a writable follow has the dirty bit set. That simplifies the code and solves the race: if the COW break fails for some reason, we'll just loop around and try again. Signed-off-by: Linus Torvalds commit 8d894c47975f7222c5537e450e71310b395488c7 Author: Antonino A. Daplas Date: Mon Aug 1 23:51:34 2005 +0800 [PATCH] tridentfb: Fix scrolling artifacts during disk IO Reported by: Jochen Hein (Bugzilla Bug 4312) When there is disk I/O happening, the framebuffer has a little snow on the screen. Once I/O has finished, no garbage remains on screen. This bug was explained by: Knut Petersen Most important is CRTC register 2f, signal quality is also improved for higher vclk values by changing set_vclk() according to the X drivers and cyblafb.c The fix is to set the performance register (0x2f) with a more stable value. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 8dad46cf38c029248d1331b6a97b2999e0751cfa Author: Antonino A. Daplas Date: Mon Aug 1 23:46:44 2005 +0800 [PATCH] tridentfb: Fix scrolling artifacts if acceleration is enabled Reported by: Jochen Hein (Bugzilla Bug 4386) booting leaves the end of long lines in the last line on screen when scrolling. When X is running, scrolling puts garbage on the screen (looks like X data) Console switch fixes the screen. Behaviour seems to be identical with noaccel and without on the video=tridentfb parameter in lilo.conf. This bug was explained by: Knut_Petersen Acceleration is broken for all BLADE 3D chips for all versions of kernel 2.6 except for 32bit modes. Most important reason is that the u32 col parameter of the graphics engine needs the color value replicated to all u8 of the u32 (8bit modes) and to both u16 of the u32. Fix color value passed to graphics engine, verified by the reporter. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 6cb54819d7b1867053e2dfd8c0ca3a8dc65a7eff Author: Ingo Molnar Date: Mon Aug 1 13:39:13 2005 +0200 [PATCH] remove sys_set_zone_reclaim() This removes sys_set_zone_reclaim() for now. While i'm sure Martin is trying to solve a real problem, we must not hard-code an incomplete and insufficient approach into a syscall, because syscalls are pretty much for eternity. I am quite strongly convinced that this syscall must not hit v2.6.13 in its current form. Firstly, the syscall lacks basic syscall design: e.g. it allows the global setting of VM policy for unprivileged users. (!) [ Imagine an Oracle installation and a SAP installation on the same NUMA box fighting over the 'optimal' setting for this flag. What will they do? Will they try to set the flag to their own preferred value every second or so? ] Secondly, it was added based on a single datapoint from Martin: http://marc.theaimsgroup.com/?l=linux-mm&m=111763597218177&w=2 where Martin characterizes the numbers the following way: ' Run-to-run variability for "make -j" is huge, so these numbers aren't terribly useful except to see that with reclaim the benchmark still finishes in a reasonable amount of time. ' in other words: the fundamental problem has likely not been solved, only a tendential move into the right direction has been observed, and a handful of numbers were picked out of a set of hugely variable results, without showing the variability data. How much variance is there run-to-run? I'd really suggest to first walk the walk and see what's needed to get stable & predictable kernel compilation numbers on that NUMA box, before adding random syscalls to tune a particular aspect of the VM ... which approach might not even matter once the whole picture has been analyzed and understood! The third, most important point is that the syscall exposes VM tuning internals in a completely unstructured way. What sense does it make to have a _GLOBAL_ per-node setting for 'should we go to another node for reclaim'? If then it might make sense to do this per-app, via numalib or so. The change is minimalistic in that it doesnt remove the syscall and the underlying infrastructure changes, only the user-visible changes. We could perhaps add a CAP_SYS_ADMIN-only sysctl for this hack, a'ka /proc/sys/vm/swappiness, but even that looks quite counterproductive when the generic approach is that we are trying to reduce the number of external factors in the VM balance picture. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 5d546f54324e04747e82ccbb4ea85f54bdcacd6d Author: Dominik Brodowski Date: Mon Aug 1 14:55:51 2005 +0200 [PATCH] pcmcia: fix multiple insertion of multifunction cards The ordering of setting and clearing device_add_pending went wrong on some occasions, causing multifunction cards only to be handled correctly on the first insertion, not on subsequent ones. Signed-off-by: Dominik Brodowski Signed-off-by: Linus Torvalds commit 2b8d4669376332a6819e21994a78ecd5502d3ebc Author: Dominik Brodowski Date: Mon Aug 1 14:16:55 2005 +0200 [PATCH] pcmcia: defer ide-cs initialization after other IDE drivers started up Avoid registering PCMCIA CF cards before other IDE stuff. This means the risk of /dev/hd* being re-ordered is lessened. The _sane_ thing to assert any ordering is to use udev, nameif and so on, of course. Signed-off-by: Dominik Brodowski Signed-off-by: Linus Torvalds commit b9c55d29e9fced1eb1b4c252b2efd4b55a0c3c7f Author: John McCutchan Date: Mon Aug 1 11:00:45 2005 -0400 [PATCH] inotify: fix race between the kernel and user space When you rm a watch, an IN_IGNORED event is sent down the event queue with the watch descriptor that you just rm'd. If you then add a watch you could get the ignored watch's wd and if you haven't read the entire event queue, user space will think that it's newly created watch was just ignored. To avoid this problem we just use idr_get_new_above instead of idr_get_new. Signed-off-by: John McCutchan Signed-off-by: Robert Love Signed-off-by: Linus Torvalds commit 7544953685859875b5ac0260b6b1856066c092d6 Author: John McCutchan Date: Mon Aug 1 11:00:45 2005 -0400 [PATCH] inotify: fix file deletion by rename detection When a file is moved over an existing file that you are watching, inotify won't send you a DELETE_SELF event and it won't unref the inode until the inotify instance is closed by the application. Signed-off-by: John McCutchan Signed-off-by: Robert Love Signed-off-by: Linus Torvalds commit be2ac68f7b66e90b8d25c168fc4d033b034f5c43 Merge: e0b98c79e605f64f263ede53344f283f5e0548be e064cd7e3ac797df1e81b55ff4fed5fca5d106b5 Author: Linus Torvalds Date: Sun Jul 31 16:49:07 2005 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit e0b98c79e605f64f263ede53344f283f5e0548be Merge: 02459eaab98a6a57717bc0cacede148fc76af881 faa725332f39329288f52b7f872ffda866ba5b09 Author: Linus Torvalds Date: Sun Jul 31 16:48:39 2005 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 02459eaab98a6a57717bc0cacede148fc76af881 Author: James Simmons Date: Sat Jul 30 23:49:54 2005 +0100 [PATCH] Display name of fbdev device This patch displays the name of the fbdev driver in sysfs. Down the road this will replace the current proc handle we have. Signed-off-by: James Simmons Signed-off-by: Linus Torvalds commit e064cd7e3ac797df1e81b55ff4fed5fca5d106b5 Author: Ralf Baechle Date: Mon Jul 4 18:30:42 2005 +0100 [PATCH] SMP fix for 6pack driver Drivers really only work well in SMP if they actually can be selected. This is a leftover from the time when the 6pack drive only used to be a bitrotten variant of the slip driver. Signed-off-by: Ralf Baechle DL5RB Kconfig | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik commit af44f5bf775e0d36aa5879c94369216ff6f717a6 Author: Tony Lindgren Date: Thu Jun 30 06:40:18 2005 -0700 [PATCH] Fix OMAP specific typo in smc91x.h --ReaqsoxgOBHFXBhH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Jeff, Here's a little patch fixing a typo in smc91x.h. Regards, Tony --ReaqsoxgOBHFXBhH Content-Type: text/x-chdr; charset=us-ascii Content-Disposition: inline; filename="patch-fix-typo-smc91x.h" Signed-off-by: Jeff Garzik commit 3f309db33e7868fe11f8fc3a0dd291703df3c662 Author: Stephen Hemminger Date: Mon Jun 27 15:47:25 2005 -0700 [PATCH] sk98lin: fix workaround for yukon-lite chipset (> rev 7) Yukon-Lite chipset needs workaround for revision 7 (or later). Without this patch, chip gets stuck in low power mode and never boots. Newer SysKonnect vendor code already had same patch. Related bug in skge is http://bugs.gentoo.org/87822 Chris, please add for 2.6.12.2 Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 00354cfb92bd819a0d09d3ef9988e509b6675fdd Author: Jay Vosburgh Date: Thu Jul 21 12:18:02 2005 -0700 [PATCH] bonding: documentation update Contains general updates (additional configuration info, hopefully better examples, updated some out of date info, and a bonus pass through ispell to banish the "paramters.") and info specific to gratuitous ARP and xmit policy functionality already in 2.6.13-rc2. Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit faa725332f39329288f52b7f872ffda866ba5b09 Author: Adrian Bunk Date: Wed Jul 27 01:06:35 2005 -0700 [PATCH] SCSI_SATA has to be a tristate SCSI=m must disallow static drivers. The problem is that all the SATA drivers depend on SCSI_SATA. With SCSI=m and SCSI_SATA=y this allows the static enabling of the SATA drivers with unwanted effects, e.g.: - SCSI=m, SCSI_SATA=y, SCSI_ATA_ADMA=y -> SCSI_ATA_ADMA is built statically but scsi/built-in.o is not linked into the kernel - SCSI=m, SCSI_SATA=y, SCSI_ATA_ADMA=y, SCSI_SATA_AHCI=m -> SCSI_ATA_ADMA and libata are built statically but scsi/built-in.o is not linked into the kernel, SCSI_SATA_AHCI is built modular (unresolved symbols due to missing libata) Signed-off-by: Adrian Bunk Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit f2e1e47d14aae1f33e98cf8d9ea93e2fe9e2f521 Author: Stephen Hemminger Date: Fri Jul 22 16:26:11 2005 -0700 [PATCH] skge: version 0.8 Increase driver version to 0.8 Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 6abebb538d317ead09cc0f3c2a0752047f9ff961 Author: Stephen Hemminger Date: Fri Jul 22 16:26:10 2005 -0700 [PATCH] skge: led toggle cleanup Cleanup code that is used to toggle LED's. Since we get called from ethtool, can use that thread rather than setting up a timer. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 4cde06ed0fb58402ec1d6d117122d1058983a393 Author: Stephen Hemminger Date: Fri Jul 22 16:26:09 2005 -0700 [PATCH] skge: ignore phy interrupts during negotiation During autonegotiation set PHY interrupt mask to ignore bogus speed change interrupts. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit d8a09943ebbaca9befd995d8fe10dd9885256dbf Author: Stephen Hemminger Date: Fri Jul 22 16:26:08 2005 -0700 [PATCH] skge: fifo control register access fix The code to clear fifo errors was incorrect and sending garbage to the external phy. Removed the no longer used inline's funcs. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 2c66851460c9438823e39b76887376d1511fb67c Author: Stephen Hemminger Date: Fri Jul 22 16:26:07 2005 -0700 [PATCH] skge: whitespace fixes Minor whitespace cleanups. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 382317138b3ade02c9c319531ab0619e95dbc672 Author: Stephen Hemminger Date: Fri Jul 22 16:26:06 2005 -0700 [PATCH] skge: support yukon lite rev 4 The check for Yukon lite changes was restricting itself to rev A3. It turns out that these changes are also true on A4 and later. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 4ff6ac052b90ee4dfee92f8e2c5cb7ef8a4d8f13 Author: Stephen Hemminger Date: Fri Jul 22 16:26:05 2005 -0700 [PATCH] skge: phy lock deadlock Cleanup the phy_lock deadlock because of relocking in the nway_reset path. Reported by Francois Romieu. Also, don't need to do irqsave/restore for blink, just excluding bh is good enough. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 0eedf4ac5b536c7922263adf1b1d991d2e2397b9 Author: Stephen Hemminger Date: Fri Jul 22 16:26:04 2005 -0700 [PATCH] skge: disable tranmitter on shutdown Here is a fix for a typo, thanks Eliot Dresselhaus. Since transmitter not active when device is down, it wasn't really noticed. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit acdd80d514a08800380c9f92b1bf4d4c9e818125 Author: Stephen Hemminger Date: Fri Jul 22 16:26:03 2005 -0700 [PATCH] skge: remove SK-9EE support The SK-9E boards use the Marvell Yukon2 chipset which is not supported by the skge driver. Thanks to Ralph Roesler for noticing. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit f6620cab9485d435aa93490533b8268d36dc4526 Author: Stephen Hemminger Date: Fri Jul 22 16:26:02 2005 -0700 [PATCH] skge: silence mac data parity messages Using Genesis board, I get harmless error reports. Rather than console error, turn it into a error counter. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit f0098f7863f814a5adc0b9cb271605d063cad7fa Author: Denis Lunev Date: Sat Jul 30 17:47:25 2005 -0700 [NET] Fix too aggressive backoff in dst garbage collection The bug is evident when it is seen once. dst gc timer was backed off, when gc queue is not empty. But this means that timer quickly backs off, if at least one destination remains in use. Normally, the bug is invisible, because adding new dst entry to queue cancels the backoff. But it shots deadly with destination cache overflow when new destinations are not released for long time f.e. after an interface goes down. The fix is to cancel backoff when something was released. Signed-off-by: Denis Lunev Signed-off-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit db44575f6fd55df6ff67ddd21f7ad5be5a741136 Author: Alexey Kuznetsov Date: Sat Jul 30 17:46:44 2005 -0700 [NET]: fix oops after tunnel module unload Tunnel modules used to obtain module refcount each time when some tunnel was created, which meaned that tunnel could be unloaded only after all the tunnels are deleted. Since killing old MOD_*_USE_COUNT macros this protection has gone. It is possible to return it back as module_get/put, but it looks more natural and practically useful to force destruction of all the child tunnels on module unload. Signed-off-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit 1f494c0e040b001cf844280910d04ba7ebdc2898 Author: Harald Welte Date: Sat Jul 30 17:44:07 2005 -0700 [NETFILTER] Inherit masq_index to slave connections masq_index is used for cleanup in case the interface address changes (such as a dialup ppp link with dynamic addreses). Without this patch, slave connections are not evicted in such a case, since they don't inherit masq_index. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit d1b04c081e3fb0a08ac108737e4efa9f4830c916 Author: Baruch Even Date: Sat Jul 30 17:41:59 2005 -0700 [NET]: Spelling mistakes threshoulds -> thresholds Just simple spelling mistake fixes. Signed-Off-By: Baruch Even Signed-off-by: David S. Miller commit 889371f61fd5bb914d0331268f12432590cf7e85 Author: Linus Torvalds Date: Sat Jul 30 13:41:56 2005 -0700 Revert "yenta free_irq on suspend" ACPI is wrong. Devices should not release their IRQ's on suspend and re-aquire them on resume. ACPI should just re-init the IRQ controller instead of breaking most drivers very subtly. Breakage reported by Hugh Dickins Undo: d8c4b4195c7d664baf296818bf756775149232d3 Signed-off-by: Linus Torvalds commit 035a4a4f8976bdf12aab992c630d3a6cfba90ea8 Author: Rafael J. Wysocki Date: Sat Jul 30 13:12:18 2005 -0700 [PATCH] sk98lin: basic suspend/resume support fixes An early version of the sk98lin patch was merged via Len's tree. But there were subsequent updates as a result of review from Jeff. THis fixes things up. Signed-off-by: Rafael J. Wysocki Cc: Jeff Garzik Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a1caa21d66bcb9ba9892435a0a54fc32cd9eeab Author: Natalie.Protasevich@unisys.com Date: Sat Jul 30 11:25:32 2005 -0700 [PATCH] x86_64: avoid wasting IRQs patch update The patch adds boundary check for the MAX_GSI_NUM. Same as the update for i386, the patch addresses a problem with ACPI SCI IRQ. The patch corrects the code such that SCI IRQ is skipped and duplicate entry is avoided. The VIA chipset uses 4-bit IRQ register for internal interrupt routing, and therefore cannot handle IRQ numbers assigned to its devices. The patch corrects this problem by allowing PCI IRQs below 16. Signed-off-by: Natalie Protasevich Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c70f5d6610c601ea2ae4ae4e49f66c80801e895f Author: Andrew Morton Date: Sat Jul 30 10:22:49 2005 -0700 [PATCH] revert bogus softirq changes This snuck in with an x86_64 change. Thanks to Richard Purdie for spotting it. Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d1d07e41a1de478a0da3cc14b4a8054ef09931c Merge: d7a465b4740806e4ee34061ad455595b2fa9fad5 adbedd34244e2b054557002817f979a9b004a405 Author: Linus Torvalds Date: Sat Jul 30 10:15:57 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus commit d7a465b4740806e4ee34061ad455595b2fa9fad5 Author: Antonino A. Daplas Date: Fri Jul 29 22:59:21 2005 -0700 [PATCH] vesafb: Document mtrr boot option usage Document mtrr boot option usage to Documentation/fb/vesafb.txt. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92ed0223aefa795d1873427e25599cb70b2148ee Author: Dave Peterson Date: Fri Jul 29 22:59:20 2005 -0700 [PATCH] x86_64: fix bug in csum_partial_copy_generic() I was observing reproducible crashes on the "movw %bx,(%rsi)" instruction below while a process in a recvfrom() system call was copying packet data to user space. The patch below fixes the exception table and causes the crash to no longer reproduce. Please apply. Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ce17b18e16177dd6409dabd38df5c2c9b58fc2d Author: Eugene Surovegin Date: Fri Jul 29 22:59:19 2005 -0700 [PATCH] ppc32: fix 44x early serial debug for configurations with more than 512M of RAM Fix 44x early serial debugging for big RAM configurations (more than 512M). We cannot use default OpenBIOS virtual mapping, because it interferes with pinned TLB entry. While we are at it, move early UART mapping to TLB slot 0, so it can survive longer during boot process (slot 1 is used by the first ioremap call, effectively killing UART mapping if it occupies this slot). Also, change UART TLB entry size to 4K (256M is too much for a bunch of registers :). Squash some warnings on the way. Tested on Ebony and Ocotea with 1G of RAM. Thanks to Scott Coulter for diagnosing this problem. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e310fd43256b3cf4d37f6447b8f7413ca744657a Author: Martin J. Bligh Date: Fri Jul 29 22:59:18 2005 -0700 [PATCH] Fix NUMA node sizing in nr_free_zone_pages We are iterating over all nodes in nr_free_zone_pages(). Because the fallback zonelists contain all nodes in the system, and we walk all the zonelists, we're counting memory multiple times (once for each node). This caused us to make a size estimate of 32GB for an 8GB AMD64 box, which makes all the dirty ratio calculations, etc incorrect. There's still a further bug to fix from e820 holes causing overestimation as well, but this fix is separate, and good as is, and fixes one class of problems. Problem found by Badari, and tested by Ram Pai - thanks! Signed-off-by: Martin J. Bligh Signed-off-by: Matt Dobson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fa918b451f625870cd4275ca908b2392ee86a51 Author: Robert Love Date: Fri Jul 29 22:59:17 2005 -0700 [PATCH] ppc64: inotify syscalls inotify system call support for PPC64 [ I don't think we need sys32 compatibility versions--and if we do, I failed in life. ] Signed-off-by: Robert Love Acked-by: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 141d751e264c16db554f6681d84056ebde0e8078 Author: Robert Love Date: Fri Jul 29 22:59:16 2005 -0700 [PATCH] ppc32: inotify syscalls Add inotify system call stubs to PPC32. Signed-off-by: Robert Love Acked-by: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7ff898ad3971cd36967453d331c57d97d407007 Author: James Bottomley Date: Sat Jul 30 10:37:55 2005 -0500 [SCSI] aic7xxx: fix bug in DT handing Basically DT isn't reported or handled at all. The problem is that lines of code like this: spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ; don't do what you think they do when spi_dt is a single bit variable. Signed-off-by: James Bottomley commit e572f7cc28a0b01b96ede3f78f448ad55c5e67ad Author: Andrew Morton Date: Wed Jul 27 01:07:43 2005 -0700 [SCSI] fc4 warning fix drivers/fc4/fc.c: In function `fcp_scsi_dev_reset': drivers/fc4/fc.c:933: warning: control reaches end of non-void function Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 7cd7ae531c7896f90485ce6ebb2b1370a0a7d8c8 Author: Linda Xie Date: Fri Jul 15 17:49:27 2005 -0500 [SCSI] scsi/ibmvscsi/srp.h: Fix a wrong type code used for SRP_LOGIN_REJ This patch fixes srp.h which uses 0x80 for SRP_LOGIN_REJ instead of 0xc2. Signed-off-by: Linda Xie Signed-off-by: James Bottomley commit adbedd34244e2b054557002817f979a9b004a405 Merge: d6ac1a7910d22626bc77e73db091e00b810715f4 b0825488a642cadcf39709961dde61440cb0731c Author: Len Brown Date: Sat Jul 30 01:55:32 2005 -0400 merge 2.6.13-rc4 with ACPI's to-linus tree commit d6ac1a7910d22626bc77e73db091e00b810715f4 Merge: 577a4f8102d54b504cb22eb021b89e957e8df18f 87bec66b9691522414862dd8d41e430b063735ef Author: Len Brown Date: Fri Jul 29 23:31:17 2005 -0400 /home/lenb/src/to-linus branch 'acpi-2.6.12' commit 87bec66b9691522414862dd8d41e430b063735ef Author: David Shaohua Li Date: Wed Jul 27 23:02:00 2005 -0400 [ACPI] suspend/resume ACPI PCI Interrupt Links Add reference count and disable ACPI PCI Interrupt Link when no device still uses it. Warn when drivers have not released Link at suspend time. http://bugzilla.kernel.org/show_bug.cgi?id=3469 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit 68ac767686fd72f37a25bb4895fb4ab0080ba755 Author: Venkatesh Pallipadi Date: Mon Apr 25 14:38:00 2005 -0400 [ACPI] delete boot-time printk()s from processor_idle.c http://bugzilla.kernel.org/show_bug.cgi?id=4401 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 90158b83204842c0108d744326868d91cc9c4dfd Author: Rafael J. Wysocki Date: Sun Jul 24 14:22:00 2005 -0400 [ACPI] fix resume issues on Asus L5D http://bugzilla.kernel.org/show_bug.cgi?id=4416 Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 4b31e77455b868b43e665edceb111c9a330c8e0f Author: Dominik Brodowski Date: Wed May 18 13:49:00 2005 -0400 [ACPI] Always set P-state on initialization Otherwise a platform that supports ACPI based cpufreq and boots up at lowest possible speed could stay there forever. This because the governor may request max speed, but the code doesn't update if there is no change in speed, and it assumed the initial state of max speed. http://bugzilla.kernel.org/show_bug.cgi?id=4634 Signed-off-by: Dominik Brodowski Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 45bea1555f5bf0cd5871b208b4b02d188f106861 Author: Luming Yu Date: Sat Jul 23 04:08:00 2005 -0400 [ACPI] Add "ec_polling" boot option EC burst mode benefits many machines, some of them significantly. However, our current implementation fails on some machines such as Rafael's Asus L5D. This patch restores the alternative EC polling code, which can be enabled at boot time via "ec_polling" http://bugzilla.kernel.org/show_bug.cgi?id=4665 Signed-off-by: Luming Yu Signed-off-by: Len Brown commit 335f16be5d917334f56ec9ef7ecf983476ac0563 Author: David Shaohua Li Date: Wed Jun 22 18:37:00 2005 -0400 [ACPI] address boot-freeze with updated DMI blacklist for c-states http://bugzilla.kernel.org/show_bug.cgi?id=4763 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit b0825488a642cadcf39709961dde61440cb0731c Author: Matthew Garrett Date: Fri Jul 29 14:03:39 2005 -0700 [PATCH] agp: restore APBASE after setting APSIZE When leaving S3 state, the AGP bridge may not have all PCI configuration registers set in the same way as they were at boot. This should be fixed by pci_restore_state - however, the APBASE register cannot be set to conflict with the APSIZE register. If APSIZE is larger than it was before suspend, pci_restore_state will not restore APBASE correctly. The attached patch adds an extra item to the agp_bridge_data structure and uses it to store the value of APBASE. On resume, this is then written after APSIZE has been set. This patch only touches the path used for Intel chipsets without integrated graphics, and may need to be extended to work with the others. Without this patch, I get the symptoms described in bug 4921 - APBASE ends up overlapping various PCI devices, and as a result they fail to work after resume. Signed-off-by: Matthew Garrett Acked-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b87a1e506115e7df4c6bfd266267ee0088cba3b7 Author: Gerald Schaefer Date: Fri Jul 29 14:03:38 2005 -0700 [PATCH] s390: fix inline assembly in appldata Fix inline assembly that gets miscompiled by gcc 4. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ffa92340b22a59575afe60ea155195c43213120 Author: Cornelia Huck Date: Fri Jul 29 14:03:37 2005 -0700 [PATCH] s390: device recognition Close a small window where a device may be not operational again after senseid finished and the "same device" check fails due to dev=0000 by checking for dnv after stsch() by then setting the device to not operational. (No need to check for dnv in ccw_device_handle_oper() again since we don't do stsch() into the subchannel's schib in the meantime and will get a crw anyway if the device becomes not oper again). Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 350e3ade9ed0809a94c51db6ee66883a35f0d6c9 Author: Heiko Carstens Date: Fri Jul 29 14:03:36 2005 -0700 [PATCH] s390: check for interrupt before waiting The patch that introduced waiting for interrupts after resetting the reader can cause the boot to fail because the system is waiting for an interrupt that will never arrive. Add code to check if an interrupt is supposed to arrive before waiting endlessly. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5712f52e8c024c6b7b82ae5c7b5b3d0f3e6f711b Author: Martin Schwidefsky Date: Fri Jul 29 14:03:35 2005 -0700 [PATCH] s390: default configuration Update default configuration of s390. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a502a3593c7aa2aff99a61ed71e7cb828ee4da8b Author: Jeff Dike Date: Fri Jul 29 14:03:33 2005 -0700 [PATCH] uml: fix vsyscall brokenness The #if/#ifdef cleanup exposed a bug in UML's ELF header processing. With this bug fixed, UML recognizes the vsyscall info coming from the host. On FC4, there is a vsyscall page low in the address space, which UML doesn't provide. This causes an infinite page fault loop and a hang on boot. This patch works around that by making this look like a no-vsyscall system. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4c5c82024f5f292c0069cf40422b8f3bf5e684e Author: Antonino A. Daplas Date: Fri Jul 29 14:03:33 2005 -0700 [PATCH] fbdev: Replace memcpy with for-loop when preparing bitmap Do not use memcpy in fb_pad_aligned_buffer. It is suboptimal because only a few bytes are moved at a time. Replace with a for-loop. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1afc3f522ed088405fc8932110d338330db82bb Author: Natalie.Protasevich@unisys.com Date: Fri Jul 29 14:03:32 2005 -0700 [PATCH] x86: avoid wasting IRQs patch update The patch addresses a problem with ACPI SCI interrupt entry, which gets re-used, and the IRQ is assigned to another unrelated device. The patch corrects the code such that SCI IRQ is skipped and duplicate entry is avoided. Second issue came up with VIA chipset, the problem was caused by original patch assigning IRQs starting 16 and up. The VIA chipset uses 4-bit IRQ register for internal interrupt routing, and therefore cannot handle IRQ numbers assigned to its devices. The patch corrects this problem by allowing PCI IRQs below 16. Signed-off by: Natalie Protasevich Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80625942094b114d85811e5ff1fbc9e06dabe0ff Author: Antonino A. Daplas Date: Fri Jul 29 14:03:31 2005 -0700 [PATCH] vesafb: Fix mtrr bugs >> vesafb: mode is 800x600x16, linelength=1600, pages=16 >> vesafb: scrolling: redraw >> vesafb: Truecolor: size=0:5:6:5, shift=0:11:5:0 >> mtrr: type mismatch for fc000000,1000000 old: write-back new: write- >> combining Range is already set to write-back, vesafb attempts to add a write-combining mtrr (default for vesafb). >> mtrr: size and base must be multiples of 4 kiB This is a bug, vesafb attempts to add a size < PAGE_SIZE triggering the messages below. To eliminate the warning messages, you can add the option mtrr:2 to add a write-back mtrr for vesafb. Or just use nomtrr option. 1. Fix algorithm for finding the best power of 2 size with mtrr_add(). 2. Add option to choose the mtrr type by extending the mtrr boot option: mtrr:n where n 0 = no mtrr (equivalent to using the nomtrr option) 1 = uncachable 2 = write back 3 = write combining (default) 4 = write through Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 655a0a7799cddf9a469916c07ac22f1106abc2be Author: Bjorn Helgaas Date: Fri Jul 29 14:03:30 2005 -0700 [PATCH] serial: add MMIO support to 8250_pnp Add support for UARTs in MMIO space and clean up a little whitespace. HP legacy-free ia64 machines need this. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d483f47579461a4715db33c68ef8752e5a97a2d Author: Eric W. Biederman Date: Fri Jul 29 14:03:29 2005 -0700 [PATCH] Fix sync_tsc hang sync_tsc was using smp_call_function to ask the boot processor to report it's tsc value. smp_call_function performs an IPI_send_allbutself which is a broadcast ipi. There is a window during processor startup during which the target cpu has started and before it has initialized it's interrupt vectors so it can properly process an interrupt. Receveing an interrupt during that window will triple fault the cpu and do other nasty things. Why cli does not protect us from that is beyond me. The simple fix is to match ia64 and provide a smp_call_function_single. Which avoids the broadcast and is more efficient. This certainly fixes the problem of getting stuck on boot which was very easy to trigger on my SMP Hyperthreaded Xeon, and I think it fixes it for the right reasons. Minor changes by AK Signed-off-by: Eric W. Biederman Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94d2ac66c12397e2ca7988dbf59f24a966d275cb Author: Ravikiran G Thirumalai Date: Fri Jul 29 14:03:28 2005 -0700 [PATCH] mm: Ensure proper alignment for node_remap_start_pfn While reserving KVA for lmem_maps of node, we have to make sure that node_remap_start_pfn[] is aligned to a proper pmd boundary. (node_remap_start_pfn[] gets its value from node_end_pfn[]) Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 590f47a1d945c611530a85057e9ad7a3bbb50578 Merge: a9b2e9170bdf1dd27ca4aa9a63048065d252d116 094ce7fde493a1196b8152f9f9e73c20e24a2b05 Author: Linus Torvalds Date: Fri Jul 29 14:40:08 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq commit a9b2e9170bdf1dd27ca4aa9a63048065d252d116 Author: Pete Zaitcev Date: Fri Jul 29 12:18:34 2005 -0700 [PATCH] USB: hidinput_hid_event() oops fix It seems that I see a bug in hidinput_hid_event. The check for NULL can never work, becaue &hidinput->input is nonzero at all times. Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 498f78e6fcf558d0dec31f5648f43426ae16433f Author: Dan Streetman Date: Fri Jul 29 12:18:28 2005 -0700 [PATCH] USB: fix in usb_calc_bus_time This patch does the same swap, i.e. use the ISO macro if (isoc). Additionally, it fixes the return value - the usb_calc_bus_time function returns the time in nanoseconds (I didn't notice that before) while the HS_USECS and HS_USECS_ISO are microseconds. This fixes the function to return nanoseconds always, and adjusts ehci-q.c (the only high-speed caller of the function) to wrap the call in NS_TO_US(). Signed-off-by: Dan Streetman Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 6b216df87cb5f3bb7d47a33f1cd955ebc7b84dfd Author: Conger, Chris A Date: Fri Jul 29 12:18:23 2005 -0700 [PATCH] USB: fix Bug in usb-skeleton.c Compare endpoint address to USB_ENDPOINT_DIR_MASK to determine endpoint direction... From: "Conger, Chris A." Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 3eb0c5f4b539873ca88f8597db6a49e83ddfd7e2 Author: Ben Dooks Date: Fri Jul 29 12:18:03 2005 -0700 [PATCH] USB: add S3C24XX USB Host driver support USB (OHCI) Host driver for S3C2410/S3C2440 based systems Signed-off-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit f29080976d109b6c08e42be8a1888f338785c502 Author: Mathieu Date: Fri Jul 29 12:17:29 2005 -0700 [PATCH] USB: drivers/net/usb/zd1201.c: Gigabyte GN-WLBZ201 dongle usbid Gigabyte GN-WLBZ201 wifi usb dongle works very well, using the zd1201 driver. the only missing part is that the corresponding usbid is not declared. The following patch should fix this. From: "Mathieu" Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 8753e65e34a7b02f8473e7c6ce1cf7e08db4c6e3 Author: Masahito Omote Date: Fri Jul 29 12:17:25 2005 -0700 [PATCH] USB: Patch for KYOCERA AH-K3001V support This patch enables a support of KYOCERA AH-K3001V, one of the most popular cell phone in Japan. This device has vendor specific ID but works with acm driver by adding USB ID. This device already works on FreeBSD and OS X by native USB ACM driver with USB ID added. This device is probed as NO_UNION_NORMAL not to hang up when probing. Signed-off-by: Masahito Omote Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit a6db592e1624bb7ec62cf56629c9556442169ac5 Author: Michael Hund Date: Fri Jul 29 12:17:20 2005 -0700 [PATCH] USB: ldusb fixes below you will find the forgotten kmalloc check (sorry). Signed-off-by: Michael Hund Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 86d30741e480f40676c2173e1153368a4846da48 Author: Alan Stern Date: Fri Jul 29 12:17:16 2005 -0700 [PATCH] USB: Usbcore: Don't try to delete unregistered interfaces This patch handles a rarely-encountered failure mode in usbcore. It's legal for device_add to fail (although now it happens even more rarely than before since failure to bind a driver is no longer fatal). So when we destroy the interfaces in a configuration, we shouldn't try to delete ones which weren't successfully registered. Also, failure to register an interface shouldn't be fatal either -- I think; you may disagree about this part of the patch. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 4a0d73c463765ce34b22ac3924d0661caf2a7539 Author: Adrian Bunk Date: Fri Jul 29 12:17:11 2005 -0700 [PATCH] USB: drivers/usb/net/: remove two unused multicast_filter_limit variables The only uses of both variables were recently removed. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit fe0410c7f43e133e156e54e3156392e800bedc21 Author: Alan Stern Date: Fri Jul 29 12:16:58 2005 -0700 [PATCH] USB: usbfs: Don't leak uninitialized data This patch fixes an information leak in the usbfs snoop facility: uninitialized data from __get_free_page can be returned to userspace and written to the system log. It also improves the snoop output by printing the wLength value. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 279e1545a1350b9147ae884f848ffc8b7db18967 Author: Ian Abbott Date: Fri Jul 29 12:16:52 2005 -0700 [PATCH] USB: ftdi_sio: fix a couple of timeouts ftdi_sio: Fix timeouts in a couple of usb_control_msg() calls due to change of units from jiffies to milliseconds in 2.6.12. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 74ede0ff59fb18787213ed979641624a2f234821 Author: Ian Abbott Date: Fri Jul 29 12:16:41 2005 -0700 [PATCH] USB: ftdi_sio: Update RTS and DTR simultaneously ftdi_sio: Update RTS and DTR simultaneously, using a single control URB instead of separate control URBs for RTS and DTR. Reinhard Bergmann observed time differences of up to 680 ms with his application on a 2.4.22 kernel when RTS and DTR were updated using separate control URBs, which is unacceptable. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9b1513d91e195af46b8e59626f74d3d41a7565af Author: Ian Abbott Date: Fri Jul 29 12:16:31 2005 -0700 [PATCH] USB: ftdi_sio: new microHAM and Evolution Robotics devices The attached patch adds the following new devices to the ftdi_sio driver: * microHAM USB-Y6 and USB-Y8 devices submitted by Justin Burket (KL1RL). * Evolution Robotics ER1 Control Module submitted by Shawn M. Lavelle. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit a46e812620bd7db457ce002544a1a6572c313d8a Author: Kumar Gala Date: Fri Jul 29 12:16:27 2005 -0700 [PATCH] PCI: fix up errors after dma bursting patch and CONFIG_PCI=n -- bug? In the patch from: http://www.uwsg.iu.edu/hypermail/linux/kernel/0506.3/0985.html Is the the following line suppose inside the if CONFIG_PCI=n #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) Signed-off-by: Kumar Gala Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 10f4338ca8534823bc6c843edbbe42fd4e73d258 Author: Ivan Kokshaysky Date: Fri Jul 29 12:16:22 2005 -0700 [PATCH] PCI: remove PCI_BRIDGE_CTL_VGA handling from setup-bus.c The setup-bus code doesn't work correctly for configurations with more than one display adapter in the same PCI domain. This stuff actually is a leftover of an early 2.4 PCI setup code and apparently it stopped working after some "bridge_ctl" changes. So the best thing we can do is just to remove it and rely on the fact that any firmware *has* to configure VGA port forwarding for the boot display device properly. But then we need to ensure that the bus->bridge_ctl will always contain valid information collected at the probe time, therefore the following change in pci_scan_bridge() is needed. Signed-off-by: Ivan Kokshaysky Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 761a3ac08c63718dacde12aaf0ec6d6760e8c2b7 Author: Jon Smirl Date: Fri Jul 29 12:16:17 2005 -0700 [PATCH] PCI: Adjust PCI rom code to handle more broken ROMs There are ROMs reporting that their size exceeds their PCI ROM resource window. This patch returns the minimum of the resource window size or the size in the ROM. An example of this breakage is the XGI Volari Z7. Signed-off-by: Jon Smirl Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit e96e2f148060330f6178b502574dcb81eb7318bf Author: Daniele Gaffuri Date: Fri Jul 29 12:15:46 2005 -0700 [PATCH] PCI: Hidden SMBus bridge on Toshiba Tecra M2 Patch against 2.6.12 to unhide SMBus on Toshiba Centrino laptops using Intel 82855PM chipset. Tested on Toshiba Tecra M2. Signed-off-by: Daniele Gaffuri Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit ea5860d22b37b47c5023949edad2ec23e75169d1 Author: Evgeniy Polyakov Date: Fri Jul 29 12:15:38 2005 -0700 [PATCH] w1: kconfig/Makefile fix. This patch was sent first time very long time ago, but magically was disapeared, it probably exists in your queue, but to be sure, I resend it. If can not be applied cleanly after your w1 queue is flushed into upstrem tree, just drop it. Thanks. Patch from Michael Farmbauer . Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 0d73adc14e239b05a9393c09c067a26a5ba86b6c Author: Jean Delvare Date: Fri Jul 29 12:15:33 2005 -0700 [PATCH] I2C: 24RF08 corruption prevention (again) The 24RF08 corruption prevention in the eeprom and max6875 drivers wasn't complete. For one thing, the additional quick write should happen as soon as possible and unconditionally, while both drivers had error paths before. For another, when a given chip is forced, the core does not emit a quick write, so a second quick write would cause the corruption rather than prevent it. I plan to move the corruption prevention in the core in the long run, so that individual drivers don't have to care anymore. But I need to merge i2c_probe and i2c_detect before I do (work in progress). Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 86749e8512d2c37618dc5814ef41abbf168f291b Author: Jean Delvare Date: Fri Jul 29 12:15:29 2005 -0700 [PATCH] I2C: missing new lines in i2c-core messages Two log messages lack their trailing new line in i2c-core. I'd swear I had fixed them already, but it seems not. Bonus: improved coding style. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 0cacdf298211ec9e87354cf102f20d070e76e075 Author: Jean Delvare Date: Fri Jul 29 12:15:12 2005 -0700 [PATCH] I2C: use time_after in 3 chip drivers A few i2c drivers were not updated to use time_after() yet. Signed-off-by: Marcelo Feitoza Parisi Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 368609c5a8bd75b77721e69726ddfd3c6a30f7d4 Author: Jean Delvare Date: Fri Jul 29 12:15:07 2005 -0700 [PATCH] I2C: Missing space in split strings A few split string in i2c (and now hwmon) drivers lack a joining space, causing them to display incorrectly. This trivial patch fixes that up. Please apply, thanks. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d91e16943fdaf02bf3459059abca1032589c0663 Author: Ladislav Michl Date: Fri Jul 29 12:15:00 2005 -0700 [PATCH] I2C: ds1337 - fix 12/24 hour mode bug DS1339 manual, page 6, chapter Date and time operation: The DS1339 can be run in either 12-hour or 24-hour mode. Bit 6 of the hours register is defined as the 12-hour or 24-hour mode-select bit. When high, the 12-hour mode is selected. Patch below makes ds1337 driver work as documented in manual. Signed-off-by: Ladislav Michl Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit cb14c3a13cb1e78acf54a9ddc9e5f3e2f023523e Author: Kumar Gala Date: Fri Jul 29 12:14:40 2005 -0700 [PATCH] I2C-MPC: Restore code removed I2C-MPC: Restore code removed A previous patch to remove support for the OCP device model was way to generious and moved some of the platform device model code, oops. Signed-off-by: Kumar Gala Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit fc185d95ecf3ca62fa9afb5214a69b39060ff537 Author: Greg KH Date: Fri Jul 29 12:14:34 2005 -0700 [PATCH] Add the rules about the -stable kernel releases to the Documentation directory This was the last agreed upon set of rules, it's probably time we actually add them to the kernel tree to make them "official". Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 3348e05a4f25489908d9f7ed4e80ac291ead18f4 Author: Adrian Bunk Date: Fri Jul 29 12:14:28 2005 -0700 [PATCH] DEBUG_FS must depend on SYSFS CONFIG_DEBUG_FS=y and CONFIG_SYSFS=n results in the following compile error: <-- snip --> ... LD vmlinux fs/built-in.o: In function `debugfs_init': inode.c:(.init.text+0x31be): undefined reference to `kernel_subsys' make: *** [vmlinux] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9ca1eb3282b6050c295adb296761f8d26baf4ca5 Author: Maneesh Soni Date: Fri Jul 29 12:14:19 2005 -0700 [PATCH] sysfs: fix sysfs_setattr o sysfs_dirent's s_mode field should also be updated in sysfs_setattr(), else there could be inconsistency in the two fields. s_mode is used while ->readdir so as not to bring in the inode to cache. Signed-off-by: Maneesh Soni Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit bc062b1b5c6bef4e3a29c7fda57967251d12beb0 Author: Maneesh Soni Date: Fri Jul 29 12:13:35 2005 -0700 [PATCH] sysfs: fix sysfs_chmod_file o sysfs_chmod_file() must update the new iattr field in sysfs_dirent else the mode change will not be persistent in case of inode evacuation from cache. Signed-off-by: Maneesh Soni Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 30d07a22a19329c89628a2057b0120245c482c9e Author: Daniel Walker Date: Fri Jul 29 12:14:07 2005 -0700 [PATCH] stable_api_nonsense.txt fixes Signed-off-by: Daniel Walker Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 8bf2755664bfe03a414e7ec02d9f16a3d5beb60d Author: Eric W. Biederman Date: Fri Jul 29 13:25:28 2005 -0600 [PATCH] x86_64 machine_kexec: Use standard pagetable helpers Use the standard hardware page table manipulation macros. This is possible now that linux works with all 4 levels of the page tables. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 0b6b2f08c24a65535cb18893ca27516389c5fc0f Author: Venkatesh Pallipadi Date: Fri Jul 29 16:00:13 2005 -0400 [ACPI] Fix memset arguments in acpi processor_idle.c http://bugzilla.kernel.org/show_bug.cgi?id=4954 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 094ce7fde493a1196b8152f9f9e73c20e24a2b05 Author: Dave Jones Date: Fri Jul 29 12:55:40 2005 -0700 arch/i386/kernel/cpu/cpufreq/powernow-k8.c: In function `powernow_k8_cpu_init_acpi': arch/i386/kernel/cpu/cpufreq/powernow-k8.c:740: warning: unused variable `vid' arch/i386/kernel/cpu/cpufreq/powernow-k8.c:739: warning: unused variable `fid' arch/i386/kernel/cpu/cpufreq/powernow-k8.c:743: warning: unused variable `vid' arch/i386/kernel/cpu/cpufreq/powernow-k8.c:742: warning: unused variable `fid' arch/i386/kernel/cpu/cpufreq/powernow-k8.c:746: `fid' undeclared (first use in this function) arch/i386/kernel/cpu/cpufreq/powernow-k8.c:746: `vid' undeclared (first use in this function) Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit 4a7164023959040e687e51663dee67cff4d2b770 Author: Venkatesh Pallipadi Date: Fri Jul 29 15:51:36 2005 -0400 [ACPI] Fix the regression with c1_default_handler on some systems where C-states come from FADT. Thanks to Kevin Radloff for identifying the issue and isolating it to exact line of code that is causing the issue. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 36c4fd23cc06f81d68ee968c4c1bf1cebb3dcea5 Author: Eric W. Biederman Date: Fri Jul 29 13:02:09 2005 -0600 [PATCH] x86_64 machine_kexec: Cleanup inline assembly. In an uncensored copy of code from i386 to x86_64 I wound up with inline assembly with the wrong constraints. Use input constraints instead of output constraints. So I know the assembler will do the right thing specify the size of the operand lidtq and lgdtq instead of just lidt and lgdt. Make load_segments use an input constraint, and delete the macro fun. Without having to reload %cs like I do on i386 this code is noticeably simpler. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit e7b47ccaf655cbaf336745a9b65cf7b22a536fca Author: Eric W. Biederman Date: Fri Jul 29 13:01:18 2005 -0600 [PATCH] i386 machine_kexec: Cleanup inline assembly For some reason I was telling my inline assembly that the input argument was an output argument. Playing in the trampoline code I have seen a couple of instances where lgdt get the wrong size (because the trampolines run in 16bit mode) so use lgdtl and lidtl to be explicit. Additionally gcc-3.3 and gcc-3.4 want's an lvalue for a memory argument and it doesn't think an array of characters is an lvalue so use a packed structure instead. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 1108bae41e2ac596f46bc4cd8876b93063203d2b Author: Eric W. Biederman Date: Fri Jul 29 12:50:57 2005 -0600 [PATCH] reboot: remove device_suspend(PMSG_FREEZE) from kernel_kexec If device_suspend(PMSG_FREEZE) is not ready to be called in kernel_restart it is definitely not ready to be called in the even more fickle kernel_kexec. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 2bcad935a3bb149833bf249e6b159f22a90d6218 Author: Dave Jones Date: Fri Jul 29 09:56:41 2005 -0700 Fix up powernow-k8 compile. (Missing definitions). From: Mark Langsdorf Signed-off-by: Dave Jones commit d6d2a2ab05da6e44bd127fe375078bb7c36a0ad0 Author: Linus Torvalds Date: Fri Jul 29 11:01:22 2005 -0400 x86: fix new find_first_bit() Some edge problems with the original C rewrite. Thanks go to Cal Peake, who pinpointed the breakage to the rewrite, and tested this fixed version. Signed-off-by: Linus Torvalds commit 33ac02aa4cef417871e128ab4a6565e751e5f3b2 Merge: e0d7ff168a71299919f01500b3d507aae0c67513 2bcad935a3bb149833bf249e6b159f22a90d6218 Author: Linus Torvalds Date: Fri Jul 29 10:16:25 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq commit e0d7ff168a71299919f01500b3d507aae0c67513 Merge: ca49a601c2b4b74e5cf57fef62122204d1982372 33fdfa97f2b3aab698ef849ec50dcc5102017f0a Author: Linus Torvalds Date: Fri Jul 29 09:48:34 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input commit ca49a601c2b4b74e5cf57fef62122204d1982372 Merge: 5a90fa71f6d45054c78b2bd6dbc4feba1638e1d2 7ac5ae4b122f9415948c642b945a26938aa8f347 Author: Linus Torvalds Date: Fri Jul 29 09:47:08 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp commit 5a90fa71f6d45054c78b2bd6dbc4feba1638e1d2 Merge: dddf8f9e4b1af852bcd735d5f737c0d0e2ce6e76 7b6dbd6872ca1d0c03dc0e0a7108d79c8dafa793 Author: Linus Torvalds Date: Fri Jul 29 09:04:47 2005 -0700 Merge head 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 7ac5ae4b122f9415948c642b945a26938aa8f347 Author: Russell King Date: Fri Jul 29 16:36:48 2005 +0100 [ARM SMP] Ensure secondary CPUs see their pen release Since the secondary CPUs will not be operating in symetric mode while they are held in the pen, we need to ensure that the write to pen_release is visible to them, by flushing the cache. Signed-off-by: Russell King commit dddf8f9e4b1af852bcd735d5f737c0d0e2ce6e76 Merge: 911656f8a630e36b22c7e2bba3317dec9174209c 6192b54b845ed05cb838f86ca588cc625c703a09 Author: Linus Torvalds Date: Thu Jul 28 22:12:57 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 911656f8a630e36b22c7e2bba3317dec9174209c Author: Stephen Smalley Date: Thu Jul 28 21:16:21 2005 -0700 [PATCH] selinux: Fix address length checks in connect hook This patch fixes the address length checks in the selinux_socket_connect hook to be no more restrictive than the underlying ipv4 and ipv6 code; otherwise, this hook can reject valid connect calls. This patch is in response to a bug report where an application was calling connect on an INET6 socket with an address that didn't include the optional scope id and failing due to these checks. Signed-off-by: Stephen Smalley Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0b9d796002d9d39575cf1beabfb625f68b507fa Author: Jon Smirl Date: Thu Jul 28 21:16:19 2005 -0700 [PATCH] fbdev: colormap fixes fix Fix a buffer overflow vunerabilty in previous cmap patch Signed-off-by: Jon Smirl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1474e2d9dfb782e6c6517a180b5a8913c69dfad Author: Dave Hansen Date: Thu Jul 28 21:16:18 2005 -0700 [PATCH] re-disable TSC on NUMAQ Somewhere recently, the TSC got re-enabled for timekeeping on NUMAQ machines. However, the hardware makes these get unsynchronized quite badly. So badly, in fact, that the code to fix up the skew can just hang on boot. This patch re-disables them. It's nicely confined to the numaq.c file. It would be great if this could make it into 2.6.13, I think it counts as a bugfix. Tested on a 16-proc 4-node NUMAQ. Signed-off-by: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78fa74a23b16bdb0d944272b696915c4e0bb3ee1 Author: George Anzinger Date: Thu Jul 28 21:16:16 2005 -0700 [PATCH] posix timers: fix normalization problem (We found this (after a customer complained) and it is in the kernel.org kernel. Seems that for CLOCK_MONOTONIC absolute timers and clock_nanosleep calls both the request time and wall_to_monotonic are subtracted prior to the normalize resulting in an overflow in the existing normalize test. This causes the result to be shifted ~4 seconds ahead instead of ~2 seconds back in time.) The normalize code in posix-timers.c fails when the tv_nsec member is ~1.2 seconds negative. This can happen on absolute timers (and clock_nanosleeps) requested on CLOCK_MONOTONIC (both the request time and wall_to_monotonic are subtracted resulting in the possibility of a number close to -2 seconds.) This fix uses the set_normalized_timespec() (which does not have an overflow problem) to fix the problem and as a side effect makes the code cleaner. Signed-off-by: George Anzinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2d76bd8fa29f9b6dbf3ee8f6bc7bdda21bc5ce8 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Jul 28 21:16:15 2005 -0700 [PATCH] uml: implement hostfs syncing Actually implement the hostfs "sync" method. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30f417c65e151dc96998a8ef721149a43998bc65 Author: Christophe Lucas Date: Thu Jul 28 21:16:12 2005 -0700 [PATCH] uml: Clean up prink calls printk() calls should include appropriate KERN_* constant. Signed-off-by: Christophe Lucas Signed-off-by: Domen Puncer Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 201134ca168c27c1f895ecfd74f9ebf1129483d0 Author: Bodo Stroesser Date: Thu Jul 28 21:16:11 2005 -0700 [PATCH] uml: Fix typo Fix a typo in wait_stub_done. 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 7e1f49da6881bbf938e502d99335ad5488eb93b4 Author: Jeff Dike Date: Thu Jul 28 21:16:09 2005 -0700 [PATCH] uml: Fix load average >=1 update_process_times was missing its irq_enter/irq_exit wrapper. This caused ksoftirqd to be scheduled on every clock tick. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9b7cc84afc7f4ebcef27691279d557e13128818 Author: Jeff Dike Date: Thu Jul 28 21:16:08 2005 -0700 [PATCH] uml: Fix redundant assignment By this point, .is_user has already been set, so this assignment is useless. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9057e9deee648cb2824d83b9eb7058edb5442a21 Author: Bodo Stroesser Date: Thu Jul 28 21:16:06 2005 -0700 [PATCH] uml: Fix skas0 stub return It's wrong to pop a fixed number of words from stack before calling sigreturn, as the number depends on what code is generated by the compiler for the start of stub_segv_handler(). What we need is esp containing the address of sigcontext. So we explicitly load that pointer into esp. 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 6f313b12335abf010802751c45249e7a0007a232 Author: Jeff Dike Date: Thu Jul 28 21:16:05 2005 -0700 [PATCH] uml: vm86 compile fix We added an include of asm/vm86.h in include/asm-i386/ptrace.h. Since UML includes the underlying arch's ptrace.h, it needs an asm/vm86.h in order to build. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8afe07ce0003d4c63b7d76b6f28264503cb80d71 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Jul 28 21:16:03 2005 -0700 [PATCH] uml: avoid unnecessary pcap rebuild Just a Kbuild subtlety, not listing a target file inside targets causes it to be rebuilt each time, and as a consequence everything depending on it is rebuilt. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b85e9680a33ae2df04bd493f220a76dcf183ce80 Author: Jeff Dike Date: Thu Jul 28 21:16:01 2005 -0700 [PATCH] uml: fix TT mode by reverting "use fork instead of clone" With Paolo 'Blaisorblade' Giarrusso Revert the following patch, because of miscompilation problems in different environments leading to UML not working *at all* in TT mode; it was merged lately in 2.6 development cycle, a little after being written, and has caused problems to lots of people; I know it's a bit too long, but it shouldn't have been merged in first place, so I still apply for inclusion in the -stable tree. Anyone using this feature currently is either using some older kernel (some reports even used 2.6.12-rc4-mm2) or using this patch, as included in my -bs patchset. For now there's not yet a fix for this patch, so for now the best thing is to drop it (which was widely reported to give a working kernel, and as such was even merged in -stable tree). "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." URL: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=98fdffccea6cc3fe9dba32c0fcc310bcb5d71529 Signed-off-by: Jeff Dike Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ca3310e78912a527d7d2c62c01da7cbf7346b8d Author: Alasdair G Kergon Date: Thu Jul 28 21:16:00 2005 -0700 [PATCH] device-mapper: fix md->lock deadlocks in core This patch is an attempt to fix deadlocks discovered in the core dm. The problems boil down to md->lock having to be held in too many places, so I've split it into two: md->suspend_lock and md->io_lock. suspend_lock is now held throughout dm_suspended() as well as dm_resume() and dm_swap_table() so that these functions cannot run concurrently: there's no requirement for that and it added complexity. DMF_FS_LOCKED becomes redundant: DMF_SUSPENDED provides adequate protection. Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e90188be4a56f37fbb4ffb5b58745683526dcb9 Author: Alasdair G Kergon Date: Thu Jul 28 21:15:59 2005 -0700 [PATCH] device-mapper: fix deadlocks in core Avoid another bdget_disk which can deadlock. Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf222b3769c3759488579441ab724ed33a2da5f4 Author: Alasdair G Kergon Date: Thu Jul 28 21:15:57 2005 -0700 [PATCH] device-mapper: fix deadlocks in core (prep) Some code tidy-ups in preparation for the next patches. Change dm_table_pre/postsuspend_targets to accept NULL. Use dm_suspended() throughout. Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c56ac3f3b12936b03d2626c7572fed5977af515 Author: Ravikiran G Thirumalai Date: Thu Jul 28 21:15:55 2005 -0700 [PATCH] x86_64: fix cpu_to_node setup for sparse apic_ids While booting with SMT disabled in bios, when using acpi srat to setup cpu_to_node[], sparse apic_ids create problems. Without this patch, intel x86_64 boxes with hyperthreading disabled in the bios (and which rely on srat for numa setup) endup having incorrect values in cpu_to_node[] arrays, causing sched domains to be built incorrectly etc. Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a7b90137d9f05390cf953d756e1edda2ca88053 Author: Andi Kleen Date: Thu Jul 28 21:15:54 2005 -0700 [PATCH] x86_64: Remove unused variable in k8-bus.c arch/x86_64/pci/k8-bus.c: In function `fill_mp_bus_to_cpumask': arch/x86_64/pci/k8-bus.c:32: warning: unused variable `printed' Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef6e525393dbbab7e1dc42594d35a1dfd688d1d7 Author: Nishanth Aravamudan Date: Thu Jul 28 21:15:53 2005 -0700 [PATCH] x86_64: Use msleep in smpboot.c Replace schedule_timeout() with msleep() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d224d32c28c165f7100a670d61d64dd15d49a1e Author: Jesse Millan Date: Thu Jul 28 21:15:51 2005 -0700 [PATCH] x86_64: Fix gcc 4 warning in sched_find_first_bit This patch eliminates the GCC4 warning on the x86_64 platform: kernel/sched.c:1824: warning: control may reach end of non-void function 'sched_find_first_bit' being inlined. The change follows the lead of others, i.e. it is guaranteed that at least one of b[0], b[1], or b[2] will have a bit set and evaluate to true. That being said, GCC4.0.0 notices that the code flow does not return anything if b[0], b[1] and b[2] are not true. Since we know better, if it's not b[0] or b[1], it has to be b[2]. Signed-off-by: Jesse Millan Signed-off-by: Domen Puncer Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07291d431ce6c6660c35dd4e5e980a406dc3629a Author: Andi Kleen Date: Thu Jul 28 21:15:50 2005 -0700 [PATCH] x86_64: Fix SRAT handling on non dual core systems Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed6b676ca8b50e0b538e61c283d52fd04f007abf Author: Andi Kleen Date: Thu Jul 28 21:15:49 2005 -0700 [PATCH] x86_64: Switch to the interrupt stack when running a softirq in local_bh_enable() This avoids some potential stack overflows with very deep softirq callchains. i386 does this too. TOADD CFI annotation Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3829ee6b1be03d5aa3005fe7d19f30088b539836 Author: Andi Kleen Date: Thu Jul 28 21:15:48 2005 -0700 [PATCH] x86_64: Small assembly improvements Save a byte here and there. Ultimatively useless, but these things always catch my eyes when reading the code so just fix them for now. Also I got at least one patch fixing of them already, which gives a good excuse. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ba80e7595f3e308e5e7135445b513779fc0ba3b Author: Andi Kleen Date: Thu Jul 28 21:15:47 2005 -0700 [PATCH] x86_64: Remove unnecessary include in fault.c Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2cac78935ff1705e1eb53be28da704d3482b4f5 Author: Andi Kleen Date: Thu Jul 28 21:15:46 2005 -0700 [PATCH] x86_64: When running cpuid4 need to run on the correct CPU Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6a68a16dc15c65fe76acb7502a806ae415cd3e4 Author: Andi Kleen Date: Thu Jul 28 21:15:45 2005 -0700 [PATCH] x86_64: Turn BUG data into valid instruction This avoids confusing the disassembler. Costs 2 bytes per BUG. Thanks to Suresh Siddha and Jan Beulich for suggesting suitable instructions. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2275cfa8bcb833cdac7dcc616d11306ca35eec58 Author: Andreas Gruenbacher Date: Thu Jul 28 21:15:44 2005 -0700 [PATCH] x86_64: Icecream has no way of detecting assembler-level includes Icecream preprocesses c sources locally, and sends the result off to a remote host for compiling. It does not recognize includes at assembler level. The fix is to put the assemberincludes an a separate .s file, which will always be assembled locally. Signed-off-by: Andreas Gruenbacher Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8d311939f9d2b2a5e935df8dceb98b7cbe08d43 Author: Andi Kleen Date: Thu Jul 28 21:15:42 2005 -0700 [PATCH] x86_64: Support more than 8 cores on AMD systems Use physical mode instead of logical mode to address more CPUs. This is also used in the CPU hotplug case to avoid a race. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37a47e65fa58d413a31f27ee88f6cb98583b6157 Author: Andi Kleen Date: Thu Jul 28 21:15:41 2005 -0700 [PATCH] x86_64: Remove the broadcast options that were added for cpuhotplug Will be obsolete with physflat. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f68c1388ada34998c2902c289c6a6b625a73c4e Author: Andi Kleen Date: Thu Jul 28 21:15:41 2005 -0700 [PATCH] x86_64: Remove IA32_* build tools in Makefile Not used anymore since quite some time. Just uses -m32 instead. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91c6d400940e97f2809c04fcf383517f7650dbd4 Author: Andi Kleen Date: Thu Jul 28 21:15:39 2005 -0700 [PATCH] x86_64: Create per CPU machine check sysfs directories This patch will create machinecheck sysdev directories per CPU. All of the cpus still share the same ctl banks. When compiled with CONFIG_HOTPLUG_CPU, it will also bring up/down sysdev directories as cpus go up/down. I have tested the patch along with CONFIG_HOTPLUG_CPU option on in 2.6.13-rc1 kernel. Minor changes by AK: remove useless unload function Signed-off-by: Jacob Shin Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69cb62eb6dceb0da701e04395d3b412a0648c118 Author: Andi Kleen Date: Thu Jul 28 21:15:39 2005 -0700 [PATCH] x86_64: Print a boot message for hotplug memory zones From: Keith Manning Print a boot message for hotplug memory zones Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b684664fd495fd640353c0f786751763db77dcfb Author: Keith Mannthey Date: Thu Jul 28 21:15:38 2005 -0700 [PATCH] x86_64: Fix overflow in NUMA hash function setup Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17158d17aa726142255050b407ad701a6f191aba Author: Andi Kleen Date: Thu Jul 28 21:15:37 2005 -0700 [PATCH] x86_64: Fix incorrectly defined MSR_K8_SYSCFG Harmless because the kernel didn't use it. Noticed by Travis Betak Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca4e6b740206fc943cc1c90fd434d4d389da8f2b Author: Andi Kleen Date: Thu Jul 28 21:15:36 2005 -0700 [PATCH] x86_64: Fix some typos in system.h comments Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6391ad0aa487e7b13588b1439d2462a320b07d0d Author: Andi Kleen Date: Thu Jul 28 21:15:35 2005 -0700 [PATCH] x86_64: Remove obsolete eat_key prototype Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d970a5218088a856d80acd9da6c6742f55cb0a0d Author: Andi Kleen Date: Thu Jul 28 21:15:35 2005 -0700 [PATCH] x86_64: Fix some comments in tlbflush.h Were either outdated or misleading. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef4d7cbea773a77b36e732779cab4018ba2c037b Author: Andi Kleen Date: Thu Jul 28 21:15:34 2005 -0700 [PATCH] x86_64: Some updates for boot-options.txt Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a54649b801e5fe69755dc55e6589f7a65af25d79 Author: Andi Kleen Date: Thu Jul 28 21:15:32 2005 -0700 [PATCH] x86_64: Improve CONFIG_GART_IOMMU description and make it default y Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c853cc7e7940a2d6ad66cfe666192516fc06b0e3 Author: Andi Kleen Date: Thu Jul 28 21:15:31 2005 -0700 [PATCH] x86_64: Remove unused variable in delay.c Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a940199f206dcf51c65fae27e2ce412f2c5a2b22 Author: Andi Kleen Date: Thu Jul 28 21:15:30 2005 -0700 [PATCH] x86_64: Some cleanup in setup64.c Minor cleanup. Move things into their include files, remove obsolete includes, fix indentation, remove obsolete special cases etc. I also added the per cpu section to asm-generic/sections.h and fixed init/main.c to use it. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de04f3220b9789cc40fd6b1d151dfa0a7e3b03b9 Author: Andi Kleen Date: Thu Jul 28 21:15:29 2005 -0700 [PATCH] x86_64: Clarify Booting processor ... message No need to print kernel addresses there and clarify what the APIC-ID is. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3019e8ebe6281843488250ee3a539106806da93a Author: Andi Kleen Date: Thu Jul 28 21:15:28 2005 -0700 [PATCH] x86_64: Minor clean up to CPU setup - use smp_processor_id instead of custom hack Does not change any semantics because numa_add_cpu checks for CPU 0 anyways. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61b1b2d0239da82c0bed8adaa1d070c6551d4afd Author: Andi Kleen Date: Thu Jul 28 21:15:27 2005 -0700 [PATCH] x86_64: Move cpu_present/possible_map parsing earlier Various code needs this information now before the actual SMP bootup. Instead of computing it on the fly while booting the other CPUs set it up now while initial MPtable/MADT parsing. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b943fbfaf0dbdd3cd9ff2dda100f0b8c47a7d8c Author: Andi Kleen Date: Thu Jul 28 21:15:26 2005 -0700 [PATCH] x86_64: i386/x86_64: remove prototypes for not existing functions in smp.h Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74f0629397cb435e144ff47c48f3bc39e879f196 Author: Andi Kleen Date: Thu Jul 28 21:15:25 2005 -0700 [PATCH] x86_64: Use for_each_cpu_mask for clustered IPI flush Makes it slightly more efficient. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit acc7b6f01c3d387faa34233a25949eaaf18e0753 Author: Andi Kleen Date: Thu Jul 28 21:15:23 2005 -0700 [PATCH] x86_64: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5df3574ec0eac0eb8d758e8e9b1ad95d909a9e1f Author: Andi Kleen Date: Thu Jul 28 21:15:22 2005 -0700 [PATCH] x86_64: Always ack IPIs even on errors Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a16a3007d5b5896ff62d149bb4dca1a29fd78c4 Author: Alexander Nyberg Date: Thu Jul 28 21:15:20 2005 -0700 [PATCH] x86_64: cpu hotplug changes kills nmi watchdog When the x86_64 cpu hotplug changes went in it added a check in default_do_nmi() which kills NMI delivery on any CPU but the BSP. The NMI watchdog is brought up quite some time before the online bit is set in num_online_cpus so this won't work very well. The nmi watchdogs on cpus that are not BSP will never be reprogrammed and no NMIs. Why was this check added? How does an offlined cpu receive an NMI? Signed-off-by: Alexander Nyberg Cc: Andi Kleen Cc: Andrew Morton Cc: Zwane Mwaikambo Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63953523341bcafe5928bf6e99bffd7db94b471e Author: Linus Torvalds Date: Thu Jul 28 15:44:44 2005 -0700 Linux 2.6.13-rc4 commit bafd2df5d0049bccc74947fece37963e3f68fadc Author: Joachim Nilsson Date: Fri Jul 29 00:18:03 2005 +0200 [PATCH] fix gconfig crash I ran glade-2 on the glade file, fixed two missing stock icons and cleaned up the C code that inserts the single/split/full modes. The rest of the patch is minor cleanups only. I refrained from using all the included xpm icons in images.c (like qconf.cc does) in favour of using the stock Gtk+ icons instead. Oh, yes there was a "back" bug in split mode that I also removed, oh well... It has been tested with success by several people, including Jesper Juhl, Randy Dunlap and myself. Signed-off-by: Sam Ravnborg Signed-off-by: Linus Torvalds commit 0dca0f7bf82face7b700890318d5550fd542cabf Author: Hal Rosenstock Date: Thu Jul 28 13:17:26 2005 -0700 [PATCH] [IPoIB] Handle sending of unicast RARP responses RARP replies are another valid case where IPoIB may need to send a unicast packet with no neighbour structure. Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 4e38d36d88ead4e56f3155573976da84d5df18b3 Author: Roland Dreier Date: Thu Jul 28 13:16:30 2005 -0700 [PATCH] [IB/cm]: Correct CM port redirect reject codes Reject code 24 is port and CM redirection, not just port redirection. Port redirection alone is code 25. Therefore we should rename code 24 to IB_CM_REJ_PORT_CM_REDIRECT and use IB_CM_REJ_PORT_REDIRECT for code 25. Signed-off-by: Roland Dreier commit 7b6dbd6872ca1d0c03dc0e0a7108d79c8dafa793 Author: Greg Felix Date: Thu Jul 28 15:54:15 2005 -0400 libata: Check PCI sub-class code before disabling AHCI This patch adds functionality to check the PCI sub-class code of an AHCI capable device before disabling AHCI. It fixes a bug where an ICH7 sata controller is being setup by the BIOS as sub-class 1 (ide) and the AHCI control registers weren't being initialized, thus causing an IO error in piix_disable_ahci(). Signed-off-by: Gregory Felix commit e7ec02938dbe8ca35b750f29eaa4b12de0b52754 Author: Russell King Date: Thu Jul 28 20:36:26 2005 +0100 [ARM SMP] Fix another ARMv6 bitop problem We sometimes forgot to check whether the exclusive store succeeded. Ensure that we always check. Also ensure that we always use the out of line versions, since the inline versions are not SMP safe. Signed-off-by: Russell King commit 505d7b193181be029f4f9aea59e6bdbfdd1e9e76 Author: Russell King Date: Thu Jul 28 20:32:47 2005 +0100 [ARM SMP] Ensure secondary CPUs have a clean TLB Since ARMv6 CPUs will not flush the TLB on context switches, it is possible that we may end up with some global TLB entries remaining present, eventually upsetting userspace. Explicitly flush the entire TLB on secondary CPUs as they startup, after we have switched to the init_mm page tables. Signed-off-by: Russell King commit 6192b54b845ed05cb838f86ca588cc625c703a09 Author: David S. Miller Date: Thu Jul 28 12:12:58 2005 -0700 [NET]: Fix busy waiting in dev_close(). If the current task has signal_pending(), the loop we have to wait for the __LINK_STATE_RX_SCHED bit to clear becomes a pure busy-loop. Fixed by using msleep() instead of the hand-crafted version. Noticed by Andrew Morton. Signed-off-by: David S. Miller commit 2ac6608c41f8c45371ea9dddae7f99bc2c15d5cf Author: Linus Torvalds Date: Thu Jul 28 10:34:47 2005 -0700 Revert broken "statement with no effect" warning fix It may shut up gcc, but it also incorrectly changes the semantics of the smp_call_function() helpers. You can fix the warning other ways if you are interested (create another inline function that takes no arguments and returns zero), but preferably gcc just shouldn't complain about unused return values from statement expressions in the first place. commit 7153d9612fe5cefc29f9f17d7a6b9f0dcd07b20e Author: Dave Jones Date: Thu Jul 28 09:45:10 2005 -0700 powernow-k8.c: In function `query_current_values_with_pending_wait': powernow-k8.c:110: warning: `hi' may be used uninitialized in this function Signed-off-by: Brian Gerst Signed-off-by: Dave Jones Signed-off-by: Andrew Morton commit cc993cab0239cb07af329d2e18faac7888821075 Author: Dave Jones Date: Thu Jul 28 09:43:56 2005 -0700 Here are two possible cleanups in cpufreq.c: * ret has no need to be unsigned in cpufreq_driver_target() * ret has no need to be initialized in __cpufreq_governor() Signed-off-by: Jean Delvare Signed-off-by: Dave Jones commit 841e40b380a70933e8dc1184e0f9ba1c6cac48af Author: Dave Jones Date: Thu Jul 28 09:40:04 2005 -0700 Opteron revision F will support higher frequencies than can be encoded in the current driver's 4 bit frequency field. This patch updates the driver to support Rev F including 6 bit FIDs and processor ID updates. This should apply cleanly whether or not the dual-core bugfix I sent out last week is applied. I'd prefer that both get applied, of course. Signed-off-by: David Keck Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones commit 03938c3f1062b0f279a0ef937a471d4db83702ed Author: Dave Jones Date: Thu Jul 28 09:38:21 2005 -0700 powernow-k8 requires that a data structure for each core be created in the _cpu_init function call. The cpufreq infrastructure doesn't call _cpu_init for the second core in each processor. Some systems crashed when _get was called with an odd-numbered core because it tried to dereference a NULL pointer since the data structure had not been created. The attached patch solves the problem by initializing data structures for all shared cores in the _cpu_init function. It should apply to 2.6.12-rc6 and has been tested by AMD and Sun. Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones commit 7b70888a192eff457c2ca0a4ffa04815f5e19734 Merge: cd85c8b4457a52d3545fdb9532082b2c1ebd5f21 0a97af41b0e77f834acc0870155de616a373e899 Author: Linus Torvalds Date: Thu Jul 28 08:41:58 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa commit cd85c8b4457a52d3545fdb9532082b2c1ebd5f21 Author: Steven Rostedt Date: Thu Jul 28 08:45:06 2005 -0400 [PATCH] speed up on find_first_bit for i386 (let compiler do the work) Avoid using "rep scas", just let the compiler select a sequence of regular instructions. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit 79a8810221ee9ea96c4e5a5817afb88f22ea698c Author: Richard Henderson Date: Thu Jul 28 01:07:41 2005 -0700 [PATCH] alpha: fix "statement with no effect" warnings Apparently gcc 4.0 complains about "({ 0; });", which leads to -Werror breakage in one of the alpha oprofile modules. One might could argue that this is a gcc bug, in that statement-expressions should be considered to be function-like rather than statement-like for the purposes of this warning. But it's just as easy to use an inline function in the first place, side-stepping the issue. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11be00cba6be114f861123cfc6779f195a615d22 Author: Bjorn Helgaas Date: Thu Jul 28 01:07:39 2005 -0700 [PATCH] PCDP: if PCDP contains parity information, use it If the PCDP supplies parity, use it (only none/even/odd supported), and don't append parity/stop bit arguments unless baud is present. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b378def5a386c4a7f15b51ed79802badb9f5a70 Author: Tony Luck Date: Thu Jul 28 01:07:38 2005 -0700 [PATCH] e1000: no need for reboot notifier sys_reboot() now calls device_suspend(), so it is no longer necessary for the e1000 driver to register a reboot notifier [in fact doing so results in e1000_suspend() getting called twice]. (akpm: we need to fast-track this. It's causing ia64 to oops on shutdown) Signed-off-by: Tony Luck Cc: Cc: Cc: Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5c1d5b2aaf9a98f15a6dcdfbba1f494d0aaae52 Author: James Morris Date: Thu Jul 28 01:07:37 2005 -0700 [PATCH] SELinux: default labeling of MLS field Implement kernel labeling of the MLS (multilevel security) field of security contexts for files which have no existing MLS field. This is to enable upgrades of a system from non-MLS to MLS without performing a full filesystem relabel including all of the mountpoints, which would be quite painful for users. With this patch, with MLS enabled, if a file has no MLS field, the kernel internally adds an MLS field to the in-core inode (but not to the on-disk file). This MLS field added is the default for the superblock, allowing per-mountpoint control over the values via fixed policy or mount options. This patch has been tested by enabling MLS without relabeling its filesystem, and seems to be working correctly. Signed-off-by: James Morris Signed-off-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1699f508ab5098de4b258268fa8913db38d9d35 Author: Ian Campbell Date: Thu Jul 28 01:07:34 2005 -0700 [PATCH] cs89x0: collect tx_bytes statistics Signed-off-by: Ian Campbell Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac12259f2984d96454affc147f9d63f2ac2ac1f8 Author: Giancarlo Formicuccia Date: Thu Jul 28 01:07:33 2005 -0700 [PATCH] Fix incorrect Asus k7m irq router detection This patch: http://marc.theaimsgroup.com/?l=bk-commits-head&m=111955644929114&w=2 uncovered a k7m bios bug, where the VT82C686A router is reported as being "586-compatible". The two chips have different pirq mapping, so this leads to "irq routing conflict" on many pci devices. The suggested fix was discussed with Aleksey Gorelov, who helped me to identify the problem as a probable bios bug. Signed-off-by: Giancarlo Formicuccia Cc: Dave Jones Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad2b93123d2b3cb4ba9a98dd5f62acb6d6b50391 Author: Mike Miller Date: Thu Jul 28 01:07:31 2005 -0700 [PATCH] cciss per disk queue This patch adds per disk queue functionality to cciss. Sometime back I submitted a patch but it looks like only part of what I needed. In the 2.6 kernel if we have more than one logical volume the driver will Oops during rmmod. It seems all of the queues actually point back to the same queue. So after deleting the first volume you hit a null pointer on the second one. This has been tested in our labs. There is no difference in performance, it just fixes the Oops. Signed-off-by: Mike Miller Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eaaf9c68e75edf0fa51c5770eb68c2a6cb5ff66b Author: Daniel Ritz Date: Thu Jul 28 01:07:30 2005 -0700 [PATCH] pcmcia: disable read prefetch/write burst on old O2Micro bridges Older O2Micro bridges have problems with both read prefetch and write burst depending on the combination of the chipset, bridge, cardbus card. safest is to disable read prefetch and write burst on those old bridges. Signed-off-by: Daniel Ritz Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8c4b4195c7d664baf296818bf756775149232d3 Author: Daniel Ritz Date: Thu Jul 28 01:07:28 2005 -0700 [PATCH] yenta: free_irq() on suspend. Resume doesn't seem to work without. Signed-off-by: Daniel Ritz Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1b274fbe3f00469fb8a68806469ec7746c7f648 Author: Dominik Brodowski Date: Thu Jul 28 01:07:27 2005 -0700 [PATCH] pcmcia: fix sharing IRQs and request_irq without IRQ_HANDLE_PRESENT Debugging and description from: Noah Misch When a driver calls pcmcia_request_irq with IRQ_HANDLE_PRESENT unset, it looks for an open IRQ by request_irq()ing with a dummy handler and NULL dev_info. free_irq uses dev_info as a key for identifying the handler to free among those sharing an IRQ, so request_irq returns -EINVAL if dev_info is NULL and the IRQ may be shared. That unknown error code is the -EINVAL. It looks like only pcnet_cs and axnet_cs are affected. Most other drivers let pcmcia_request_irq install their interrupt handlers. sym53c500_cs requests its IRQ manually, but it cannot share an IRQ. The appended patch changes pcmcia_request_irq to pass an arbitrary, unique, non-NULL dev_info with the dummy handler. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 661d04c6f08c16ae63fb3be05d59ee99c6f3de52 Author: Dominik Brodowski Date: Thu Jul 28 01:07:26 2005 -0700 [PATCH] pcmcia: update documentation Update the PCMCIA documentation to reflect some more, though older, changes. Parts extracted from an e-mail from Randy Dunlap with his consent. Signed-off-by: Randy Dunlap Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d277ad0eaa056c632707271192ec5896548f15d6 Author: Komuro Date: Thu Jul 28 01:07:24 2005 -0700 [PATCH] pcmcia: fix many device IDs If the product-id-string contains the '+' , '&' ,'_', it was not converted properly from the /etc/pcmcia/config(pcmcia-cs config file). Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e5a3e79091615c5eae871ad9e794ed48753ae05 Author: Dominik Brodowski Date: Thu Jul 28 01:07:23 2005 -0700 [PATCH] pcmcia: avoid duble iounmap of one address Avoid double iounmap of one address, and disable cis_virt if set_mem_map failed. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc33a4a36cad02b939b9a4fb2f15ade17d61cdaf Author: Dominik Brodowski Date: Thu Jul 28 01:07:22 2005 -0700 [PATCH] pcmcia: update au1000 to work with recent changes Get the au1000 PCMCIA socket drivers to work. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2e0743a515c3317b0f9c93fb1c5e082c87474a2 Author: Jar Date: Thu Jul 28 01:07:21 2005 -0700 [PATCH] pcmcia: remove duplicates in orinoco_cs Remove duplicates from the device id table. Signed-off-by: Jarkko Raja Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba5bb6b58490693fb9b5de3ffee48c6dc9ae0d6c Author: Pavel Roskin Date: Thu Jul 28 01:07:20 2005 -0700 [PATCH] pcmcia: fix comment There are two problems with the message about missing callback functions: it's not written in correct English and it lacks newline at the end. Signed-off-by: Pavel Roskin Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 698e22c4bf7dad25d63f5c2ec6ca07047579c434 Author: Pavel Roskin Date: Thu Jul 28 01:07:19 2005 -0700 [PATCH] pcmcia: ide-cs id_table update SanDisk ConnectPlus has two functions. Function 0 is prism2 card, currently only supported by HostAP (not in the kernel). Function 1 is 128M flash, supported by ide-cs. This patch adds an entry for function 1 to ide-cs.c. Signed-off-by: Pavel Roskin Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5453be48e8def75a9c1b2177b82fa0e692c6e3a Author: Andrew Morton Date: Thu Jul 28 01:07:18 2005 -0700 [PATCH] bio_clone fix Fix bug introduced in 2.6.11-rc2: when we clone a BIO we need to copy over the current index into it as well. It corrupts data with some MD setups. See http://bugzilla.kernel.org/show_bug.cgi?id=4946 Huuuuuuuuge thanks to Matthew Stapleton for doggedly chasing this one down. Acked-by: Jens Axboe Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da28c12089dfcfb8695b6b555cdb8e03dda2b690 Merge: 6de7dc2c4c713d037c19aa1e310d240f16973414 577a4f8102d54b504cb22eb021b89e957e8df18f Author: Dave Kleikamp Date: Thu Jul 28 09:03:36 2005 -0500 Merge with /home/shaggy/git/linus-clean/ /home/shaggy/git/linus-clean/ /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp commit 0a97af41b0e77f834acc0870155de616a373e899 Author: Jaroslav Kysela Date: Thu Jul 28 15:50:42 2005 +0200 [ALSA] version 1.0.9b commit da8ea98b21236f29a5df723e3cc5abdc6530c07c Author: Takashi Iwai Date: Thu Jul 28 15:22:55 2005 +0200 [ALSA] wavefront - declare initialization data as static Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 69c3e5f8562c7854d9dd8d7820a89286f9440e41 Author: Takashi Iwai Date: Wed Jul 27 17:30:14 2005 +0200 [ALSA] via82xx - Fix dxs_support of twinhead laptop VIA82xx driver Changed the dxs_support value of twinhead laptop to DXS_SRC. Signed-off-by: Takashi Iwai commit eeacb5457cf5f0802fb29f385befa0b1d166cadb Author: Sergey Ulanov Date: Wed Jul 27 17:28:58 2005 +0200 [ALSA] Jack Sense support for AD1980 and AD1888 AC97 Codec Attached patch adds 'Jack Sense' controls for AD1980 and AD1888 chips. Signed-off-by: Takashi Iwai commit 7b566054b33474cdd674289a8c7dd282c02e536e Author: Takashi Iwai Date: Wed Jul 27 17:26:59 2005 +0200 [ALSA] vx-driver - Fix the calculation of frequency parameter Digigram VX core Fixed the calculation of frequency parameter of vx boards. Signed-off-by: Takashi Iwai commit fb92e6f05e84f6c217d786208e2ed5acf633b6ce Author: Nicolas Graziano Date: Wed Jul 27 17:25:08 2005 +0200 [ALSA] hda driver, correct bug in model 'auto' HDA Codec driver - Correct some index variable inversion in patch_cmedia.c Signed-off-by: Nicolas Graziano Signed-off-by: Takashi Iwai commit 5a0f217d96656068f0f1e5cda16c35945f979b16 Author: Victor Fusco Date: Tue Jul 26 13:42:31 2005 +0200 [ALSA] sound/core Fix the sparse warning 'implicit cast to nocast type' Memalloc module,ALSA Core,Instrument layer Fix the sparse warning 'implicit cast to nocast type' File/Subsystem:sound/core Signed-off-by: Victor Fusco Signed-off-by: Domen Puncer Signed-off-by: Jaroslav Kysela commit 854af9578cb84e4ca3cb1551a6be40c4e81bb455 Author: Clemens Ladisch Date: Mon Jul 25 16:19:10 2005 +0200 [ALSA] usb-audio - change quirk type handling USB generic driver Make the quirk type an enum instead of a #defined integer, and use a table for the quirk constructor functions instead of a big switch statement. Signed-off-by: Clemens Ladisch commit f38275fe994c333b809796230f4f98090f8d919b Author: Clemens Ladisch Date: Mon Jul 25 16:17:29 2005 +0200 [ALSA] usb-audio - add support for Miditech USB MIDI keyboards USB generic driver Add support for Miditech Midistart and MidiStudio keyboards (another case of devices using the standard protocol but having no descriptors). Signed-off-by: Clemens Ladisch commit d06e4c4001cf26147a6af0718703368944f0df32 Author: Clemens Ladisch Date: Thu Jul 21 08:01:22 2005 +0200 [ALSA] seq-midi - silently ignore non-MIDI events ALSA sequencer When non-MIDI sequencer events are sent to a RawMIDI port, silently ignore them instead of returning a confusing error code which may upset the sequencer and abort the current write() to /dev/snd/seq. Signed-off-by: Clemens Ladisch commit 7858ffa062886706026cfff3ba80b8400b520501 Author: Clemens Ladisch Date: Mon Jul 11 15:37:19 2005 +0200 [ALSA] ac97 - remove unused variable AC97 Codec remove a variable made obsolete by the last change Signed-off-by: Clemens Ladisch commit c9eab129fcbcef364b34fb3a70cb2531847e1edf Author: James Courtier-Dutton Date: Sun Jul 10 12:04:29 2005 +0200 [ALSA] ac97: Fix volume control bit size detection for STAC9704. AC97 Codec Signed-off-by: James Courtier-Dutton commit 7c1d549aa9b22365fe5405c372f840cdbc6315f5 Author: James Courtier-Dutton Date: Sun Jul 10 11:50:36 2005 +0200 [ALSA] emu10k1: Add EMU 1212m card entry and document it as not supported yet. EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton commit b27c187f95cd6c9f13f26a5088bea384ac557b45 Author: Nishanth Aravamudan Date: Sat Jul 9 10:54:37 2005 +0200 [ALSA] Fix-up sleeping in sound/usb USB generic driver,USB USX2Y Description: Fix-up sleeping in sound/usb. Replace big_mdelay() with msleep() to guarantee the task delays as expected. This also involved replacing/removing custom sleep functions. Patch is compile-tested. Signed-off-by: Nishanth Aravamudan Signed-off-by: Jaroslav Kysela commit 989a0b248bbf32c89e60dc6f02219e446b320712 Author: Nishanth Aravamudan Date: Sat Jul 9 10:53:24 2005 +0200 [ALSA] Fix-up sleeping in sound/ppc PPC AWACS driver,PPC PMAC driver,PPC Tumbler driver Description: Fix-up sleeping in sound/ppc. Replace big_mdelay() with msleep() to guarantee the task delays as expected. This also involved replacing/removing custom sleep functions. Signed-off-by: Nishanth Aravamudan Signed-off-by: Jaroslav Kysela commit ef21ca24faf28df6d06939e77d5032a313490289 Author: Nishanth Aravamudan Date: Sat Jul 9 10:13:22 2005 +0200 [ALSA] sound/pci: fix-up sleeping paths ENS1370/1+ driver,ES1968 driver,Intel8x0 driver,VIA82xx driver VIA82xx-modem driver,AC97 Codec,ALI5451 driver,CS46xx driver MIXART driver,RME HDSP driver,Trident driver,YMFPCI driver Description: Fix-up sleeping in sound/pci. These changes fall under the following two categories: 1) Replace schedule_timeout() with msleep() to guarantee the task delays as expected. This also involved replacing/removing custom sleep functions. 2) Do not assume jiffies will only increment by one if you request a 1 jiffy sleep, i.e. use time_after/time_before in while loops. Signed-off-by: Nishanth Aravamudan Signed-off-by: Jaroslav Kysela commit 072c01194df6e4843582d09380b780987f642d6d Author: Jaroslav Kysela Date: Sat Jul 9 10:07:55 2005 +0200 [ALSA] ens1371 - added extra delay for ac97 codec initialization ENS1370/1+ driver Signed-off-by: Jaroslav Kysela commit 856def8a4695066e6cbd2919c5987f1df23dbe8a Author: Henrik Kretzschmar Date: Fri Jul 8 13:53:42 2005 +0200 [ALSA] typo-fix and snd_assert()-expression-split ALSA Core This patch corrects a typo in the kerneldocs of snd_info_get_str(). It also splits the expressions of snd_assert() in snd_info_unregister() into one-expression-per-call for better debugging. Signed-off-by: Henrik Kretzschmar Signed-off-by: Takashi Iwai commit 5b738babf13d51285710ed57336ee5f072ac9490 Author: Henrik Kretzschmar Date: Fri Jul 8 09:29:18 2005 +0200 [ALSA] fix compiler warning GUS Library This patch fixes a compiler warning if sequencer is disabled. Signed-off-by: Henrik Kretzschmar Signed-off-by: Jaroslav Kysela commit ae3a72d8cb4e5b30606c5e3ac9c59b729117579a Author: James Courtier-Dutton Date: Wed Jul 6 22:36:18 2005 +0200 [ALSA] snd-emu10k1: Fixes recognition of Audigy ES. EMU10K1/EMU10K2 driver Fixes ALSA bug #1237. Signed-off-by: James Courtier-Dutton commit e66bc8b2a7d85166935a2da651b94efb9e7a2f11 Author: James Courtier-Dutton Date: Wed Jul 6 22:21:51 2005 +0200 [ALSA] emu10k1: Add module option uint subsystem. EMU10K1/EMU10K2 driver It allows the user to force the snd-emu10k1 module to think the user has a particular sound card. Useful if their particular sound card is not yet recognised. Signed-off-by: James Courtier-Dutton commit 2201987c562f7c810440d399ef7a85fe79be01e7 Author: Jaroslav Kysela Date: Tue Jul 5 10:27:09 2005 +0200 [ALSA] via82xx - changed MSI K7T266 Pro2 - 4005:4710 in white list (SRC enable) VIA82xx driver Signed-off-by: Jaroslav Kysela commit e3ea4d896109edd64dc549ecaeeff8d89025fb57 Author: Takashi Iwai Date: Mon Jul 4 18:12:39 2005 +0200 [ALSA] hdsp - Add 'Sample Clock Source Locking' control RME HDSP driver Added 'Sample Clock Source Locking' control. If this switch is on, the clock source can't be changed via PCM hw_params API (as sample rate). This will fix the problem of OSS-emulation, for example. Signed-off-by: Takashi Iwai commit 4e55096e27d745908e44c6abd2cc0c5b615854a4 Author: Matt Date: Mon Jul 4 17:51:39 2005 +0200 [ALSA] hda: add sigmatel hp detect support HDA Codec driver Adds support for detecting hp insertion/removal and enable/disable of lineouts based on unsolicited events. Signed-off-by: Matt Signed-off-by: Takashi Iwai commit 41e2fce431070cb2d91391808077378582d3e6b1 Author: Matt Date: Mon Jul 4 17:49:55 2005 +0200 [ALSA] hda: enable unsolicited responses HDA Intel driver Patch enables unsolicited responses on the HDA controller. Without the UREN bit set, the controller will not place unsolicited responses in a RIRB. Signed-off-by: Matt Signed-off-by: Takashi Iwai commit bbd4615cdb68de943b2814e956ec14899606dc45 Author: Clemens Ladisch Date: Mon Jul 4 09:21:45 2005 +0200 [ALSA] usb-audio - use bDeviceSubClass to detect MOTU FastLane USB generic driver MOTU builds other USB MIDI interfaces with the same product ID as the FastLane, so we have to check the bDeviceSubClass field to differentiate between them. Signed-off-by: Clemens Ladisch commit 6155aff84b98b2aa35eaa4384b539dfbab86afcc Author: Clemens Ladisch Date: Mon Jul 4 09:20:42 2005 +0200 [ALSA] usb-audio - rename QUIRK_MIDI_MOTU to QUIRK_MIDI_RAW USB generic driver Rename the protocol used by the MOTU FastLane to 'raw' because it might be useful with other devices, and there are other MOTU interfaces that do not use this protocol. Signed-off-by: Clemens Ladisch commit b1c6ef52e2623c81c2124801c783a903f6e5437a Author: Clemens Ladisch Date: Mon Jul 4 09:18:46 2005 +0200 [ALSA] usb-audio - enable high speed transfers with Audiy 2 NX USB generic driver This patch enables the boot commands to activate high speed mode (and associated sample formats like 8 channels with 24 bits at 96 kHz) on the SB Audigy 2 NX. Signed-off-by: Clemens Ladisch commit 88dc0e5dadf9b0cb529c89b12cd10f75d5b1bce4 Author: James Courtier-Dutton Date: Sun Jul 3 12:54:29 2005 +0200 [ALSA] emu10k1: Added tested status comments. EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton commit a6f6192bb38a76c4ad44c894144b1fbf3d14606b Author: James Courtier-Dutton Date: Sun Jul 3 12:32:40 2005 +0200 [ALSA] emu10k1: Sort by card id. EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton commit 3818152e64866b54020b5656ff5fdd0f5e085183 Author: James Courtier-Dutton Date: Sat Jul 2 18:03:37 2005 +0200 [ALSA] snd-emu10k1: Tidy mixer controls. EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton commit e0474e53985c5fac97a5bb85d66ec0d017b5faf3 Author: James Courtier-Dutton Date: Sat Jul 2 16:33:34 2005 +0200 [ALSA] snd-emu10k1: Card capabilities tidy up. EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton commit 7bc71ecd6477db90221efc08fb742b3df4f49b46 Author: Jaroslav Kysela Date: Sat Jul 2 15:20:57 2005 +0200 [ALSA] via82xx - added MSI K7T266 Pro2 - 4005:4710 to white list (DXS enable) VIA82xx driver Reporter: Marko Kohtala Signed-off-by: Jaroslav Kysela commit 0ac2ac0ad7d1e8c84241d1c40b0d196b9b7c8104 Author: Clemens Ladisch Date: Fri Jul 1 16:19:39 2005 +0200 [ALSA] usb-audio: add support for an unknown Yamaha USB MIDI device USB generic driver Add a quirk for the Yamaha USB MIDI device with USB ID 0x103d. Signed-off-by: Clemens Ladisch commit 2c484df0d249323d223f7f58e0f3b992b7414be8 Author: Takashi Iwai Date: Thu Jun 30 18:54:04 2005 +0200 [ALSA] Add ARM PXA2xx AC97 driver Documentation,ARM,/arm/Makefile,ARM PXA2XX driver Added ARM PXA2xx AC97 driver by Nicolas Pitre (moved from alsa-driver tree). Signed-off-by: Takashi Iwai commit 1bd9debf25b8a5f5029d7619f43e4a9a775973d3 Author: Takashi Iwai Date: Thu Jun 30 18:26:20 2005 +0200 [ALSA] Add DBRI driver on Sparcs Documentation,SPARC,/sparc/Makefile Add the DBRI driver on Sparcs by Martin Habets (moved from alsa-driver tree). Signed-off-by: Takashi Iwai commit ab79509a95b1d22c40d4a87823b6a48bc9a12af5 Author: Takashi Iwai Date: Thu Jun 30 18:13:54 2005 +0200 [ALSA] Add help texts to Kconfig SPARC Added simple help texts to Kconfig of Sparc sound drivers. (Better texts are appreciated :) Signed-off-by: Takashi Iwai commit 5ba1e7b594db4d0e1f88ace87c1cb295761ca5c9 Author: Takashi Iwai Date: Thu Jun 30 13:47:58 2005 +0200 [ALSA] maestro3 - Clean up Maestro3 driver - Clean up maestro3 code - Use msleep() - Don't enable hw-vol irq when not defined Signed-off-by: Takashi Iwai commit 52b723888c1a55d34551f9b0b9d9296e0e3e8d3c Author: Takashi Iwai Date: Thu Jun 30 13:47:06 2005 +0200 [ALSA] Fix resume of intel8x0 Intel8x0 driver,AC97 Codec Fix resume of intel8x0 driver. The ac97 codec didn't restore some registers properly, and the restore of ICH4 SPDIF and SDIN settings was missing. Signed-off-by: Takashi Iwai commit 2eff7ec81eb586076974cb0918dffc5f4ad763d5 Author: Takashi Iwai Date: Thu Jun 30 13:45:20 2005 +0200 [ALSA] cmipci - Add Mic Boost capture switch CMIPCI driver Added 'Mic Boost Capture Switch' and 'Phone' switches. The existing playback switch is renamed as 'Mic Boost Playback Switch'. Signed-off-by: Takashi Iwai commit 174d52204500a63c19e6613e49db3fcfe4e9d35a Author: Takashi Iwai Date: Thu Jun 30 13:42:39 2005 +0200 [ALSA] vxpocket - Remove unused code Digigram VX Pocket driver Removed unused files (dropped by the last change). Signed-off-by: Takashi Iwai commit 6d00a3127972e7853d6296ffc1e72c5b1a23d937 Author: Takashi Iwai Date: Thu Jun 30 13:40:51 2005 +0200 [ALSA] Fix and clean-up of vxpocket driver Documentation,PCMCIA Kconfig,Digigram VX Pocket driver - Fixed Oops with request_firmware() - Detect the card type in runtime (vxpoocket v2 or 440) - snd-vxp440 driver is merged to snd-vxpocket - Clean up the code Signed-off-by: Takashi Iwai commit 82fe0c5803f4c77ffeb4c1c2367defb3dcedad45 Author: Takashi Iwai Date: Thu Jun 30 10:54:33 2005 +0200 [ALSA] Use kstrdup HDA Codec driver Use the new kstrdup() function instead of in-house one. Signed-off-by: Takashi Iwai commit 0884484762f731a1d5446c0b618a74c5957dea4f Author: Takashi Iwai Date: Thu Jun 30 09:55:31 2005 +0200 [ALSA] Fix dependency of GUS driver ALSA sequencer Add the missing snd-seq-midi-emul to SND_GUS_SYNTH list. Signed-off-by: Takashi Iwai commit d5750f67853350373fc1d5698c3a58ea16eddf4c Author: Henrik Kretzschmar Date: Wed Jun 29 19:31:06 2005 +0200 [ALSA] cleanup and typo-correction ALSA Core This patch changes, adds and remove some comments, which will make now more sense and fit on a 80-char line. It also changes the order of snd_power_wait() to make the file more readable. It removes the device.c comment in front of _snd_minor, cause snd_minor has nothing to do with device.c. The both typos in the kernel-docs were corrected too. Signed-off-by: Henrik Kretzschmar Signed-off-by: Takashi Iwai commit a3352f01ea2d38b0d5b7b63de754e94b9aba0390 Author: Henrik Kretzschmar Date: Wed Jun 29 19:30:42 2005 +0200 [ALSA] Fix two typos and changes on snd_assert() ALSA Core Both typos were in the kerneldocs. I splitted the snd_assert() calls in one-expression-per-call for better debugging. Signed-off-by: Henrik Kretzschmar Signed-off-by: Takashi Iwai commit 7a318a70a42057692f191ff49c289cd3e27e21f5 Author: Takashi Iwai Date: Tue Jun 28 14:16:21 2005 +0200 [ALSA] hda-codec - Add entry for Acer APFV HDA Codec driver Added the model entry for Acer APFV. Signed-off-by: Takashi Iwai commit b6482d48e536729829025262d6529df09ae20396 Author: Takashi Iwai Date: Mon Jun 27 15:32:43 2005 +0200 [ALSA] hda-codec - Add 6stack model for ALC880 Documentation,HDA Codec driver - Added a new '6stack' model for ALC880. - Fixed the typo in 6stack-digout model name. - Added description for missing models in ALSA-Configuration.txt. Signed-off-by: Takashi Iwai commit 548e7823bc33b8cde4de59dfafe0fd69d951d3b5 Author: Harald Welte Date: Mon Jun 27 15:10:56 2005 +0200 [ALSA] Add new pci device id (SB400) to atiixp-modem ATIIXP-modem driver I didn't actually test whether the modem works, but at least the driver loads and initializes fine. Please consider inclusion. Signed-off-by: Takashi Iwai commit b95eed7cde4a44476fa12e776e090fc494059458 Author: Takashi Iwai Date: Mon Jun 27 15:07:33 2005 +0200 [ALSA] trident - Shut up compile warnings Trident driver Shut up compile warnings about uninitialized variables. Signed-off-by: Takashi Iwai commit ff6fdc37fbe66e24ef9ad7c23a278ff757480dda Author: Matt Date: Mon Jun 27 15:06:52 2005 +0200 [ALSA] hda-codec - SigmaTel HDA resume support HDA Codec driver Adds resume support to the SigmaTel HDA patch. Please apply. Signed-off-by: Matt Signed-off-by: Takashi Iwai commit c7d4b2fa3169a1206450bc445d1997a17479644f Author: Matt Date: Mon Jun 27 14:59:41 2005 +0200 [ALSA] hda-codec - SigmaTel HDA multichannel support HDA Codec driver Adds 6/8 channel support to the SigmaTel HDA patch. Please apply. Signed-off-by: Matt Signed-off-by: Takashi Iwai commit b4d3f9d452ec574e0ffb292267427f69bb470631 Author: Clemens Ladisch Date: Mon Jun 27 08:18:27 2005 +0200 [ALSA] usb-audio - fix capture of non-48k sample rates on Audigy 2 NX USB generic driver On the SB Audigy 2 NX, capturing with sample rates that are not a multiple of 48 kHz does not seem to work, so disable it. Signed-off-by: Clemens Ladisch commit 573567e07bb4470ff177f17d1adca3f3bd310221 Author: Clemens Ladisch Date: Mon Jun 27 08:17:30 2005 +0200 [ALSA] usb-audio - high speed audio support USB generic driver Add support for endpoints with bInterval > 1, and decoding of the wMaxPacketSize field of high-speed endpoints. Signed-off-by: Clemens Ladisch commit b0af0de5cb57c96b0c3d739005172152b7de0ce8 Author: Takashi Iwai Date: Tue Jun 21 14:49:19 2005 +0200 [ALSA] hda-codec - Fix oops with ALC880 HDA Codec driver - Fixed oops with ALC880 auto-config mode - Fixed a wrong config table entry for ALC880 Signed-off-by: Takashi Iwai commit 145794dc09117b31b6730096558e52b673af7b84 Author: Jaroslav Kysela Date: Mon Jun 20 10:42:44 2005 +0200 [ALSA] ak4114: removed duplicate wake_up() AK4114 receiver - wake_up(&runtime->sleep) is already called in snd_pcm_post_stop() Signed-off-by: Jaroslav Kysela commit 577a4f8102d54b504cb22eb021b89e957e8df18f Author: Andrew Vasquez Date: Wed Jul 27 22:10:59 2005 -0700 [PATCH] More qla2xxx configuration fixes This adds the appropriate FW_LOADER pre-requisite and a separate entry for ISP24xx support. Thanks to Adrian Bunk and Jesper Juhl for their efforts in fixing this quirk. Signed-off-by: Linus Torvalds commit 79d81907594e1ec4d5171653dde7cb9e9cb87de2 Author: Hal Rosenstock Date: Wed Jul 27 20:38:56 2005 -0700 [IB/ucm]: Clean up userspace CM Only print debug messages when debug_level is set. Eliminate NULL checks prior to calling kfree. Signed-off-by: Hal Rosenstock Signed-off-by: Libor Michalek commit 2868bd281fef21d1e73d6b7648a41efc3d75f10c Merge: 6d376756f2cf3478d5a4fdb8d18e958948366b9d 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af Author: Roland Dreier Date: Wed Jul 27 19:12:56 2005 -0700 Merge /scratch/Ksrc/linux-git/ commit 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af Author: Richard Henderson Date: Wed Jul 27 17:10:52 2005 -0700 [PATCH] new alpha syscalls Signed-off-by: Linus Torvalds commit 340d10e47238daeb5e5eb27df25b4e7ec71f6571 Merge: e0aa8afd97536a9d94f82a07b4c4b3f05aef6f82 48b0e5487fcdcb3421bda67666277348b2bd2661 Author: Linus Torvalds Date: Wed Jul 27 17:09:10 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit e0aa8afd97536a9d94f82a07b4c4b3f05aef6f82 Author: Linus Torvalds Date: Wed Jul 27 17:08:21 2005 -0700 Fix up qla2xxx configuration bogosity If we haven't configured the qla24xx driver, then the Makefile shouldn't do it for us. This also means that we can avoid the unnecessary selection of FC_ATTRS. Debugged by James Bottomley commit e4ff4d7f9d85a2bc714307eb9113617182e62845 Author: Andrew Morton Date: Wed Jul 27 10:41:23 2005 -0700 [PATCH] Avoid device suspend on reboot My fairly ordinary x86 test box gets stuck during reboot on the wait_for_completion() in ide_do_drive_cmd(): Signed-off-by: Linus Torvalds commit 49302d0c42592b37f49ae96e0f06a3599cf5a8a0 Merge: 839c5d2511fadc35cc4e8a8ffa833d76668700b2 18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8 Author: Linus Torvalds Date: Wed Jul 27 16:42:22 2005 -0700 Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6 commit 839c5d2511fadc35cc4e8a8ffa833d76668700b2 Merge: 96fad28a781069eb40156f78b8f50c349805b652 5e43db7730e7cef7d37968ea789c41392519a864 Author: Linus Torvalds Date: Wed Jul 27 16:37:59 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 96fad28a781069eb40156f78b8f50c349805b652 Merge: 3334c39f1815d2911238c43f40840c3c7b378165 b833961bd30eec201b9a94eec36aa7ac96f9c9c0 Author: Linus Torvalds Date: Wed Jul 27 16:37:03 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 3334c39f1815d2911238c43f40840c3c7b378165 Merge: 71b2c86f5fd22b27feaa6c19c2c6662480ecd7d5 614d73edae68836f7659ee8efec90878e6215fb1 Author: Linus Torvalds Date: Wed Jul 27 16:36:08 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp commit 71b2c86f5fd22b27feaa6c19c2c6662480ecd7d5 Author: Marcelo Tosatti Date: Wed Jul 27 04:55:54 2005 -0300 [PATCH] ppc32: 8xx remove BROKEN Kconfig entry 8xx is not BROKEN anymore. Signed-off-by: Marcelo Tosatti Signed-off-by: Linus Torvalds commit bf85fa6c878aa3968df47d7f70a2b506c3e53b99 Author: Anton Wöllert Date: Wed Jul 27 04:45:17 2005 -0300 [PATCH] ppc32: 8xx avoid icbi misbehaviour in __flush_dcache_icache_phys On 8xx, in the case where a pagefault happens for a process who's not the owner of the vma in question (ptrace for instance), the flush operation is performed via the physical address. Unfortunately, that results in a strange, unexplainable "icbi" instruction fault, most likely due to a CPU bug (see oops below). Avoid that by flushing the page via its kernel virtual address. Oops: kernel access of bad area, sig: 11 [#2] NIP: C000543C LR: C000B060 SP: C0F35DF0 REGS: c0f35d40 TRAP: 0300 Not tainted MSR: 00009022 EE: 1 PR: 0 FP: 0 ME: 1 IR/DR: 10 DAR: 00000010, DSISR: C2000000 TASK = c0ea8430[761] 'gdbserver' THREAD: c0f34000 Last syscall: 26 GPR00: 00009022 C0F35DF0 C0EA8430 00F59000 00000100 FFFFFFFF 00F58000 00000001 GPR08: C021DAEF C0270000 00009032 C0270000 22044024 10025428 01000800 00000001 GPR16: 007FFF3F 00000001 00000000 7FBC6AC0 00F61022 00000001 C0839300 C01E0000 GPR24: 00CD0889 C082F568 3000AC18 C02A7A00 C0EA15C8 00F588A9 C02ACB00 C02ACB00 NIP [c000543c] __flush_dcache_icache_phys+0x38/0x54 LR [c000b060] flush_dcache_icache_page+0x20/0x30 Call trace: [c000b154] update_mmu_cache+0x7c/0xa4 [c005ae98] do_wp_page+0x460/0x5ec [c005c8a0] handle_mm_fault+0x7cc/0x91c [c005ccec] get_user_pages+0x2fc/0x65c [c0027104] access_process_vm+0x9c/0x1d4 [c00076e0] sys_ptrace+0x240/0x4a4 [c0002bd0] ret_from_syscall+0x0/0x44 Signed-off-by: Marcelo Tosatti Signed-off-by: Linus Torvalds commit 59904159c316f7bc02d00ff7b0dc3f9d3afd07fd Author: Jesper Juhl Date: Wed Jul 27 11:46:10 2005 -0700 [PATCH] Update CREDITS entry and listings in source files for Jesper Juhl a) update entry in CREDITS for Jesper Juhl b) remove email address from source files so it's only listed in credits. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77933d7276ee8fa0e2947641941a6f7a100a327b Author: Jesper Juhl Date: Wed Jul 27 11:46:09 2005 -0700 [PATCH] clean up inline static vs static inline `gcc -W' likes to complain if the static keyword is not at the beginning of the declaration. This patch fixes all remaining occurrences of "inline static" up with "static inline" in the entire kernel tree (140 occurrences in 47 files). While making this change I came across a few lines with trailing whitespace that I also fixed up, I have also added or removed a blank line or two here and there, but there are no functional changes in the patch. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03e259a9cdbd0583e71468293aaa1ccadbdaeff1 Author: Michal Januszewski Date: Wed Jul 27 11:46:08 2005 -0700 [PATCH] fbdev: update info->cmap when setting cmap from user-/kernelspace. The fb_info struct, as defined in include/linux/fb.h, contains an element that is supposed to hold the current color map: struct fb_cmap cmap; /* Current cmap */ This cmap is currently never updated when either fb_set_cmap() or fb_set_user_cmap() are called. As a result, info->cmap contains the default cmap that was set by a device driver/fbcon and a userspace application using the FBIOGETCMAP ioctl will not always get the *currently* used color map. The patch fixes this by making sure the cmap is copied to info->cmap after it is set correctly. It moves most of the code that is responsible for setting the cmap to fb_set_cmap() and out of fb_set_user_cmap() to avoid code-duplication. Signed-off-by: Michal Januszewski Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbd4f12859307c20a4c65a7de4cdd5f9f518dc7a Author: Michal Januszewski Date: Wed Jul 27 11:46:06 2005 -0700 [PATCH] fbcon: don't repaint the cursor when it is disabled. Currently even when the cursor is disabled (`setterm -cursor off`), it is still repainted as a black rectangle the size of a single char. This can be seen, for example, by chvt'ing to a free tty, disabling the cursor and doing `dd if=3D/dev/urandom of=3D/dev/fb0`. The patch changes this behaviour by avoiding painting anything when the cursor is disabled. Signed-off-by: Michal Januszewski Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d210224732b3d32e802e3537499297d387852166 Author: Jon Smirl Date: Wed Jul 27 11:46:05 2005 -0700 [PATCH] fbdev: colormap fixes Color maps have up to 256 entries. 4096/256 allows for 16 characters per line. The format for a cmap entry is "%02x%c%4x%4x%4x\n" %02x entry %c transp %4x red %4x blue %4x green You can read the color_map with cat fb0/color_map. Signed-off-by: Jon Smirl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ca34fcbfbf8a7cbe99d54ae81c4e28fdc6f4ac6 Author: Jon Smirl Date: Wed Jul 27 11:46:05 2005 -0700 [PATCH] radeonfb: clean up EDID sysfs attribute radeonfb does not clean up EDID sysfs attribute Signed-off-by: Jon Smirl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a340cce09f5dfd89b7b7eea1a52d1a2d1c99a2e Author: Jon Smirl Date: Wed Jul 27 11:46:04 2005 -0700 [PATCH] fbmem: use unregister_chrdev() on unload fbdev is missing unregister_chrdev() on unload. Signed-off-by: Jon Smirl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a793b77f786022bd0fef1a18142c1b9be9e421d Author: Jon Smirl Date: Wed Jul 27 11:46:03 2005 -0700 [PATCH] fbmon: horizontal frequency rounding fix Fix rounding error when mode frequency is very close to monitor limit Signed-off-by: Jon Smirl Acked-by: James Simmons Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e4b7952cd34af4dd78e012265d4bc858db6adf3 Author: Marcelo Tosatti Date: Wed Jul 27 11:46:01 2005 -0700 [PATCH] cpm_uart: use DPRAM for early console m8xx_cpm_hostalloc() can't rely on using the coherent DMA allocator early on boot because the VM is not fully up yet. Change it to use the on-board DPRAM instead. The current code relies on the "bootmem_page" allocated by m8xx_cpm_reset(), which must be killed. This is done in v2.4 but has never been forward ported to v2.6. Signed-off-by: Marcelo Tosatti Cc: Pantelis Antoniou Cc: Kumar Gala Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ddcc9197beef7cba993c38cdcad45aefb557d33 Author: Michael Krufky Date: Wed Jul 27 11:46:00 2005 -0700 [PATCH] dvb: rename lgdt3302 frontend module to lgdt330x Rename lgdt3302 to lgdt330x, to make way for the addition of lgdt3303 support in future revisions. I am changing the name of this module now so that hopefully the name will be changed before the release of 2.6.13 ... It wouldn't make sense to release 2.6.13 with the name lgdt3302 in it, which will only be renamed to lgdt330x in later versions. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d2599d98e9cb511f326b2d1b353e462bc360774 Author: Michael Hunold Date: Wed Jul 27 11:46:00 2005 -0700 [PATCH] v4l: fix tuning with MXB driver I noticed that some past changes to the gerneric Video4Linux tuner module for analog tuners broke my "Multimedia eXtension Board" driver. The tuner driver was made aware of Video4Linux2 tuning ioctls, but my driver was not ported and still uses the Video4Linux1 ioctls. This does not work anymore as intendend, the tuning is currently broken. The attached patch fixes non-working tuning in MXB driver introduced by some recent generic tuner changes by replacing Video4Linux1 tuner ioctls with proper Video4Linux2 tuner ioctls. - fix non-working tuning in MXB driver introduced by some recent generic tuner changes by replacing Video4Linux1 tuner ioctls with proper Video4Linux2 tuner ioctls Signed-off-by: Michael Hunold Cc: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29780bb7af61752924cf4814f2d8180747b38105 Author: Michael Krufky Date: Wed Jul 27 11:45:59 2005 -0700 [PATCH] v4l: hybrid dvb: rename CFLAGS from CONFIG_DVB_xxxx back to original HAVE_xxxx The #define CONFIG_DVB_* are actually CFLAGS set by Makefile. CONFIG_* namespace is reserved for Kconfig. This renames them back to HAVE_* Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84de2eff1390a89a76507abc3073dad8de751869 Author: Michael Krufky Date: Wed Jul 27 11:45:58 2005 -0700 [PATCH] v4l: hybrid dvb: move #defines to Makefile This patch moves #define from cx88-dvb.c and saa7134-dvb.c into Makefile as CFLAGS, allowing code compatability with video4linux cvs. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b1cd0c77429083d6ceb379b1d15c6bca165e90b Author: Michael Krufky Date: Wed Jul 27 11:45:57 2005 -0700 [PATCH] v4l: hybrid dvb: fix warnings with -Wundef This patch adds a missing #ifdef to saa7134-dvb.c (thanks to Mauro Carvalho Chehab) and changes #if to #ifdef in both files. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d975872c5c94615a12040009cde71c82cddeb1be Author: Michael Krufky Date: Wed Jul 27 11:45:56 2005 -0700 [PATCH] dvb/v4l: cx88 cleanup Remove unneeded comment. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 723d52e6a6391e8c4954dca0a7efd3645181981f Author: Michael Krufky Date: Wed Jul 27 11:45:56 2005 -0700 [PATCH] lgdt3302: warning fix warning: `i2c_readbytes' defined but not used This code will either be re-enabled or deleted in a future patch. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ccef6dbb08770bf21ffc82094c2117bd7977ff8 Author: Michael Krufky Date: Wed Jul 27 11:45:55 2005 -0700 [PATCH] dvb/4vl: RF input selection fir Select the RF input connector based upon the type of demodulation selected. ANT RF connector is selected for 8-VSB and CABLE RF connector is selected for QAM64/QAM256. This only affects the cards that use the Microtune 4042 tuner. Signed-off-by: Mac Michaels Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6aef071bdef0cd9f69113bb3575aa45fafdbbbf Author: Michael Krufky Date: Wed Jul 27 11:45:54 2005 -0700 [PATCH] dvb/v4l: lgdt3302: isolate tuner Remove the dvb_pll_desc from the frontend and replace with a pll_set-callback to isolate the tuner programming from the frontend. Signed-off-by: Mac Michaels Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fd0f3acfa7dfc6e8aba7ce1639b8590ddb98fea Author: Michael Krufky Date: Wed Jul 27 11:45:53 2005 -0700 [PATCH] v4l: fix regression modprobe bttv freezes the computer Remove redundant bttv_reset_audio() which caused the computer to freeze with some bt8xx based DVB cards when loading the bttv driver. Signed-off-by: Johannes Stezenbach Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b96d611f373b2cbf5ffc093d859b3a9b1009e096 Author: Adrian Bunk Date: Wed Jul 27 11:45:52 2005 -0700 [PATCH] VIDEO_SAA7134 must depend on SOUND VIDEO_SAA7134=y and SOUND=n results in the following compile error: LD .tmp_vmlinux1 drivers/built-in.o(.text+0x4fafcb): In function `saa7134_initdev': : undefined reference to `unregister_sound_dsp' drivers/built-in.o(.text+0x4fb141): In function `saa7134_initdev': : undefined reference to `register_sound_dsp' drivers/built-in.o(.text+0x4fb17c): In function `saa7134_initdev': : undefined reference to `register_sound_mixer' drivers/built-in.o(.text+0x4fb339): In function `saa7134_finidev': : undefined reference to `unregister_sound_mixer' drivers/built-in.o(.text+0x4fb341): In function `saa7134_finidev': : undefined reference to `unregister_sound_dsp' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Adrian Bunk Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82ee3e6fa347dcba19e36afb23a01020bc2e77e2 Author: Adrian Bunk Date: Wed Jul 27 11:45:51 2005 -0700 [PATCH] drivers/media/video/tveeprom.c: possible cleanups This patch contains the following possible cleanups: - make two needlessly global structs static - #if 0 the EXPORT_SYMBOL'ed but unused function tveeprom_dump Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e00e48626474854bf712372fe6656ef4621af0f Author: Gregory B Frost Date: Wed Jul 27 11:45:48 2005 -0700 [PATCH] DVICO Fusion DVB-T1 Tuner (LG-Z201) fix It is a small modification to the table that defines the way that the LG-Z201 tuner is controlled for the DVICO Fusion DVB-T1 tuner card. I believe that a mistake was made when the dvb tuner code was reorganised (to use a generic table for the tuner information instead of inline code) and as a result, the DVICO card doesn't tune properly. The modification I have made to the table makes it behave like it did with the old inline tuner code that worked. The patch is on top of the 2.6.12 kernel. Signed-off-by: Gregory B Frost Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 617b586bca4eda775f93915b8efd586dddf7903c Author: Hal Rosenstock Date: Wed Jul 27 11:45:47 2005 -0700 [PATCH] IB: Add core locking documentation to Infiniband Add core locking documentation to Infiniband Signed-off-by: Roland Dreier Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f13f9f501a6eee14e495aba56ec6f70cf2328180 Author: Hal Rosenstock Date: Wed Jul 27 11:45:46 2005 -0700 [PATCH] IB: Eliminate sparse warnings in SA client Eliminate sparse warnings in SA client Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8fd65b096a7ba1fff69c7991f481ebac5498673e Author: Hal Rosenstock Date: Wed Jul 27 11:45:45 2005 -0700 [PATCH] IB: Hook up userspace CM to the make system Hook up userspace CM to the make system Signed-off-by: Libor Michalek Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d0d099f1950bda2f712364a3bf74f20ddb61190 Author: Tom Duffy Date: Wed Jul 27 11:45:45 2005 -0700 [PATCH] Add kernel portion of user CM implementation (fix) Include the patch openib-general changing class_simple to class. Signed-off-by: Tom Duffy Cc: Hal Rosenstock Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5b74540770cb28b8ae779d0c27e228fe7500669 Author: Hal Rosenstock Date: Wed Jul 27 11:45:44 2005 -0700 [PATCH] IB: Add kernel portion of user CM implementation Add kernel portion of user CM implementation Signed-off-by: Libor Michalek Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8aa009191d157de53735646552421f3d1595364a Author: Hal Rosenstock Date: Wed Jul 27 11:45:43 2005 -0700 [PATCH] IB: Add the header file for user space CM Add the header file for user space CM. This file defines the ABI used by the CM for kernel/user communication. Signed-off-by: Libor Michalek Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb183a06b381652b7637fedfa7ef85ec0baf2a1f Author: Hal Rosenstock Date: Wed Jul 27 11:45:42 2005 -0700 [PATCH] IB: Implementation for RMPP support in user MAD Implementation for RMPP support in user MAD Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f75daddb4fc6b695faa4e12e76894389e913dcb Author: Hal Rosenstock Date: Wed Jul 27 11:45:41 2005 -0700 [PATCH] IB: User MAD ABI changes to support RMPP User MAD ABI changes to support RMPP Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a977049dacdef6a9e69fb4872b42a68e93a69956 Author: Hal Rosenstock Date: Wed Jul 27 11:45:40 2005 -0700 [PATCH] IB: Add the kernel CM implementation Add the kernel CM implementation Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3e0164758fc24623020e0ad7bd278607b4693e3 Author: Hal Rosenstock Date: Wed Jul 27 11:45:39 2005 -0700 [PATCH] IB: Add the header file for kernel CM (Communications Manager) Add the header file for kernel CM (Communications Manager) Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cbae32c56314fa3032f92db36caab49f08ab0601 Author: Hal Rosenstock Date: Wed Jul 27 11:45:38 2005 -0700 [PATCH] IB: Add Service Record support to SA client Add Service Record support to SA client Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa619a77046bef30478697aba0553991033afb8e Author: Hal Rosenstock Date: Wed Jul 27 11:45:37 2005 -0700 [PATCH] IB: Add RMPP implementation Add RMPP implementation. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2082ee516200095956bd66279be4f62f4a5843d Author: Hal Rosenstock Date: Wed Jul 27 11:45:36 2005 -0700 [PATCH] IB: Introduce RMPP APIs Introduce RMPP APIs Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 497677ab940e637a41351dca6610bc4320abc8f1 Author: Hal Rosenstock Date: Wed Jul 27 11:45:35 2005 -0700 [PATCH] IB: A couple of IB core bug fixes Replace be32_to_cpup with be32_to_cpu and fix bug referencing pointer rather than value in ib_create_ah_from_wc(). Signed-off-by: Tom Duffy Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 513789ed995fb2ba72ba2a5bee53ea11d1170580 Author: Hal Rosenstock Date: Wed Jul 27 11:45:34 2005 -0700 [PATCH] IB: Add ib_create_ah_from_wc to IB verbs Added new call: ib_create_ah_from_wc. Call will allocate an address handle given work completion information, including any received GRH. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cabe3cbcbb3b09637b9e706c49eadb180fca057e Author: Hal Rosenstock Date: Wed Jul 27 11:45:33 2005 -0700 [PATCH] IB: Fix a couple of MAD code paths Fixed locking to handle error posting MAD send work requests. Fixed handling canceling a MAD with an active work request. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29bb33dd87dbe8db07c2b19df3fb453d999c96de Author: Hal Rosenstock Date: Wed Jul 27 11:45:32 2005 -0700 [PATCH] IB: Optimize canceling a MAD Optimize canceling a MAD. - Eliminate searching timeout list in cancel case. - Remove duplicate calls to queue work item. - Eliminate resending a MAD before MAD is completed. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03b61ad2f29295f019e095d0f490f30a4d678d3f Author: Hal Rosenstock Date: Wed Jul 27 11:45:32 2005 -0700 [PATCH] IB: Add ib_modify_mad API to MAD Add new MAD layer call to modify (ib_modify_mad) the timeout of a sent MAD, and simplify cancel code. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c153b934dca08d58e0aafde18a182e0891aa201 Author: Hal Rosenstock Date: Wed Jul 27 11:45:31 2005 -0700 [PATCH] IB: Eliminate MAD cache leak associated with local completions Eliminate MAD cache leak associated with local completions. Also, when canceling MAD, empty local completion list as well. Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbf9227bd3dff71c3c2f540cc3e96098d2ab41e7 Author: Hal Rosenstock Date: Wed Jul 27 11:45:30 2005 -0700 [PATCH] IB: Simplify calling of list_del in MAD Simplify calling of list_del. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f75b7a5294949cd1b7bc301e3087c7bb78e22520 Author: Hal Rosenstock Date: Wed Jul 27 11:45:29 2005 -0700 [PATCH] IB: Add automatic retries to MAD layer Add automatic retries to MAD layer. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df9f9ead746e9607099d7024f312133944173609 Author: Hal Rosenstock Date: Wed Jul 27 11:45:28 2005 -0700 [PATCH] IB: Add ib_coalesce_recv_mad to MAD Add implementation for ib_coalesce_recv_mad. Also, clear allocated MAD data buffer in ib_create_send_mad. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f68bcc2df8115b4ea45bfa4f8de22ec7232562b5 Author: Hal Rosenstock Date: Wed Jul 27 11:45:27 2005 -0700 [PATCH] IB: Minor cleanup during MAD startup and shutdown Minor cleanup during startup and shutdown Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a0c435ef9e2473934442282054d0f58235d1de2 Author: Hal Rosenstock Date: Wed Jul 27 11:45:26 2005 -0700 [PATCH] IB: Fix timeout/cancelled MAD handling Fixes an issue processing a sent MAD after it has timed out or been canceled. The race occurs when a response MAD matches with the send request. The request could time out or be canceled after the response MAD matches with the request, but before the request completion can be processed. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d760ce8f71ec5336c4a750a1293f26c0eb938c8a Author: Hal Rosenstock Date: Wed Jul 27 11:45:25 2005 -0700 [PATCH] IB: Change ib_mad_send_wr_private struct Have ib_mad_send_wr_private reference the private agent structure directly, rather than the exposed agent definition. Remove unneeded parameters to functions and simplify code were possible from this change. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8197a4ed1bba8c80ed6ddf4535ded80cb4152cf Author: Hal Rosenstock Date: Wed Jul 27 11:45:24 2005 -0700 [PATCH] IB: Change saving of user's send wr_id in MAD Move saving of user's send wr_id to better match layering of received response handling. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a0754fae8fb5162d1cf4f738d48bb1e8190c09f Author: Hal Rosenstock Date: Wed Jul 27 11:45:24 2005 -0700 [PATCH] IB: Combine some MAD routines Combine response_mad() and solicited_mad() routines into a single function and simplify/encapsulate its usage. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 824c8ae7d05bb4d21af707832c5bfa45d5494ec8 Author: Hal Rosenstock Date: Wed Jul 27 11:45:23 2005 -0700 [PATCH] IB: Add MAD helper functions Add new helper routines for allocating MADs for sending and formatting a send WR. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b82cab6b331b51d82f90d2207f3bbfdf09361ac9 Author: Hal Rosenstock Date: Wed Jul 27 11:45:22 2005 -0700 [PATCH] IB: Update MAD client API Automatically allocate a MR when registering a MAD agent. MAD clients are modified to use this updated API. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c183a4c33528d17cde0dcb093ae4248d8cb8f649 Author: Hal Rosenstock Date: Wed Jul 27 11:45:20 2005 -0700 [PATCH] IB: Update FMR functions Change some functions to return void rather than an int since they are always returning 0, thus making checking return values rather pointless. Signed-off-by: Tom Duffy Signed-off-by: Libor Michalek Signed-off-by: Hal Rosenstock Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 896e5518da74f9d20db8163526014fba16b1f2b4 Author: Kurt Wall Date: Wed Jul 27 11:45:20 2005 -0700 [PATCH] Add text for dealing with "dot releases" to README The emergence of so-called "dot releases" that are non-incremental patches against a base kernel requires different handling of patches (revert previous patches before applying the newest one). This patch adds a paragrach to $TOPDIR/README explaining how to do deal with dot release patches. Signed-off-by: Kurt Wall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5c2d749172657ed51e20e4b5ab540447666cc50 Author: Ralf Baechle Date: Wed Jul 27 11:45:19 2005 -0700 [PATCH] serial_core whitespace fix Use tabs for formatting like anywhere else in this file. Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71ae18ec690953e9ba7107c7cc44589c2cc0d9f1 Author: Blaisorblade Date: Wed Jul 27 11:45:18 2005 -0700 [PATCH] sys_get_thread_area does not clear the returned argument sys_get_thread_area does not memset to 0 its struct user_desc info before copying it to user space... since sizeof(struct user_desc) is 16 while the actual datas which are filled are only 12 bytes + 9 bits (across the bitfields), there is a (small) information leak. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44456d37b59d8e541936ed26d8b6e08d27e88ac1 Author: Olaf Hering Date: Wed Jul 27 11:45:17 2005 -0700 [PATCH] turn many #if $undefined_string into #ifdef $undefined_string turn many #if $undefined_string into #ifdef $undefined_string to fix some warnings after -Wno-def was added to global CFLAGS Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02b775696fee75a04041d8d94db26a9462216d24 Author: Andreas Gruenbacher Date: Wed Jul 27 11:45:16 2005 -0700 [PATCH] reiserfs doesn't use mbcache reiserfs doesn't use the mbcache, so this can go. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec0344a2c93c770fe1ef7cdccd8115a69ca100d1 Author: Adrian Bunk Date: Wed Jul 27 11:45:15 2005 -0700 [PATCH] Documentation/Changes: document the required udev version Document that udev 058 is required. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c52ab42c11b5a7fb44bb84c954d09968e90e9e7 Author: Andreas Gruenbacher Date: Wed Jul 27 11:45:15 2005 -0700 [PATCH] mbcache: Remove unused mb_cache_shrink parameter The cache parameter to mb_cache_shrink isn't used. We may as well remove it. Signed-off-by: Andreas Gruenbacher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dcce8e22bf9956ac2c5233539cac07c978e58c7 Author: Andrew Morton Date: Wed Jul 27 11:45:14 2005 -0700 [PATCH] ppc64: tpm_infineon build fix ppc64 uses symbol `DAR', as does the TPM driver, causing a build failure. Change the TPM name. Cc: Marcel Selhorst Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ebb81fdb3dd0be7514b84197c4f8388a17130f04 Author: Marcel Selhorst Date: Wed Jul 27 11:45:12 2005 -0700 [PATCH] tpm: Support for Infineon TPM This patch provides a new device driver for the Infineon SLD 9630 TT Trusted Platform Module (TPM 1.1b) [1] which is embedded on Intel- mainboards or in HP/ Fujitsu-Siemens / Toshiba-Notebooks. A nearly complete list where this module is integrated in can be found in [2]. This kernel module acts as a communication gateway between the linux kernel and the hardware chip and fits the TPM-specific interfaces created by IBM in drivers/char/tpm/tpm.h Further information about this module and a list of succesfully tested and therefore supported hardware can be found at our project page [3]. [1] http://www.infineon.com/cgi/ecrm.dll/ecrm/scripts/public_download.jsp?oid=114135&parent_oid=29049 [2] http://www.tonymcfadden.net/tpmvendors.htm [3] http://www.prosec.rub.de/tpm Signed-off-by: Marcel Selhorst Acked-by: Kylene Jo Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e77e17161ccb8bd877bf83b3611cd318e451c605 Author: Randy Dunlap Date: Wed Jul 27 11:45:11 2005 -0700 [PATCH] kernel/crash_dump.c: add kerneldoc Add kerneldoc to kernel/crash_dump.c Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9fd8a6d443b509147280f058d4e59f0b796a323 Author: Randy Dunlap Date: Wed Jul 27 11:45:11 2005 -0700 [PATCH] kernel/cpuset.c: add kerneldoc, fix typos Add kerneldoc to kernel/cpuset.c Fix cpuset typos in init/Kconfig Signed-off-by: Randy Dunlap Acked-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 207a7ba8dc000e1b13acac97f3736810dd86e8e2 Author: Randy Dunlap Date: Wed Jul 27 11:45:10 2005 -0700 [PATCH] kernel/capability.c: add kerneldoc Add kerneldoc to kernel/capability.c Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c293621bbf678a3d85e3ed721c3921c8a670610d Author: Peter Staubach Date: Wed Jul 27 11:45:09 2005 -0700 [PATCH] stale POSIX lock handling I believe that there is a problem with the handling of POSIX locks, which the attached patch should address. The problem appears to be a race between fcntl(2) and close(2). A multithreaded application could close a file descriptor at the same time as it is trying to acquire a lock using the same file descriptor. I would suggest that that multithreaded application is not providing the proper synchronization for itself, but the OS should still behave correctly. SUS3 (Single UNIX Specification Version 3, read: POSIX) indicates that when a file descriptor is closed, that all POSIX locks on the file, owned by the process which closed the file descriptor, should be released. The trick here is when those locks are released. The current code releases all locks which exist when close is processing, but any locks in progress are handled when the last reference to the open file is released. There are three cases to consider. One is the simple case, a multithreaded (mt) process has a file open and races to close it and acquire a lock on it. In this case, the close will release one reference to the open file and when the fcntl is done, it will release the other reference. For this situation, no locks should exist on the file when both the close and fcntl operations are done. The current system will handle this case because the last reference to the open file is being released. The second case is when the mt process has dup(2)'d the file descriptor. The close will release one reference to the file and the fcntl, when done, will release another, but there will still be at least one more reference to the open file. One could argue that the existence of a lock on the file after the close has completed is okay, because it was acquired after the close operation and there is still a way for the application to release the lock on the file, using an existing file descriptor. The third case is when the mt process has forked, after opening the file and either before or after becoming an mt process. In this case, each process would hold a reference to the open file. For each process, this degenerates to first case above. However, the lock continues to exist until both processes have released their references to the open file. This lock could block other lock requests. The changes to release the lock when the last reference to the open file aren't quite right because they would allow the lock to exist as long as there was a reference to the open file. This is too long. The new proposed solution is to add support in the fcntl code path to detect a race with close and then to release the lock which was just acquired when such as race is detected. This causes locks to be released in a timely fashion and for the system to conform to the POSIX semantic specification. This was tested by instrumenting a kernel to detect the handling locks and then running a program which generates case #3 above. A dangling lock could be reliably generated. When the changes to detect the close/fcntl race were added, a dangling lock could no longer be generated. Cc: Matthew Wilcox Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e5ea098446e19175fdee4c2c4ec9366b0217db4 Author: Christian Borntraeger Date: Wed Jul 27 11:45:06 2005 -0700 [PATCH] s390: use __cpcmd in vmcp_write vmcp_write uses GPF_DMA for the memory allocation of the response buffer, so it can use the low level function __cpcmd directly, no need to call the wrapper. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ffa7405afe0eaf34db6254160b734f084601f68 Author: Heiko Carstens Date: Wed Jul 27 11:45:06 2005 -0700 [PATCH] s390: cpu timer reset in machine check handler Fix wrong move direction of timer values for cpu accounting in case of a machine check that indicates a broken cpu timer. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f878e4367580f37327e68ce2c6861245077f0904 Author: Heiko Carstens Date: Wed Jul 27 11:45:05 2005 -0700 [PATCH] s390: 31 bit memory size limit Limit reported memory size to 2GB if running in 31 bit mode. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4111796d89b8cfa36054d65d9858460b5ec0e8c7 Author: Stefan Bader Date: Wed Jul 27 11:45:04 2005 -0700 [PATCH] s390: channel tape fixes Tape driver fixes: - Added deferred condition handling to tape driver core. - Added ability to handle busy conditions. - Code cleanup. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6bb0e01081c2ca585b5e145783fea53bb0589786 Author: Horst Hummel Date: Wed Jul 27 11:45:03 2005 -0700 [PATCH] s390: free dasd slab cache Free dasd slab cache on module unload. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d61f6f3d8b63a2aadcf8b058fe65581ccd8dee97 Author: Horst Hummel Date: Wed Jul 27 11:45:02 2005 -0700 [PATCH] s390: fba dasd i/o errors The FBA discipline does not use retries for failed requests. A request fails after the first unsuccessful start attempt. There are some rare conditions (e.g. CIO path recovery) in which the start of an i/o on a fba device can fail. A tiny amount of retries is therefore reasonable. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c63307f164a79e0ff6dd2da33436c59b3d3396cd Author: Cornelia Huck Date: Wed Jul 27 11:45:01 2005 -0700 [PATCH] s390: resource accessibility event handling When processing resource accessibility events, continue searching for further affected subchannels if a link address is provided in the event information. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d3ac7aadbccd8456fdca09394ddb570b95fe7dc Author: Cornelia Huck Date: Wed Jul 27 11:45:00 2005 -0700 [PATCH] s390: debug data for ifcc/ccc Fix debug data in case of an interface-control or channel-control check: don't log the not yet accumulated interrupt-response-block, but the one we just received. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99b2d8df1d06f1072a949fc1e01a08b94b084d5f Author: Heiko Carstens Date: Wed Jul 27 11:45:00 2005 -0700 [PATCH] s390: external call performance The kernel uses the SIGP external call order code to signal other CPUs. When running with dedicated CPUs external calls don't get delivered immediately but within a fixed polling invervall. This can lead to delays where the system appears to do nothing. Replace the SIGP external call order with the SIGP emergency call order since this one gets delivered immediately. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46ee058cdb3abab9313cc9cb9e9927d7672a718c Author: Heiko Carstens Date: Wed Jul 27 11:44:59 2005 -0700 [PATCH] s390: atomic64 inline functions The atomic64 primitives are supposed to have 64-bit parameters instead of int. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afff7e2b3b13dbd26a2b9991d3d571df111d92e8 Author: Martin Schwidefsky Date: Wed Jul 27 11:44:58 2005 -0700 [PATCH] s390: find_next_{zero}_bit fixes The find_next_{zero}_bit primitives on s390* should never return a bit number bigger then the bit field size. In the case of a bitfield that doesn't end on a word boundary, an offset that makes the search start at the last word of the bit field and the last word doesn't contain any zero/one bits the search is continued with a call to find_first_bit with a negative size. The search normally ends pretty quickly because the words following the bit field contain a mix of zeros and ones. But the bit number that is returned in this case is too big. To fix this and additional if to check for this case is needed. To make the code easier to read I removed the assembler parts from the find_next_{zero}_bit functions, the C-ified code is as good. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 951f22d5b1f0eaae35dafc669e3774a0c2084d10 Author: Martin Schwidefsky Date: Wed Jul 27 11:44:57 2005 -0700 [PATCH] s390: spin lock retry Split spin lock and r/w lock implementation into a single try which is done inline and an out of line function that repeatedly tries to get the lock before doing the cpu_relax(). Add a system control to set the number of retries before a cpu is yielded. The reason for the spin lock retry is that the diagnose 0x44 that is used to give up the virtual cpu is quite expensive. For spin locks that are held only for a short period of time the costs of the diagnoses outweights the savings for spin locks that are held for a longer timer. The default retry count is 1000. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8449d003f323ca7a00eec38905d984ba5ec83a29 Author: Miles Bader Date: Wed Jul 27 11:44:56 2005 -0700 [PATCH] v850: Define L1_CACHE_SHIFT and L1_CACHE_SHIFT_MAX Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b2bf06994b9cd6067e5c7620e270eec73fef70b Author: Miles Bader Date: Wed Jul 27 11:44:55 2005 -0700 [PATCH] v850: Update PCI support These changes are untested (I no longer have the hardware). Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 947ac8b9265e2a22552552d011db1e161f802a4a Author: Miles Bader Date: Wed Jul 27 11:44:55 2005 -0700 [PATCH] v850: Add pte_file Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21ea9f63297497df3040c70a67a207d229368a4c Author: Miles Bader Date: Wed Jul 27 11:44:54 2005 -0700 [PATCH] v850: Update ioremap return type and add ioread/iowrite functions Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f307d365ea4db4848a0b43bbbdf3c96f4d2e0933 Author: Miles Bader Date: Wed Jul 27 11:44:53 2005 -0700 [PATCH] v850: Add defconfigs Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f9a6e101a962dd845eda69fa066184457968228 Author: Miles Bader Date: Wed Jul 27 11:44:53 2005 -0700 [PATCH] v850: const-qualify first parameter of find_next_zero_bit Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e9c3d6b925e0fdb5e62fad6d81e4004897cfe79d Author: Miles Bader Date: Wed Jul 27 11:44:52 2005 -0700 [PATCH] v850: Define pfn_valid Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e63b68de5c9bf68cfb4a272469147b19176d76d6 Author: Mikael Starvik Date: Wed Jul 27 11:44:51 2005 -0700 [PATCH] CRIS IDE driver * Added abstraction layer for subarchs. * Added v32 support. * Renamed driver. Signed-off-by: Mikael Starvik Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51533b615e605d86154ec1b4e585c8ca1b0b15b7 Author: Mikael Starvik Date: Wed Jul 27 11:44:44 2005 -0700 [PATCH] CRIS update: new subarchitecture v32 New CRIS sub architecture named v32. From: Dave Jones Fix swapped kmalloc args Signed-off-by: Mikael Starvik Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d01e6ce785884a5db5792cd2e5bb36fa82fe23c Author: Mikael Starvik Date: Wed Jul 27 11:44:43 2005 -0700 [PATCH] CRIS update: updates for 2.6.12 Patches to make CRIS work with 2.6.12. Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcf1310b72149d016970c666539d4d73bb77c086 Author: Mikael Starvik Date: Wed Jul 27 11:44:42 2005 -0700 [PATCH] CRIS update: synchronous serial port driver Include file for synchronous serial port driver. Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d20a541b089ecb67a88a673548161b686ed7b85 Author: Mikael Starvik Date: Wed Jul 27 11:44:42 2005 -0700 [PATCH] CRIS update: SMP Patches to support SMP. * Each CPU has its own current_pgd. * flush_tlb_range is implemented as flush_tlb_mm. * Atomic operations implemented with spinlocks. * Semaphores implemented with spinlocks. Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21783c9746619a782c21be606f6498bbd4d4615e Author: Mikael Starvik Date: Wed Jul 27 11:44:40 2005 -0700 [PATCH] CRIS update: profiler System-level profiler. Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59c61138a556cf89692e0d5bd2c9de5df54b824f Author: Mikael Starvik Date: Wed Jul 27 11:44:40 2005 -0700 [PATCH] CRIS update: pci Patches to make it possible to add PCI support. Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f18cfbf0990bfc2e8e7706eeb9e5bef898ae923 Author: Mikael Starvik Date: Wed Jul 27 11:44:39 2005 -0700 [PATCH] CRIS update: mm Memory management patches. * SMP support. * Non-executable stack (on v32). * 4-level page tables. * Added simple Thread Local Storage support. Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7cf32cad153d63ac4f6f2d5dd16ddd32ad72d578 Author: Mikael Starvik Date: Wed Jul 27 11:44:38 2005 -0700 [PATCH] CRIS update: misc patches * Start threads with IRQs enabled. * Move symbol exports to arch specific file. * Prepare for real command line in the future. * Handle csum for partition that crosses flash boundary. * Set utsname. Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e0cea1decf7f21df0496571c218df3b3b8cce99 Author: Mikael Starvik Date: Wed Jul 27 11:44:36 2005 -0700 [PATCH] CRIS update: IRQ Use the generic IRQ framework Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63245d2cde2be64f172388c2c50862f233c05700 Author: Mikael Starvik Date: Wed Jul 27 11:44:35 2005 -0700 [PATCH] CRIS update: I/O and DMA allocator Added I/O and DMA allocators to be used by drivers. Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e9204265b4ec6680fad9abc7a78b94087983916 Author: Mikael Starvik Date: Wed Jul 27 11:44:34 2005 -0700 [PATCH] CRIS update: drivers Updates to device drivers. * Use I/O and DMA allocators. * Use wait_event_interruptible instead of interrutiple_sleep_on. * Added spinlocks SMP. * Changed restore_flags to local_irq_restore etc. * Updated IDE driver include to fit 2.6.12. Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 059163cabc01a15b9e2cf10e5de5b6dc06e0da1f Author: Mikael Starvik Date: Wed Jul 27 11:44:32 2005 -0700 [PATCH] CRIS update: debug Improvements to crash debug code. Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05b4c28cba8dc48505322988340307073c353b1e Author: Mikael Starvik Date: Wed Jul 27 11:44:31 2005 -0700 [PATCH] CRIS update: console Changes to console. * Added LF->CRLF translation * Make use of real console framework. Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e41d6522a6922a95f9d953f4171b45b82b3d6f4 Author: Mikael Starvik Date: Wed Jul 27 11:44:30 2005 -0700 [PATCH] CRIS update: configuration and build Changes to configuration and build system. * Added v32 sub architecture. * Use generic hard IRQ. * Added SMP options. * Added options to OOPS at NMI and reboot at OOM. * Made it possible to set objtree. * Added option to select Kernel GDB serial port. * Corrected Kconfig usage. * Added system profiler. Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb09f540a1c5e6c5beb6e82f554d51a1f2c87e67 Author: Mikael Starvik Date: Wed Jul 27 11:44:27 2005 -0700 [PATCH] CRIS update: arch split Changes necessary to make the sub-arch split complete. Signed-off-by: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1637f437f1a2e552e0572e02d46e2c395a4ecaf Author: Adrian Bunk Date: Wed Jul 27 11:44:24 2005 -0700 [PATCH] m32r: add missing Kconfig help text There's no help text for CONFIG_DEBUG_STACKOVERFLOW - add one. Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk Cc: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dab175f393cdf30fbaec5978682a49dc3c890b2f Author: Adrian Bunk Date: Wed Jul 27 11:44:23 2005 -0700 [PATCH] i386: add missing Kconfig help text There's no help text for CONFIG_DEBUG_STACKOVERFLOW - add one. Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2d5c74d778fc59a46f8e173cf986e7320e15e50 Author: Yoichi Yuasa Date: Wed Jul 27 11:44:22 2005 -0700 [PATCH] mips: remove obsolete GIU driver for vr41xx This patch has removed obsolete GIU driver for vr41xx. This patch already has been applied to mips tree. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 488f84994c55927eef587a0827dc957c908a0bad Author: David Gibson Date: Wed Jul 27 11:44:21 2005 -0700 [PATCH] ppc64: remove another fixed address constraint Presently the LparMap, one of the structures the kernel shares with the legacy iSeries hypervisor has a fixed offset address in head.S. This patch changes this so the LparMap is a normally initialized structure, without fixed address. This allows us to use macros to compute some of the values in the structure, which wasn't previously possible because the assembler always uses signed-% which gets the wrong answers for the computations in question. Unfortunately, a gcc bug means that doing this requires another structure (hvReleaseData) to be initialized in asm instead of C, but on the whole the result is cleaner than before. Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 533f08172e21521a74e15cdef8a13c929596d506 Author: David Gibson Date: Wed Jul 27 11:44:19 2005 -0700 [PATCH] ppc64: dynamically allocate segment tables PPC64 machines before Power4 need a segment table page allocated for each CPU. Currently these are allocated statically in a big array in head.S for all CPUs. The segment tables need to be in the first segment (so do_stab_bolted doesn't take a recursive fault on the stab itself), but other than that there are no constraints which require the stabs for the secondary CPUs to be statically allocated. This patch allocates segment tables dynamically during boot, using lmb_alloc() to ensure they are within the first 256M segment. This reduces the kernel image size by 192k... Tested on RS64 iSeries, POWER3 pSeries, and POWER5. Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fdfb382813d66757aef4d83e369f8153a40b371 Author: Olaf Hering Date: Wed Jul 27 11:44:18 2005 -0700 [PATCH] make a few functions static in pmac_setup.c Making a few functions static saves a few bytes, but only on ppc32. text data bss dec hex filename 3752421 1605208 345608 5703237 570645 ../O-ppc64_iSeries_defconfig/vmlinux 3709411 2042552 339992 6091955 5cf4b3 ../O-ppc64_maple_defconfig/vmlinux 5397329 3054824 679856 9132009 8b57e9 ../O-ppc64_pSeries_defconfig/vmlinux -3882695 417552 197760 4498007 44a257 ../O-ppc_common_defconfig/vmlinux -3414510 574500 241440 4230450 408d32 ../O-ppc_pmac_defconfig/vmlinux +3882627 417168 197760 4497555 44a093 ../O-ppc_common_defconfig/vmlinux +3414442 575428 241440 4231310 40908e ../O-ppc_pmac_defconfig/vmlinux Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62b662a30963c2e7bdfc129f78c3da0559202379 Author: Andrew Morton Date: Wed Jul 27 11:44:17 2005 -0700 [PATCH] ppc64: genrtc build fix genrtc.c won't compile on ppc64. Seems that ppc32 does support it though? We do this wrong btw - we should be selecting GEN_RTC in each arch/xxx/Kconfig. Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64c74de7a3a744bc546ef76872be6285307ce101 Author: Olaf Hering Date: Wed Jul 27 11:44:16 2005 -0700 [PATCH] ppc64: hide CONFIG_ADB This bites me all day when I use our default config for ppc64. We use a patch to fix the compile errors and provide the CONFIG_MAC_EMUMOUSEBTN functionality (which is behind CONFIG_INPUT_ADBHID). But Benh doesnt like it. http://ozlabs.org/pipermail/linuxppc64-dev/2005-March/003423.html Just hide all the ADB parts from via-pmu on ppc64 instead. drivers/macintosh/adbhid.c: In function `adbhid_init': drivers/macintosh/adbhid.c:1199: error: `_MACH_chrp' undeclared (first use in this function) drivers/macintosh/adbhid.c:1199: error: (Each undeclared identifier is reported only once drivers/macintosh/adbhid.c:1199: error: for each function it appears in.) Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bc3a1ec6030f7a6a9e78172e1221be9baed68e8 Author: Olaf Hering Date: Wed Jul 27 11:44:15 2005 -0700 [PATCH] ppc64: update defconfigs update defconfig, use new CONFIG_HZ and set it to 100 just for the kicks. Signed-off-by: Olaf Hering Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c64d7b4cea71b6841d9d96d390aed323c9fe1c9d Author: Kumar Gala Date: Wed Jul 27 11:44:14 2005 -0700 [PATCH] ppc32: Fix building of TQM8260 board Added missing include of cpm2.h in correct order to allow TQM8260 to build Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 757569295d4204b4e00dd9294790e09ed5a2ffd2 Author: Eugene Surovegin Date: Wed Jul 27 11:44:13 2005 -0700 [PATCH] ppc32: fix 440SP MAL channels count Fix the MAL channels count in PPC 440SP OCP definition. PPC 440SP has only 1 EMAC attached to MAL. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f6a3d083729c76ced92106c259f0e6536a2eaea Author: Matt Porter Date: Wed Jul 27 11:44:12 2005 -0700 [PATCH] ppc32: fix dma_map_page() to use page_to_bus() The following trivial patch changes dma_map_page() to use page_to_bus() instead of open-coding it (incorrectly in some cases). Signed-off-by: Eugene Surovegin Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15ce2982c6bc41ccd7f2cbca63e024aa9044c000 Author: Kumar Gala Date: Wed Jul 27 11:44:11 2005 -0700 [PATCH] ppc32: Fix building of radstone_ppc7d Updated radstone_ppc7d_defconfig to include the ds1337 driver which is used by the platform code. This fixes the link error when building. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 571e63fc839e57965749acf19d58b3cbbef5d06a Author: Kumar Gala Date: Wed Jul 27 11:44:10 2005 -0700 [PATCH] ppc32: Fix building of prpmc750 Updated prpmc750 platform code to include serial_reg.h to fix building. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 127384524b31d99bc3f9e2d2e7af4a5fad572235 Author: Kumar Gala Date: Wed Jul 27 11:44:10 2005 -0700 [PATCH] ppc32: Fix typo in setup of 2nd PCI bus on 85xx Typo bug that was using PCI1 defines instead of PCI2 when setting up the second PCI bus controller on 85xx based systems. This hasn't been a real issue since currently the PCI2 sizes are the same as the PCI1 sizes for currently supported boards. Thanks to Andrew Klossner @ Xerox for point this out. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c41b72d5bd590e6ff781d6bdfc71595f3996bacf Author: Downing, Thomas Date: Wed Jul 27 11:44:09 2005 -0700 [PATCH] ppc32: fix compilation error with CONFIG_PQ2FADS The 2.6.12.3 kernel compilation fails for ARCH=ppc when CONFIG_PQ2FADS=y. This patch has been tested on Freescale PQ2FADS-ZU and -VR boards. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a1ce8aa2d9611a779c308fbf332ae86217b0df6 Author: Marcelo Tosatti Date: Wed Jul 27 11:44:08 2005 -0700 [PATCH] ppc32: 8xx: update DataTLBMiss exception comment On PPC 8xx, the DataTLBMiss handler does not jump directly to the page fault handler, as was the case in v2.4. It instead loads an invalid TLB which causes a subsequent DataTLBError exception. The comment on top of it haven't been update to reflect the change, though. Signed-off-by: Marcelo Tosatti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13e886c3b435d14668aefaed449d8d7ca6dce3a8 Author: Kumar Gala Date: Wed Jul 27 11:44:07 2005 -0700 [PATCH] ppc32: Make the UARTs on MPC824x individual platform devices The UARTs on the MPC824x are unique devices and really shouldn't be thought of as a DUART. In addition, if both UARTs are in use we need to configure the part to enable the 2nd UART since the pins for the UARTs are multiplexed. Adds support to run the 824x Sandpoint with both UARTs if desired. Signed-off-by: Matt McClintock Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d054b5acfe1f68460fe70aff5028ad95a7a38140 Author: Kumar Gala Date: Wed Jul 27 11:44:06 2005 -0700 [PATCH] ppc32: Add proper prototype for cpm2_reset() Added a proper prototype for cpm2_reset() which gets rid of a build warning. Signed-off-by: Jon Loeliger Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 694e50db5d75f4c29011d7d15e069a95aded8af1 Author: Olaf Hering Date: Wed Jul 27 11:44:04 2005 -0700 [PATCH] ppc32: update defconfigs update pmac_defconfig enable all relevant options in common_defconfig, so it can serve as a compiletest for PPC_MULTIPLATFORM configuration Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b625c001a897394b969becac3358d733728d02b Author: Olaf Hering Date: Wed Jul 27 11:44:03 2005 -0700 [PATCH] ppc/ppc64: use Kconfig.hz use new Kconfig.hz on ppc/ppc64, use also Kconfig.preempt for ppc Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12b1c5f382194d3f656e78fb5c9c8f2bfbe8ed8a Author: Andy Whitcroft Date: Wed Jul 27 11:44:02 2005 -0700 [PATCH] Remove bogus warning in page_alloc.c Originally __free_pages_bulk used the relative page number within a zone to define its buddies. This meant that to maintain the "maximally aligned" requirements (that an allocation of size N will be aligned at least to N physically) zones had to also be aligned to 1< Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 165cd40235732644b1856a5ed5e158c9b93f6010 Author: suzuki Date: Wed Jul 27 11:43:59 2005 -0700 [PATCH] madvise() does not always return -EBADF on non-file mapped area The madvise() system call returns -EBADF for areas which does not map to files, only for *behaviour* request MADV_WILLNEED. According to man pages, madvise returns : EBADF - the map exists, but the area maps something that isn't a file. Fixes bug 2995. Signed-off-by: Suzuki K P Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4bfdf37830111321e2cd1fe0102dd776ce93194d Author: Andrey Panin Date: Wed Jul 27 11:43:58 2005 -0700 [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling Attached patch removes #ifdef CONFIG_WATCHDOG_NOWAYOUT mess duplicated in almost every watchdog driver and replaces it with common define in linux/watchdog.h. Signed-off-by: Andrey Panin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7657e20e46e26b198b24e2aefc696410bbe889c9 Author: Brian Gerst Date: Wed Jul 27 11:43:57 2005 -0700 [PATCH] Fix warning in powernow-k8.c powernow-k8.c: In function `query_current_values_with_pending_wait': powernow-k8.c:110: warning: `hi' may be used uninitialized in this function Signed-off-by: Brian Gerst Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbaf364103cee15c895e2086723d0ad9ef47ae99 Author: Alexey Dobriyan Date: Wed Jul 27 11:43:56 2005 -0700 [PATCH] drm: via: fix sparse warnings Signed-off-by: Alexey Dobriyan Cc: Dave Airlie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db1de1595d03d3ddea3e0548b20decb0a32e4258 Author: David Ranson Date: Wed Jul 27 11:43:55 2005 -0700 [PATCH] serial: MRi MRI-PCIDS1 dual port serial card Add support for the MRi PCIDS1 dual port serial card. This card is a little controversial since it is the subject of a PCI vendor/device ID clash. (See http://www.ussg.iu.edu/hypermail/linux/kernel/0303.1/0516.html). I have for now just used the hex ID 0x950a. The divisor was part calculated part iterated, so may not be exactly correct (but works for me at all settings between 300 - 115300 bps). Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e8c9e14e8fdce0af9f5eed7ce6dd26b91fc8f4e Author: Andrew Morton Date: Wed Jul 27 11:43:55 2005 -0700 [PATCH] statically link halfmd4 For some reason halfmd4 isn't being linked into the kernel any more and modular ext3 wants it. So statically link the halfmd4 code into the kernel. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1aaf18ff9de1f37bf674236fc0779c3aaa65b998 Author: Andrew Morton Date: Wed Jul 27 11:43:54 2005 -0700 [PATCH] check_user_page_readable() deadlock fix Fix bug identifued by Richard Purdie . oprofile calls check_user_page_readable() from interrupt context, so we deadlock over various VFS locks. But check_user_page_readable() doesn't imply either a read or a write of the page's contents. Change __follow_page() so that check_user_page_readable() can tell __follow_page() that we're not accessing the page's contents, and use that info to avoid the troublesome lock-takings. Also, make follow_page() inline for the single callsite in memory.c to save a bit of stack space. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0cfc11ed45e4c00750039e5a18c0fc0d681e19db Author: Carsten Otte Date: Wed Jul 27 11:43:52 2005 -0700 [PATCH] fix xip sparse file handling in ext2 Oliver Paukstadt from our test department is testing the xip patches in Linus' git-tree. He found a problem that shows when reading a file that contains sparse blocks (holes) on a -o xip mounted ext2 filesystem: the BUG_ON() in fs/ext2/xip.c:40 triggers where it should not. The problem was introduced by a cleanup in my previous patch, this patch fixes it. Signed-off-by: Carsten Otte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1872bcebbcd6ad7ddd99e92fb1e4f3d19e73919c Author: Pete Zaitcev Date: Wed Jul 27 11:43:51 2005 -0700 [PATCH] ub: fix for blank CDs This patch fixes a microcode lockup in my CD-ROM adapters when a blank CD is inserted. However, do not try to burn CDs yet! I'm pretty sure that trying it will end in coasters. - Fix a few cases where we were unable to resynchronize with replies for previous commands. The main thing is to keep reading replies in case of a stall. This is done with the new state CLRRS. - Since I am forgetting the basic state machine already, document it. - Move counter increments in the looping path in its own function. - Fix a harmless buglet in case CSW read fails to submit: do not override state. - Implement the Alan Stern's idea for adaptive signature checking. Signed-off-by: Pete Zaitcev Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90c5029e471636f21221bf66b9a46ada2ab79a22 Author: Andi Kleen Date: Wed Jul 27 11:43:50 2005 -0700 [PATCH] Undo mempolicy shared policy rbtree microoptimization All mempolicy changes must be inside the spinlock and readding the rb_erase prevents a crash while doing: > echo "1" > /tmp/numatest > numactl --length=0x4000 --shm /tmp/numatest --localalloc > numactl --length=0x2000 --offset=0 --shm /tmp/numatest --membind=0 > numactl --length=0x2000 --offset=0x2000 --shm /tmp/numatest --membind=1 > ipcs > ipcrm -M "the_key_value_of_this_shm_area" Based on a patch by John Blackwood Cc: Cc: Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c223695634fb360ed65e5a811161853a05e46962 Author: V. ANANDA KRISHNAN Date: Wed Jul 27 11:43:49 2005 -0700 [PATCH] jsm: warning fixes - updates the version - fix mixing of declarations and code. The mixing of declarations and code displays warnings when used against RedHat RHEL4.0 distro (compiler version is 3.4.3-22.1) and hence I separated them out. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9539c1d495c8d92837e7b6382a1219ac275b94b2 Author: V. ANANDA KRISHNAN Date: Wed Jul 27 11:43:48 2005 -0700 [PATCH] jsm: use dynamic major number allocation The jsm driver uses a static number of 253. The major number 253 is a reserved for "LOCAL/EXPERIMENTAL USE" by both char and block devices. So take advantage of the dynamic allocation of major number by the kernel. Signed-off-by: V. Ananda Krishnan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49f29915856435ad8e34a4a3a907b09682a5826e Author: Olivier Blin Date: Wed Jul 27 11:43:47 2005 -0700 [PATCH] i4l: add Olitec ISDN PCI card in hisax gazel driver This patch adds support for the Olitec ISDN PCI card in the hisax gazel driver. The gazel driver supports this card, but wasn't aware of its PCI ids. Users used to modify the PCI ids of a supported card in include/linux/pci_ids.h and recompile their kernel to get this card running, as said in most Howtos. This patch makes the hisax gazel driver recognize the PCI ids of the Olitec ISDN PCI card. Signed-off-by: Olivier Blin Signed-off-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b24b1033451fcc87087a692fc47ca45daebd51ac Author: Alan Stern Date: Wed Jul 27 11:43:46 2005 -0700 [PATCH] scsi_scan: check return code from scsi_sysfs_add_sdev Adds a missing check for an error return code from scsi_sysfs_add_sdev. This resolves entry #4863 in the OSDL bugzilla. Although in that bug report the failure occurred because of a confusion over scanning vs. rescanning, in general add_sdev can fail for a number of reasons (the simplest being insufficient memory) and the caller should cope properly. Signed-off-by: Alan Stern Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 104e49fc1e1656142869fab0e75d7df52b72eed9 Author: Ian Kent Date: Wed Jul 27 11:43:45 2005 -0700 [PATCH] autofs4: fix infamous "Busy inodes after umount ..." message If the automount daemon receives a signal which causes it to sumarily terminate the autofs4 module leaks dentries. The same problem exists with detached mount requests without the warning. This patch cleans these dentries at umount. Signed-off-by: Ian Kent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f94c8e1256fcb786e1918e30bdaeccf669bf63c Author: Dominik Brodowski Date: Wed Jul 27 11:43:44 2005 -0700 [PATCH] Add pcibios_bus_to_resource for parisc Signed-off-by: Dominik Brodowski Acked-by: Grant Grundler Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d912d1ff218195c248c770eb677726695e07aa40 Author: George Anzinger Date: Wed Jul 27 11:43:44 2005 -0700 [PATCH] itimer fixes Fix the recent off-by-one fix in the itimer code: 1. The repeating timer is figured using the requested time (not +1 as we know where we are in the jiffie). 2. The tests for interval too large are left to the time_val to jiffie code. Signed-off-by: George Anzinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7343f01e326374e69666ca6001bdb6a7c67e9f7 Author: Rolf Eike Beer Date: Wed Jul 27 11:43:42 2005 -0700 [PATCH] watchdog: add missing 0x in alim1535_wdt.c Usually the device IDs are given in hex. This one is a bit strange: it is without 0x in the first place and used with it some lines later. I suspect the first one to be the wrong. Signed-off-by: Rolf Eike Beer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bba0e4670a4e1841a96b561dcc60ebe335049891 Author: Nigel Cunningham Date: Wed Jul 27 11:43:41 2005 -0700 [PATCH] Address BUG: using smp_processor_id() in preemptible [00000001] code This patch fixes a warning in the disable_nonboot_cpus call in kernel/power/smp.c. Signed-off by: Nigel Cunningham Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a14d4c898285623d1f5c338b659fa82cf4480fb Author: Adrian Bunk Date: Wed Jul 27 11:43:41 2005 -0700 [PATCH] drivers/pnp/pnpbios/rsparser.c: fix compile error with PCI=n drivers/pnp/pnpbios/rsparser.c: In function 'pnpbios_parse_allocated_irqresource': drivers/pnp/pnpbios/rsparser.c:67: error: too many arguments to function 'pcibios_penalize_isa_irq' Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab6862e6dab813ecde9ae7da506188dc1e9f11bb Author: Jan Kara Date: Wed Jul 27 11:43:40 2005 -0700 [PATCH] ext3: drop quota references before releasing inode We must drop references to quota structures before releasing the inode. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7e9a52ef0089492bba457dfb8eba1a54e19f24a Author: Jan Kara Date: Wed Jul 27 11:43:39 2005 -0700 [PATCH] ext2: drop quota reference before releasing inode We must drop references to quota structures before releasing the inode. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3bb8afd965159f155d4f629cbea158cbcc69275 Author: Jeff Mahoney Date: Wed Jul 27 11:43:38 2005 -0700 [PATCH] reiserfs: fix deadlock in inode creation failure path w/ default ACL reiserfs_new_inode() can call iput() with the xattr lock held. This will cause a deadlock to occur when reiserfs_delete_xattrs() is called to clean up. The following patch releases the lock and reacquires it after the iput. This is safe because interaction with xattrs is complete, and the relock is just to balance out the release in the caller. The locking needs some reworking to be more sane, but that's more intrusive and I was just looking to fix this bug. Signed-off-by: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9b3ad673460fc997a652cd58aa3a345d40e5218 Author: Jens Axboe Date: Wed Jul 27 11:43:37 2005 -0700 [PATCH] as-iosched tunable encoding fix AS is doing internal msec<->jiffies conversions twice, so the sysfs tunables which represent time are coming out wrong. The switch from HZ=1000 exposed this. Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef2a701d444a4ea9790146e92756b0dde5070a15 Author: Nigel Cunningham Date: Wed Jul 27 11:43:36 2005 -0700 [PATCH] Fix missing refrigerator invocation in jffs2 Here's a patch to fix a missing refrigerator call in jffs2. Signed-off-by: Nigel Cunningham Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e50e7a99d04774506f4e1dee51afba37125cd3c Author: Nigel Cunningham Date: Wed Jul 27 11:43:35 2005 -0700 [PATCH] Add missing tvaudio try_to_freeze() Tvaudio lacks a refrigerator call. This patch fixes that. Signed-off-by: Nigel Cunningham Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e6c1f5facffd94000832d402be1ea75f73c90e3 Author: Nigel Cunningham Date: Wed Jul 27 11:43:34 2005 -0700 [PATCH] try_to_freeze() call fixes Here are fixes for four try_to_freeze calls that are still (incorrectly) using a parameter after the recent try_to_freeze() changes. Signed-off-by: Nigel Cunningham Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54264911ce8c3f4a9e7fc193bc78a85e04df7fa0 Author: Andi Kleen Date: Wed Jul 27 11:43:34 2005 -0700 [PATCH] x86_64: fix SMP boot lockup on some machines Fixes boot up lockups on some machines where CPU apic ids don't start with 0 Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d4579ed553e8bb29d580c08bfcabcb0826a89c3 Author: Jeff Dike Date: Wed Jul 27 11:43:33 2005 -0700 [PATCH] uml: fix misdeclared function This fixes an interface which differed from its declaration, and includes the relevant header so that this doesn't happen again. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20a64f1d70a1a9cc001f2fec5ba1b0a4ff3f6bd5 Author: Dominik Hackl Date: Wed Jul 27 11:43:32 2005 -0700 [PATCH] uml: update module interface This patch replaces the deprecated MODULE_PARM function by the new module_param function. Signed-off-by: Dominik Hackl Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb66504d65e54210d7dc55a0027d309ca5f51f83 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Jul 27 11:43:31 2005 -0700 [PATCH] uml: add skas0 command-line option This adds the "skas0" parameter to force skas0 operation on SKAS3 host and shows which operating mode has been selected. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6b038a24a826fe22d9823722cfbbbd3ad7a3021 Author: Olaf Hering Date: Wed Jul 27 11:43:30 2005 -0700 [PATCH] uml: add dependency to arch/um/Makefile for parallel builds the header file must be build before mk_user_constants. Adding it as a direct dep doesnt work for some reason. arch/um/os-Linux/util/mk_user_constants.c:2:26: error: user-offsets.h: No such file or directory arch/um/os-Linux/util/mk_user_constants.c: In function 'main': arch/um/os-Linux/util/mk_user_constants.c:17: error: '__UM_FRAME_SIZE' undeclared (first use in this function) arch/um/os-Linux/util/mk_user_constants.c:17: error: (Each undeclared identifier is reported only once arch/um/os-Linux/util/mk_user_constants.c:17: error: for each function it appears in.) make[1]: *** [arch/um/os-Linux/util/mk_user_constants] Error 1 Signed-off-by: Olaf Hering Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8648373af214d3c74b81e78049a64dad986c1024 Author: Olaf Hering Date: Wed Jul 27 11:43:29 2005 -0700 [PATCH] uml: readd missing define to arch/um/Makefile-i386 scripts/Makefile.build:13: /Makefile: No such file or directory scripts/Makefile.build:64: kbuild: Makefile.build is included improperly the define was removed, but its still required to build some targets. Signed-off-by: Olaf Hering Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b5c7ae83704320e2afb0912f4c42eadabc7535b Author: NeilBrown Date: Wed Jul 27 11:43:28 2005 -0700 [PATCH] md: when resizing an array, we need to update resync_max_sectors as well as size Without this, and attempt to 'grow' an array will claim to have synced the extra part without actually having done anything. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b38817dda45bc2990a8d593f3a1b4d444b2dcf4f Author: Yoichi Yuasa Date: Wed Jul 27 11:43:28 2005 -0700 [PATCH] mips: fbdev Kcofnig fix arch/mips/Kconfig is defining CONFIG_FB as bool and drivers/video/Kconfig was changed a while ago to define it as tristate. Remove the MIPS definition. Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c10b873695c6a1de0d8ebab40b525575ca576683 Author: Alexey Dobriyan Date: Wed Jul 27 11:43:27 2005 -0700 [PATCH] Really __nocast-annotate kmalloc_node() One chunk was lost somewhere between my and Andrew's machine. Noticed by Victor Fusco. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c86cb127b2b7614903cb2a38db3207488a0405a Author: Kumar Gala Date: Wed Jul 27 11:43:26 2005 -0700 [PATCH] I2C-MPC: Restore code removed A previous patch to remove support for the OCP device model was way to generious and moved some of the platform device model code, oops. Signed-off-by: Kumar Gala Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 388b0925f59461cb482447ea87e6942b5653ee1d Author: Andrew Morton Date: Wed Jul 27 11:43:25 2005 -0700 [PATCH] user_mode_vm() build fix include/asm/ptrace.h: In function `user_mode_vm': include/asm/ptrace.h:67: `VM_MASK' undeclared (first use in this function) Cc: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48b0e5487fcdcb3421bda67666277348b2bd2661 Author: David S. Miller Date: Wed Jul 27 16:08:44 2005 -0700 [SPARC64]: Fix ugly dependency on NR_CPUS being a power-of-2. The page->flags D-cache dirty state tracking depended upon NR_CPUS being a power-of-2 via it's "NR_CPUS - 1" masking. Fix that to use a fixed (256 - 1) mask as that is the limit imposed by thread_info->cpu which is a "u8". Finally, add a compile time check that NR_CPUS is not greater than 256. Signed-off-by: David S. Miller commit 5e43db7730e7cef7d37968ea789c41392519a864 Author: Matt Mackall Date: Wed Jul 27 15:24:42 2005 -0700 [NET]: Move in_aton from net/ipv4/utils.c to net/core/utils.c Move in_aton to allow netpoll and pktgen to work without the rest of the IPv4 stack. Fix whitespace and add comment for the odd placement. Delete now-empty net/ipv4/utils.c Re-enable netpoll/netconsole without CONFIG_INET Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 614d73edae68836f7659ee8efec90878e6215fb1 Author: Russell King Date: Wed Jul 27 23:00:05 2005 +0100 [ARM SMP] Fix data corruption in test_* bitops If we found that the bit was already in the desired state, we would skip performing the operation, and write random data back. Signed-off-by: Russell King commit 7cee432a22bb328ea7a4012dacc5a3471fabeb07 Author: Nick Sillik Date: Wed Jul 27 14:46:03 2005 -0700 [NETFILTER]: Fix -Wunder error in ip_conntrack_core.c Signed-off-by: Nick Sillik Signed-off-by: David S. Miller commit 6d376756f2cf3478d5a4fdb8d18e958948366b9d Author: Michael S. Tsirkin Date: Wed Jul 27 14:42:45 2005 -0700 [IB/mthca]: Use io_remap_pfn_range for PCI space Use io_remap_pfn_range to remap IO pages (remap_pfn_range is for memory). Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 2181858bb814b51de8ec25b3ddd37cd06c53b0c9 Author: Roland Dreier Date: Wed Jul 27 14:41:32 2005 -0700 [IB/ipoib]: Fix unsigned comparisons to handle wraparound Fix handling of tx_head/tx_tail comparisons to handle wraparound. Signed-off-by: Roland Dreier commit abdf119b4dad015803819c3d046d20cfbd393e87 Author: Gleb Natapov Date: Wed Jul 27 14:40:00 2005 -0700 [IB/uverbs]: Add O_ASYNC support Add support for O_ASYNC notifications on userspace verbs completion and asynchronous event file descriptors. Signed-off-by: Gleb Natapov Signed-off-by: Roland Dreier commit 42b1806d5cfc93bf8c3d7fa6e9e79e4ec860c678 Author: Roland Dreier Date: Wed Jul 27 14:38:49 2005 -0700 [IB/mthca]: Fix error CQ entry handling on mem-free HCAs Fix handling of error CQ entries on mem-free HCAs: the doorbell count is never valid so we shouldn't look at it. This fixes problems exposed by new HCA firmware. Signed-off-by: Roland Dreier commit a77be819f94fc55627ee257f496198ad703aaad4 Author: Kyle Moffett Date: Wed Jul 27 14:22:30 2005 -0700 [NET]: Fix setsockopt locking bug On Sparc, SO_DONTLINGER support resulted in sock_reset_flag being called without lock_sock(). Signed-off-by: Kyle Moffett Signed-off-by: David S. Miller commit b833961bd30eec201b9a94eec36aa7ac96f9c9c0 Author: Keith Owens Date: Thu Jul 21 23:41:00 2005 -0700 [IA64] unwind.c uses wrong unat from switch_stack unwind.c can read the wrong unat bits from switch_stack. sw->caller_unat is the value of ar.unat when the task was blocked. sw->ar_unat is the value of ar.unat after doing st8.spill for r4-7. IOW, ar_unat is caller_unat with 4 bits changed. unw_access_gr() uses sw->ar_unat for r4-7 (correct), but it also uses sw->ar_unat for other scratch registers (incorrect). sw->ar_unat should only be used for r4-7, everything else should use sw->caller_unat, unless modified by unwind info. Using sw->ar_unat risks picking up the 4 bits that were overwritten when r4-7 were saved. Also this line is wrong unw.sw_off[unw.preg_index[UNW_REG_PFS]] = SW(AR_UNAT); and should be unw.sw_off[unw.preg_index[UNW_REG_PFS]] = SW(AR_PFS); Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 40a085c41dc3d5991fdf90ed2557cc06cce0590a Author: David S. Miller Date: Wed Jul 27 14:14:39 2005 -0700 [SPARC]: Add inotify syscall entries. Signed-off-by: David S. Miller commit cbcd2a4cca1a6223e4f98661ef524919d322675e Author: Randy Dunlap Date: Wed Jul 27 13:04:35 2005 -0700 [NET]: Improve presentation of networking driver families. Suggestion from Sam Ravnborg It causes all driver families to be displayed aligned immediately under the main network drivers heading (in menuconfig/xconfig/gconfig) instead of not being subordinate to (i.e., not indented) the Network device support heading at all. The improved network driver families are: token ring, wireless, PCMCIA, WAN, ATM, and S390. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit eaa1c5d05947819643b2e72cbfc51ae2ddcf1991 Author: Hans-Juergen Tappe (SYSGO AG) Date: Wed Jul 27 13:00:04 2005 -0700 [IPV4]: Fix Kconfig syntax error From: "Hans-Juergen Tappe (SYSGO AG)" Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 6de7dc2c4c713d037c19aa1e310d240f16973414 Merge: cbc3d65ebcb0c494183d45cf202a53352cbf3871 9e566d8bd61f939b7f5d7d969f5b178571471cf9 Author: Dave Kleikamp Date: Wed Jul 27 12:50:08 2005 -0500 Merge with /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp commit d108919b2b5c064946c9bd30cbd4761d491cddb0 Author: Robert Love Date: Wed Jul 27 08:58:00 2005 -0700 [IA64] inotify: ia64 syscalls. Attached patch adds the inotify syscalls to ia64. Signed-off-by: Robert Love Signed-off-by: Tony Luck commit c2834cf4746cf13501efc3489b1895bce58a4ccb Merge: 05cb784c81a0fd1f97732156ea464bd392ce875a 9e566d8bd61f939b7f5d7d969f5b178571471cf9 Author: Tony Luck Date: Wed Jul 27 10:36:54 2005 -0700 Auto merge with /home/aegl/GIT/linus commit cbc3d65ebcb0c494183d45cf202a53352cbf3871 Author: Dave Kleikamp Date: Wed Jul 27 09:17:57 2005 -0500 JFS: Improve sync barrier processing Under heavy load, hot metadata pages are often locked by non-committed transactions, making them difficult to flush to disk. This prevents the sync point from advancing past a transaction that had modified the page. There is a point during the sync barrier processing where all outstanding transactions have been committed to disk, but no new transaction have been allowed to proceed. This is the best time to write the metadata. Signed-off-by: Dave Kleikamp commit 9e566d8bd61f939b7f5d7d969f5b178571471cf9 Author: Andrew Morton Date: Tue Jul 26 21:41:38 2005 -0700 [PATCH] x86_64 fsnotify build fix Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 479d0f41e50646a618c43f69af7af31a8f748433 Author: Andrew Morton Date: Tue Jul 26 21:41:38 2005 -0700 [PATCH] softdog build fix drivers/char/watchdog/softdog.c:94: too many arguments to function `emergency_restart' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc1d3a9a78f0f602fa1e7993dba4d16ad9781bc1 Author: Andrew Morton Date: Tue Jul 26 21:41:37 2005 -0700 [PATCH] eurotechwdt build fix drivers/char/watchdog/eurotechwdt.c:165: too many arguments to function `emergency_restart' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae6578fe9b65208dee8eda40629984efd23740c4 Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Tue Jul 26 21:57:24 2005 -0400 [PATCH] i386: clean up user_mode macros - make the new user_mode() return 0 or 1 (same as x86_64) - remove conditional jump from user_mode_vm() it's called every timer tick on each CPU on SMP) Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Linus Torvalds commit 4d7de66e2cc508761f050d1d4eaca88a6e6f711e Merge: e93adf1e6554511a6194f4785fd29af8e41104db a4f1bac62564049ea4718c4624b0fadc9f597c84 Author: Linus Torvalds Date: Tue Jul 26 16:43:39 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit e93adf1e6554511a6194f4785fd29af8e41104db Author: Tom Rini Date: Tue Jul 26 12:49:53 2005 -0700 [PATCH] Change PowerPC MPC8xx maintainer As Marcelo has been spending a great deal of time working on MPC8xx systems of late (thanks!) and has more time than I do now for it, I'm handing this over to him. Signed-off-by: Tom Rini Signed-off-by: Linus Torvalds commit a4f1bac62564049ea4718c4624b0fadc9f597c84 Author: Herbert Xu Date: Tue Jul 26 15:43:17 2005 -0700 [XFRM]: Fix possible overflow of sock->sk_policy Spotted by, and original patch by, Balazs Scheidler. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d46523ea32a79fbc8cd1237f9441f45cc3f02456 Author: Steven Rostedt Date: Mon Jul 25 16:28:39 2005 -0400 [PATCH] fix MAX_USER_RT_PRIO and MAX_RT_PRIO Here's the patch again to fix the code to handle if the values between MAX_USER_RT_PRIO and MAX_RT_PRIO are different. Without this patch, an SMP system will crash if the values are different. Signed-off-by: Steven Rostedt Cc: Ingo Molnar Signed-off-by: Dean Nelson Signed-off-by: Linus Torvalds commit cadf01c2fc0cd66dfef4956ef1a6482ed01c3150 Author: Adrian Bunk Date: Tue Jul 26 15:39:28 2005 -0700 [NETFILTER]: Fix ip_conntrack_put() prototype. The function is not inline. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 18586e721636527cb5177467fb17e2350615978a Author: Andreas Steinmetz Date: Sat Jul 23 13:42:04 2005 +0200 [PATCH] Fix RLIMIT_RTPRIO breakage RLIMIT_RTPRIO is supposed to grant non privileged users the right to use SCHED_FIFO/SCHED_RR scheduling policies with priorites bounded by the RLIMIT_RTPRIO value via sched_setscheduler(). This is usually used by audio users. Unfortunately this is broken in 2.6.13rc3 as you can see in the excerpt from sched_setscheduler below: /* * Allow unprivileged RT tasks to decrease priority: */ if (!capable(CAP_SYS_NICE)) { /* can't change policy */ if (policy != p->policy) return -EPERM; After the above unconditional test which causes sched_setscheduler to fail with no regard to the RLIMIT_RTPRIO value the following check is made: /* can't increase priority */ if (policy != SCHED_NORMAL && param->sched_priority > p->rt_priority && param->sched_priority > p->signal->rlim[RLIMIT_RTPRIO].rlim_cur) return -EPERM; Thus I do believe that the RLIMIT_RTPRIO value must be taken into account for the policy check, especially as the RLIMIT_RTPRIO limit is of no use without this change. The attached patch fixes this problem. Signed-off-by: Andreas Steinmetz Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit fc00a6274b786f6863b32c79ff6f92aa0960b789 Merge: 0983f0509480f95584f8e945e5b9c5310e9038f3 a8d11e3d0282e9607f65c73383c4030fd8f0e972 Author: Linus Torvalds Date: Tue Jul 26 15:13:26 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 0983f0509480f95584f8e945e5b9c5310e9038f3 Merge: db776a14f327c20d4984ac4b724a934df34bfe31 186efd5275bbe7ffb73d939c1ce5690682668200 Author: Linus Torvalds Date: Tue Jul 26 15:12:54 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp commit db776a14f327c20d4984ac4b724a934df34bfe31 Author: Linus Torvalds Date: Tue Jul 26 14:50:02 2005 -0700 Fix compiler warning in qla_iocb.c Remove bogus initialization that was re-done (correctly) later. commit a8d11e3d0282e9607f65c73383c4030fd8f0e972 Author: Ben Dooks Date: Tue Jul 26 22:39:14 2005 +0100 [PATCH] ARM: 2831/1: S3C2440 - split s3c2440 clocks from central clock code Patch from Ben Dooks Split the s3c2440 specific clocks from the arch clock support, to make the code clearer. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit b35c67a46b025e8dc320b59fbe5c283094e1d7f5 Author: Eric W. Biederman Date: Tue Jul 26 12:17:52 2005 -0600 [PATCH] acpi: Don't call acpi_sleep_prepare from acpi_power_off Now that all of the code paths that call acpi_power_off have been modified to call either call kernel_power_off (which calls apci_sleep_prepare by way of acpi_shutdown) or to call acpi_sleep_prepare directly it is redundant to call acpi_sleep_prepare from acpi_power_off. So simplify the code and simply don't call acpi_sleep_prepare. In addition there is a little error handling done so if we can't register the acpi class we don't hook pm_power_off. I think I have done the right thing with the CONFIG_PM define but I'm not certain. Can this code even be compiled if CONFIG_PM is false? Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 6660316cb7a1a2c59a73a52870490c0f782f45c1 Author: Eric W. Biederman Date: Tue Jul 26 12:16:00 2005 -0600 [PATCH] acpi_power_off: Don't switch to the boot cpu machine_power_off on i386 and x86_64 now switch to the boot cpu out of paranoia and because the MP Specification indicates it is a good idea on reboot, so for those architectures it is a noop. I can't see anything in the acpi spec that requires you to be on the boot cpu to power off the system, so this should not be an issue for ia64. In addition ia64 has the altix a massive multi-node system where switching to the boot cpu sounds insane as we may hot removed the boot cpu. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 0963aba54aa26c89114dca7257acf8c938bfec8a Author: Eric W. Biederman Date: Tue Jul 26 12:14:16 2005 -0600 [PATCH] x86_64 sync machine_power_off with i386 i386 machine_power_off was disabling the local apic and all of it's users wanted to be on the boot cpu. So call machine_shutdown which places us on the boot cpu and disables the apics. This keeps us in sync and reduces the number of cases we need to worry about in the power management code. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 910de55c6653d76f90380c80f0b7a395f12019e3 Author: Eric W. Biederman Date: Tue Jul 26 12:10:02 2005 -0600 [PATCH] APM: Remove redundant call to set_cpus_allowed machine_power_off now always switches to the boot cpu so there is no reason for APM to also do that. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 4fa2564a6fde9815df969ef3547744a22f66ba9d Author: Eric W. Biederman Date: Tue Jul 26 12:08:53 2005 -0600 [PATCH] i386 machine_power_off cleanup Call machine_shutdown() to move to the boot cpu and disable apics. Both acpi_power_off and apm_power_off want to move to the boot cpu. and we are already disabling the local apics so calling machine_shutdown simply reuses code. ia64 doesn't have a special path in power_off for efi so there is no reason i386 should. If we really need to call the efi power off path the efi driver can set pm_power_off like everyone else. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit d8e392e7c8f019657ff3ebe70a45d234990831db Author: Eric W. Biederman Date: Tue Jul 26 12:07:01 2005 -0600 [PATCH] machine_shutdown: Typo fix to actually allow specifying which cpu to reboot on This appears to be a typo I introduced when cleaning this code up earlier. Ooops. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 68acc05d0120e19c850e1f347ee96055f5aa032f Author: Eric W. Biederman Date: Tue Jul 26 12:03:08 2005 -0600 [PATCH] pcwd.c: Call kernel_power_off not machine_power_off The call appears to come from process context so kernel_power_off should be safe. And acpi_power_off won't necessarily work if you just call machine_power_off. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit fdde86ac50357b6a811e3574e47d189e81a21444 Author: Eric W. Biederman Date: Tue Jul 26 12:01:17 2005 -0600 [PATCH] swpsuspend: Have suspend to disk use factors of sys_reboot The suspend to disk code was a poor copy of the code in sys_reboot now that we have kernel_power_off, kernel_restart and kernel_halt use them instead of poorly duplicating them inline. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 804ebf46d51653e736108074473d9493398f2df9 Author: Eric W. Biederman Date: Tue Jul 26 11:59:54 2005 -0600 [PATCH] 68328serial: sysrq should use emergency_reboot The 68328serial.c driver has a weird local reimplementation of magic sysrq. The code is architecture specific enough that calling machine_restart() is probably ok. But there is no reason not to call emergency_