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 thi