commit 741b2252a5e14d6c60a913c77a6099abe73a854a Author: Linus Torvalds Date: Thu Oct 27 17:02:08 2005 -0700 Linux v2.6.14 "Better late than never" commit 927321440976d0781a252eefe686ae6b0f236ae2 Author: Dave Jones Date: Thu Oct 27 16:16:25 2005 -0700 [PATCH] cpufreq: SMP fix for conservative governor Don't try to access not-present CPUs. Conservative governor will always oops on SMP without this fix. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=4781 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79b95a454bb5c1d9b7287d1016a70885ba3f346c Author: Linus Torvalds Date: Thu Oct 27 16:28:39 2005 -0700 Revert "x86-64: Avoid unnecessary double bouncing for swiotlb" Commit id 6142891a0c0209c91aa4a98f725de0d6e2ed4918 Andi Kleen reports that it seems to break things for some people, and since it's purely a small optimization, revert it for now. Signed-off-by: Linus Torvalds commit 2ad41065d9fe518759b695fc2640cf9c07261dd2 Author: Herbert Xu Date: Thu Oct 27 18:47:46 2005 +1000 [TCP]: Clear stale pred_flags when snd_wnd changes This bug is responsible for causing the infamous "Treason uncloaked" messages that's been popping up everywhere since the printk was added. It has usually been blamed on foreign operating systems. However, some of those reports implicate Linux as both systems are running Linux or the TCP connection is going across the loopback interface. In fact, there really is a bug in the Linux TCP header prediction code that's been there since at least 2.1.8. This bug was tracked down with help from Dale Blount. The effect of this bug ranges from harmless "Treason uncloaked" messages to hung/aborted TCP connections. The details of the bug and fix is as follows. When snd_wnd is updated, we only update pred_flags if tcp_fast_path_check succeeds. When it fails (for example, when our rcvbuf is used up), we will leave pred_flags with an out-of-date snd_wnd value. When the out-of-date pred_flags happens to match the next incoming packet we will again hit the fast path and use the current snd_wnd which will be wrong. In the case of the treason messages, it just happens that the snd_wnd cached in pred_flags is zero while tp->snd_wnd is non-zero. Therefore when a zero-window packet comes in we incorrectly conclude that the window is non-zero. In fact if the peer continues to send us zero-window pure ACKs we will continue making the same mistake. It's only when the peer transmits a zero-window packet with data attached that we get a chance to snap out of it. This is what triggers the treason message at the next retransmit timeout. Signed-off-by: Herbert Xu Signed-off-by: Arnaldo Carvalho de Melo commit 72ab373a5688a78cbdaf3bf96012e597d5399bb7 Author: Roland McGrath Date: Thu Oct 27 03:16:42 2005 -0700 [PATCH] Yet more posix-cpu-timer fixes This just makes sure that a thread's expiry times can't get reset after it clears them in do_exit. This is what allowed us to re-introduce the stricter BUG_ON() check in a362f463a6d316d14daed0f817e151835ce97ff7. Signed-off-by: Linus Torvalds commit a362f463a6d316d14daed0f817e151835ce97ff7 Author: Linus Torvalds Date: Thu Oct 27 09:07:33 2005 -0700 Revert "remove false BUG_ON() from run_posix_cpu_timers()" This reverts commit 3de463c7d9d58f8cf3395268230cb20a4c15bffa. Roland has another patch that allows us to leave the BUG_ON() in place by just making sure that the condition it tests for really is always true. That goes in next. Signed-off-by: Linus Torvalds commit 7a4ed937aa44acdeb8c6ba671509dc7b54b09d3a Author: Oleg Nesterov Date: Wed Oct 26 20:26:53 2005 +0400 [PATCH] Fix cpu timers expiration time There's a silly off-by-one error in the code that updates the expiration of posix CPU timers, causing them to not be properly updated when they hit exactly on their expiration time (which should be the normal case). This causes them to then fire immediately again, and only _then_ get properly updated. Signed-off-by: Linus Torvalds commit 70ab81c2ed3d1323e7d6805bf59cbb570dff7937 Author: Linus Torvalds Date: Wed Oct 26 11:23:06 2005 -0700 posix cpu timers: fix timer ordering Pointed out by Oleg Nesterov, who has been walking over the code forwards and backwards. Signed-off-by: Linus Torvalds commit b0917bd912d3708c50e1df1b5e1648d0547108a3 Author: Ivan Kokshaysky Date: Wed Oct 26 11:05:25 2005 +0100 [PATCH] fix radeon_cp_init_ring_buffer() I've seen similar failure on alpha. Obviously, someone forgot to convert sg->handle stuff for PCI gart case. Signed-off-by: Dave Airlie Signed-off-by: Linus Torvalds commit 4bcde03d41d2264edb4ea3c47cb27da1e2609e48 Author: Andrew Morton Date: Wed Oct 26 01:59:03 2005 -0700 [PATCH] svcsock timestamp fix Convert nanoseconds to microseconds correctly. Spotted by Steve Dickson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94c1d3184523efa7109472eb393cee6e954c5d75 Author: Peter Wainwright Date: Wed Oct 26 01:59:02 2005 -0700 [PATCH] Fix HFS+ to free up the space when a file is deleted. fsck_hfs reveals lots of temporary files accumulating in the hidden directory "\000\000\000HFS+ Private Data". According to the HFS+ documentation these are files which are unlinked while in use. However, there may be a bug in the Linux hfsplus implementation which causes this to happen even when the files are not in use. It looks like the "opencnt" field is never initialized as (I think) it should be in hfsplus_read_inode. This means that a file can appear to be still in use when in fact it has been closed. This patch seems to fix it for me. Signed-off-by: Anton Altaparmakov Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35848e048f55368f132e28e7f3278ce2d2347f6c Author: Jeff Garzik Date: Wed Oct 26 01:59:01 2005 -0700 [PATCH] kill massive wireless-related log spam Although this message is having the intended effect of causing wireless driver maintainers to upgrade their code, I never should have merged this patch in its present form. Leading to tons of bug reports and unhappy users. Some wireless apps poll for statistics regularly, which leads to a printk() every single time they ask for stats. That's a little bit _too_ much of a reminder that the driver is using an old API. Change this to printing out the message once, per kernel boot. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb32051532fed727de0d513a9a578b54c0b7ea5a Author: Andrew Morton Date: Wed Oct 26 01:59:01 2005 -0700 [PATCH] export cpu_online_map With CONFIG_SMP=n: *** Warning: "cpu_online_map" [drivers/firmware/dcdbas.ko] undefined! due to set_cpus_allowed(). Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 958d24df82e021704437da0789c47fcf581e4b85 Author: Benjamin Herrenschmidt Date: Wed Oct 26 01:59:00 2005 -0700 [PATCH] ppc64: Fix wrong register mapping in mpic driver The mpic interrupt controller driver (used on G5 and early pSeries among others) has a bug where it doesn't get the right virtual address for the timer registers. It causes the driver to poke at the MMIO space of whatever has been mapped just next to it (ouch !) when initializing and causes boot failures on some IBM machines. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c6fe9465941df04a1ad8f009bd6d95b20072a58 Author: Magnus Damm Date: Wed Oct 26 01:58:59 2005 -0700 [PATCH] NUMA: broken per cpu pageset counters The NUMA counters in struct per_cpu_pageset (linux/mmzone.h) are never cleared today. This works ok for CPU 0 on NUMA machines because boot_pageset[] is already zero, but for other CPU:s this results in uninitialized counters. Signed-off-by: Magnus Damm Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8712e553562bbbed9b3a99370f08e9bc25908a76 Author: NeilBrown Date: Wed Oct 26 01:58:58 2005 -0700 [PATCH] md: make sure mdthreads will always respond to kthread_stop There are still a couple of cases where md threads (the resync/recovery thread) is not interruptible since the change to use kthreads. All places there it tests "signal_pending", it should also test kthread_should_stop, as with this patch. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7edc24c4d1924e79d3853a8d7563bcce73f31e5d Author: Ian Campbell Date: Wed Oct 26 15:04:21 2005 +0100 [ARM] 3032/1: sparse: complains about generic_fls() prototype in asm-arm/bitops.h Patch from Ian Campbell Sparse complains about the definition of generic_fls in asm-arm/bitops.h: CHECK /home/icampbell/devel/kernel/2.6/arch/arm/mach-pxa/viper.c include2/asm/bitops.h:350:34: error: marked inline, but without a definition The definition is unnecessary since linux/bitops.h defines generic_fls before including asm/bitops.h and asm/bitops.h should not be included directly. There are still some places where asm/bitops.h is directly included, but I think that code should be fixed. I was a little wary of the patch for this reason but lubbock, mainstone and assabet all build OK and so do my in house boards... ARM is the only arch with the generic_fls prototype in this way. Signed-off-by: Ian Campbell Signed-off-by: Russell King commit 6693e74a16ef563960764bd963f1048392135c3c Author: Linus Torvalds Date: Tue Oct 25 20:40:09 2005 -0700 PCI: be more verbose about resource quirks When reserving an PCI quirk, note that in the kernel bootup messages. Also, parse the strange PIIX4 device resources - they should get their own PCI resource quirks, but for now just print out what it finds to verify that the code does the right thing. Signed-off-by: Linus Torvalds commit 5ed688a7162ff8d28d7cf98b34a1f825e4c2c2ac Author: Jochen Friedrich Date: Sun Oct 23 10:33:52 2005 +0200 [LLC]: Strip RIF flag from source MAC address Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 5ac660ee1334b401450280cd282113b2c18398f5 Author: Jochen Friedrich Date: Sun Oct 23 10:31:45 2005 +0200 [TR]: Preserve RIF flag even for 2 byte RIF fields. Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 4ea6a8046bb49d43c950898f0cb4e1994ef6c89d Author: Yan Zheng Date: Mon Oct 24 19:55:23 2005 +0800 [IPV6]: Fix refcnt of struct ip6_flowlabel Signed-off-by: Yan Zheng Acked-by: YOSHIFUJI Hideaki Signed-off-by: Arnaldo Carvalho de Melo commit 444d1d9bb5b724f03344c9317bc01d54a9b39073 Author: Andrew Morton Date: Tue Oct 25 11:00:56 2005 -0700 [PATCH] qlogic lockup fix If qla2x00_probe_one()'s call to qla2x00_iospace_config() fails, we call qla2x00_free_device() to clean up. But because ha->dpc_pid hasn't been set yet, qla2x00_free_device() tries to stop a kernel thread which hasn't started yet. It does wait_for_completion() against an uninitialised completion struct and the kernel hangs up. Fix it by initialising ha->dpc_pid a bit earlier. Cc: Andrew Vasquez Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0db9ae4a79381a5a3d272ccb51851c48c4bcbb6d Author: Andrew Morton Date: Mon Oct 24 23:05:58 2005 -0700 [PATCH] alpha: atomic dependency fix My alpha build is exploding because asm/atomic.h now needs smb_mb(), which is over in the (not included) system.h. I fear what will happen if I include system.h into atomic.h, so let's put the barriers into their own header file. Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c34e152a494c0de8d920b70163d95235a51f4120 Author: Pavel Machek Date: Mon Oct 24 22:30:10 2005 +0100 [ARM] fix sharp zaurus c-3000 compile failure without CONFIG_FB_PXA This fixes compile problem when CONFIG_FB_PXA is not set. LD .tmp_vmlinux1 arch/arm/mach-pxa/built-in.o(.text+0x1d74): In function `spitz_get_hsync_len': : undefined reference to `pxafb_get_hsync_time' make: *** [.tmp_vmlinux1] Error 1 3.46user 0.46system 5.10 (0m5.106s) elapsed 77.01%CPU Signed-off-by: Pavel Machek Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 551f8f0e87becb415c522adccab524a7a05ca83a Author: Justin Chen Date: Mon Oct 24 22:16:38 2005 +0100 [SERIAL] new hp diva console port Add the new ID 0x132a and configure the new PCI Diva console port. This device supports only 1 single console UART. Signed-off-by: Andrew Morton Signed-off-by: Russell King commit add7b58e7558dd2894f3c17ca8574099fcba5c15 Author: Bjorn Helgaas Date: Mon Oct 24 22:11:57 2005 +0100 [SERIAL] support the Exsys EX-4055 4S four-port card Tested by Wolfgang Denk with this device: 00:0f.0 Network controller: PLX Technology, Inc. PCI <-> IOBus Bridge (rev 01) Subsystem: Exsys EX-4055 4S(16C550) RS-232 Control: I/O+ Mem+ BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- Status: Cap- 66Mhz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- SERR- Signed-off-by: Russell King commit c14e2cfc18659c6ca67c2e10417c432eb978d976 Author: James Simmons Date: Mon Oct 24 21:46:21 2005 +0100 [PATCH] Return the line length via sysfs for fbdev This small patch returns the stride/line length of the framebuffer via sysfs. Signed-off-by: James Simmons Signed-off-by: Linus Torvalds commit d5c5d8fe32a4b9b14363c6031061e98e26da59a2 Author: Takashi Iwai Date: Mon Oct 24 18:16:50 2005 +0200 [PATCH] ALSA: Fix Oops of suspend/resume with generic drivers The patch fixes Oops from sound drivers using generic platform device but have no suspend/resume callbacks. Signed-off-by: Takashi Iwai Signed-off-by: Linus Torvalds commit 10ded9493ec4a566977ed68b65158eba280e61e5 Author: Miklos Szeredi Date: Mon Oct 24 17:49:34 2005 +0200 [PATCH] uml: fix compile failure for TT mode Without this patch, uml compile fails with: LD .tmp_vmlinux1 arch/um/kernel/built-in.o: In function `config_gdb_cb': arch/um/kernel/tt/gdb.c:129: undefined reference to `TASK_EXTERN_PID' Tested on i386, but fix needed on x86_64 too AFAICS. Signed-off-by: Miklos Szeredi Signed-off-by: Linus Torvalds commit a69ac4a78d8bd9e1ec478bd7297d4f047fcd44a8 Author: Oleg Nesterov Date: Mon Oct 24 18:29:58 2005 +0400 [PATCH] posix-timers: fix posix_cpu_timer_set() vs run_posix_cpu_timers() race This might be harmless, but looks like a race from code inspection (I was unable to trigger it). I must admit, I don't understand why we can't return TIMER_RETRY after 'spin_unlock(&p->sighand->siglock)' without doing bump_cpu_timer(), but this is what original code does. posix_cpu_timer_set: read_lock(&tasklist_lock); spin_lock(&p->sighand->siglock); list_del_init(&timer->it.cpu.entry); spin_unlock(&p->sighand->siglock); We are probaly deleting the timer from run_posix_cpu_timers's 'firing' local list_head while run_posix_cpu_timers() does list_for_each_safe. Various bad things can happen, for example we can just delete this timer so that list_for_each() will not notice it and run_posix_cpu_timers() will not reset '->firing' flag. In that case, .... if (timer->it.cpu.firing) { read_unlock(&tasklist_lock); timer->it.cpu.firing = -1; return TIMER_RETRY; } sys_timer_settime() goes to 'retry:', calls posix_cpu_timer_set() again, it returns TIMER_RETRY ... Signed-off-by: Oleg Nesterov Signed-off-by: Linus Torvalds commit ca531a0a5e01e5122f67cb6aca8fcbfc70e18e0b Author: Oleg Nesterov Date: Mon Oct 24 14:36:28 2005 +0400 [PATCH] posix-timers: exit path cleanup No need to rebalance when task exited Signed-off-by: Oleg Nesterov Signed-off-by: Linus Torvalds commit 3de463c7d9d58f8cf3395268230cb20a4c15bffa Author: Oleg Nesterov Date: Mon Oct 24 14:34:03 2005 +0400 [PATCH] posix-timers: remove false BUG_ON() from run_posix_cpu_timers() do_exit() clears ->it_##clock##_expires, but nothing prevents another cpu to attach the timer to exiting process after that. After exit_notify() does 'write_unlock_irq(&tasklist_lock)' and before do_exit() calls 'schedule() local timer interrupt can find tsk->exit_state != 0. If that state was EXIT_DEAD (or another cpu does sys_wait4) interrupted task has ->signal == NULL. At this moment exiting task has no pending cpu timers, they were cleaned up in __exit_signal()->posix_cpu_timers_exit{,_group}(), so we can just return from irq. Signed-off-by: Oleg Nesterov Signed-off-by: Linus Torvalds commit 108150ea78003044e41150c75259447b2c0953b6 Author: Oleg Nesterov Date: Sun Oct 23 20:25:39 2005 +0400 [PATCH] posix-timers: fix cleanup_timers() and run_posix_cpu_timers() races 1. cleanup_timers() sets timer->task = NULL under tasklist + ->sighand locks. That means that this code in posix_cpu_timer_del() and posix_cpu_timer_set() lock_timer(timer); if (timer->task == NULL) return; read_lock(tasklist); put_task_struct(timer->task) is racy. With this patch timer->task modified and accounted only under timer->it_lock. Sadly, this means that dead task_struct won't be freed until timer deleted or armed. 2. run_posix_cpu_timers() collects expired timers into local list under tasklist + ->sighand again. That means that posix_cpu_timer_del() should check timer->it.cpu.firing under these locks too. Signed-off-by: Oleg Nesterov Signed-off-by: Linus Torvalds commit 75eeec2f3fd9e8a16777219ebf1bf8395845faa7 Author: Roland Dreier Date: Sun Oct 23 12:57:19 2005 -0700 [PATCH] ib: mthca: Always re-arm EQs in mthca_tavor_interrupt() We should always re-arm an event queue's interrupt in mthca_tavor_interrupt() if the corresponding bit is set in the event cause register (ECR), even if we didn't find any entries in the EQ. If we don't, then there's a window where we miss an EQ entry and then get stuck because we don't get another EQ event. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d3b35914aa54232b27e6a2b57d84092aadc5e86 Author: Andrew Morton Date: Sun Oct 23 12:57:18 2005 -0700 [PATCH] inotify/idr leak fix Fix a bug which was reported and diagnosed by Stefan Jones IDR trees include a cache of idr_layer objects. There's no way to destroy this cache, so when we discard an overall idr tree we end up leaking some memory. Add and use idr_destroy() for this. v9fs and infiniband also need to use idr_destroy() to avoid leaks. Or, we make the cache global, like radix_tree_preload(). Which is probably better. Later. Cc: Eric Van Hensbergen Cc: Roland Dreier Cc: Robert Love Cc: John McCutchan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0fef676bbd75e711711ed3ff5bebb7bfd1bdb00 Author: Mike Krufky Date: Sun Oct 23 12:57:17 2005 -0700 [PATCH] Kconfig: saa7134-dvb should not select cx22702 On 2005-05-01, Gerd Knorr sent in a patch to add cx22702 to cx88-dvb: [PATCH] dvb: cx22702 frontend driver update http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9990d744bea7d28e83c420e2c9d524c7a8a2d136 ...but as we can see, the Kconfig portion of his patch was incorrectly applied to saa7134-dvb instead of cx88-dvb. On 2005-06-24, Adrian bunk fixed cx88-dvb: [PATCH] VIDEO_CX88_DVB must select DVB_CX22702 http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d6988588e13616587aa879c2e0bd7cd811705e5d ...but we never removed the original patch from Gerd. This patch sets things straight: saa7134-dvb should not select cx22702 Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20c19e4179884d7e843314071e2dfb1ea7b0afcd Author: Davi Arnaut Date: Sun Oct 23 12:57:16 2005 -0700 [PATCH] SELinux: handle sel_make_bools() failure in selinuxfs This patch fixes error handling in sel_make_bools(), where currently we'd get a memory leak via security_get_bools() and try to kfree() the wrong pointer if called again. Signed-off-by: James Morris Acked-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 282c1f5eba150d0b156ffa9e6b064f1d92f8315f Author: Stephen Smalley Date: Sun Oct 23 12:57:15 2005 -0700 [PATCH] selinux: Fix NULL deref in policydb_destroy This patch fixes a possible NULL dereference in policydb_destroy, where p->type_attr_map can be NULL if policydb_destroy is called to clean up a partially loaded policy upon an error during policy load. Please apply. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8766ce41018a0cb80fbe0ce7dbf747f357c752da Author: Kostik Belousov Date: Sun Oct 23 12:57:13 2005 -0700 [PATCH] aio syscalls are not checked by lsm Another case of missing call to security_file_permission: aio functions (namely, io_submit) does not check credentials with security modules. Below is the simple patch to the problem. It seems that it is enough to check for rights at the request submission time. Signed-off-by: Kostik Belousov Signed-off-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a991304496bdaec09f497d1eb5d9dcf2f94b7d5d Author: Randy Dunlap Date: Sun Oct 23 12:57:11 2005 -0700 [PATCH] kernel-parameters cleanup Fix typos & trailing whitespace. Add blank lines in a few places. Remove "AM53C974=" option: driver does not exist. Restrict to < 80 columns in most places (but don't split formatted command-line arguments). Add a few option arguments for completeness. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4196c3af25d98204216a5d6c37ad2cb303a1f2bf Author: Linus Torvalds Date: Sun Oct 23 16:31:16 2005 -0700 cardbus: limit IO windows to 256 bytes That's what we've always historically done, and bigger windows seem to confuse some cardbus bridges. Or something. Alan reports that this makes the ThinkPad 600x series work properly again: the 4kB IO window for some reason made IDE DMA not work, which makes IDE painfully slow even if it works after DMA timeouts. Signed-off-by: Linus Torvalds commit e80eda94d3eaf1d12cfc97878eff77cd679dabc9 Author: Linus Torvalds Date: Sun Oct 23 10:02:50 2005 -0700 Posix timers: limit number of timers firing at once Bursty timers aren't good for anybody, very much including latency for other programs when we trigger lots of timers in interrupt context. So set a random limit, after which we'll handle the rest on the next timer tick. Noted by Oleg Nesterov Signed-off-by: Linus Torvalds commit 49636bb12892786e4a7b207b37ca7b0c5ca1cae0 Author: Herbert Xu Date: Sun Oct 23 17:18:00 2005 +1000 [NEIGH] Fix timer leak in neigh_changeaddr neigh_changeaddr attempts to delete neighbour timers without setting nud_state. This doesn't work because the timer may have already fired when we acquire the write lock in neigh_changeaddr. The result is that the timer may keep firing for quite a while until the entry reaches NEIGH_FAILED. It should be setting the nud_state straight away so that if the timer has already fired it can simply exit once we relinquish the lock. In fact, this whole function is simply duplicating the logic in neigh_ifdown which in turn is already doing the right thing when it comes to deleting timers and setting nud_state. So all we have to do is take that code out and put it into a common function and make both neigh_changeaddr and neigh_ifdown call it. Signed-off-by: Herbert Xu commit 6fb9974f49f7a6032118c5b6caa6e08e7097913e Author: Herbert Xu Date: Sun Oct 23 16:37:48 2005 +1000 [NEIGH] Fix add_timer race in neigh_add_timer neigh_add_timer cannot use add_timer unconditionally. The reason is that by the time it has obtained the write lock someone else (e.g., neigh_update) could have already added a new timer. So it should only use mod_timer and deal with its return value accordingly. This bug would have led to rare neighbour cache entry leaks. Signed-off-by: Herbert Xu commit 203755029e063066ecc4cf5eee1110ab946c2d88 Author: Herbert Xu Date: Sun Oct 23 16:11:39 2005 +1000 [NEIGH] Print stack trace in neigh_add_timer Stack traces are very helpful in determining the exact nature of a bug. So let's print a stack trace when the timer is added twice. Signed-off-by: Herbert Xu commit d475f3f47a0427dfee483cecf9a7e9109e991423 Author: Ivan Kokshaysky Date: Fri Oct 21 22:06:15 2005 +0400 [PATCH] alpha: additional smp barriers As stated in Documentation/atomic_ops.txt, atomic functions returning values must have the memory barriers both before and after the operation. Thanks to DaveM for pointing that out. Signed-off-by: Ivan Kokshaysky Signed-off-by: Linus Torvalds commit 4595f251058609d97a5d792de08c34a7956af816 Author: Ralf Baechle Date: Fri Oct 14 21:29:56 2005 +0100 [AX.25]: Fix signed char bug On architectures where the char type defaults to unsigned some of the arithmetic in the AX.25 stack to fail, resulting in some packets being dropped on receive. Credits for tracking this down and the original patch to Bob Brose N0QBJ . Signed-off-by: Ralf Baechle DL5RB Signed-off-by: Arnaldo Carvalho de Melo commit c98d80edc827277c28f88d662a7d6e9affa7e12f Author: Julian Anastasov Date: Sat Oct 22 13:39:21 2005 +0300 [SK_BUFF]: ipvs_property field must be copied IPVS used flag NFC_IPVS_PROPERTY in nfcache but as now nfcache was removed the new flag 'ipvs_property' still needs to be copied. This patch should be included in 2.6.14. Further comments from Harald Welte: Sorry, seems like the bug was introduced by me. Signed-off-by: Julian Anastasov Signed-off-by: Harald Welte Signed-off-by: Arnaldo Carvalho de Melo commit 63172cb3d5ef762dcb60a292bc7f016b85cf6e1f Author: Chris Wright Date: Fri Oct 21 16:56:08 2005 -0700 [PATCH] typo fix in last cpufreq powernow patch Not sure how it slipped by, but here's a trivial typo fix for powernow. Signed-off-by: Chris Wright [ It's "nurter" backwards.. Maybe we have a hillbilly The Shining fan? ] Signed-off-by: Linus Torvalds commit 25f407f0b668f5e4ebd5d13e1fb4306ba6427ead Author: Roland McGrath Date: Fri Oct 21 15:03:29 2005 -0700 [PATCH] Call exit_itimers from do_exit, not __exit_signal When I originally moved exit_itimers into __exit_signal, that was the only place where we could reliably know it was the last thread in the group dying, without races. Since then we've gotten the signal_struct.live counter, and do_exit can reliably do group-wide cleanup work. This patch moves the call to do_exit, where it's made without locks. This avoids the deadlock issues that the old __exit_signal code's comment talks about, and the one that Oleg found recently with process CPU timers. [ This replaces e03d13e985d48ac4885382c9e3b1510c78bd047f, which is why it was just reverted. ] Signed-off-by: Roland McGrath Signed-off-by: Linus Torvalds commit 9465bee863bc4c6cf1566c12d6f92a8133e3da5c Author: Linus Torvalds Date: Fri Oct 21 15:36:00 2005 -0700 Revert "Fix cpu timers exit deadlock and races" Revert commit e03d13e985d48ac4885382c9e3b1510c78bd047f, to be replaced by a much nicer fix from Roland. commit 0213df74315bbab9ccaa73146f3e11972ea6de46 Author: Dave Jones Date: Fri Oct 21 17:21:03 2005 -0400 [PATCH] cpufreq: fix pending powernow timer stuck condition AMD recently discovered that on some hardware, there is a race condition possible when a C-state change request goes onto the bus at the same time as a P-state change request. Both requests happen, but the southbridge hardware only acknowledges the C-state change. The PowerNow! driver is then stuck in a loop, waiting for the P-state change acknowledgement. The driver eventually times out, but can no longer perform P-state changes. It turns out the solution is to resend the P-state change, which the southbridge will acknowledge normally. Thanks to Johannes Winkelmann for reporting this and testing the fix. Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 3078fcc1d18c7235b034dc889642c5300959fa20 Author: David Gibson Date: Fri Oct 21 13:41:19 2005 +1000 [PATCH] ppc64: Fix typo bug in iSeries hash code This fixes a stupid typo bug in the iSeries hash table code. When we place a hash PTE in the secondary bucket, instead of setting the SECONDARY flag bit, as we should, we (redundantly) set the VALID flag. This was introduced with the patch abolishing bitfields from the hash table code. Mea culpa, oops. It hasn't been noticed until now because in practice we don't hit the secondary bucket terribly often. Signed-off-by: David Gibson Signed-off-by: Linus Torvalds commit e29971f9a4ca08c3c31b98be96c293ef9f7dcc32 Author: Dave Airlie Date: Thu Oct 20 23:49:00 2005 +0100 [PATCH] drm: another mga bug The wrong state emission routines were being called for G550, and consistent maps weren't correctly mapped... Signed-off-by: Dave Airlie Signed-off-by: Linus Torvalds commit 5d96551541a8f5521dcc8c634a18d42a3d349ec9 Author: Benjamin Herrenschmidt Date: Fri Oct 21 14:12:51 2005 +1000 [PATCH] ppc64: Fix pages marked dirty abusively While working on 64K pages, I found this little buglet in our update_mmu_cache() implementation. The code calls __hash_page() passing it an "access" parameter (the type of access that triggers the hash) containing the bits _PAGE_RW and _PAGE_USER of the linux PTE. The latter is useless in this case and the former is wrong. In fact, if we have a writeable PTE and we pass _PAGE_RW to hash_page(), it will set _PAGE_DIRTY (since we track dirty that way, by hash faulting !dirty) which is not what we want. In fact, the correct fix is to always pass 0. That means that only read-only or already dirty read write PTEs will be preloaded. The (hopefully rare) case of a non dirty read write PTE can't be preloaded this way, it will have to fault in hash_page on the actual access. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit a1c7e111934b6375baf07a970d6c890d18d7e34f Author: Paul Mackerras Date: Fri Oct 21 22:39:36 2005 +1000 [PATCH] ppc64: Fix typo in time calculations This fixes a typo in the div128_by_32 function used in the timekeeping calculations on ppc64. If you look at the code it's quite obvious that we need (rb + c) rather than (rb + b). The "b" is clearly just a typo. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 024358eeafd44ecffd0e7a1002ef3ccc1d0acd4d Author: Eric Moore Date: Fri Oct 21 20:56:36 2005 +0200 [PATCH] mptsas: fix phy identifiers This fixes handling of the phy identifiers in mptsas. Signed-off-by: Eric Moore [ split it a pre-2.6.14 portion from Eric's bigger patch ] Signed-off-by: Christoph Hellwig Signed-off-by: Linus Torvalds commit d18566376055046fca0b51ad536f1778ef34966a Author: Russell King Date: Fri Oct 21 10:17:37 2005 +0100 [ARM] Fix Integrator IM/PD-1 support Signed-off-by: Russell King commit 7fe8785e4198ad6b5dfd4a76c44c97e9b4463534 Author: Ben Dooks Date: Thu Oct 20 23:21:20 2005 +0100 [ARM] 3028/1: S3C2410 - add DCLK mask definitions Patch from Ben Dooks From: Guillaume Gourat Add MASK definitions for DCLK0 and DCLK1 Signed-off-by: Guillaume Gourat Signed-off-by: Ben Dooks Signed-off-by: Russell King commit b048dbf4d428c89f219efc2eddf2771f13500503 Author: Ben Dooks Date: Thu Oct 20 23:21:19 2005 +0100 [ARM] 3027/1: BAST - reduce NAND timings slightly Patch from Ben Dooks The current Simtec BAST nand area timings are a little too slow to be obtained by a 2410 running at 266MHz, so reduce the timings slightly to bring them into the acceptable range. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a7ce8edc8232da51dc3a804ec9c734019d115b40 Author: Ben Dooks Date: Thu Oct 20 23:21:18 2005 +0100 [ARM] 3026/1: S3C2410 - avoid possible overflow in pll calculations Patch from Ben Dooks Avoid the possiblity that if the board is using a 16.9334 or higher crystal with a high PLL multiplier, then the pll value could overflow the capability of an int. Also fix the value types of the intermediate variables to unsigned int. Rewrite of patch from Guillaume Gourat Signed-off-by: Ben Dooks Signed-off-by: Russell King commit b2640b420a806c91f6b8799314ca96bb88a246d2 Author: Matt Reimer Date: Thu Oct 20 23:21:18 2005 +0100 [ARM] 3025/1: Add I2S platform device for PXA Patch from Matt Reimer Adds an I2S platform_device for PXA. I2S is used to interface with sound chips on systems like iPAQ h1910/h2200/hx4700 and Asus 716. Signed-off-by: mreimer@vpop.net Signed-off-by: Russell King commit b2cc99f04c5a732c793519aca61a20f719b50db4 Author: Herbert Xu Date: Thu Oct 20 17:13:13 2005 -0200 [TCP] Allow len == skb->len in tcp_fragment It is legitimate to call tcp_fragment with len == skb->len since that is done for FIN packets and the FIN flag counts as one byte. So we should only check for the len > skb->len case. Signed-off-by: Herbert Xu Signed-off-by: Arnaldo Carvalho de Melo commit 49c5bfaffe8ae6e6440dc4bf78b03800960d93f5 Author: Herbert Xu Date: Tue Oct 18 12:03:28 2005 +1000 [DCCP]: Clear the IPCB area Turns out the problem has nothing to do with use-after-free or double-free. It's just that we're not clearing the CB area and DCCP unlike TCP uses a CB format that's incompatible with IP. Signed-off-by: Herbert Xu Signed-off-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo commit ffa29347dfbc158d1f47f5925324a6f5713659c1 Author: Herbert Xu Date: Sun Oct 16 21:08:46 2005 +1000 [DCCP]: Make dccp_write_xmit always free the packet icmp_send doesn't use skb->sk at all so even if skb->sk has already been freed it can't cause crash there (it would've crashed somewhere else first, e.g., ip_queue_xmit). I found a double-free on an skb that could explain this though. dccp_sendmsg and dccp_write_xmit are a little confused as to what should free the packet when something goes wrong. Sometimes they both go for the ball and end up in each other's way. This patch makes dccp_write_xmit always free the packet no matter what. This makes sense since dccp_transmit_skb which in turn comes from the fact that ip_queue_xmit always frees the packet. Signed-off-by: Herbert Xu Signed-off-by: Arnaldo Carvalho de Melo commit fda0fd6c5b722cc48e904e0daafedca275d332af Author: Herbert Xu Date: Fri Oct 14 16:38:49 2005 +1000 [DCCP]: Use skb_set_owner_w in dccp_transmit_skb when skb->sk is NULL David S. Miller wrote: > One thing you can probably do for this bug is to mark data packets > explicitly somehow, perhaps in the SKB control block DCCP already > uses for other data. Put some boolean in there, set it true for > data packets. Then change the test in dccp_transmit_skb() as > appropriate to test the boolean flag instead of "skb_cloned(skb)". I agree. In fact we already have that flag, it's called skb->sk. So here is patch to test that instead of skb_cloned(). Signed-off-by: Herbert Xu Acked-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo commit ac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 Author: Hugh Dickins Date: Thu Oct 20 16:24:28 2005 +0100 [PATCH] Fix handling spurious page fault for hugetlb region This reverts commit 3359b54c8c07338f3a863d1109b42eebccdcf379 and replaces it with a cleaner version that is purely based on page table operations, so that the synchronization between inode size and hugetlb mappings becomes moot. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 93918e9afc76717176e9e114e79cdbb602a45ae8 Author: Linus Torvalds Date: Wed Oct 19 23:23:05 2005 -0700 Linux v2.6.14-rc5 The -rc4 release was supposed to be the last -rc, but here goes. The RCU fixes and the swiotlb changes need an -rc for final testing. commit 450da6ca97185830315d21c06e46e232618e0fa6 Author: Al Viro Date: Tue Oct 18 22:45:17 2005 +0100 [PATCH] build fix for uml/amd64 Missing half of the [PATCH] uml: Fix sysrq-r support for skas mode We need to remove these (UPT_[DEFG]S) from the read side as well as the write one - otherwise it simply won't build. Signed-off-by: Al Viro Acked-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Linus Torvalds commit 461a0ffbec1bcea896bd5daf1a98a18232a1e9c7 Author: Steven Rostedt Date: Wed Oct 19 08:22:13 2005 -0400 [PATCH] scsi_error thread exits in TASK_INTERRUPTIBLE state. Found in the -rt patch set. The scsi_error thread likely will be in the TASK_INTERRUPTIBLE state upon exit. This patch fixes this bug. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit bf3f81b3f755fe3fced2aaac5cb3ecb4b541f41c Author: Paul Mackerras Date: Thu Oct 20 08:34:56 2005 +1000 [PATCH] ppc64: update defconfigs Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 281dd25cdc0d6903929b79183816d151ea626341 Author: Yasunori Goto Date: Wed Oct 19 15:52:18 2005 -0700 [PATCH] swiotlb: make sure initial DMA allocations really are in DMA memory This introduces a limit parameter to the core bootmem allocator; The new parameter indicates that physical memory allocated by the bootmem allocator should be within the requested limit. We also introduce alloc_bootmem_low_pages_limit, alloc_bootmem_node_limit, alloc_bootmem_low_pages_node_limit apis, but alloc_bootmem_low_pages_limit is the only api used for swiotlb. The existing alloc_bootmem_low_pages() api could instead have been changed and made to pass right limit to the core allocator. But that would make the patch more intrusive for 2.6.14, as other arches use alloc_bootmem_low_pages(). We may be done that post 2.6.14 as a cleanup. With this, swiotlb gets memory within 4G for both x86_64 and ia64 arches. Signed-off-by: Yasunori Goto Cc: Ravikiran G Thirumalai Signed-off-by: Linus Torvalds commit 51b190b304bbeb1090ba20b0623d39917fa62997 Author: Peter Chubb Date: Wed Oct 19 22:45:14 2005 -0700 [PATCH] `unaligned access' in acpi get_root_bridge_busnr() In drivers/acpi/glue.c the address of an integer is cast to the address of an unsigned long. This breaks on systems where a long is larger than an int --- for a start the int can be misaligned; for a second the assignment through the pointer will overwrite part of the next variable. Signed-off-by: Peter Chubb Acked-by: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11909d64389c24b409e20f0eeafdc262e0a55788 Author: Dave Airlie Date: Wed Oct 19 21:23:51 2005 -0700 [PATCH] fix MGA DRM regression before 2.6.14 I've gotten a report on lkml, of a possible regression in the MGA DRM in 2.6.14-rc4 (since -rc1), I haven't been able to reproduce it here, but I've figured out some possible issues in the mga code that were definitely wrong, some of these are from DRM CVS, the main fix is the agp enable bit on the old code path still used by everyone..... Signed-off-by: Dave Airlie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1209d049bbc3df66650f8417637be4f7b57b604 Author: Alan Stern Date: Wed Oct 19 21:23:51 2005 -0700 [PATCH] Threads shouldn't inherit PF_NOFREEZE The PF_NOFREEZE process flag should not be inherited when a thread is forked. This patch (as585) removes the flag from the child. This problem is starting to show up more and more as drivers turn to the kthread API instead of using kernel_thread(). As a result, their kernel threads are now children of the kthread worker instead of modprobe, and they inherit the PF_NOFREEZE flag. This can cause problems during system suspend; the kernel threads are not getting frozen as they ought to be. Signed-off-by: Alan Stern Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9b25fabfddf142b5af8268692701d386cf37e4f Author: Tom Rini Date: Wed Oct 19 21:23:49 2005 -0700 [PATCH] Export RCS_TAR_IGNORE for rpm targets The variable RCS_TAR_IGNORE is used in scripts/packaging/Makefile, but not exported from the main Makefile, so it's never used. This results in the rpm targets being very unhappy in quilted trees. Signed-off-by: Tom Rini Acked-by: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83bcbf8dad86c217ef70b4b4d53811422bb79dfa Author: Benjamin Herrenschmidt Date: Wed Oct 19 21:23:49 2005 -0700 [PATCH] ppc64: Fix error in vDSO 32 bits date The implementation of __kernel_gettimeofday() in the 32 bits vDSO has a small bug (a typo actually) that will cause it to lose 1 bit of precision. Not terribly bad but worth fixing. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6985c43f39b3d799999c390099c56ebbee27d4f4 Author: NeilBrown Date: Wed Oct 19 21:23:47 2005 -0700 [PATCH] Three one-liners in md.c The main problem fixes is that in certain situations stopping md arrays may take longer than you expect, or may require multiple attempts. This would only happen when resync/recovery is happening. This patch fixes three vaguely related bugs. 1/ The recent change to use kthreads got the setting of the process name wrong. This fixes it. 2/ The recent change to use kthreads lost the ability for md threads to be signalled with SIG_KILL. This restores that. 3/ There is a long standing bug in that if: - An array needs recovery (onto a hot-spare) and - The recovery is being blocked because some other array being recovered shares a physical device and - The recovery thread is killed with SIG_KILL Then the recovery will appear to have completed with no IO being done, which can cause data corruption. This patch makes sure that incomplete recovery will be treated as incomplete. Note that any kernel affected by bug 2 will not suffer the problem of bug 3, as the signal can never be delivered. Thus the current 2.6.14-rc kernels are not susceptible to data corruption. Note also that if arrays are shutdown (with "mdadm -S" or "raidstop") then the problem doesn't occur. It only happens if a SIGKILL is independently delivered as done by 'init' when shutting down. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a9949d7ac9e2bc51939f27b184be6e1bd99004e Author: Andy Wingo Date: Wed Oct 19 21:23:46 2005 -0700 [PATCH] raw1394: fix locking in the presence of SMP and interrupts Changes all spinlocks that can be held during an irq handler to disable interrupts while the lock is held. Changes spin_[un]lock_irq to use the irqsave/irqrestore variants for robustness and readability. In raw1394.c:handle_iso_listen(), don't grab host_info_lock at all -- we're not accessing host_info_list or host_count, and holding this lock while trying to tasklet_kill the iso tasklet this can cause an ABBA deadlock if ohci:dma_rcv_tasklet is running and tries to grab host_info_lock in raw1394.c:receive_iso. Test program attached reliably deadlocks all SMP machines I have been able to test without this patch. Signed-off-by: Andy Wingo Acked-by: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c367c21c93ccdaf7e1e124891633d89f9ae77f54 Author: Andrew Morton Date: Wed Oct 19 21:23:44 2005 -0700 [PATCH] orinoco: limit message rate Brice Goglin reports a printk storm from this driver. Fix. Acked-by: David Gibson Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c59827d1da9bcd6970800d4f8a031b5859e8b4c Author: Hugh Dickins Date: Wed Oct 19 21:23:43 2005 -0700 [PATCH] mm: hugetlb truncation fixes hugetlbfs allows truncation of its files (should it?), but hugetlb.c often forgets that: crashes and misaccounting ensue. copy_hugetlb_page_range better grab the src page_table_lock since we don't want to guess what happens if concurrently truncated. unmap_hugepage_range rss accounting must not assume the full range was mapped. follow_hugetlb_page must guard with page_table_lock and be prepared to exit early. Restyle copy_hugetlb_page_range with a for loop like the others there. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e03d13e985d48ac4885382c9e3b1510c78bd047f Author: Roland McGrath Date: Wed Oct 19 22:21:23 2005 -0700 [PATCH] Fix cpu timers exit deadlock and races Oleg Nesterov reported an SMP deadlock. If there is a running timer tracking a different process's CPU time clock when the process owning the timer exits, we deadlock on tasklist_lock in posix_cpu_timer_del via exit_itimers. That code was using tasklist_lock to check for a race with __exit_signal being called on the timer-target task and clearing its ->signal. However, there is actually no such race. __exit_signal will have called posix_cpu_timers_exit and posix_cpu_timers_exit_group before it does that. Those will clear those k_itimer's association with the dying task, so posix_cpu_timer_del will return early and never reach the code in question. In addition, posix_cpu_timer_del called from exit_itimers during execve or directly from timer_delete in the process owning the timer can race with an exiting timer-target task to cause a double put on timer-target task struct. Make sure we always access cpu_timers lists with sighand lock held. Signed-off-by: Roland McGrath Signed-off-by: Chris Wright Signed-off-by: Linus Torvalds commit 67c5587ad4047041e4fb137628076388ede05281 Author: Tony Lindgren Date: Wed Oct 19 23:00:56 2005 +0100 [ARM] 3024/1: Add cpu_v6_proc_fin Patch from Tony Lindgren Machine restart calls cpu_proc_fin() to clean and disable cache, and turn off interrupts. This patch adds proper cpu_v6_proc_fin. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 3359b54c8c07338f3a863d1109b42eebccdcf379 Author: Seth, Rohit Date: Tue Oct 18 14:15:12 2005 -0700 [PATCH] Handle spurious page fault for hugetlb region The hugetlb pages are currently pre-faulted. At the time of mmap of hugepages, we populate the new PTEs. It is possible that HW has already cached some of the unused PTEs internally. These stale entries never get a chance to be purged in existing control flow. This patch extends the check in page fault code for hugepages. Check if a faulted address falls with in size for the hugetlb file backing it. We return VM_FAULT_MINOR for these cases (assuming that the arch specific page-faulting code purges the stale entry for the archs that need it). Signed-off-by: Rohit Seth [ This is apparently arguably an ia64 port bug. But the code won't hurt, and for now it fixes a real problem on some ia64 machines ] Signed-off-by: Linus Torvalds commit 055787e447a6cf50aa1cc42f7d3b07f08223dd9b Author: Steven Rostedt Date: Wed Oct 19 08:22:13 2005 -0400 [SCSI] scsi_error thread exits in TASK_INTERRUPTIBLE state. Found in the -rt patch set. The scsi_error thread likely will be in the TASK_INTERRUPTIBLE state upon exit. This patch fixes this bug. Signed-off-by: Steven Rostedt Signed-off-by: James Bottomley commit d1972efaf24e56c06b43c40c364f9377763c2e13 Author: Paul Schulz Date: Tue Oct 18 19:40:32 2005 +0100 [ARM] 3023/1: pxa-regs: Typo in ARM pxa register definitions. Patch from Paul Schulz The following trivial patch is to fix what looks like a typo in the PXA register definitions. The correction comes directly from the definition in the Intel Documentation. http://www.intel.com/design/pca/applicationsprocessors/manuals/278693.htm Intel(R) PXA 255 Processor - Developers Manual - Jan 2004 - Page 12-33 Neither 'UDCCS_IO_ROF' or 'UDCCS_IO_DME' are currently used elseware in the main code (from grep of tree)... The current definitions have been in the code since at lease 2.4.7. Signed-off-by: Paul Schulz Signed-off-by: Russell King commit bb7e257ef8d8ba43cab356aa1cc1b20d0106d45f Author: Antonino A. Daplas Date: Tue Oct 18 15:59:52 2005 +0800 [PATCH] vesafb: Fix display corruption on display blank Reported by: Bob Tracy "...I've got a Toshiba notebook (730XCDT -- Pentium 150MMX) for which I'm using the Vesa FB driver. When the machine has been idle for some time and the driver attempts to powerdown the display, rather than the display going blank, it goes gray with several strange lines. When I hit the "shift" key or other-wise wake up the display, the old video state is not fully restored..." vesafb recently added a blank method which has only 2 states, powerup and powerdown. The powerdown state is used for all blanking levels, but in his case, powerdown does not work correctly for higher levels of display powersaving. Thus, for intermediate power levels, use software blanking, and use only hardware blanking for an explicit powerdown. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 1e65174a3378494608e8ed7f8c74d658be9a0fb2 Author: Linus Torvalds Date: Tue Oct 18 08:26:15 2005 -0700 Add some basic .gitignore files This still leaves driver and architecture-specific subdirectories alone, but gets rid of the bulk of the "generic" generated files that we should ignore. Signed-off-by: Linus Torvalds commit 251b928cdff5f12e7da8f56e8933e2b58ba08456 Author: Kenneth Tan Date: Tue Oct 18 07:53:35 2005 +0100 [ARM] 3021/1: Interrupt 0 bug fix for ixp4xx Patch from Kenneth Tan The get_irqnr_and_base subroutine of ixp4xx does not take interrupt 0 condition into account properly. We should not perform "subs" here. The Z flag will be set when interrupt 0 occur, which resulting "movne r1, sp" in the caller routine (irq_handler) not being executed. When interrupt 0 occur: o if CONFIG_CPU_IXP46X is not set, "subs" will set the Z flag and return o if CONFIG_CPU_IXP46X is set, codes in upper interrupt handling will be trigerred. But since this is not supper interrupt, the "cmp" in the upper interrupt handling portion will set the Z flag and return Signed-off-by: Kenneth Tan Signed-off-by: Russell King commit ad1b472bea1bbcd8dc7fd92f6952d8b2d8355edb Author: Kenneth Tan Date: Tue Oct 18 07:51:35 2005 +0100 [ARM] 3020/1: Fixes typo error CONFIG_CPU_IXP465, which should be CONFIG_CPU_IXP46X Patch from Kenneth Tan The cpu_is_ixp465 macro in include/asm-arm/arch-ixp4xx/hardware.h is always returning 0 because #ifdef CONFIG_CPU_IXP465 is always false. Signed-off-by: Kenneth Tan Signed-off-by: Russell King commit 9b15c6c4e22cbb381373fac3bee8cacb811147a9 Author: Nicolas Pitre Date: Tue Oct 18 07:51:34 2005 +0100 [ARM] 3019/1: fix wrong comments Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit c086f282c01d7e5a887c3f7b190520538267f12e Author: Ben Dooks Date: Tue Oct 18 07:51:34 2005 +0100 [ARM] 3018/1: S3C2410 - check de-referenced device is really a platform device Patch from Ben Dooks Check that the device we are looking at is really a platform device before trying to cast it to one to find out the platform bus number. Thanks to RMK for pointing this out. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 39ca371c45b04cd50d0974030ae051906fc516b6 Author: Mark Rustad Date: Mon Oct 17 16:43:34 2005 -0700 [PATCH] kbuild: Eliminate build error when KALLSYMS not defined The following build error happens with 2.6.14-rc4 when CONFIG_KALLSYMS is not defined. The error message in a fragment of the output was: CC arch/i386/lib/usercopy.o AR arch/i386/lib/lib.a /bin/sh: line 1: +@: command not found make[3]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule. CHK include/linux/compile.h Signed-off-by: Mark Rustad Signed-off-by: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4faa5285283fad081443e3612ca426a311bb6c7e Author: Zach Brown Date: Mon Oct 17 16:43:33 2005 -0700 [PATCH] aio: revert lock_kiocb() lock_kiocb() was introduced to serialize retrying and cancellation. In the process of doing so it tried to sleep waiting for KIF_LOCKED while holding the ctx_lock spinlock. Recent fixes have ensured that multiple concurrent retries won't be attempted for a given iocb. Cancel has other problems and has no significant in-tree users that have been complaining about it. So for the immediate future we'll revert sleeping with the lock held and will address proper cancellation and retry serialization in the future. Signed-off-by: Zach Brown Acked-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7507ed91e093b9e4e218e41ebfdce05458258fc Author: Dmitry Torokhov Date: Mon Oct 17 16:43:32 2005 -0700 [PATCH] uniput - fix crash on SMP Only signal completion after marking request slot as free, otherwise other processor can free request structure before we finish using it. Signed-off-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5cc9eeef9a9567acdfc2f6943f24381bf460f008 Author: Pavel Machek Date: Mon Oct 17 16:43:31 2005 -0700 [PATCH] Fix /proc/acpi/events around suspend Fix -EIO on /proc/acpi/events after suspends. This actually breaks suspending by power button in many setups. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ac0b9c1927228a38a71216536176af8811a435a Author: Stephan Brodkorb Date: Mon Oct 17 16:43:30 2005 -0700 [PATCH] n_r3964 mod_timer() fix Since Revision 1.10 was released the n_r3964 module wasn't able to receive any data. The reason for that behavior is because there were some wrong calls of mod_timer(...) in the function receive_char (...). This patch should fix this problem and was successfully tested with talking to some kuka industrial robots. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b65574fec5db1211bce7fc8bec7a2b32486e0670 Author: David McCullough Date: Mon Oct 17 16:43:29 2005 -0700 [PATCH] output of /proc/maps on nommu systems is incomplete Currently you do not get all the map entries on nommu systems because the start function doesn't index into the list using the value of "pos". Signed-off-by: David McCullough Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ee832dbc6770135ec8d63296af0a4374557bb79 Author: Eric Dumazet Date: Mon Oct 17 20:01:21 2005 +0200 [PATCH] rcu: keep rcu callback event counter This makes call_rcu() keep track of how many events there are on the RCU list, and cause a reschedule event when the list gets too long. This helps keep RCU event lists down. Signed-off-by: Linus Torvalds commit cc675230a9ca17010694bc8bd3c69ca9adf2efef Author: Jeff Garzik Date: Mon Oct 17 13:01:57 2005 -0400 [PATCH] Fix and clean up quirk_intel_ide_combined() configuration This change makes quirk_intel_ide_combined() dependent on the precise conditions under which it is needed: * IDE is built in * IDE SATA option is not set * ata_piix or ahci drivers are enabled This fixes an issue where some modular configurations would not cause the quirk to be enabled. Signed-off-by: Jeff Garzik Signed-off-by: Linus torvalds commit 47d6b08334a43fafa61a587f721fa21ef65d81be Author: Oleg Nesterov Date: Mon Oct 17 18:49:42 2005 +0400 [PATCH] posix-timers: fix task accounting Make sure we release the task struct properly when releasing pending timers. release_task() does write_lock_irq(&tasklist_lock), so it can't race with run_posix_cpu_timers() on any cpu. Signed-off-by: Oleg Nesterov Signed-off-by: Linus Torvalds commit 6ce969171d5187f7621be68c0ebbc7fb02ec53f1 Author: Trond Myklebust Date: Mon Oct 17 06:03:23 2005 -0400 [PATCH] NFS: Fix Oopsable/unnecessary i_count manipulations in nfs_wait_on_inode() Oopsable since nfs_wait_on_inode() can get called as part of iput_final(). Unnecessary since the caller had better be damned sure that the inode won't disappear from underneath it anyway. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit b3c52da33ce95747b1bff86cce716d4f1397f14a Author: Trond Myklebust Date: Mon Oct 17 06:02:00 2005 -0400 [PATCH] NFS: Fix cache consistency races If the data cache has been marked as potentially invalid by nfs_refresh_inode, we should invalidate it rather than assume that changes are due to our own activity. Also ensure that we always start with a valid cache before declaring it to be protected by a delegation. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit 13b58ee51802a45d2b8853ffe0003d9fa768195c Author: Christian Krause Date: Mon Oct 17 14:30:48 2005 -0700 [PATCH] USB: fix bug in handling of highspeed usb HID devices During the development of an USB device I found a bug in the handling of Highspeed HID devices in the kernel. What happened? Highspeed HID devices are correctly recognized and enumerated by the kernel. But even if usbhid kernel module is loaded, no HID reports are received by the kernel. The output of the hardware USB analyzer told me that the host doesn't even poll for interrupt IN transfers (even the "interrupt in" USB transfer are polled by the host). After some debugging in hid-core.c I've found the reason. In case of a highspeed device, the endpoint interval is re-calculated in driver/usb/input/hid-core.c: line 1669: /* handle potential highspeed HID correctly */ interval = endpoint->bInterval; if (dev->speed == USB_SPEED_HIGH) interval = 1 << (interval - 1); Basically this calculation is correct (refer to USB 2.0 spec, 9.6.6). This new calculated value of "interval" is used as input for usb_fill_int_urb: line 1685: usb_fill_int_urb(hid->urbin, dev, pipe, hid->inbuf, 0, hid_irq_in, hid, interval); Unfortunately the same calculation as above is done a second time in usb_fill_int_urb in the file include/linux/usb.h: line 933: if (dev->speed == USB_SPEED_HIGH) urb->interval = 1 << (interval - 1); else urb->interval = interval; This means, that if the endpoint descriptor (of a high speed device) specifies e.g. bInterval = 7, the urb->interval gets the value: hid-core.c: interval = 1 << (7-1) = 0x40 = 64 urb->interval = 1 << (interval -1) = 1 << (63) = integer overflow Because of this the value of urb->interval is sometimes negative and is rejected in core/urb.c: line 353: /* too small? */ if (urb->interval <= 0) return -EINVAL; The conclusion is, that the recalculaton of the interval (which is necessary for highspeed) should not be made twice, because this is simply wrong. ;-) Re-calculation in usb_fill_int_urb makes more sense, because it is the most general approach. So it would make sense to remove it from hid-core.c. Because in hid-core.c the interval variable is only used for calling usb_fill_int_urb, it is no problem to remove the highspeed re-calculation in this file. Signed-off-by: Christian Krause Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit e9b765decfb49ddc105d303d491e1bee9769436f Author: Olav Kongas Date: Mon Oct 17 14:30:43 2005 -0700 [PATCH] isp116x-hcd: fix handling of short transfers Increased use of scatter-gather by usb-storage driver after 2.6.13 has exposed a buggy codepath in isp116x-hcd, which was probably never visited before: bug happened only for those urbs, for which URB_SHORT_NOT_OK was set AND short transfer occurred. The fix attached was tested in 2 ways: (a) it fixed failing initialization of a flash drive with an embedded hub; (b) the fix was tested with 'usbtest' against a modified g_zero driver (on top of net2280), which generated short bulk IN transfers of various lengths including multiples and non-multiples of max_packet_length. Signed-off-by: Olav Kongas Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 16192896ea8e03d18d4228023500607b00df49e6 Author: Christoph Hellwig Date: Mon Oct 17 15:40:52 2005 +0200 [SCSI] mptsas: fix phy identifiers This patch from Eric fixes handling of the phy identifiers in mptsas. I've split it up from his bigger patch as it should go into 2.6.14 still. Signed-off-by: Eric Moore Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit f4fd20bf31376f29e4edde6596e3972198877309 Author: Karl Magnus Kolstoe Date: Mon Oct 17 10:05:42 2005 +0200 [SCSI] 2.6.13.3; add Pioneer DRM-624x to drivers/scsi/scsi_devinfo.c The patch below should make the Pioneer DRM-624X automatically be set up with all 6 "drives". (6 slot SCSI CD changer) Signed-off-by: Karl Magnus Kolstø Signed-off-by: James Bottomley commit 2cc78eb52bc1ae89f0a4fa5a00eb998dffde4a9f Author: Linus Torvalds Date: Mon Oct 17 09:10:15 2005 -0700 Increase default RCU batching sharply Dipankar made RCU limit the batch size to improve latency, but that approach is unworkable: it can cause the RCU queues to grow without bounds, since the batch limiter ended up limiting the callbacks. So make the limit much higher, and start planning on instead limiting the batch size by doing RCU callbacks more often if the queue looks like it might be growing too long. Signed-off-by: Linus Torvalds commit de21eb63add932c61e018d20a760dcaed8c3e40c Author: Ronald S. Bultje Date: Sun Oct 16 20:29:25 2005 -0700 [PATCH] fix black/white-only svideo input in vpx3220 decoder Fix the fact that the svideo input will only give input in black/white in some circumstances. Reason is that in the PCI controller driver (zr36067), after setting input, we reset norm, which overwrites the input register with the default. This patch makes it always set the correct value for the input when changing norm. Signed-off-by: Ronald S. Bultje Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b3acc21d7677787ef456d17574a084a1c1193ae Author: Ronald S. Bultje Date: Sun Oct 16 20:29:24 2005 -0700 [PATCH] fix vpx3220 offset issue in SECAM Fix bug #5404 in kernel bugzilla. It basically updates the vpx3220 initialization tables with some newer values that we've had in CVS for a while (and that, for some reason, never ended up in the kernel... must've gotten lost). Those fix a ~16 pixels noise at the top of the picture in at least SECAM, although (now that I think about it) PAL was probably affected, also. Signed-off-by: Ronald S. Bultje Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0aec4867dca149e2049e8439b76bd82ad9dac52c Author: Samuel Thibault Date: Sun Oct 16 20:29:22 2005 -0700 [PATCH] SVGATextMode fix Fix bug 5441. I didn't know about messy programs like svgatextmode... Couldn't this be integrated in some linux/drivers/video/console/svgacon.c ?... So because of the existence of the svgatextmode program, the kernel is not supposed to touch to CRT_OVERFLOW/SYNC_END/DISP/DISP_END/OFFSET ? Disabling the check in vgacon_resize() might help indeed, but I'm really not sure whether it will work for any chipset: in my patch, CRT registers are set at each console switch, since stty rows/cols apply to consoles separately... The attached solution is to keep the test, but if it fails, we assume that the caller knows what it does (i.e. it is svgatextmode) and then disable any further call to vgacon_doresize. Svgatextmode is usually used to _expand_ the display, not to shrink it. And it is harmless in the case of a too big stty rows/cols: the display will just be cropped. I tested it on my laptop, and it works fine with svgatextmode. A better solution would be that svgatextmode explicitely tells the kernel not to care about video timing, but for this an interface needs be defined and svgatextmode be patched. Signed-off-by: Samuel Thibault Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b24d18aa743dad0c42918157c5d717686269d3a8 Author: Herbert Xu Date: Sun Oct 16 20:29:20 2005 -0700 [PATCH] list: add missing rcu_dereference on first element It seems that all the list_*_rcu primitives are missing a memory barrier on the very first dereference. For example, #define list_for_each_rcu(pos, head) \ for (pos = (head)->next; prefetch(pos->next), pos != (head); \ pos = rcu_dereference(pos->next)) It will go something like: pos = (head)->next prefetch(pos->next) pos != (head) do stuff We're missing a barrier here. pos = rcu_dereference(pos->next) fetch pos->next barrier given by rcu_dereference(pos->next) store pos Without the missing barrier, the pos->next value may turn out to be stale. In fact, if "do stuff" were also dereferencing pos and relying on list_for_each_rcu to provide the barrier then it may also break. So here is a patch to make sure that we have a barrier for the first element in the list. Signed-off-by: Herbert Xu Acked-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d80636a0d5f056ffc26472d05b6027a7a9f6e1c Author: Linus Torvalds Date: Sun Oct 16 17:36:06 2005 -0700 Fix memory ordering bug in page reclaim As noticed by Nick Piggin, we need to make sure that we check the page count before we check for PageDirty, since the dirty check is only valid if the count implies that we're the only possible ones holding the page. We always did do this, but the code needs a read-memory-barrier to make sure that the orderign is also honored by the CPU. (The writer side is ordered due to the atomic decrement and test on the page count, see the discussion on linux-kernel) Signed-off-by: Linus Torvalds commit 7c72ce81870ded9365f4bc5caa98ef1591dd18dd Author: Alan Stern Date: Fri Oct 14 11:23:27 2005 -0400 [SCSI] Fix leak of Scsi_Cmnds When a request is deferred in scsi_init_io because the sg table could not be allocated, the associated scsi_cmnd is not released and the request is not marked with REQ_DONTPREP. When the command is retried, if scsi_prep_fn decides to kill it then the scsi_cmnd will never be released. This patch (as573) changes scsi_init_io so that it calls scsi_put_command before deferring a request. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit d16794f6ac8d9b50f62e02a6e6175ae1a30d0ccd Author: James.Smart@Emulex.Com Date: Wed Oct 5 13:50:08 2005 -0400 [SCSI] FW: [PATCH] for Deadlock in transport_fc Cannot call fc_rport_terminate() under the host lock, so drop the lock. Signed-off-by: James Bottomley commit 7a9366e46c167930f8bd9e378a3656861c5a41b6 Author: Salyzyn, Mark Date: Wed Oct 5 12:58:38 2005 -0400 [SCSI] Fix aacraid regression Juan was kind enough to linger on site, and work on a production machine, to try the parameter to make the system stable. He discovered that reducing the maximum transfer size issued to the adapter to 128KB stabilized his system. This is related to an earlier change for the 2.6.13 tree resulting from Martin Drab's testing where the transfer size was reduced from 4G to 256KB; we needed to go still further in scaling back the request size. Here is the patch that tames this regression. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit f566a576bca09de85bf477fc0ab2c8c96405b77b Author: Randy Dunlap Date: Sun Oct 2 17:15:29 2005 -0700 [SCSI] NCR5380: fix undefined preprocessor identifier Fix 12 undefined preprocessor identifier warnings (4 each in 3 driver builds): drivers/scsi/NCR5380.c:2744:16: warning: undefined preprocessor identifier 'NDEBUG_ABORT' drivers/scsi/NCR5380.c:2744:16: warning: "NDEBUG_ABORT" is not defined Signed-off-by: Randy Dunlap Signed-off-by: James Bottomley commit 688ce17b8599abc548b406c00e4d18ae0dec954f Author: Al Viro Date: Sun Oct 16 00:17:33 2005 -0700 [PATCH]: highest_possible_processor_id() has to be a macro ... otherwise, things like alpha and sparc64 break and break badly. They define cpu_possible_map to something else in smp.h *AFTER* having included cpumask.h. If that puppy is a macro, expansion will happen at the actual caller, when we'd already seen #define cpu_possible_map ... and we will get the right thing used. As an inline helper it will be tokenized before we get to that define and that's it; no matter what we define later, it won't affect anything. We get modules with dependency on cpu_possible_map instead of the right symbol (phys_cpu_present_map in case of sparc64), or outright link errors if they are built-in. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit e6850cce8f0fcb0e16b981f13cb9c69618bbdaf1 Author: Andrew Morton Date: Sat Oct 15 16:15:38 2005 -0700 [NETFILTER]: Fix ip6_table.c build with NETFILTER_DEBUG enabled. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c1542cbc50d19565006633827532ab9f96c92cea Author: maximilian attems Date: Sat Oct 15 10:43:35 2005 +0100 [SERIAL] Add SupraExpress 56i support The modem is said to work with belows addition to pnp_dev_table[]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=296011 Signed-off-by: maximilian attems Signed-off-by: Russell King commit 7a3ca7d2b5ec31b2cfa594b961d77e68075e33c7 Author: Randall Nortman Date: Fri Oct 14 17:21:50 2005 -0700 [PATCH] usbserial: Regression in USB generic serial driver Kernel version 2.6.13 introduced a regression in the generic USB serial converter driver (usbserial.o, drivers/usb/serial/generic.c). The bug manifests, as far as I can tell, whenever you attempt to write to the device -- the write will never complete (write() returns 0, or blocks). Signed-off-by: Randall Nortman Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 757e0108473787f470294ce77bf703fedddfce7d Author: Kolli, Neela Syam Date: Fri Oct 14 15:59:13 2005 -0700 [PATCH] megaraid maintainers entry I am taking over all Megaraid SCSI drivers. Here is the patch for the MAINTENERS file. Signed-off-by: Neela Syam Kolli Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d656901bca2e19057ca7a6e48bc56dec9ca7003e Author: Yoshinori Sato Date: Fri Oct 14 15:59:12 2005 -0700 [PATCH] sh-sci.c sci_start_tx error Argument does not agree. Signed-off-by: Yoshinori Sato Cc: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63c6764ce4c650245a41a95a2235207d25ca4fde Author: Yoshinori Sato Date: Fri Oct 14 15:59:11 2005 -0700 [PATCH] nommu build error fix "proc_smaps_operations" is not defined in case of "CONFIG_MMU=n". Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d1f87a728a5ddd9ee0418e14a12e5cb0372fad1 Author: Evgeniy Polyakov Date: Fri Oct 14 15:59:11 2005 -0700 [PATCH] Dallas's 1-wire bus compile error drivers/built-in.o: In function `w1_alloc_dev': undefined reference to `netlink_kernel_create' drivers/built-in.o: In function `w1_alloc_dev': undefined reference to `sock_release' Signed-off-by: Evgeniy Polyakov Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e7734d3ca24302a513e69dd24a560c34047c038 Author: Mark Haverkamp Date: Fri Oct 14 15:59:10 2005 -0700 [PATCH] aacraid: host_lock not released fix While doing some testing of error cases I ran into this bug. In some cases the reset handler can exit with the host_lock still held. Signed-off-by: Mark Haverkamp Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1350843cf0fa46e2f633c78b335777aac3d054b2 Author: Benjamin Herrenschmidt Date: Fri Oct 14 15:59:09 2005 -0700 [PATCH] ppc64: Fix G5 model in /proc/cpuinfo Andreas Schwab spotted that recent kernels broke reporting of the PowerMac machine model in /proc/cpuinfo. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a90933fb4e7b85587e5cbdf863deeb16695c19bd Author: Hirokazu Takata Date: Fri Oct 14 15:59:07 2005 -0700 [PATCH] m32r: Fix smp.c for preempt kernel This patch fixes the following BUG message of arch/m32r/smp.c for CONFIG_DEBUG_PREEMPT: BUG: using smp_processor_id() in preemptible This message is displayed by an smp_processor_id() execution during kernel's preemptible-state. Signed-off-by: Hitoshi Yamamoto Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6593b58cfb54138781c5cd88f605e2ae663301b0 Author: Matteo Croce <3297627799@wind.it> Date: Fri Oct 14 15:59:06 2005 -0700 [PATCH] wireless/airo: Build fix The aironet PCI driver has a build dependency on ISA that prevent the driver to compile on systems that doesn't support ISA, like x86_64. The driver really doesn't depend on ISA, it does some ISA stuff in the initialization code, since the driver supports both ISA and PCI cards. So the driver should depend on ISA_DMA_API to build on all systems, and this will not hurt PCI at all. Signed-off-by: Matteo Croce <3297627799@wind.it> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e26148d934762b61133a64b6862f870624ff617d Author: Tim Schmielau Date: Fri Oct 14 15:59:05 2005 -0700 [PATCH] Fix copy-and-paste error in BSD accounting Fix copy and paste error in jiffies_to_AHZ conversion which leads to wrong BSD accounting information on alpha and ia64 when CONFIG_BSD_PROCESS_ACCT_V3 is turned on. Also update comment to match reorganised header files. Signed-off-by: Tim Schmielau Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1ac046d7b297186f755fb213589b539426e1406 Author: Alexey Dobriyan Date: Fri Oct 14 15:59:04 2005 -0700 [PATCH] radio-cadet: check request_region() return value correctly Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6ecf7ed3131961e5aeedb0efd217afa0808798f Author: Takashi Iwai Date: Fri Oct 14 15:59:03 2005 -0700 [PATCH] Add missing export of getnstimeofday() Adds the missing EXPORT_SYMBOL_GPL for getnstimeofday() when CONFIG_TIME_INTERPOLATION isn't set. Needed by drivers/char/mmtimer.c Signed-off-by: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 65d406ace3b44e042807d3f9a2e71088818e80f2 Author: Pavel Machek Date: Fri Oct 14 15:59:03 2005 -0700 [PATCH] zaurus: fix dependencies on collie keyboard This fixes depenencies of collie keyboard. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4846d0172dd7fb6a77843644caa6d9a8909225b9 Author: Pavel Machek Date: Fri Oct 14 15:59:02 2005 -0700 [PATCH] zaurus: fix soc_common.c This fixes wrong comments, non-working debug subsystem, and some potentially dangerous macros. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6edb7467be2195e7eeb6844e37668253af216100 Author: Pavel Machek Date: Fri Oct 14 15:59:01 2005 -0700 [PATCH] zaurus: fix compilation with cpufreq disabled This fixes compilation with CPU_FREQ disabled. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43d2c4ca385b02ab7a604aa09a9da36f1668bee6 Author: Yoichi Yuasa Date: Fri Oct 14 15:59:00 2005 -0700 [PATCH] mips: fix build error in TANBAC TB0226 arch/mips/pci/fixup-tb0226.c: In function `pcibios_map_irq': arch/mips/pci/fixup-tb0226.c:31: warning: implicit declaration of function `vr41xx_set_irq_trigger' arch/mips/pci/fixup-tb0226.c:32: error: `TRIGGER_LEVEL' undeclared (first use in this function) arch/mips/pci/fixup-tb0226.c:32: error: (Each undeclared identifier is reported only once arch/mips/pci/fixup-tb0226.c:32: error: for each function it appears in.) arch/mips/pci/fixup-tb0226.c:33: error: `SIGNAL_THROUGH' undeclared (first use in this function) arch/mips/pci/fixup-tb0226.c:34: warning: implicit declaration of function `vr41xx_set_irq_level' arch/mips/pci/fixup-tb0226.c:34: error: `LEVEL_LOW' undeclared (first use in this function) Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4d1b825785847cddee6d104113da913f2ca8efb Author: David S. Miller Date: Fri Oct 14 15:26:08 2005 -0700 [SPARC64]: Fix powering off on SMP. Doing a "SUNW,stop-self" firmware call on the other cpus is not the correct thing to do when dropping into the firmware for a halt, reboot, or power-off. For now, just do nothing to quiet the other cpus, as the system should be quiescent enough. Later we may decide to implement smp_send_stop() like the other SMP platforms do. Based upon a report from Christopher Zimmermann. Signed-off-by: David S. Miller commit f75884d28a6eae5a422d0454b982da3842f777af Author: David S. Miller Date: Fri Oct 14 13:44:32 2005 -0700 [QLOGICPTI]: Handle INQUIRY response sniffing correctly. These days, in 2.6.x, even INQUIRY commands are sent using scatter gather lists. Bug reported by Tom 'spot' Callaway. Signed-off-by: David S. Miller commit 414894938b88c1ad2e9cea6502ceccefb30605c4 Author: Richard Purdie Date: Fri Oct 14 16:07:28 2005 +0100 [ARM] 3014/1: Spitz keyboard: Correct the right shift key Patch from Richard Purdie Correct the right shift key entry in the spitz keyboard driver. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 72023b63cc512d2d7c2a31c6bc1be497eafbd834 Author: Richard Purdie Date: Fri Oct 14 16:07:27 2005 +0100 [ARM] 3013/1: Spitz: Fix compile errors Patch from Richard Purdie Remove a couple of lines of accidently added code causing compile errors. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 10f92eb7c6b4e8069c2defd2ad23b74f31f8962d Author: Richard Purdie Date: Fri Oct 14 16:07:26 2005 +0100 [ARM] 3012/1: Corgi/Spitz LCD: Use bus_find_device to locate pxafb - fix compile error Patch from Richard Purdie Update corgi_lcd to use bus_find_device to locate the pxafb device hence fixing a compile error. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit cb38c569e5ecf9e922e66963b6da2751b4f13d81 Author: Richard Purdie Date: Fri Oct 14 16:07:25 2005 +0100 [ARM] 3011/1: pxafb: Add ability to set device parent + fix spitz compile error Patch from Richard Purdie Add a function to allow machines to set the parent of the pxa framebuffer device. This means the power up/down sequence can be controlled where required by the machine. Update spitz to use the new function, fixing a compile error. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 04f03bf7dbd04c15c30d91c6a277f6970cc4ef14 Author: Baris Cicek Date: Fri Oct 14 14:32:40 2005 +0100 [SERIAL] Add SupraExpress 336i Sp ASVD modem ID Signed-off-by: Russell King commit cb90d681ae439e525de9de519508ac9041342321 Author: Deepak Saxena Date: Fri Oct 14 12:49:15 2005 +0100 [ARM] 2980/1: Fix L7200 core.c compile Patch from Deepak Saxena This patch fixes L7200 so that it builds in 2.6.latest. I do not have the hardware so don't know if it actually still works, but the changes are fairly trivial. I am not even sure if anyone still maintains, uses, or cares about this machine type. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 6205d158d16d2619bf30f0aff47a8e09b07106e9 Author: Ben Dooks Date: Fri Oct 14 12:24:24 2005 +0100 [ARM] 3009/1: S3C2410 - io.h offsets too large for LDRH/STRH Patch from Ben Dooks The __inwc/__outwc calls are capable of creating LDRH and STRH instructions with offsets over 8bits as GCC does not have a constraint for an 8bit offset. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 688cb30bdc3e398d97682a6a58f825821ee838c2 Author: David S. Miller Date: Thu Oct 13 22:15:24 2005 -0700 [SPARC64]: Eliminate PCI IOMMU dma mapping size limit. The hairy fast allocator in the sparc64 PCI IOMMU code has a hard limit of 256 pages. Certain devices can exceed this when performing very large I/Os. So replace with a more simple allocator, based largely upon the arch/ppc64/kernel/iommu.c code. Signed-off-by: David S. Miller commit 51e8513615ed8202b22ba9a43b0c7376ea4f6868 Author: David S. Miller Date: Thu Oct 13 21:10:08 2005 -0700 [SPARC64]: Consolidate common PCI IOMMU init code. All the PCI controller drivers were doing the same thing setting up the IOMMU software state, put it all in one spot. Signed-off-by: David S. Miller commit 046d20b73960b7a2474b6d5e920d54c3fd7c23fe Author: Herbert Xu Date: Thu Oct 13 14:42:24 2005 -0700 [TCP]: Ratelimit debugging warning. Better safe than sorry. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit eb0d6041143fae63410c5622fef96862e6b20933 Author: Evgeniy Polyakov Date: Thu Oct 13 14:42:04 2005 -0700 [CONNECTOR]: Update documentation to match reality. Updated documentation to reflect 2.6.14 netlink changes about socket options, multicasting and group number. Please concider for 2.6.14. Signed-off-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit 34cb711ba922f53cca45443b8c3c1078873cf599 Author: Andi Kleen Date: Thu Oct 13 14:41:44 2005 -0700 [NET]: Disable NET_SCH_CLK_CPU for SMP x86 hosts Opterons with frequency scaling have fully unsynchronized TSCs running at different frequencies, so using TSCs there is not a good idea. Also some other x86 boxes have this problem. gettimeofday should be good enough, so just disable it. Signed-off-by: Andi Kleen Signed-off-by: David S. Miller commit c8923c6b852d3a97c1faad0566e38fca330375a7 Author: David S. Miller Date: Thu Oct 13 14:41:23 2005 -0700 [NETFILTER]: Fix OOPSes on machines with discontiguous cpu numbering. Original patch by Harald Welte, with feedback from Herbert Xu and testing by Sébastien Bernard. EBTABLES, ARP tables, and IP/IP6 tables all assume that cpus are numbered linearly. That is not necessarily true. This patch fixes that up by calculating the largest possible cpu number, and allocating enough per-cpu structure space given that. Signed-off-by: David S. Miller commit 13b1f64c16e2eb96a021b49cf3986528046ba3dc Author: Nicolas Pitre Date: Thu Oct 13 22:04:37 2005 +0100 [ARM] 3008/1: the exception table is not read-only Patch from Nicolas Pitre ... and therefore should not live in the .text section. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 50688ea9ed6fe154058c065bc7dc60980533a2c8 Author: Ben Dooks Date: Thu Oct 13 22:04:36 2005 +0100 [ARM] 3007/1: BAST - add CONFIG_ISA to build Patch from Ben Dooks The Simtec EB2410ITX (BAST) has a PC/104 slot, and therefore we should enable CONFIG_ISA to allow the drivers for ISA peripherals to be selected Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 3a8f675c40ba2d04e4fff6710db3da763436269f Author: Ben Dooks Date: Thu Oct 13 16:46:35 2005 +0100 [ARM] 3006/1: S3C2410 - arch/arm/mach-s3c2410 sparse fixes Patch from Ben Dooks Remove an unused variable from s3c2410.c and ensure that items not needed to be exported from s3c2440.c are declared static. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 9153bd75f25ff3170f07fb9ac1fb0e718afc6fce Author: Ben Dooks Date: Thu Oct 13 16:46:35 2005 +0100 [ARM] 3005/1: S3C2440 - add definition for s3c2440_set_dsc() call in hardware.h Patch from Ben Dooks include/asm-arm/arch-s3c2410/hardware.h was missing the definition for s3c2440_set_dsc() Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 9ff5c59ce278c37bca22fbf98076d199bcaf9845 Author: Herbert Xu Date: Wed Oct 12 15:59:39 2005 -0700 [TCP]: Add code to help track down "BUG at net/ipv4/tcp_output.c:438!" This is the second report of this bug. Unfortunately the first reporter hasn't been able to reproduce it since to provide more debugging info. So let's apply this patch for 2.6.14 to 1) Make this non-fatal. 2) Provide the info we need to track it down. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit afb997c6163b33292d31a09d6aa5cbb03ffa5bf1 Author: Ben Dooks Date: Wed Oct 12 15:12:21 2005 -0700 [NETPOLL]: wrong return for null netpoll_poll_lock() When netpoll is not being used, the macro that defines the removed routing netpoll_poll_lock defines the return as zero, but the real routine returns a `void *` Signed-off-by: Ben Dooks Signed-off-by: David S. Miller commit ab4060e858e36129f9319ef0fa055347ad60e1d5 Author: Stephen Hemminger Date: Wed Oct 12 15:10:01 2005 -0700 [BRIDGE]: fix race on bridge del if This fixes the RCU race on bridge delete interface. Basically, the network device has to be detached from the bridge in the first step (pre-RCU), rather than later. At that point, no more bridge traffic will come in, and the other code will not think that network device is part of a bridge. This should also fix the XEN test problems. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c9c10830740df1b5e7848d6fbb68c93a73e8f7cd Author: David S. Miller Date: Wed Oct 12 12:22:46 2005 -0700 [SPARC64]: Fix boot failures on SunBlade-150 The sequence to move over to the Linux trap tables from the firmware ones needs to be more air tight. It turns out that to be %100 safe we do need to be able to translate OBP mappings in our TLB miss handlers early. In order not to eat up a lot of kernel image memory with static page tables, just use the translations array in the OBP TLB miss handlers. That solves the bulk of the problem. Furthermore, to make sure the OBP TLB miss path will work even before the fixed MMU globals are loaded, explicitly load %g1 to TLB_SFSR at the beginning of the i-TLB and d-TLB miss handlers. To ease the OBP TLB miss walking of the prom_trans[] array, we sort it then delete all of the non-OBP entries in there (for example, there are entries for the kernel image itself which we're not interested in at all). We also save about 32K of kernel image size with this change. Not a bad side effect :-) There are still some reasons why trampoline.S can't use the setup_trap_table() yet. The most noteworthy are: 1) OBP boots secondary processors with non-bias'd stack for some reason. This is easily fixed by using a small bootup stack in the kernel image explicitly for this purpose. 2) Doing a firmware call via the normal C call prom_set_trap_table() goes through the whole OBP enter/exit sequence that saves and restores OBP and Linux kernel state in the MMUs. This path unfortunately does a "flush %g6" while loading up the OBP locked TLB entries for the firmware call. If we setup the %g6 in the trampoline.S code properly, that is in the PAGE_OFFSET linear mapping, but we're not on the kernel trap table yet so those addresses won't translate properly. One idea is to do a by-hand firmware call like we do in the early bootup code and elsewhere here in trampoline.S But this fails as well, as aparently the secondary processors are not booted with OBP's special locked TLB entries loaded. These are necessary for the firwmare to processes TLB misses correctly up until the point where we take over the trap table. This does need to be resolved at some point. Signed-off-by: David S. Miller commit a451e28c7642830d8b066e5a13de46934151ce3a Author: Liam Girdwood Date: Wed Oct 12 19:58:12 2005 +0100 [ARM] 3003/1: SSP channel map register updates for pxa2xx Patch from Liam Girdwood This patch updates the pxa2xx channel map registers definitions in pxa-regs.h Changes:- o Added description for SSP2 registers o Added definitions for SSP3 registers Signed-off-by:Liam Girdwood Signed-off-by: Russell King commit e6158b4a5647624ceb90074bfcc248ea3152c906 Author: Lothar Wassmann Date: Wed Oct 12 19:58:11 2005 +0100 [ARM] 3002/1: Wrong parameter to uart_update_timeout() in drivers/serial/pxa.c Patch from Lothar Wassmann The function serial_pxa_set_termios() is calling uart_update_timeout() with the baud rate divisor as third parameter, while uart_update_timeout() expects the baud rate in this place. This results in a bogus port->timeout which is proportional to the baud rate. Signed-off-by: Lothar Wassmann Signed-off-by: Russell King commit 6ec5e7f3656f0397b7e8b39a7dcc77937d187596 Author: Ben Dooks Date: Wed Oct 12 19:58:10 2005 +0100 [ARM] 2978/1: nwfpe - clean up sparse errors Patch from Ben Dooks The NWFPE is producing a number of errors from sparse due to not defining a number of functions in the header files. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 737d0bb7701cdebb661e4db0236071a7df977777 Author: George G. Davis Date: Wed Oct 12 19:58:10 2005 +0100 [ARM] 2969/1: miscellaneous whitespace cleanup Patch from George G. Davis Fix leading, trailing and other miscellaneous whitespace issues in arch/arm/kernel/alignment.c. Signed-off-by: George G. Davis Signed-off-by: Russell King commit cd26f45bfca4d4fa5ddfe21613d2da46f1acb821 Author: George G. Davis Date: Wed Oct 12 19:58:09 2005 +0100 [ARM] 2970/1: Use -mtune=arm1136j-s when building for CPU_V6 targets Patch from George G. Davis When building for CPU_V6 targets, we should use -mtune=arm1136j-s rather than -mtune=strongarm but fall back to the later in case someone is using an older toolchain (although they should really upgrade instead). Signed-off-by: George G. Davis Signed-off-by: Russell King commit ceca629e0b4858d6b8bff260dab2e947d31aca56 Author: Sascha Hauer Date: Wed Oct 12 19:58:08 2005 +0100 [ARM] 2971/1: i.MX uart handle rts irq Patch from Sascha Hauer handle rts interrupt Signed-off-by: Giancarlo Formicuccia Signed-off-by: Sascha Hauer commit 9f693d7b149a74bac301ee47136359294cffed25 Author: Ben Dooks Date: Wed Oct 12 19:58:07 2005 +0100 [ARM] 2979/2: S3C2410 - add static to non-exported machine items Patch from Ben Dooks Do not export items that are not needed by symbol name elsewhere Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a7b1bbbc89194deba8cde02200f08b3840c9daa2 Author: Ben Dooks Date: Wed Oct 12 19:58:07 2005 +0100 [ARM] 2977/1: armksyms.c - make items in export table static Patch from Ben Dooks The items in the export table do not need to be exported elsehwere, so quash the sparse warning by making the symbol for the table entry static. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 17efa644f624a521e4a6c6a4641d39d227a9b24a Author: Ben Dooks Date: Wed Oct 12 19:58:06 2005 +0100 [ARM] 2976/1: S3C2410: add static to functions in serial driver Patch from Ben Dooks The s3c2410 serial driver is missing static declerations on several functions that are not exported, and have no need of being exported outside the driver Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 0eea3c0b6cb356bc8e515084f831cac7e3d5131c Author: Ben Dooks Date: Wed Oct 12 19:58:05 2005 +0100 [ARM] 2975/1: S3C2410: time.c missing include of cpu.h Patch from Ben Dooks arch/arm/mach-s3c2410/time.c is missing include of cpu.h, causing the declaration of the timer struct (s3c24xx_timer) to be flagged as missing the declaration. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 60ac133aac9e07b94f2cb6bf571bf8aef69248c3 Author: Nicolas Pitre Date: Wed Oct 12 19:51:24 2005 +0100 [ARM] 2974/1: fix ARM710 swi bug workaround Patch from Nicolas Pitre Either no one is using an ARM710 with recent kernels, or all ARM710s still in use are not afflicted by this swi bug. Nevertheless, the code to work around the ARM710 swi bug is itself currently buggy since it uses r8 as a pointer to S_PC while in fact it holds the spsr content these days. Fix that, and simplify the code as well. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit d8e998c58a870770905495a1d45ebf7285b5b1c5 Author: Benjamin Herrenschmidt Date: Wed Oct 12 14:22:50 2005 +1000 [PATCH] ppc32: Tell userland about lack of standard TB Glibc is about to get some new high precision timer stuff that relies on the standard timebase of the PPC architecture. However, some (rare & old) CPUs do not have such timebase and it is a bit annoying to have your stuff just crash because you are running on the wrong CPU... This exposes to userland a CPU feature bit that tells that the current processor doesn't have a standard timebase. It's negative logic so that glibc will still "just work" on older kernels (it will just be unhappy on those old CPUs but that doesn't really matter as distro tend to update glibc & kernel at the same time). Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit cbd27b8ced4b1888c93f69b4dd108a69ac4d733f Author: Benjamin Herrenschmidt Date: Wed Oct 12 11:39:33 2005 +1000 [PATCH] ppc32: Fix timekeeping Interestingly enough, ppc32 had broken timekeeping for ages... It worked, but probably drifted a bit more than could be explained by the actual bad precision of the timebase calibration. We discovered that recently when somebody figured out that the common code was using CLOCK_TICK_RATE to correct the timekeeing, and ppc32 had a completely bogus value for it. This patch turns it into something saner. Probably not as good as doing something based on the actual timebase frequency precision but I'll leave that sort of math to others. This at least makes it better for the common HZ values. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 9d624ea474a3ddf3a0702d9b47e428ce1f8488a6 Author: Paolo 'Blaisorblade' Giarrusso Date: Tue Oct 11 21:01:01 2005 +0200 [PATCH] uml: compile-time fix recent patch Give an empty definition for clear_can_do_skas() when it is not needed. Thanks to Junichi Uekawa for reporting the breakage and providing a fix (I re-fixed it in an IMHO cleaner way). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 91acb21f084aa244f26839406ae7ed8aa3668058 Author: Jeff Dike Date: Mon Oct 10 23:10:32 2005 -0400 [PATCH] uml: revert block driver use of host AIO The patch to use host AIO support that I submitted early after 2.6.13 exposed some problems in the block driver. I have fixes for these, but am not comfortable putting them into 2.6.14 at this late date. So, this patch reverts the use of host AIO. I will resubmit the original patch, plus fixes to the driver after 2.6.14 in order to get a reasonable amount of testing before they're exposed to the general public. Signed-off-by: Jeff Dike Signed-off-by: Linus Torvalds commit b1b510aa284af1908d5d369d52f7dae16aaabd71 Author: David S. Miller Date: Tue Oct 11 15:45:16 2005 -0700 [SPARC64]: Fix net booting on Ultra5 We were not doing alignment properly when remapping the kernel image. What we want is a 4MB aligned physical address to map at KERNBASE. Mistakedly we were 4MB aligning the virtual address where the kernel initially sits, that's wrong. Instead, we should PAGE align the virtual address, then 4MB align the physical address result the prom gives to us. Signed-off-by: David S. Miller commit f5154a98a1931641f0448f6512294a15279110d7 Author: Hugh Dickins Date: Tue Oct 11 19:16:26 2005 +0100 [PATCH] Don't map the same page too much Refuse to install a page into a mapping if the mapping count is already ridiculously large. You probably cannot trigger this on 32-bit architectures, but on a 64-bit setup we should protect against it. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 9149ccfa3571eaa4a4b444777d67fc4ed3ebcf27 Author: Peter Bergner Date: Tue Oct 11 09:28:24 2005 -0700 [PATCH] ppc64: Add R_PPC64_TOC16 module reloc Newer gcc's are generating this relocation, so the module loader needs to handle it. Signed-off-by: Peter Bergner Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3089792f6ee38cdc9e254a7cb2f8c8d7f38c20d Author: Michael Krufky Date: Tue Oct 11 09:28:24 2005 -0700 [PATCH] V4L: Enable s-video input on DViCO FusionHDTV5 Lite * bttv-cards.c: - Enable S-Video input on DViCO FusionHDTV5 Lite Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9de11aab1c8fd87da7e1fb435ce0ff26bacd7909 Author: Hirokazu Takata Date: Tue Oct 11 08:29:09 2005 -0700 [PATCH] m32r: trap handler code for illegal traps This patch prevents illegal traps from causing m32r kernel's infinite loop execution. Signed-off-by: Naoto Sugai Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6de505173e24e76bb33a2595312e0c2b44d49e58 Author: akpm@osdl.org Date: Tue Oct 11 08:29:08 2005 -0700 [PATCH] binfmt_elf bss padding fix Nir Tzachar points out that if an ELF file specifies a zero-length bss at a whacky address, we cannot load that binary because padzero() tries to zero out the end of the page at the whacky address, and that may not be writeable. See also http://bugzilla.kernel.org/show_bug.cgi?id=5411 So teach load_elf_binary() to skip the bss settng altogether if the elf file has a zero-length bss segment. Cc: Roland McGrath Cc: Daniel Jacobowitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0c111c631e7ab4abd68920debd44259160812ef Author: Paolo Galtieri Date: Tue Oct 11 08:29:07 2005 -0700 [PATCH] ppc highmem fix I've noticed that the calculations for seg_size and nr_segs in __dma_sync_page_highmem() (arch/ppc/kernel/dma-mapping.c) are wrong. The incorrect calculations can result in either an oops or a panic when running fsck depending on the size of the partition. The problem with the seg_size calculation is that it can result in a negative number if size is offset > size. The problem with the nr_segs caculation is returns the wrong number of segments, e.g. it returns 1 when size is 200 and offset is 4095, when it should return 2 or more. Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bef40032992320dd25a266fc166bfb8fa3f2f59 Author: Suzuki Date: Tue Oct 11 08:29:06 2005 -0700 [PATCH] madvise: Avoid returning error code -EBADF for anonymous mappings Revert this recent correctness change: Douglas Crosher reported that it broke an existing application, and that madvise() works without error on anonymous mappings on Solaris. This means that madvise() will remain non-standards-compliant: we should return -EBADF for all requests against non-file-backed vma's, but Linux only does this for MADV_WILLNEED requests. Signed-off-by: Suzuki K P Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22c1ea44f0d33eda532883858b6cdabc5f265b66 Author: Andreas Gruenbacher Date: Tue Oct 11 08:29:05 2005 -0700 [PATCH] nfsacl: Solaris VxFS compatibility fix Here is a compatibility fix between Linux and Solaris when used with VxFS filesystems: Solaris usually accepts acl entries in any order, but with VxFS it replies with NFSERR_INVAL when it sees a four-entry acl that is not in canonical form. It may also fail with other non-canonical acls -- I can't tell, because that case never triggers: We only send non-canonical acls when we fake up an ACL_MASK entry. Instead of adding fake ACL_MASK entries at the end, inserting them in the correct position makes Solaris+VxFS happy. The Linux client and server sides don't care about entry order. The three-entry-acl special case in which we need a fake ACL_MASK entry was handled in xdr_nfsace_encode. The patch moves this into nfsacl_encode. Signed-off-by: Andreas Gruenbacher Acked-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19cba8abd6ca09527c194864ae651db65cbacfe1 Author: Latchesar Ionkov Date: Tue Oct 11 08:29:03 2005 -0700 [PATCH] v9fs: remove additional buffer allocation from v9fs_file_read and v9fs_file_write v9fs_file_read and v9fs_file_write use kmalloc to allocate buffers as big as the data buffer received as parameter. kmalloc cannot be used to allocate buffers bigger than 128K, so reading/writing data in chunks bigger than 128k fails. This patch reorganizes v9fs_file_read and v9fs_file_write to allocate only buffers as big as the maximum data that can be sent in one 9P message. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad6ce87e5bd4440a6ce9aa9f8cda795b9e902eff Author: Abhay Salunke Date: Tue Oct 11 08:29:02 2005 -0700 [PATCH] dell_rbu: changes in packet update mechanism In the current dell_rbu code ver 2.0 the packet update mechanism makes the user app dump every individual packet in to the driver. This adds in efficiency as every packet update makes the /sys/class/firmware/dell_rbu/loading and data files to disappear and reappear again. Thus the user app needs to wait for the files to reappear to dump another packet. This slows down the packet update tremendously in case of large number of packets. I am submitting a new patch for dell_rbu which will change the way we do packet updates; In the new method the user app will create a new single file which has already packetized the rbu image and all the packets are now staged in this file. This driver also creates a new entry in /sys/devices/platform/dell_rbu/packet_size ; the user needs to echo the packet size here before downloading the packet file. The user should do the following: create one single file which has all the packets stacked together. echo the packet size in to /sys/devices/platform/dell_rbu/packet_size. echo 1 > /sys/class/firmware/dell_rbu/loading cat the packetfile > /sys/class/firmware/dell_rbu/data echo 0 > /sys/class/firmware/dell_rbu/loading The driver takes the file which came through /sys/class/firmware/dell_rbu/data and takes chunks of paket_size data from it and place in contiguous memory. This makes packet update process very efficient and fast. As all the packet update happens in one single operation. The user can still read back the downloaded file from /sys/devices/platform/dell_rbu/data. Signed-off-by: Abhay Salunke Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4314bf496bb7bb9acd754aeb319c30869bc8d76 Author: Anton Blanchard Date: Tue Oct 11 08:29:00 2005 -0700 [PATCH] ppc64: Fix PCI hotplug pSeries_irq_bus_setup is marked __devinit but references s7a_workaround which is marked __initdata. Depending on who got the memory for s7a_workaround (and if the value was now positive), it was possible for PCI hotplugged devices to have 3 subtracted from their interrupt number. This would happen randomly and caused me much confusion :) Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5945b4f605d1479d5b44252a2c691168c5d38d6 Author: Cornelia Huck Date: Tue Oct 11 08:28:59 2005 -0700 [PATCH] s390: ccw device reconnect oops. Search for a disconnect ccw_device on the ccw bus rather than on the css bus (was a typo in patch I did for the klist conversion). A cast to an embedding ccw_device from an embedded device in a struct subchannel will lead us to oopses. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9621904012de3c8d0d4e2904dcc7170b3012119e Author: Jeff Garzik Date: Tue Oct 11 01:52:39 2005 -0400 sata_nv: Fixed bug introduced by 0.08's MCP51 and MCP55 support. commit 875521ddccfa90d519cf31dfc8aa472f7f6325bb Author: Jeff Garzik Date: Tue Oct 11 01:38:35 2005 -0400 e100: revert CPU cycle saver microcode, it causes severe problems for certain NICs Reverting 685fac63f5ca6c5ca06bab641e1a32bbf9287e89: > [PATCH] e100: CPU cycle saver microcode > > > Add cpu cycle saver microcode to 8086:{1209/1229} other than ICH devices. > > Signed-off-by: Mallikarjuna R Chilakala > Signed-off-by: Ganesh Venkatesan > Signed-off-by: John Ronciak > Signed-off-by: Jeff Garzik commit eeb2b8560676e454ad37ee30b49bc7d897edc9be Author: Arnaldo Carvalho de Melo Date: Mon Oct 10 21:25:23 2005 -0700 [TWSK]: Grab the module refcount for timewait sockets This is required to avoid unloading a module that has active timewait sockets, such as DCCP. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 2a9bc9bb4d3a4570a8a48aadf071b91e657adb89 Author: Arnaldo Carvalho de Melo Date: Mon Oct 10 21:25:00 2005 -0700 [DCCP]: Transition from PARTOPEN to OPEN when receiving DATA packets Noticed by Andrea Bittau, that provided a patch that was modified to not transition from RESPOND to OPEN when receiving DATA packets. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 777b25a2fea7129222eb11fba55c0a67982383ff Author: Arnaldo Carvalho de Melo Date: Mon Oct 10 21:24:20 2005 -0700 [CCID]: Check if ccid is NULL in the hc_[tr]x_exit functions For consistency with ccid_exit and to fix a bug when IP_DCCP_UNLOAD_HACK is enabled as the control sock is not associated to any CCID. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 061cb4a0ec34a6e3069d5a1b3c547e55a71498c5 Author: Pablo Neira Ayuso Date: Mon Oct 10 21:23:46 2005 -0700 [NETFILTER] ctnetlink: add support to change protocol info This patch add support to change the state of the private protocol information via conntrack_netlink. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 339231537506846cb232a2f0cc4a2c662b2d5b07 Author: Pablo Neira Ayuso Date: Mon Oct 10 21:23:28 2005 -0700 [NETFILTER] ctnetlink: allow userspace to change TCP state This patch adds the ability of changing the state a TCP connection. I know that this must be used with care but it's required to provide a complete conntrack creation via conntrack_netlink. So I'll document this aspect on the upcoming docs. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit a051a8f7306476af0a74370ad56e793cb6c43bf7 Author: Harald Welte Date: Mon Oct 10 21:21:10 2005 -0700 [NETFILTER]: Use only 32bit counters for CONNTRACK_ACCT Initially we used 64bit counters for conntrack-based accounting, since we had no event mechanism to tell userspace that our counters are about to overflow. With nfnetlink_conntrack, we now have such a event mechanism and thus can save 16bytes per connection. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit d4875b049b2e6401a6e1fae90b7f09e20a636fcf Author: Herbert Xu Date: Mon Oct 10 21:11:34 2005 -0700 [IPSEC] Fix block size/MTU bugs in ESP This patch fixes the following bugs in ESP: * Fix transport mode MTU overestimate. This means that the inner MTU is smaller than it needs be. Worse yet, given an input MTU which is a multiple of 4 it will always produce an estimate which is not a multiple of 4. For example, given a standard ESP/3DES/MD5 transform and an MTU of 1500, the resulting MTU for transport mode is 1462 when it should be 1464. The reason for this is because IP header lengths are always a multiple of 4 for IPv4 and 8 for IPv6. * Ensure that the block size is at least 4. This is required by RFC2406 and corresponds to what the esp_output function does. At the moment this only affects crypto_null as its block size is 1. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit a02a64223eddb410712b015fb3342c9a316ab70b Author: Herbert Xu Date: Mon Oct 10 21:11:08 2005 -0700 [IPSEC]: Use ALIGN macro in ESP This patch uses the macro ALIGN in all the applicable spots for ESP. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 08eb8f124f990aa476589d1f7810f7ec7f259c08 Author: David S. Miller Date: Mon Oct 10 21:02:26 2005 -0700 [SPARC32]: Revert IOMAP change eb98129eec7fa605f0407dfd92d40ee8ddf5cd9a Breakage noted by Al Viro. It breaks non-PCI builds, it's probably better to have a more direct implementation on sparc32, and which driver actually needs this is still questionable. We can resolve this in 2.6.15 Signed-off-by: David S. Miller commit e1c73b78e3706bd3c336d4730a01dd4081dfb7ee Author: Pablo Neira Ayuso Date: Mon Oct 10 20:55:49 2005 -0700 [NETFILTER] ctnetlink: add one nesting level for TCP state To keep consistency, the TCP private protocol information is nested attributes under CTA_PROTOINFO_TCP. This way the sequence of attributes to access the TCP state information looks like here below: CTA_PROTOINFO CTA_PROTOINFO_TCP CTA_PROTOINFO_TCP_STATE instead of: CTA_PROTOINFO CTA_PROTOINFO_TCP_STATE Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 5bbc243aafff9ad653dc7a9fa7bcaf0b4631355a Author: Harald Welte Date: Mon Oct 10 20:54:01 2005 -0700 [NETFILTER]: Add missing include to ip_conntrack_tuple.h Without this #include, __be16 is not defined and userspace programs will break. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit a1bcc3f26885b0a8bf04799551de2e9574ccbda1 Author: Pablo Neira Ayuso Date: Mon Oct 10 20:53:16 2005 -0700 [NETFILTER] ctnetlink: ICMP ID is not mandatory The ID is only required by ICMP type 8 (echo), so it's not mandatory for all sort of ICMP connections. This patch makes mandatory only the type and the code for ICMP netlink messages. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit d000eaf7720cb12cd03cd3d55f71be44357d27a9 Author: Harald Welte Date: Mon Oct 10 20:52:51 2005 -0700 [NETFILTER] conntrack_netlink: Fix endian issue with status from userspace When we send "status" from userspace, we forget to convert the endianness. This patch adds the reqired conversion. Thanks to Pablo Neira for discovering this. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit b3a91d037a2575040f9b6a483f60c407a3d80368 Author: Harald Welte Date: Mon Oct 10 20:52:36 2005 -0700 [NETFILTER] nat: remove bogus structure member When 'rustynat' was merged in 2.6.12, the use of the "helper" pointer of struct ipt_nat_info was obsoleted, but the pointer not removed from the struct. This patch removes the pointer, thereby yet again shrinking struct ip_conntrack. Discovered-by: Rusty Russell Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit ebe0bbf06c9e03613bdcb6b5a704595a9344b7ff Author: Harald Welte Date: Mon Oct 10 20:52:19 2005 -0700 [NETFILTER] nfnetlink: use highest bit of nfa_type to indicate nested TLV As Henrik Nordstrom pointed out, all our efforts with "split endian" (i.e. host byte order tags, net byte order values) are useless, unless a parser can determine whether an attribute is nested or not. This patch steals the highest bit of nfattr.nfa_type to indicate whether the data payload contains a nested nfattr (1) or not (0). This will break userspace compatibility, but luckily no kernel with nfnetlink was released so far. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit f40863cec87464f3f4ec3a6c00e3fda3bbb0c91b Author: Harald Welte Date: Mon Oct 10 20:51:53 2005 -0700 [NETFILTER] ipt_ULOG: Mark ipt_ULOG as OBSOLETE Similar to nfnetlink_queue and ip_queue, we mark ipt_ULOG as obsolete. This should have been part of the original nfnetlink_log merge, but I somehow missed it. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 85d9b05d9b1edad9a2630584754720a957ab0a2a Author: Harald Welte Date: Mon Oct 10 20:47:42 2005 -0700 [NETFILTER] PPTP helper: Add missing Kconfig dependency PPTP should not be selectable without conntrack enabled Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit b8df110fea555d5088bba67f446c2435104405be Author: David S. Miller Date: Mon Oct 10 20:43:22 2005 -0700 [SPARC64]: Fix oops on runlevel change with serial console. Incorrect uart_write_wakeup() calls cause reference to a NULL tty pointer in sunsab and sunzilog serial drivers. Signed-off-by: David S. Miller commit 907a42617970a159361f17ef9a63f04d276995ab Author: Linus Torvalds Date: Mon Oct 10 18:19:19 2005 -0700 Linux v2.6.14-rc4 commit 3c92c2ba33cd7d666c5f83cc32aa590e794e91b0 Author: Andi Kleen Date: Tue Oct 11 01:28:33 2005 +0200 [PATCH] i386: Don't discard upper 32bits of HWCR on K8 Need to use long long, not long when RMWing a MSR. I think it's harmless right now, but still should be better fixed if AMD adds any bits in the upper 32bit of HWCR. Bug was introduced with the TLB flush filter fix for i386 Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 421c7ce6d001fce28b1fa8fdd2e7ded0ed8a0ad5 Author: Andi Kleen Date: Mon Oct 10 22:32:45 2005 +0200 [PATCH] x86_64: Allocate cpu local data for all possible CPUs CPU hotplug fills up the possible map to NR_CPUs, but it did that after setting up per CPU data. This lead to CPU data not getting allocated for all possible CPUs, which lead to various side effects. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d7dd8a72ab8d305fbe1c4bb571e0633eba3a8d23 Author: Linus Torvalds Date: Mon Oct 10 16:31:30 2005 -0700 Use the new "kill_proc_info_as_uid()" for USB disconnect too All the same issues - we can't just save the pointer to the thread, we must save the pid/uid/euid combination. Signed-off-by: Linus Torvalds commit 46113830a18847cff8da73005e57bc49c2f95a56 Author: Harald Welte Date: Mon Oct 10 19:44:29 2005 +0200 [PATCH] Fix signal sending in usbdevio on async URB completion If a process issues an URB from userspace and (starts to) terminate before the URB comes back, we run into the issue described above. This is because the urb saves a pointer to "current" when it is posted to the device, but there's no guarantee that this pointer is still valid afterwards. In fact, there are three separate issues: 1) the pointer to "current" can become invalid, since the task could be completely gone when the URB completion comes back from the device. 2) Even if the saved task pointer is still pointing to a valid task_struct, task_struct->sighand could have gone meanwhile. 3) Even if the process is perfectly fine, permissions may have changed, and we can no longer send it a signal. So what we do instead, is to save the PID and uid's of the process, and introduce a new kill_proc_info_as_uid() function. Signed-off-by: Harald Welte [ Fixed up types and added symbol exports ] Signed-off-by: Linus Torvalds commit 5d8e1b181c4ad63e6ca90d51287b31afd400d2eb Author: David S. Miller Date: Mon Oct 10 16:12:13 2005 -0700 [SPARC64]: Fix Ultra5, Ultra60, et al. boot failures. On the boot processor, we need to do the move onto the Linux trap table a little bit differently else we'll take unhandlable faults in the firmware address space. Previously we would do the following: 1) Disable PSTATE_IE in %pstate. 2) Set %tba by hand to sparc64_ttable_tl0 3) Initialize alternate, mmu, and interrupt global trap registers. 4) Call prom_set_traptable() That doesn't work very well actually with the way we boot the kernel VM these days. It worked by luck on many systems because the firmware accesses for the prom_set_traptable() call happened to be loaded into the TLB already, something we cannot assume. So the new scheme is this: 1) Clear PSTATE_IE in %pstate and set %pil to 15 2) Call prom_set_traptable() 3) Initialize alternate, mmu, and interrupt global trap registers. and this works quite well. This sequence has been moved into a callable function in assembler named setup-trap_table(). The idea is that eventually trampoline.S can use this code as well. That isn't possible currently due to some complications, but eventually we should be able to do it. Thanks to Meelis Roos for the Ultra5 boot failure report. Signed-off-by: David S. Miller commit 094804c5a132f04c12dd4902ee15c64362e5c1af Author: Andi Kleen Date: Tue Oct 11 01:03:39 2005 +0200 [PATCH] x86_64: Fix change_page_attr cache flushing Noticed by Terence Ripperda Undo wrong change in global_flush_tlb. We need to flush the caches in all cases, not just when pages were reverted. This was a bogus optimization added earlier, but it was wrong. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 71e2b2ecc1c44cb4f2f3e68827af8b90246becac Author: Vincent Sanders Date: Mon Oct 10 18:24:09 2005 +0100 [ARM] 2968/1: defconfig for the ARM Collie platform Patch from Vincent Sanders Add a defconfig for the ARM Collie platform Signed-off-by: Richard Purdie Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 36e5ea67590707a069ce3bcc179b38cdabebcfdd Author: Vincent Sanders Date: Mon Oct 10 18:24:08 2005 +0100 [ARM] 2967/1: defconfig for the ARM Corgi platform Patch from Vincent Sanders Add a defconfig for the ARM Corgi Zarus platform Signed-off-by: Richard Purdie Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit b0bdc7be78931dfbfaec8bd0da44a5f4e158ca8f Author: Vincent Sanders Date: Mon Oct 10 18:24:07 2005 +0100 [ARM] 2966/1: defconfig for the ARM Poodle platform Patch from Vincent Sanders Add a defconfig for the ARM Poodle Zarus platform Signed-off-by: Richard Purdie Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 86b324874f571297237c0c940bfe7e5f0f9ca5d2 Author: Vincent Sanders Date: Mon Oct 10 18:24:06 2005 +0100 [ARM] 2965/1: defconfig for the ARM Spitz platform Patch from Vincent Sanders Add a defconfig for the ARM Spitz Zarus platform Signed-off-by: Richard Purdie Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 585f54575d832506bbe9b5a2f435f37b81efc849 Author: Nicolas Pitre Date: Mon Oct 10 18:22:17 2005 +0100 [ARM] 2956/1: fix the "Fix gcc4 build errors in ucb1x00-core.c" Patch from Nicolas Pitre drivers/mfd/ucb1x00-core.c: In function 'ucb1x00_probe': drivers/mfd/ucb1x00-core.c:482: error: 'ucb1x00_class' undeclared (first use in this function) Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit d347f372273c2b3d86a66e2e1c94c790c208e166 Author: Markus F.X.J. Oberhumer Date: Sun Oct 9 18:54:23 2005 +0200 [PATCH] i386: fix stack alignment for signal handlers This fixes the setup of the alignment of the signal frame, so that all signal handlers are run with a properly aligned stack frame. The current code "over-aligns" the stack pointer so that the stack frame is effectively always mis-aligned by 4 bytes. But what we really want is that on function entry ((sp + 4) & 15) == 0, which matches what would happen if the stack were aligned before a "call" instruction. Signed-off-by: Markus F.X.J. Oberhumer Signed-off-by: Linus Torvalds commit 867f8b4e47a17c5d68c98dc6eee12739c4490056 Author: Benjamin Herrenschmidt Date: Sun Oct 9 10:37:47 2005 +1000 [PATCH] ide: Workaround PM problem The logic in ide_do_request() doesn't guarantee that both drives will be serviced after a call. It may "forget" to service one in some circumstances, including when one of the drive is suspended (it will eventually fail to service the slave when the master is suspended for example). This prevents the wakeup requests that gets queued on wakeup from sleep from beeing serviced in some cases when 2 drives are sharing an IDE bus. The problem is deep enough in the way this code works (and there are probably a few other problematic but rare corner cases) and fixing it would require some major rethinking of the way IDE decides which channel to service. This is not 2.6.14 material. However, in the meantime, Bart has accepted this simple workaround that will fix the crash on wakeup from sleep since this specific corner case is actually hitting users to get into 2.6.14. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 1cc956e12aedfdc6baf6312bc36a6b5a71af3c9d Author: Tom Zanussi Date: Sun Oct 9 10:41:32 2005 -0500 [PATCH] relayfs: fix bogus param value in call to vmap The third param in this call to vmap shouldn't be GFP_KERNEL, which makes no sense, but rather VM_MAP. Thanks to Al Viro for spotting this. Signed-off-by: Tom Zanussi Signed-off-by: Linus Torvalds commit 50f72b57946d565db74fae71bac23f3f319311c8 Author: Jeff Dike Date: Sun Oct 9 16:11:44 2005 -0400 [PATCH] uml: fix x86_64 with !CONFIG_FRAME_POINTER UML/x86_64 doesn't run when built with frame pointers disabled. There was an implicit frame pointer assumption in the stub segfault handler. With frame pointers disabled, UML dies on handling its first page fault. The container-of part of this is from Paolo Giarrusso . Signed-off-by: Jeff Dike Signed-off-by: Linus Torvalds commit 3dd083255ddcfa87751fa8e32f61a9547a15a541 Author: Rafael J. Wysocki Date: Sun Oct 9 21:19:40 2005 +0200 [PATCH] x86_64: Set up safe page tables during resume The following patch makes swsusp avoid the possible temporary corruption of page translation tables during resume on x86-64. This is achieved by creating a copy of the relevant page tables that will not be modified by swsusp and can be safely used by it on resume. The problem is that during resume on x86-64 swsusp may temporarily corrupt the page tables used for the direct mapping of RAM. If that happens, a page fault occurs and cannot be handled properly, which leads to the solid hang of the affected system. This leads to the loss of the system's state from before suspend and may result in the loss of data or the corruption of filesystems, so it is a serious issue. Also, it appears to happen quite often (for me, as often as 50% of the time). The problem is related to the fact that (at least) one of the PMD entries used in the direct memory mapping (starting at PAGE_OFFSET) points to a page table the physical address of which is much greater than the physical address of the PMD entry itself. Moreover, unfortunately, the physical address of the page table before suspend (i.e. the one stored in the suspend image) happens to be different to the physical address of the corresponding page table used during resume (i.e. the one that is valid right before swsusp_arch_resume() in arch/x86_64/kernel/suspend_asm.S is executed). Thus while the image is restored, the "offending" PMD entry gets overwritten, so it does not point to the right physical address any more (i.e. there's no page table at the address pointed to by it, because it points to the address the page table has been at during suspend). Consequently, if the PMD entry is used later on, and it _is_ used in the process of copying the image pages, a page fault occurs, but it cannot be handled in the normal way and the system hangs. In principle we can call create_resume_mapping() from swsusp_arch_resume() (ie. from suspend_asm.S), but then the memory allocations in create_resume_mapping(), resume_pud_mapping(), and resume_pmd_mapping() must be made carefully so that we use _only_ NosaveFree pages in them (the other pages are overwritten by the loop in swsusp_arch_resume()). Additionally, we are in atomic context at that time, so we cannot use GFP_KERNEL. Moreover, if one of the allocations fails, we should free all of the allocated pages, so we need to trace them somehow. All of this is done in the appended patch, except that the functions populating the page tables are located in arch/x86_64/kernel/suspend.c rather than in init.c. It may be done in a more elegan way in the future, with the help of some swsusp patches that are in the works now. [AK: move some externs into headers, renamed a function] Signed-off-by: Rafael J. Wysocki Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 52a2d3e45e06012a662f627177729d3196ba8903 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Oct 9 21:37:53 2005 +0200 [PATCH] uml: cleanup whitespace for COW driver Fix whitespace - I split this off the previous patch for easier review. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 028c0cc16e429ae24d9b8aacc64f4438bdfac0cc Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Oct 9 21:37:45 2005 +0200 [PATCH] uml: cleanup byte order macros for COW driver After restoring the existing code, make it work also when included in kernelspace code (which isn't currently the case, but at least this will prevent people from "fixing" it as just happened). Whitespace is fixed in next patch - it cluttered the diff too much. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 855ec613ca7e1953d96d7ea81af90392678788f5 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Oct 9 21:37:35 2005 +0200 [PATCH] uml: restore include breakage, breaking binary format of COW driver Commit 44456d37b59d8e541936ed26d8b6e08d27e88ac1, between 2.6.13-rc3 and -rc4, was a "nice cleanup" which broke something. Revert the offending part. It broke because: a) because this part doesn't fall under the description b) the author didn't know what he was doing here c) the author didn't try to compile the existing code and see that it worked perfectly. d) the author didn't ask us what was happening e) you didn't either, and somebody there should have learned that UML is a bit different. In fact, UML is special in linking to host libc and using its includes. In particular, since host includes always define both __BIG_ENDIAN and __LITTLE_ENDIAN, ntohll() macros started thinking to be in a big-endian world; and on-disk compatibility was broken. Many thanks go to Nix for reporting the problem and correctly diagnosing an endianness problem. Btw, this patch restores the previous code, which worked; but the definitions would be uncorrect if used in kernelspace files. Next patch addresses that. Cc: Nix , Olaf Hering Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 54a8a2220c936a47840c9a3d74910c5a56fae2ed Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Oct 9 21:37:26 2005 +0200 [PATCH] uml: allow building .s/.i/.lst files from userspace files For files which need to include glibc headers (i.e. userspace files), we specified the correct flags only for .o, not for .s/.lst/.i. Fix this. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 9e3d862e5c341c59b673c9cadd64210ca03cb41e Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Oct 9 21:37:18 2005 +0200 [PATCH] uml: add mode=skas0 as a synonym of skas0 Too many people were confused by skas0 and tried using "mode=skas0". And after all, they are right - accept this. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 5cd10daa0c7fc1410e1c0d685cbc9622c769eb16 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Oct 9 21:37:05 2005 +0200 [PATCH] Uml: hide commands when not being verbose Add a missing $(Q) to a "ln" invocation. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 220ec0291130a932b32b2c66a10e9c5019dab702 Author: Steven Rostedt Date: Mon Oct 10 11:13:17 2005 -0400 [PATCH] pcmcia: fix task state at pccard thread exit The pccardd thread has a race in it that it can shutdown in the TASK_INTERRUPTIBLE state. Make sure we mark ourselves runnable again as we remove ourselves from the wait queue. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit 7dead80cbee3259e3a9f25bfc65c8dc769a19e0e Author: Ben Dooks Date: Mon Oct 10 10:20:07 2005 +0100 [ARM] 2964/1: S3C2410 - serial: add .owner to driver Patch from Ben Dooks Initialise the driver's .owner field so that the device driver can be referenced to the module that owns it Signed-off-by: Ben Dooks Signed-off-by: Russell King commit cdfc8f5079fdd18f6cb8097aa4235704d1155ec5 Author: Ben Dooks Date: Mon Oct 10 10:20:06 2005 +0100 [ARM] 2963/1: S3C2410 - add .owner field to device_driver Patch from Ben Dooks Add initialisation of .owner field so that the device driver can be referenced to the module that owns it. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 7c3989885cfd37d237eca97832b712a7ffbbf40c Author: Richard Purdie Date: Mon Oct 10 10:20:06 2005 +0100 [ARM] 2962/1: scoop: Allow GPIO pin suspend state to be specified Patch from Richard Purdie Allow the GPIO pin suspend states to be specified for SCOOP devices. This is needed for correct operation on the spitz platform. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 1036260e93a907a0143efa31bf05be1f3271eb90 Author: Richard Purdie Date: Mon Oct 10 10:17:45 2005 +0100 [ARM] 2961/1: corgi: Add missing include Patch from Richard Purdie Add a missing include from corgi.c Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 97b8e00e8538c9eb23983545d665ffd7052ccedb Author: Richard Purdie Date: Mon Oct 10 10:17:44 2005 +0100 [ARM] 2960/1: collie: Add missing scoop call parameters Patch from Richard Purdie Add some missing parameters from the scoop calls on collie. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 19da83f632d235fff9f94671d2e2cf87d27a2446 Author: George G. Davis Date: Mon Oct 10 10:17:44 2005 +0100 [ARM] 2959/1: Add test for invalid LDRD/STRD Rd cases in ARM alignment handler Patch from George G. Davis Add test for invalid LDRD/STRD Rd cases in ARM alignment handler and restore SWP printk KERN_ERR. Signed-off-by: Steve Longerbeam Signed-off-by: George G. Davis Signed-off-by: Russell King commit 79d13b62ef9da84d3ba551caac42d6107e57208f Author: Sascha Hauer Date: Mon Oct 10 10:17:43 2005 +0100 [ARM] 2958/1: fix definition in imx-regs.h Patch from Sascha Hauer Fix PD7_AF_UART2_DTR definition Signed-off-by: Giancarlo Formicuccia Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 86371d071bc38a181984b01d323b6172a4b7bb1f Author: Sascha Hauer Date: Mon Oct 10 10:17:42 2005 +0100 [ARM] 2957/1: imx UART Error handling Patch from Sascha Hauer Fix error path in imx_startup. Signed-off-by: Giancarlo Formicuccia Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit ce80cc14810fbd78fa70c15c7e16a0b26d462fc6 Author: Russell King Date: Mon Oct 10 09:48:10 2005 +0100 [ARM] Update mach-types Signed-off-by: Russell King commit 2e457ef667158840c1be511f5d10dd42c6dbbe46 Author: Sven Hartge Date: Sat Oct 8 21:12:04 2005 -0700 [SPARC64]: Fix compile error in irq.c irq.c is missing the inclusion of asm/io.h, which causes readb() and writeb() the be undefined. Signed-off-by: Sven Hartge Signed-off-by: David S. Miller commit dd0fc66fb33cd610bc1a5db8a5e232d34879b4d7 Author: Al Viro Date: Fri Oct 7 07:46:04 2005 +0100 [PATCH] gfp flags annotations - part 1 - added typedef unsigned int __nocast gfp_t; - replaced __nocast uses for gfp flags with gfp_t - it gives exactly the same warnings as far as sparse is concerned, doesn't change generated code (from gcc point of view we replaced unsigned int with typedef) and documents what's going on far better. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3b0e77bd144203a507eb191f7117d2c5004ea1de Author: Jens Axboe Date: Fri Oct 7 19:41:34 2005 +0200 [PATCH] scsi_ioctl: only warn for rejected commands We should not be warning about commands that we allow, even if they are unknown. So move the if-root-allow check up a notch. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 7ab501db8cb6659efdf04034e0de6b44c059a51b Author: David Howells Date: Fri Oct 7 16:41:24 2005 +0100 [PATCH] Keys: Possessor permissions should be additive This patch makes the possessor permissions on a key additive with user/group/other permissions on the same key. This permits extra rights to be granted to the possessor of a key without taking away any rights conferred by them owning the key or having common group membership. Signed-Off-By: David Howells Signed-off-by: Linus Torvalds commit 468ed2b0c85ec4310b429e60358213b6d077289e Author: David Howells Date: Fri Oct 7 15:07:38 2005 +0100 [PATCH] Keys: Split key permissions checking into a .c file The attached patch splits key permissions checking out of key-ui.h and moves it into a .c file. It's quite large and called quite a lot, and it's about to get bigger with the addition of LSM support for keys... key_any_permission() is also discarded as it's no longer used. Signed-Off-By: David Howells Signed-off-by: Linus Torvalds commit f1a9badcf6ecad9975240d94514721cb93932151 Author: David Howells Date: Fri Oct 7 15:04:52 2005 +0100 [PATCH] Keys: Add request-key process documentation The attached patch adds documentation for the process by which request-key works, including how it permits helper processes to gain access to the requestor's keyrings. Signed-Off-By: David Howells Signed-off-by: Linus Torvalds commit 74fd92c511bd4a0771ac0faaaef38bb1be3a29f6 Author: David Howells Date: Fri Oct 7 15:01:09 2005 +0100 [PATCH] key: plug request_key_auth memleak Plug request_key_auth memleak. This can be triggered by unprivileged users, so is local DoS. Signed-off-by: Chris Wright Signed-Off-By: David Howells Signed-off-by: Linus Torvalds commit c2059b2e0b209a0674c21f78337bb158d3ccb22b Author: David Vrabel Date: Fri Oct 7 14:43:22 2005 +0100 [PATCH] yenta: fix build if YENTA && !CARDBUS (struct pcmcia_socket).tune_bridge only exists if CONFIG_CARDBUS is set but building yenta_socket without CardBus is valid. Signed-off-by: David Vrabel Signed-off-by: Linus Torvalds commit 788e05a67c343fa22f2ae1d3ca264e7f15c25eaf Author: Oleg Nesterov Date: Fri Oct 7 17:46:19 2005 +0400 [PATCH] fix do_coredump() vs SIGSTOP race Let's suppose we have 2 threads in thread group: A - does coredump B - has pending SIGSTOP thread A thread B do_coredump: get_signal_to_deliver: lock(->sighand) ->signal->flags = SIGNAL_GROUP_EXIT unlock(->sighand) lock(->sighand) signr = dequeue_signal() ->signal->flags |= SIGNAL_STOP_DEQUEUED return SIGSTOP; do_signal_stop: unlock(->sighand) coredump_wait: zap_threads: lock(tasklist_lock) send SIGKILL to B // signal_wake_up() does nothing unlock(tasklist_lock) lock(tasklist_lock) lock(->sighand) re-check sig->flags & SIGNAL_STOP_DEQUEUED, yes set_current_state(TASK_STOPPED); finish_stop: schedule(); // ->state == TASK_STOPPED wait_for_completion(&startup_done) // waits for complete() from B, // ->state == TASK_UNINTERRUPTIBLE We can't wake up 'B' in any way: SIGCONT will be ignored because handle_stop_signal() sees ->signal->flags & SIGNAL_GROUP_EXIT. sys_kill(SIGKILL)->__group_complete_signal() will choose uninterruptible 'A', so it can't help. sys_tkill(B, SIGKILL) will be ignored by specific_send_sig_info() because B already has pending SIGKILL. This scenario is not possbile if 'A' does do_group_exit(), because it sets sig->flags = SIGNAL_GROUP_EXIT and delivers SIGKILL to subthreads atomically, holding both tasklist_lock and sighand->lock. That means that do_signal_stop() will notice !SIGNAL_STOP_DEQUEUED after re-locking ->sighand. And it is not possible to any other thread to re-add SIGNAL_STOP_DEQUEUED later, because dequeue_signal() can only return SIGKILL. I think it is better to change do_coredump() to do sigaddset(SIGKILL) and signal_wake_up() under sighand->lock, but this patch is much simpler. Signed-off-by: Oleg Nesterov Signed-off-by: Linus Torvalds commit 4f55cd105c38af4aa157804729d694f864fbc78a Author: Jean-Denis Boyer Date: Fri Oct 7 13:44:35 2005 -0700 [ATM]: [br2684] if we free the skb, we should return 0 From: "Jean-Denis Boyer" Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit ba6399334dd8a75bd295de26496196c720abae0a Author: David S. Miller Date: Fri Oct 7 13:30:49 2005 -0700 [SPARC64]: Fix userland FPU state corruption. We need to use stricter memory barriers around the block load and store instructions we use to save and restore the FPU register file. Signed-off-by: David S. Miller commit d85c3553df5e24cb3117385f0a17e1cc0436d148 Author: Tom 'spot' Callaway Date: Fri Oct 7 13:05:56 2005 -0700 [SPARC]: Fix p9100 framebuffer in 2.6 The attached patch fixes the p9100 framebuffer so that text is viewable (not black on black, like it was before the patch). The linux logo displays for a very short period of time, then is replaced by a grey box. This leads me to believe that this framebuffer would have problems in X, but since there hasn't been a weitek driver for X in several millennia, this isn't something that I can confirm or deny. But this patch does get color console working on my SPARCbook 3TX. Signed-off-by: Tom 'spot' Callaway Signed-off-by: David S. Miller commit a25f175c2f6962c38cdbacfc4b66b297f4fb54b2 Author: Clemens Ladisch Date: Wed Oct 5 13:23:19 2005 +0200 [ALSA] usb-audio: add MIDI quirk for Hercules DJ Console USB generic driver Add a quirk entry for the external MIDI ports of the Windows Edition of the Hercules DJ Console. Signed-off-by: Clemens Ladisch commit 9c9565f709f28c12dadfe74b31f2c86ffd75f71e Author: Clemens Ladisch Date: Wed Oct 5 13:02:38 2005 +0200 [ALSA] usb-audio: add another ID for Hercules DJ Console USB generic driver Add a mixer quirk entry for the Hercules DJ Console (Windows Edition) that uses a different USB product ID. Signed-off-by: Clemens Ladisch commit 4d060fd16946d767ee903804c6769a26d7da7ab2 Author: Takashi Iwai Date: Tue Oct 4 13:50:44 2005 +0200 [ALSA] ali5451 - Don't build non-existing modem PCM ALI5451 driver Don't build the modem PCM if the corresponding codec isn't detected. Signed-off-by: Takashi Iwai commit b150869369adafb7cc0cf65ea500f9f3c4bbf857 Author: Takashi Iwai Date: Tue Oct 4 13:49:32 2005 +0200 [ALSA] emu10k1 - Fix handling of ac97_chip=2 EMU10K1/EMU10K2 driver Fixed the handling of ac97_chip=2 capability type. The error occurs in snd_ac97_mixer(), not in snd_ac97_bus(). Also, release the unnecessary ac97_bus object in the error path. Signed-off-by: Takashi Iwai commit 315e3bd717068624ce888f3d045a168acefc6ce8 Author: Clemens Ladisch Date: Tue Oct 4 08:42:10 2005 +0200 [ALSA] korg1212: fix typo KORG1212 driver Add a missing comma that made the stateName array one entry too short. Signed-off-by: Clemens Ladisch commit f12aa40c9d76af5add413731d30565327219c41f Author: Takashi Iwai Date: Fri Sep 30 16:56:59 2005 +0200 [ALSA] emu10k1 - Fix loading of SBLive Game board EMU10K1/EMU10K2 driver Fixed the error at loading SBLive Game board (and possible other models). The PCI SSIDs of this board conflicts with SB Live 5.1 Platinum, which has no AC97 chip. Signed-off-by: Takashi Iwai commit c66186e1c966e7e115a86af55597c05c5512014b Author: Takashi Iwai Date: Thu Sep 29 13:49:44 2005 +0200 [ALSA] via82xx - dxs_support entry for an ASUS mobo VIA82xx driver Addded a dxs_support entry for an ASUS mobo. Signed-off-by: Takashi Iwai commit 35451088f445955fe460a38b25b97c263ff35033 Author: Takashi Iwai Date: Thu Sep 29 13:25:14 2005 +0200 [ALSA] Fix confliction of capture controls on ALC880 test model HDA Codec driver Fixed the confliction of capture controls on ALC880 'test' model. Signed-off-by: Takashi Iwai commit 92447f3f1a1c1af418eb1dfee85a7685d9b9a3ef Author: John W. Linville Date: Thu Sep 29 13:20:45 2005 +0200 [ALSA] fix HD audio ALC882 lfe (un)mute HDA Codec driver Mark the ALC882 'LFE Playback Switch' as an input, like the other playback switch settings. Signed-off-by: John W. Linville Signed-off-by: Takashi Iwai commit 1c1fa8b69e6d538bcc1e58791938b31a2354ee65 Author: John W. Linville Date: Thu Sep 29 13:18:41 2005 +0200 [ALSA] fix alc880_test_mixer typo HDA Codec driver Fix a typo (cut & paste) in the alc880_test_mixer structure. Signed-off-by: John W. Linville Signed-off-by: Takashi Iwai commit a7175aab3f5cffe3c79575e56dfcfe87a41a74c7 Author: John W. Linville Date: Thu Sep 29 13:13:38 2005 +0200 [ALSA] fix HD audio ALC260 mono (un)mute HDA Codec driver The ALC260 'Mono Playback Switch' is marked as an output in patch_realtek.c. It actually does not work unless it is marked as an input. Go figure... This was tested and confirmed on an HP xw4300. Signed-off-by: John W. Linville Signed-off-by: Takashi Iwai commit d31cbbfd80a84696847913b7486a998481038663 Author: Clemens Ladisch Date: Mon Sep 26 09:59:57 2005 +0200 [ALSA] usb-audio: increase max buffer size USB generic driver Increase the maximum PCM buffer size to 1 MB. The USB driver doesn't have any inherent buffer size limit, and big multichannel interfaces may benefit from this. Signed-off-by: Clemens Ladisch commit 31ab9523ed3773d5de7c07b3b6c4c00ddb06045e Author: Clemens Ladisch Date: Mon Sep 26 08:55:01 2005 +0200 [ALSA] usb-audio: add another ID for the TerraTec PHASE26 USB generic driver There is another revision of the PHASE26 with a different product ID; add a quirk entry for that, too. Signed-off-by: Clemens Ladisch commit f542fda8f8cd0cc0e4bffef42b27c7dc59cd07d3 Author: Clemens Ladisch Date: Tue Sep 20 09:06:36 2005 +0200 [ALSA] usb-audio: add more Yamaha USB MIDI devices USB generic driver Add quirk entries for four unknown Yamaha USB MIDI devices. Signed-off-by: Clemens Ladisch commit 1e8bdcaf82268ac713cbbaffc14801147be42ae7 Author: Takashi Iwai Date: Mon Sep 19 15:21:17 2005 +0200 [ALSA] Add iBook 1.33GHz support PPC PMAC driver Added the support of iBook 1.33GHz. Signed-off-by: Takashi Iwai commit 5a2a68f5a1dab785d60a4575f48af5b15ab6328d Author: Clemens Ladisch Date: Mon Sep 19 12:24:00 2005 +0200 [ALSA] usb-audio: add Roland RD-700SX support USB generic driver Add a quirk entry for the Roland RD-700SX. This should work for the RD-300SX, too. Signed-off-by: Clemens Ladisch commit db99055f8d8eb54d9da55293a11b82e9d53ca80d Author: Takashi Iwai Date: Fri Sep 16 19:07:52 2005 +0200 [ALSA] via82xx - Add a dxs whitelist entry VIA82xx driver Added a dxs whitelist entry for an ECS mobo. Signed-off-by: Takashi Iwai commit 90b66e833261618e11d71a35f2488a7d664a4566 Author: Nicolas Pitre Date: Fri Sep 16 18:50:53 2005 +0200 [ALSA] clean suspend/resume calls for ac97_bus_type AC97 Codec A single call to the driver suspend/resume method for each device is enough. The level and SUSPEND_*/RESUME_* arguments are deprecated and said to be removed eventually anyway (no other subsystem are using them anymore except platform devices). Signed-off-by: Nicolas Pitre Signed-off-by: Takashi Iwai commit 72e75de2df9a7116d0afbcd5810b2a8fd4bf7559 Author: Nicolas Pitre Date: Fri Sep 16 18:49:22 2005 +0200 [ALSA] remove redundent assignment to the ac97 device structure AC97 Codec Don't use dev.platform_data to store a reference to the containing ac97_t structure. Such assignment is redundent since we can deduce the ac97_t structure location from the contained device structure. This sets platform_data free for other purposes. Signed-off-by: Nicolas Pitre Signed-off-by: Takashi Iwai commit 3a91e95969b84a56c7fef15ba25a5f6a17dd94b2 Author: Nicolas Pitre Date: Fri Sep 16 18:46:36 2005 +0200 [ALSA] remove bogus match method for ac97_bus AC97 Codec The bus_id is initialized with a generic identifier string which is not really useful for proper driver matching. Let the driver decide what it needs via its probe method instead. Signed-off-by: Nicolas Pitre Signed-off-by: Takashi Iwai commit 460dc98afc6db255344a06c8da1196e2a2744758 Author: Clemens Ladisch Date: Fri Sep 16 16:56:01 2005 +0200 [ALSA] usb-audio: ignore Hercules DJ Console mixer errors USB generic driver Add a quirk entry for the Hercules DJ Console to ignore timeouts on some mixer control transfers. Signed-off-by: Clemens Ladisch commit 1dcee12591320d79e4fc5bcdc4aa8a2522b7afdb Author: Dirk Opfer Date: Wed Sep 14 20:52:25 2005 +0200 [ALSA] Fix pm_message_t in PXA2XX-AC97 driver ARM PXA2XX driver Fix pm_message_t in PXA2XX-AC97 driver. Signed-off-by: Takashi Iwai commit e8dede5a136bd7ef36d1779ea173cfd504dff0cb Author: Takashi Iwai Date: Tue Sep 13 11:28:53 2005 +0200 [ALSA] hda-intel - Disable DMA position auto-correction HDA Intel driver Disable the auto-correction of DMA position temporarily. It doesn't work as expected yet... Signed-off-by: Takashi Iwai commit 84802f0df3425ae0f9987af0d35ea19910479ec0 Author: Sasha Khapyorsky Date: Tue Sep 13 11:25:54 2005 +0200 [ALSA] hda-codec - 'empty' generic mfg-only codec HDA generic driver This creates 'empty' hda generic for unknown MFG-only codecs. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai commit 27bcaa693c866b9bccf94ee5b60eaf705e90c341 Author: Sasha Khapyorsky Date: Tue Sep 13 11:23:13 2005 +0200 [ALSA] no templated index for si3036 modem controls AC97 Codec No index is templated for si3036 modem controls. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai commit 0444e2aca9ac89f571f0bb7781d12818719e4baf Author: Sasha Khapyorsky Date: Tue Sep 13 11:21:30 2005 +0200 [ALSA] no templated index for mc97 controls AC97 Codec No index is templated for mdoem controls. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai commit 06f619ccb3319759c2acf91c7ca02b6b1d9ed343 Author: Daniel Ritz Date: Mon Sep 12 11:47:04 2005 +0200 [ALSA] snd_opl3sa2: add missing pnp_unregister_driver() calls OPL3SA2 driver Signed-off-by: Daniel Ritz Signed-off-by: Takashi Iwai commit 0f21ba7cc3320d33459ecb3f538f1a42040c29cd Author: Eric Kinzie Date: Thu Oct 6 22:19:28 2005 -0700 [ATM]: add support for LECS addresses learned from network From: Eric Kinzie Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit eb98129eec7fa605f0407dfd92d40ee8ddf5cd9a Author: Tom 'spot' Callaway Date: Thu Oct 6 22:14:59 2005 -0700 [SPARC32]: Enable generic IOMAP. This helps some PCI stuff build. Signed-off-by: Tom 'spot' Callaway Signed-off-by: David S. Miller commit 829841146878e082613a49581ae252c071057c23 Author: Linus Torvalds Date: Thu Oct 6 21:54:21 2005 -0700 Avoid 'names_cache' memory leak with CONFIG_AUDITSYSCALL The nameidata "last.name" is always allocated with "__getname()", and should always be free'd with "__putname()". Using "putname()" without the underscores will leak memory, because the allocation will have been hidden from the AUDITSYSCALL code. Arguably the real bug is that the AUDITSYSCALL code is really broken, but in the meantime this fixes the problem people see. Reported by Robert Derr, patch by Rick Lindsley. Acked-by: Al Viro Signed-off-by: Linus Torvalds commit 20c9c825b12fcb8526a29cf20a17a5a3fc581726 Author: Sridhar Samudrala Date: Thu Oct 6 21:37:01 2005 -0700 [SCTP] Fix SCTP socket options to work with 32-bit apps on 64-bit kernels. Adds alignment attribute to a few structures used with SCTP socket options so that the sizes and offsets remain the same when built using either 32 or 64 bit tools. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 5fe467ee9787007dd9b263eb42dde3742deb743b Author: Ivan Skytte Jørgensen Date: Thu Oct 6 21:36:17 2005 -0700 [SCTP] Fix sctp_get{pl}addrs() API to work with 32-bit apps on 64-bit kernels. The old socket options are marked with a _OLD suffix so that the existing 32-bit apps on 32-bit kernels do not break. Signed-off-by: Ivan Skytte Jørgensen Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 2256c13b992b09f1f9563c26457aa048da2865df Author: David S. Miller Date: Thu Oct 6 20:43:54 2005 -0700 [SPARC64]: Probe for power device on ISA bus too. Signed-off-by: David S. Miller commit 76e677e25dd3d8af77d0b3810eacaacaf2f93f2f Author: Bryan Sutula Date: Wed Oct 5 11:02:06 2005 -0600 [IA64] Avoid kernel hang during CMC interrupt storm I've noticed a kernel hang during a storm of CMC interrupts, which was tracked down to the continual execution of the interrupt handler. There's code in the CMC handler that's supposed to disable CMC interrupts and switch to polling mode when it sees a bunch of CMCs. Because disabling CMCs across all CPUs isn't safe in interrupt context, the disable is done with a schedule_work(). But with continual CMC interrupts, the schedule_work() never gets executed. The following patch immediately disables CMC interrupts for the current CPU. This then allows (at least) one CPU to ignore CMC interrupts, execute the schedule_work() code, and disable CMC interrupts on the rest of the CPUs. Acked-by: Keith Owens Signed-off-by: Bryan Sutula Signed-off-by: Tony Luck commit a448a28589a6640736b8af1f2f57616c10bb37d5 Author: Russell King Date: Thu Oct 6 13:09:42 2005 +0100 [MFD] Fix gcc4 build errors in ucb1x00-core.c drivers/mfd/ucb1x00-core.c:555: error: static declaration of 'ucb1x00_class' follows non-static declaration drivers/mfd/ucb1x00.h:109: error: previous declaration of 'ucb1x00_class' was here Since ucb1x00_class isn't used by anything, remove the extern declaration and the symbol export. Signed-off-by: Russell King commit 9ad98c5b4461e7dfa3754963200993a68825eab4 Author: David S. Miller Date: Wed Oct 5 15:12:00 2005 -0700 [SPARC64]: Fix initrd when net booting. By allocating early memory for the firmware page tables, we can write over the beginning of the initrd image. So what we do now is: 1) Read in firmware translations table while still on the firmware's trap table. 2) Switch to Linux trap table. 3) Init bootmem. 4) Build firmware page tables using __alloc_bootmem(). And this keeps the initrd from being clobbered. Signed-off-by: David S. Miller commit e03eb5272b670e5002463c95fdc023410ba18484 Author: Catalin Marinas Date: Wed Oct 5 23:06:36 2005 +0100 [ARM] 2954/1: Allow D and I cache and branch prediction disabling for ARMv6 Patch from Catalin Marinas There is no reason to not allow these config options. They are useful when the hardware has problems. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 782c3fd470abddf2525e34cf3131215a8f95e834 Author: Martin Habets Date: Wed Oct 5 12:21:36 2005 -0700 [SPARC]: Remove some duplicated sparc32 config items Remove some duplicated items due to the inclusion of the general drivers/Kconfig file. These are now taken from drivers/char/Kconfig, and can be turned off there as well (which is desirable sometimes). Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit 3a867b36c3234673e61f883ebc11ad18f80a176f Author: Ralf Baechle Date: Wed Oct 5 12:16:04 2005 -0700 [AX.25]: Fix packet socket crash Since changeset 98a82febb6340466824c3a453738d4fbd05db81a AX.25 is passing received IP and ARP packets to the stack through netif_rx() but we don't set the skb->mac.raw to right value which may result in a crash with applications that use a packet socket. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 77d8d7a6848c81084f413e1ec4982123a56e2ccb Author: Herbert Xu Date: Wed Oct 5 12:15:12 2005 -0700 [IPSEC]: Document that policy direction is derived from the index. Here is a patch that adds a helper called xfrm_policy_id2dir to document the fact that the policy direction can be and is derived from the index. This is based on a patch by YOSHIFUJI Hideaki and 210313105@suda.edu.cn. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 140e26fcd559f6988e5a9056385eecade19d9b49 Author: YOSHIFUJI Hideaki Date: Wed Oct 5 12:11:41 2005 -0700 [IPV6]: Fix NS handing for proxy/anycast address Timer set up by pneigh_enqueue() ended up calling ndisc_rcv() via pndisc_redo(), which clears LOCALLY_ENQUEUED flag in NEIGH_CB(skb) and NS was queued again. Let's call ndisc_recv_ns() directly to avoid the loop. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 42a39450f830c57432fd4e5644fa81f41ce7156d Author: Stephen Hemminger Date: Wed Oct 5 12:09:31 2005 -0700 [TCP]: BIC coding bug in Linux 2.6.13 Missing parenthesis in causes BIC to be slow in increasing congestion window. Spotted by Injong Rhee. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit fab10fe37ad8dc4388fc444c89ef5aefe906354f Author: Yan Zheng Date: Wed Oct 5 12:08:13 2005 -0700 [MCAST] ipv6: Fix address size in grec_size Signed-Off-By: Yan Zheng Acked-by: YOSHIFUJI Hideaki Acked-by: David L Stevens Signed-off-by: David S. Miller commit c0758146adbe39514e75ac860ce7e49f865c2297 Author: Dave Jones Date: Mon Oct 3 15:02:20 2005 -0400 [PATCH] Fix drm 'debug' sysfs permissions Just enables some extra printk's, but still.. Only the sysadmin should be able to do that. Signed-off-by: Linus Torvalds commit 23cb8c297eb939b25e5a628dc9e8a71b17f1c44e Author: Benjamin Herrenschmidt Date: Wed Oct 5 17:43:40 2005 +1000 [PATCH] ppc: Fix timekeeping with HZ=250 on some Mac models Older Macs which uses the VIA chip timers to calibrate the timebase used some code that wouldn't work if HZ wasn't divisible by 100... This fixes it at least for 250. Not totally perfect but should be enough for now (so it at least works with the default value which is now 250). There is still a potential issue with the core using CLOCK_TICK_RATE to maintain xtime and CLOCK_TICK_RATE value on ppc32 is pure crap, but that is a different problem, this patch at least brings us back to our previous situation. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 329d4dd72e5c3393a0c7aeebf3e62df77b196d71 Author: Al Viro Date: Wed Oct 5 08:36:02 2005 +0100 [PATCH] fix the breakage in sparc headers If we switch extern inline to static inline, we'd better switch the pre-declarations we use to say that these puppies have __attribute_const__ on them. Otherwise we get extern declaration followed by static inline one. Which makes gcc unhappy, and for a good reason... Signed-off-by: Al Viro Signed-off-by: David S. Miller Signed-off-by: Linus Torvalds commit 83fa3400ebcba307a60909824a251be984eb9567 Author: Randy Dunlap Date: Tue Oct 4 22:45:35 2005 -0700 [XFRM]: fix sparse gfp nocast warnings Fix implicit nocast warnings in xfrm code: net/xfrm/xfrm_policy.c:232:47: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 3d2aef668920e8d93b77f145f8f647f62abe75db Author: Randy Dunlap Date: Tue Oct 4 22:45:14 2005 -0700 [TEXTSEARCH]: fix sparse gfp nocast warnings Fix nocast sparse warnings: include/linux/textsearch.h:165:57: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit dd13a285b79ba77416b96ee10f49097f4aaf48c5 Author: Randy Dunlap Date: Tue Oct 4 22:44:45 2005 -0700 [RPC]: fix sparse gfp nocast warnings Fix nocast sparse warnings: net/rxrpc/call.c:2013:25: warning: implicit cast to nocast type net/rxrpc/connection.c:538:46: warning: implicit cast to nocast type net/sunrpc/sched.c:730:36: warning: implicit cast to nocast type net/sunrpc/sched.c:734:56: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 00fa02334540ec795934737cd6e6ef8db2560731 Author: Randy Dunlap Date: Tue Oct 4 22:43:04 2005 -0700 [AF_KEY]: fix sparse gfp nocast warnings Fix implicit nocast warnings in net/key code: net/key/af_key.c:195:27: warning: implicit cast to nocast type net/key/af_key.c:1439:28: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit c6f4fafccfa66f0530587ac3c11bb8fd0b8fe8ab Author: Randy Dunlap Date: Tue Oct 4 22:42:42 2005 -0700 [NETFILTER]: fix sparse gfp nocast warnings Fix implicit nocast warnings in nfnetlink code: net/netfilter/nfnetlink.c:204:43: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 8eea00a44d9f493869f8d30b72e3ed18475be556 Author: Randy Dunlap Date: Tue Oct 4 22:42:15 2005 -0700 [IPVS]: fix sparse gfp nocast warnings From: Randy Dunlap Fix implicit nocast warnings in ip_vs code: net/ipv4/ipvs/ip_vs_app.c:631:54: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit f4a19a56e38442e434b8809915d756469f1e89a2 Author: Randy Dunlap Date: Tue Oct 4 22:41:48 2005 -0700 [DECNET]: fix sparse gfp nocast warnings Fix implicit nocast warnings in decnet code: net/decnet/af_decnet.c:458:40: warning: implicit cast to nocast type net/decnet/dn_nsp_out.c:125:35: warning: implicit cast to nocast type net/decnet/dn_nsp_out.c:219:29: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 17b698856328a42d5874ac87640e2cd84a824eef Author: Randy Dunlap Date: Tue Oct 4 22:41:16 2005 -0700 [CONNECTOR]: fix sparse gfp nocast warnings Fix implicit nocast warnings in connector code: drivers/connector/connector.c:102:24: warning: implicit cast to nocast type drivers/connector/connector.c:114:45: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit de54f3907d2f5d8e25cfafe513811f146b250dee Author: Randy Dunlap Date: Tue Oct 4 22:39:41 2005 -0700 [BONDING]: fix sparse gfp nocast warnings Fix implicit nocast warnings in bonding code: drivers/net/bonding/bond_main.c:1302:49: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 7b5b3f3d826ea87c224c66de9c95c09e7f110ecd Author: Randy Dunlap Date: Tue Oct 4 22:38:44 2005 -0700 [ATM]: fix sparse gfp nocast warnings Fix implicit nocast warnings in atm code: net/atm/atm_misc.c:35:44: warning: implicit cast to nocast type drivers/atm/fore200e.c:183:33: warning: implicit cast to nocast type Also use kzalloc() instead of kmalloc(). Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 9bc39bec87ee3e35897fe27441e979e7c208f624 Author: Pavel Roskin Date: Tue Oct 4 21:33:10 2005 -0400 [PATCH] orinoco: Information leakage due to incorrect padding The orinoco driver can send uninitialized data exposing random pieces of the system memory. This happens because data is not padded with zeroes when its length needs to be increased. Reported by Meder Kydyraliev Signed-off-by: Pavel Roskin Signed-off-by: Jeff Garzik commit ce12467d44d7394731ec9e91e032d50b04e502f6 Author: Deepak Saxena Date: Tue Oct 4 16:32:38 2005 -0700 [PATCH] Fix broken IXP4xx GPIO macro Macro ended up backwards during one of cleanups. Found by Alessandro Zummo. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit a5181ab06ddca8071b4eb54ac2c314f7d24825d4 Author: Horst H. von Brand Date: Tue Oct 4 15:58:56 2005 -0700 [NETFILTER]: Fix Kconfig typo Signed-off-by: Horst H. von Brand Signed-off-by: David S. Miller commit 944d2647dded12e2b05ad8ebc020644bb1997ce1 Author: Andi Kleen Date: Wed Oct 5 00:21:39 2005 +0200 [PATCH] x86_64: Drop global bit from early low mappings Drop global bit from early low mappings Suggested by Linus, originally also proposed by Suresh. This fixes a race condition with early start of udev, originally tracked down by Suresh B. Siddha. The problem was that switching to the user space VM would not clear the global low mappings for the beginning of memory, which lead to memory corruption. Drop the global bits. The kernel mapping stays global because it should stay constant. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6d2553612fa329979e6423a5f2410fd7be5aa902 Author: Eric Dumazet Date: Tue Oct 4 15:55:51 2005 -0700 [INET]: Shrink struct inet_ehash_bucket on 32 bits UP No need to align struct inet_ehash_bucket on a 8 bytes boundary. On 32 bits Uniprocessor, that's a waste of 4 bytes per struct (50 %) On other platforms, the attribute is useless, natual alignement is already 8. platform | Size before | Size after patch -------------+-------------+------------------ 32 bits, UP | 8 | 4 32 bits, SMP | 8 | 8 64 bits, UP | 8 | 8 64 bits, SMP | 16 | 16 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 0835ae0f27c0bfde67613d189ef6c537e004a6de Author: David S. Miller Date: Tue Oct 4 15:23:20 2005 -0700 [SPARC64]: Replace cheetah+ code patching with variables. Instead of code patching to handle the page size fields in the context registers, just use variables from which we get the proper values. Signed-off-by: David S. Miller commit c2f480869fa7559fa3532e415e3e3ec49339f208 Author: Nicolas Pitre Date: Tue Oct 4 23:17:53 2005 +0100 [ARM] 2952/1: fix a register clobber list Patch from Nicolas Pitre If gcc decides to assign lr to %0 we're screwed. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 74f8849496b73d2ae4f9c53f61bf59e063ceed88 Author: Nicolas Pitre Date: Tue Oct 4 23:17:52 2005 +0100 [ARM] 2951/1: fix wrong comment Patch from Nicolas Pitre The cmpxchg emulation syscall needs write access. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 0a5b0aa8a331f4346b4b02bc653107304a6abdc5 Author: Sascha Hauer Date: Tue Oct 4 23:17:52 2005 +0100 [ARM] 2950/1: i.MX gpio setup function Patch from Sascha Hauer Current implementation of imx_gpio_mode does not allow to configure all alternate routing possibilities of the i.MX. With this patch every bit in the gpio setup registers has a corresponding bit in the gpio_mode parameter, so every routing should be possible now. Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit d78795b6930956fb66238d4d26242482d4a31470 Author: Sascha Hauer Date: Tue Oct 4 23:17:51 2005 +0100 [ARM] 2949/1: Hynix h720x Run mode Patch from Sascha Hauer After coming out of idle mode the h720x goes into slow mode. Switch it back to run mode. Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit fad1c45c939bb246a488be1fa06f539e85b80545 Author: Allan Graves Date: Tue Oct 4 14:53:52 2005 -0400 [PATCH] uml: Fix sysrq-r support for skas mode The old code had the IP and SP coming from the registers in the thread struct, which are completely wrong since those are the userspace registers. This fixes that by pulling the correct values from the jmp_buf in which the kernel state of each thread is stored. Signed-off-by: Allan Graves Signed-off-by: Jeff Dike Signed-off-by: Linus Torvalds commit 71dc036247573e377703233af289019f4aa3176e Author: Jeff Dike Date: Tue Oct 4 14:53:49 2005 -0400 [PATCH] UML - Fix Al's build tidying Al's build tidying missed one bit from me - without this UML doesn't boot. Signed-off-by: Jeff Dike Acked-by: Al Viro Signed-off-by: Linus Torvalds commit c2b513dfbb04d7c94cca145172cfeb91f7683e54 Author: Al Viro Date: Tue Oct 4 17:48:44 2005 +0100 [PATCH] bfs iget() abuses bfs_fill_super() walks the inode table to get the bitmap of free inodes and collect stats. It has no business using iget() for that - it's a lot of extra work, extra icache pollution and more complex code. Switched to walking the damn thing directly. Note: that also allows to kill ->i_dsk_ino in there - separate patch if Tigran can confirm that this field can be zero only for deleted inodes (i.e. something that could only be found during that scan and not by normal lookups). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ce0fe7e70a0ad11097a3773e9f3f0de3d859edf0 Author: Alexey Dobriyan Date: Tue Oct 4 17:43:06 2005 +0100 [PATCH] bfs endianness annotations Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 25e2d79f527b7abce624f30516f3167195b69a2e Author: Al Viro Date: Tue Oct 4 17:40:44 2005 +0100 [PATCH] bogus kfree() in ibmtr On several failure exits in ibmtr we end up doing kfree() on dev->priv, with dev allocated by alloc_trdev() and ->priv never reassigned. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 433992361ce95a1da76b76c9c24d4c957b058aff Author: Al Viro Date: Tue Oct 4 17:36:04 2005 +0100 [PATCH] missing include in megaraid_sas megaraid_sas depends on arch-specific indirect includes pulling fs.h in; on alpha they do not. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e6308be85afee685347fa3440bed10faaa5d6c1a Author: Robert Olsson Date: Tue Oct 4 13:01:58 2005 -0700 [IPV4]: fib_trie root-node expansion The patch below introduces special thresholds to keep root node in the trie large. This gives a flatter tree at the cost of a modest memory increase. Overall it seems to be gain and this was also proposed by one the authors of the paper in recent a seminar. Main table after loading 123 k routes. Aver depth: 3.30 Max depth: 9 Root-node size 12 bits Total size: 4044 kB With the patch: Aver depth: 2.78 Max depth: 8 Root-node size 15 bits Total size: 4150 kB An increase of 8-10% was seen in forwading performance for an rDoS attack. Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 87bf9c97b4b3af8dec7b2b79cdfe7bfc0a0a03b2 Author: YOSHIFUJI Hideaki Date: Tue Oct 4 13:00:39 2005 -0700 [IPV6]: Fix infinite loop in udp_v6_get_port(). Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 96f339c6b95344942fe5fce012ff4f2a3b2cb80d Author: Greg Edwards Date: Wed Sep 28 17:05:19 2005 -0500 [IA64] mbcs_init() should give up unless running on sn2 CONFIG_SGI_MBCS is enabled in generic kernels, but the driver may oops some other platforms. Check whether we are running on sn2 and bail out if we are not before doing anything dangerous. Acked-by: Bruce Losure Signed-off-by: Greg Edwards Signed-off-by: Tony Luck commit c394e458b69632902d65f9e2f39df79314f72908 Author: Anton Altaparmakov Date: Tue Oct 4 13:08:53 2005 +0100 NTFS: Fix a 64-bitness bug where a left-shift could overflow a 32-bit variable which we now cast to 64-bit first (fs/ntfs/mft.c::map_mft_record_page(). Signed-off-by: Anton Altaparmakov commit 18efefa9355119b4f6d9b73b074ebbf9882c37c3 Author: Anton Altaparmakov Date: Tue Oct 4 13:06:00 2005 +0100 NTFS: Fix a stupid bug in __ntfs_bitmap_set_bits_in_run() which caused the count to become negative and hence we had a wild memset() scribbling all over the system's ram. Signed-off-by: Anton Altaparmakov commit 832f8f0378ff1566f2a222352c7ad5df3f8d0d9d Author: Randy Dunlap Date: Tue Oct 4 00:41:22 2005 -0700 [PATCH] sungem: fix gfp flags type Fix nocast sparse warnings in sungen: drivers/net/sungem.h:1040:45: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 81c58732277654a51bb52832e1bc74234bb977bc Author: Randy Dunlap Date: Mon Oct 3 21:24:36 2005 -0700 [PATCH] ns83820: fix gfp flags type Fix implicit nocast warnings in ns83820 code, including __nocast: drivers/net/ns83820.c:603:46: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit f36a29d5672c7698ffe55c7c05107ae77fa698cc Author: Randy Dunlap Date: Mon Oct 3 21:24:45 2005 -0700 [PATCH] ieee80211: fix gfp flags type Fix implicit nocast warnings in ieee80211 code, including __nocast: net/ieee80211/ieee80211_tx.c:215:9: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 67974231d4354fe26aaa39a3153b5c0945b94858 Author: Ion Badulescu Date: Mon Oct 3 22:31:36 2005 -0400 [netdrvr starfire] fix highmem and broken firmware issues Unfortunately, [your patch] might address the crash but doesn't address the real problem. It turns out that the problem is one of padding (the firmware cksum engine works only on 32-bit chunks, yuck), so the special casing for length == 1 wasn't sufficient anyway. This patch addresses the issue, as well the other issue of i386 + CONFIG_HIGHMEM being broken. It is pretty much the same workaround that Adaptec themselves used in their Windows driver. I have yet to check if it fixes the problem when the skb is non-linear, but this patch _will_ solve the problem for 99% of the users out there (those not using sendfile). Signed-off-by: Ion Badulescu Signed-off-by: Jeff Garzik commit 32fa2bfcf882f8901ca206e33b0d8975cc8e89a2 Author: Grant Coady Date: Sat Sep 10 00:14:05 2005 +1000 [PATCH] net/Kconfig: convert pocket_adapter ISA to PARPORT This patch changes pocket and parallel adaptors to depend on PARPORT instead of ISA in order to get the option in newer SuperIO based systems. Signed-off-by: Grant Coady Signed-off-by: Jeff Garzik commit 49a9db07abd4ac89693dbd4dcd92fcd1f30ece00 Author: Wade Farnsworth Date: Mon Oct 3 22:21:33 2005 -0400 [PATCH] emac: add support for platform-specific unsupported PHY features This patch adds support to the ibm_emac driver for platform-specific unsupported PHY features. The patch attempts to determine the highest speed and duplex when autonegotiation is unsupported. Signed-off-by: Wade Farnsworth Signed-off-by: Jeff Garzik commit 32b5bfab9a09b19ea9a7d902b249ebf311fd2999 Author: Philippe De Muyter Date: Thu Sep 22 11:09:44 2005 +0200 [PATCH] tulip DC21143 rev 48 10Mbit HDX fix The patch below is necessary to allow my Digital DS21143 Tulip rev 48 ethernet interface to work in a 10Mbit Half Duplex network. Without it, the driver keeps retrying other modes in an endless loop. It seems like someone already had the same problem with a rev 65 board :) Signed-off-by: Philippe De Muyter Signed-off-by: Jeff Garzik commit 217df670d9a4da036d68b22500ac06128811d5c8 Author: Jay Vosburgh Date: Mon Sep 26 16:11:50 2005 -0700 [PATCH] fix bonding crash, remove old ABI support David S. Miller wrote: >I think removing support for older ifenslave binaries is >the least painful solution to this problem. This patch removes backwards compatibility for old ifenslave binaries (ifenslave prior to verison 1.0.0). I did not similarly modify ifenslave itself; with sysfs on the horizon, I don't see that as being worthwhile. Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 9123e0d78990246304fe681167b8d8097f1e02d7 Author: Ursula Braun Date: Fri Sep 30 10:17:24 2005 +0200 [PATCH] s390: qeth driver fixes From: Peter Tiedemann From: Frank Pavlic minor qeth fixes: - free old skb in qeth_realloc_headroom after duplicating skb - disable IPV6 support for Hipersockets devices - call ccw_device_set_offline on every channel regardless of the return value of the prior ccw_device_set_offline calls - allocate qdio structures in DMA-area - schedule recovery of appropriate card when cable has been inserted again. - add missing initialization of card->lock - write sequence number in skb->cb for SNA protocol which requires strictly serialized packets. Signed-off-by: Frank Pavlic diffstat: qeth.h | 2 ++ qeth_main.c | 37 +++++++++++++++++-------------------- 2 files changed, 19 insertions(+), 20 deletions(-) Signed-off-by: Jeff Garzik commit bb53d6d0e70cd0749a7844efc62cefeb24b134b6 Author: Komuro Date: Mon Oct 3 22:03:28 2005 -0400 [netdrvr] fix smc91c92_cs multicast bug The smc91c92_cs multicast does not work if the count of multicast address is 1. Signed-off-by: Signed-off-by: Jeff Garzik commit 8cb6108baee9dcd1dc96f476fe217d6a6b53c994 Author: Randy Dunlap Date: Sun Oct 2 22:41:09 2005 -0700 [PATCH] ieee80211: fix gfp flags type Fix implicit nocast warnings in ieee80211 code: net/ieee80211/ieee80211_tx.c:215:9: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 0a1c80f1115b9a1aacf00a312a532ceef49dfa1b Author: Randy Dunlap Date: Sun Oct 2 22:42:11 2005 -0700 [PATCH] ns83820: fix gfp flags type Fix implicit nocast warnings in ns83820 code: drivers/net/ns83820.c:603:46: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit c2681dd8c71c8fb4ca530f94536550fcd843aae4 Author: Stephen Hemminger Date: Mon Oct 3 12:03:13 2005 -0700 [PATCH] skge: set mac address oops with bonding Skge driver was bringing link up/down when changing mac address. This doesn't work in the bonding environment, and is more effort than needed. Fixes-bug: http://bugzilla.kernel.org/show_bug.cgi?id=5271 Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit fdc657c66678551c7987dc23a78ae1a26251276f Author: David S. Miller Date: Mon Oct 3 17:37:27 2005 -0700 [SUNSU]: Fix bogus locking in sunsu_change_mouse_baud() The lock is not held when calling this function, so we shouldn't drop then reacquire it. Based upon a report from Jim MacBaine. Signed-off-by: David S. Miller commit 3115624eda34d0f4e673fc6bcea36b7ad701ee33 Author: Adrian Bunk Date: Mon Oct 3 17:37:02 2005 -0700 [SPARC]: "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit ed39f731ab2e77e58122232f6e27333331d7793d Author: David S. Miller Date: Mon Oct 3 16:25:23 2005 -0700 [TG3]: Update driver version and release date. Signed-off-by: David S. Miller commit 7ce312467edc270fcbd8a699efabb37ce1802b98 Author: David S. Miller Date: Mon Oct 3 16:07:30 2005 -0700 [IPV4]: Update icmp sysctl docs and disable broadcast ECHO/TIMESTAMP by default It's not a good idea to be smurf'able by default. The few people who need this can turn it on. Signed-off-by: David S. Miller commit 3e56a40bb36f1f73b4eac2ffe267c5357811e321 Author: Herbert Xu Date: Mon Oct 3 14:36:32 2005 -0700 [IPV4]: Get rid of bogus __in_put_dev in pktgen This patch gets rid of a bogus __in_dev_put() in pktgen.c. This was spotted by Suzanne Wood. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit e5ed639913eea3e4783a550291775ab78dd84966 Author: Herbert Xu Date: Mon Oct 3 14:35:55 2005 -0700 [IPV4]: Replace __in_dev_get with __in_dev_get_rcu/rtnl The following patch renames __in_dev_get() to __in_dev_get_rtnl() and introduces __in_dev_get_rcu() to cover the second case. 1) RCU with refcnt should use in_dev_get(). 2) RCU without refcnt should use __in_dev_get_rcu(). 3) All others must hold RTNL and use __in_dev_get_rtnl(). There is one exception in net/ipv4/route.c which is in fact a pre-existing race condition. I've marked it as such so that we remember to fix it. This patch is based on suggestions and prior work by Suzanne Wood and Paul McKenney. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit a5e7c210fefd2454c757a3542e41063407ca7108 Author: David S. Miller Date: Mon Oct 3 14:21:58 2005 -0700 [IPV6]: Fix leak added by udp connect dst caching fix. Based upon a patch from Mitsuru KANDA Signed-off-by: David S. Miller commit f36d6ab182a5c68e92ea3e85821dde9d29bfe284 Author: Yan Zheng Date: Mon Oct 3 14:19:15 2005 -0700 [IPV6]: Fix ipv6 fragment ID selection at slow path Signed-Off-By: Yan Zheng Signed-off-by: David S. Miller commit 444fc8fc3a1f926fa224655b8950bd853368c1a3 Author: Herbert Xu Date: Mon Oct 3 14:18:10 2005 -0700 [IPV4]: Fix "Proxy ARP seems broken" Meelis Roos wrote: > RK> My firewall setup relies on proxyarp working. However, with 2.6.14-rc3, > RK> it appears to be completely broken. The firewall is 212.18.232.186, > > Same here with some kernel between 14-rc2 and 14-rc3 - no reposnse to > ARP on a proxyarp gateway. Sorry, no exact revison and no more debugging > yet since it'a a production gateway. The breakage is caused by the change to use the CB area for flagging whether a packet has been queued due to proxy_delay. This area gets cleared every time arp_rcv gets called. Unfortunately packets delayed due to proxy_delay also go through arp_rcv when they are reprocessed. In fact, I can't think of a reason why delayed proxy packets should go through netfilter again at all. So the easiest solution is to bypass that and go straight to arp_process. This is essentially what would've happened before netfilter support was added to ARP. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 496a22b08fa326bf17c11eb900e0505aa9da3506 Author: Russell King Date: Mon Oct 3 14:16:34 2005 -0700 [NET]: Fix "sysctl_net.c:36: error: 'core_table' undeclared here" During the build for ARM machine type "fortunet", this error occurred: CC net/sysctl_net.o net/sysctl_net.c:36: error: 'core_table' undeclared here (not in a function) It appears that the following configuration settings cause this error due to a missing include: CONFIG_SYSCTL=y CONFIG_NET=y # CONFIG_INET is not set core_table appears to be declared in net/sock.h. if CONFIG_INET were defined, net/sock.h would have been included via: sysctl_net.c -> net/ip.h -> linux/ip.h -> net/sock.h so include it directly. Signed-off-by: Russell King Signed-off-by: David S. Miller commit 81c3d5470ecc70564eb9209946730fe2be93ad06 Author: Eric Dumazet Date: Mon Oct 3 14:13:38 2005 -0700 [INET]: speedup inet (tcp/dccp) lookups Arnaldo and I agreed it could be applied now, because I have other pending patches depending on this one (Thank you Arnaldo) (The other important patch moves skc_refcnt in a separate cache line, so that the SMP/NUMA performance doesnt suffer from cache line ping pongs) 1) First some performance data : -------------------------------- tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established() The most time critical code is : sk_for_each(sk, node, &head->chain) { if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif)) goto hit; /* You sunk my battleship! */ } The sk_for_each() does use prefetch() hints but only the begining of "struct sock" is prefetched. As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far away from the begining of "struct sock", it has to bring into CPU cache cold cache line. Each iteration has to use at least 2 cache lines. This can be problematic if some chains are very long. 2) The goal ----------- The idea I had is to change things so that INET_MATCH() may return FALSE in 99% of cases only using the data already in the CPU cache, using one cache line per iteration. 3) Description of the patch --------------------------- Adds a new 'unsigned int skc_hash' field in 'struct sock_common', filling a 32 bits hole on 64 bits platform. struct sock_common { unsigned short skc_family; volatile unsigned char skc_state; unsigned char skc_reuse; int skc_bound_dev_if; struct hlist_node skc_node; struct hlist_node skc_bind_node; atomic_t skc_refcnt; + unsigned int skc_hash; struct proto *skc_prot; }; Store in this 32 bits field the full hash, not masked by (ehash_size - 1) Using this full hash as the first comparison done in INET_MATCH permits us immediatly skip the element without touching a second cache line in case of a miss. Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to sk_hash and tw_hash) already contains the slot number if we mask with (ehash_size - 1) File include/net/inet_hashtables.h 64 bits platforms : #define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\ (((__sk)->sk_hash == (__hash)) ((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \ ((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \ (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif)))) 32bits platforms: #define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\ (((__sk)->sk_hash == (__hash)) && \ (inet_sk(__sk)->daddr == (__saddr)) && \ (inet_sk(__sk)->rcv_saddr == (__daddr)) && \ (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif)))) - Adds a prefetch(head->chain.first) in __inet_lookup_established()/__tcp_v4_check_established() and __inet6_lookup_established()/__tcp_v6_check_established() and __dccp_v4_check_established() to bring into cache the first element of the list, before the {read|write}_lock(&head->lock); Signed-off-by: Eric Dumazet Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 399de50bbbb2501a6db43daaa8a2dafbc9bcfe0c Author: Michael Chan Date: Mon Oct 3 14:02:39 2005 -0700 [TG3]: Refine AMD K8 write-reorder chipset test. Test for VIA K8T800 north bridge instead of AMD K8 HyperTransport bridge based on new information from Andi Kleen. The AMD HyperTransport interface is not responsible for PCI transactions and so the re-ordering is more likely done by the VIA north bridge. This code is subject to change if we get more information from AMD or VIA. PCI Express devices are excluded from doing the read flush since all chipsets in the write_reorder list are PCI chipsets. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a232f76732e11c91c2215d3a43cf9ebc7f939939 Author: Al Viro Date: Mon Oct 3 14:01:37 2005 -0700 [CASSINI]: Convert to ethtool_ops Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 325ed8239309cb29f10ea58c5a668058ead11479 Author: Herbert Xu Date: Mon Oct 3 13:57:23 2005 -0700 [NET]: Fix packet timestamping. I've found the problem in general. It affects any 64-bit architecture. The problem occurs when you change the system time. Suppose that when you boot your system clock is forward by a day. This gets recorded down in skb_tv_base. You then wind the clock back by a day. From that point onwards the offset will be negative which essentially overflows the 32-bit variables they're stored in. In fact, why don't we just store the real time stamp in those 32-bit variables? After all, we're not going to overflow for quite a while yet. When we do overflow, we'll need a better solution of course. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit ddea7be0ec8d1374f0b483a81566ed56ec9f3905 Author: Ravikiran G Thirumalai Date: Mon Oct 3 10:36:28 2005 -0700 [PATCH] x86_64: Fix numa node topology detection for srat based x86_64 boxes 2.6.14-rc2 does not assign cpus to proper nodeids on our em64t numa boxen. Our boxes use acpi srat for parsing the numa information. srat_detect_node() used phys_proc_id[] to get to the cpu's local apic id, but phys_proc_id[] represents the cpu<->initial_apic_id mapping. The following patch fixes this problem. Now apicid_to_node[] is properly indexed with the local apic id. Signed-off-by: Ravikiran Thirumalai Acked-by: Suresh Siddha Cc: Andi Kleen Signed-off-by: Linus Torvalds commit d6b9acc0c6c4a7c5d484d15271a5274656d0864f Author: Paul Jackson Date: Mon Oct 3 00:29:10 2005 -0700 [PATCH] Document patch subject line better Improve explanation of the Subject line fields in Documentation/SubmittingPatches Canonical Patch Format. Signed-off-by: Paul Jackson Signed-off-by: Linus Torvalds commit 51c928c34fa7cff38df584ad01de988805877dba Author: James Bottomley Date: Sat Oct 1 09:38:05 2005 -0500 [SCSI] Legacy MegaRAID: Fix READ CAPACITY Some Legacy megaraid cards can't actually cope with the scatter/gather version of the READ CAPACITY command (which is what we now send them since altering all SCSI internal I/O to go via the block layer). Fix this (and a few other broken megaraid driver assumptions) by sending the non-sg version of the command if the sg list only has a single element. Signed-off-by: James Bottomley commit 75f8426c17bc091260a6f7536ba10767596e15eb Author: Paul Jackson Date: Sun Oct 2 18:01:42 2005 -0700 [PATCH] Document from line in patch format Document more details of patch format such as the "from" line and the "---" marker line, and provide more references for patch guidelines. Signed-off-by: Paul Jackson Signed-off-by: Linus Torvalds commit 2c3a0540999ac9bd7147fb98833224a58cdaf217 Author: Catalin Marinas Date: Sun Oct 2 22:34:35 2005 +0100 [ARM] 2943/1: Clear the exclusive monitor in v6_early_abort Patch from Catalin Marinas Data abort caused by ldrex/strex can leave the exclusive monitor in an unpredictable state. It is recommended that a clrex/strex is performed to clear this state. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit d70ddac1bf3a8b102996588010ca87018c3a4a04 Author: Richard Henderson Date: Sun Oct 2 12:49:52 2005 -0700 [PATCH] alpha: fix kernel alignment traps Pass in the pointer to the on-stack registers rather than using them directly as the arguments. Ivan noticed that I missed a spot when purging the registers as first stack parameter idiom. Signed-off-by: Linus Torvalds commit 97af50f60ff1202b0dd9ce481d4cf98c6a578bec Author: James Bottomley Date: Sun Oct 2 15:22:35 2005 -0500 [SCSI] aic7xxx/aic79xx: fix module removal path not to panic In these drivers, scsi_remove_host() is called too late, at the point it is called, the driver has already shut down too far to accept any I/O that the shutdown might generate. Any generated I/O actually triggers a panic. Fix this by calling scsi_remove_host() as early as possible and not calling scsi_host_put() until just before we kfree the ahc_softc. Signed-off-by: James Bottomley commit 9e70592fcd87c90e9e98090d66cb79f39d740d4a Author: James Bottomley Date: Sun Oct 2 12:59:49 2005 -0500 [SCSI] fix potential panic with proc on module removal There's a problem in our host release in that it calls scsi_proc_hostdir_rm(). However, if you hold a reference to the host as you remove the module, the host template (which proc uses) will be freed and the system will panic when the host device is finally released. Fix this by moving scsi_proc_hostdir_rm() to where it should be: in scsi_remove_host(). Signed-off-by: James Bottomley commit 487fd4eb1445407c9760af08b0b34c3f4cdb4afc Author: Russell King Date: Sun Oct 2 18:12:03 2005 +0100 [ARM] Fix init printk for EBSA110 network driver, and link timer Arrange for the initialisation printks to happen after we've registered the network interface, so we know what name the device is. Also, check the link every 500ms (and use msecs_to_jiffies.) Signed-off-by: Russell King commit 0e3a64e2162f971180bf1fdd91c263dbdfcfd385 Author: Russell King Date: Sun Oct 2 18:02:25 2005 +0100 [ARM] Fix EBSA110 network driver link detection EBSA110 link detection didn't read the register - it wrote it. Oops. Signed-off-by: Russell King commit 036bfdcb0dfa39fc1ff5ded196b5fd92f1bb9ea8 Author: Sven Henkel Date: Sun Oct 2 08:30:33 2005 +1000 [PATCH] ppc32: Add new iBook 12" to PowerMac models table This adds the new iBook G4 (manufactured after July 2005) to the PowerMac models table. The model name (PowerBook6,7) is taken from a 12" iBook, I don't know if it also matches the 14" version. The patch applies to a vanilla 2.6.13.2 kernel. Signed-off-by: Sven Henkel Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 14bfd1ff94f519a59b1e88e682819332d7e98171 Author: Sven Henkel Date: Sun Oct 2 08:29:18 2005 +1000 [PATCH] pmac/radeonfb: Add suspend support for M11 chip in new iBook 12" This adds suspend support for the Radeon M11 chip in 12" iBooks manufactured after July 2005. I don't know if the new 14" iBooks also have that chip, so they might also be supported. The chip identifies itself as "RV350 NV" (pci id 0x4e56), revision 0x80. Apple calls it "Snowy", xfree86 names it "ATI FireGL Mobility T2 (M11) NV (AGP)". So, we seem to be lucky here: The suspend-code for the M10 (which also is a "RV350 NV") works flawless for that chip. Signed-off-by: Sven Henkel Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 31f919c3296a30427b18458b13c308513a62c3b9 Author: Vincent Sanders Date: Sat Oct 1 22:56:34 2005 +0100 [ARM] 2945/1: ARM fortunet fails to build because of missing include Patch from Vincent Sanders When building the fortunet ARM platform it fails to compile because of missing include. Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 9f4426dde2be352aabc326539eccc726cea2d98c Author: Vincent Sanders Date: Sat Oct 1 22:56:34 2005 +0100 [ARM] 2944/1: GCC 4 mx1ads serial driver compile fix Patch from Vincent Sanders When building the mx1ads ARM platforms the serial driver fails to compile with GCC 4.01 due to extern/static ambiguity. Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 14bf01bb0599c89fc7f426d20353b76e12555308 Author: Linus Torvalds Date: Sat Oct 1 11:04:18 2005 -0700 Fix inequality comparison against "task->state" We should always use bitmask ops, rather than depend on some ordering of the different states. With the TASK_NONINTERACTIVE flag, the inequality doesn't really work. Oleg Nesterov argues (likely correctly) that this test is unnecessary in the first place. However, the minimal fix for now is to at least make it work in the presense of TASK_NONINTERACTIVE. Waiting for consensus from Roland & co on potential bigger cleanups. Signed-off-by: Linus Torvalds commit fd2e54b35bd70d11c160ded4834e2378e915356e Author: Diego Calleja Date: Sat Oct 1 17:00:48 2005 +0200 [PATCH] trivial #if -> #ifdef Use '#ifdef' consistently on __KERNEL__. This was reported as bug #5340 (isn't easier to send a fix than report the bug?!) Signed-off-by: Diego Calleja Signed-off-by: Linus Torvalds commit 2d8ab6ad6edf0e8709da9ad24e3f023503f76cee Author: Ananth N Mavinakayanahalli Date: Sat Oct 1 13:14:17 2005 -0400 [PATCH] ppc64: fix up()/down() usage for kprobe_mutex The incorrect kprobe_mutex usage on x86_64 had percolated to ppc64 too. First noticed by Yanmin Zhang. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Linus Torvalds commit 702c96d55059b4a8e5b1eb112ee3b1804708a1bd Author: Deepak Saxena Date: Fri Sep 30 16:20:22 2005 -0700 [PATCH] ARM: Fix IXP2000 serial port resource range. For real this time. Serial port only needs 32 bytes of resource space but we are currently asking for 64K. Signed-off-by: Deepak Saxena [ diff went missing first time due to corrupted patch ] Signed-off-by: Linus Torvalds commit f0e837d9182d7903bde3ebafbd1d0d68c6d32d43 Author: Francois Romieu Date: Fri Sep 30 16:54:02 2005 -0700 [PATCH] r8169: tone down the r8169 driver Tone down the r8169 driver As an alternative, people can use the boot time 'debug' option and/or use 'ethtool -s ethX msglvl xyz'. The different messages are listed at: http://www.zoreil.com/~romieu/r8169/doc/msglvl.txt Signed-off-by: Francois Romieu Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9487e48a34d7ad606f40a76080475a522a27cff Author: Benjamin Herrenschmidt Date: Sat Oct 1 09:21:25 2005 +1000 [PATCH] pmac: fix cpufreq for old tipb 550Mhz The old 550Mhz titanium powerbook can switch to a lower frequency (500Mhz). A user has been repeately reporting overtemp conditions on his machine at high speed so this simple patch adds support to PowerMac cpufreq for this machine. The difference in frequency isn't big but seem enough to fix that user's problems. The patch has been around for some time now and doesn't seem to cause any problem, so I suppose it could go in now. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Alain RICHARD Signed-off-by: Linus Torvalds commit 69d37960b578be0a69383bd71d06c1fcfb86e8b9 Author: Deepak Saxena Date: Fri Sep 30 16:20:22 2005 -0700 [PATCH] Fix IXP2000 serial port resource range Serial port only needs 32 bytes of resource space but we are currently asking for 64K. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit 1c9426e8a59461688bb451e006456987b198e4c0 Author: Linus Torvalds Date: Fri Sep 30 14:17:35 2005 -0700 Linux v2.6.14-rc3 commit aba7a22f291c13448177b28e0e3d01260ed04fbe Author: Michael S. Tsirkin Date: Fri Sep 30 13:55:50 2005 -0700 [IB] mthca: Fix memory leak on device close Remember to free the multicast group context memory table. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 85cc5135ace4c8b75d7b4e1ea9fe15a7fcbd1516 Author: Ravikiran G Thirumalai Date: Fri Sep 30 11:59:22 2005 -0700 [PATCH] x86_64 early numa init fix The tests Alok carried out on Petr's box confirmed that cpu_to_node[BP] is not setup early enough by numa_init_array due to the x86_64 changes in 2.6.14-rc*, and unfortunately set wrongly by the work around code in numa_init_array(). cpu_to_node[0] gets set with 1 early and later gets set properly to 0 during identify_cpu() when all cpus are brought up, but confusing the numa slab in the process. Here is a quick fix for this. The right fix obviously is to have cpu_to_node[bsp] setup early for numa_init_array(). The following patch will fix the problem now, and the code can stay on even when cpu_to_node{BP] gets fixed early correctly. Thanks to Petr for access to his box. Signed off by: Ravikiran Thirumalai Signed-off-by: Alok N Kataria Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6a045a5b89037ae87c8c1bc84403f1d498e52a1 Author: Ravikiran G Thirumalai Date: Fri Sep 30 11:59:21 2005 -0700 [PATCH] x86_64: fix the BP node_to_cpumask Fix the BP node_to_cpumask. 2.6.14-rc* broke the boot cpu bit as the cpu_to_node(0) is now not setup early enough for numa_init_array. cpu_to_node[] is setup much later at srat_detect_node on acpi srat based em64t machines. This seems like a problem on amd machines too, Tested on em64t though. /sys/devices/system/node/node0/cpumap shows up sanely after this patch. Signed off by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2dd960d66bc12b6b206e63104636514e5da0ddb7 Author: Zhang, Yanmin Date: Fri Sep 30 11:59:20 2005 -0700 [PATCH] utilization of kprobe_mutex is incorrect on x86_64 The up()/down() orders are incorrect in arch/x86_64/kprobes.c file. kprobe_mutext is used to protect the free kprobe instruction slot list. arch_prepare_kprobe applies for a slot from the free list, and arch_remove_kprobe returns a slot to the free list. The incorrect up()/down() orders to operate on kprobe_mutex fail to protect the free list. If 2 threads try to get/return kprobe instruction slot at the same time, the free slot list might be broken, or a free slot might be applied by 2 threads. Signed-off-by: Zhang Yanmin Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32e7a04faa29f50f65e06d43a9029bb607743e76 Author: Jody McIntyre Date: Fri Sep 30 11:59:19 2005 -0700 [PATCH] ohci1394: less noise in dmesg less noise in dmesg Signed-off-by: Ben Collins Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f31c9cf3bd6bc1f3e29807ba59d0c7d711385a06 Author: Jody McIntyre Date: Fri Sep 30 11:59:18 2005 -0700 [PATCH] ieee1394: delete legacy module aliases amdtp, dv1394, raw1394, video1394: Delete legacy module aliases. The macros did not work and the aliases are not needed nowadays. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ae3d0d4ae4131563d9eb55859f4fa5bd39059bd Author: Jody McIntyre Date: Fri Sep 30 11:59:18 2005 -0700 [PATCH] eth1394: workaround limitation in rawiso routines Work around limitation in rawiso routines. Required with 1394b cards on architectures where PAGE_SIZE is 4096. Based on a previous patch by Ben Collins. Signed-off-by: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 998150c3d3cf049da7596875f6fdc253db089a9a Author: Jody McIntyre Date: Fri Sep 30 11:59:17 2005 -0700 [PATCH] ieee1394: remove superfluous include in csr1212 Remove superfluous include. Signed-off-by: Jody McIntyre Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3256cc13983da2cfe45c17788e4f5b379695404e Author: Jody McIntyre Date: Fri Sep 30 11:59:16 2005 -0700 [PATCH] ieee1394: trivial edits of a few comments trivial edits of a few comments Signed-off-by: Stefan Richter Signed-off-by: Ben Collins Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63bea35036540c0e8a309aef9bc37a9acfb520ae Author: Jody McIntyre Date: Fri Sep 30 11:59:10 2005 -0700 [PATCH] ieee1394: use time_before() Use of time_before() macro, defined at linux/jiffies.h, which deal with wrapping correctly and are nicer to read. Signed-off-by: Marcelo Feitoza Parisi Signed-off-by: Domen Puncer Signed-off-by: Ben Collins Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db2fd664f8ac3664dfd94d624c0a871bee937bd5 Author: Jody McIntyre Date: Fri Sep 30 11:59:09 2005 -0700 [PATCH] ieee1394: fix for debug output Fix debug code so it prints the correct speed (was defaulting to 100, so anything > 400 showed only 100). Signed-off-by: Stefan Richter Signed-off-by: Ben Collins Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e31a127c2f99b9cb9abc99a1ec22b75194890800 Author: Jody McIntyre Date: Fri Sep 30 11:59:09 2005 -0700 [PATCH] ieee1394: skip unnecessary pause when scanning config ROMs Skip a superfluous pause that occured when the config ROM of a node was scanned unsuccessfully. This also occurs if a node without link wrongly enables its "link active" self ID flag. A GWCTech 6-port hub does this. Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 328699bf0ff4d35a9932ce279441f955e78a890e Author: Jody McIntyre Date: Fri Sep 30 11:59:08 2005 -0700 [PATCH] ieee1394: reorder activities after bus reset (fixes device detection) Units were not detected if the local IRM performed a bus reset. ("The root node is not cycle master capable; selecting a new root node and resetting...", often seen with iPods and other SBP-2 devices). Rearrange the order of IRM duties and node scanning. TODO: Audit the ROM caching and parsing code for underlying issues. Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2bab359a5009f330b12a4ed09a57d3d2ac6b3483 Author: Jody McIntyre Date: Fri Sep 30 11:59:07 2005 -0700 [PATCH] sbp2: default to serialize_io=1 Set serialize_io=1 by default. This is safer and required by seemingly more and more hardware. It causes little or no performance loss for S400 devices. Performance of S800 1394b devices may drop by 25...30%. Therefore make the parameter's description and dmesg message clearer about performance impact. Update description of the max_speed parameter too. IEEE1394_SPEED_MAX is currently S800. Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abd559b1052e28d8b9c28aabde241f18fa89090b Author: Jody McIntyre Date: Fri Sep 30 11:59:06 2005 -0700 [PATCH] sbp2: fix deadlocks and delays on device removal/rmmod Fixes for deadlocks of the ieee1394 and scsi subsystems and long delays in futile error recovery attempts when SBP-2 devices are removed or drivers are unloaded. - Complete commands quickly with DID_NO_CONNECT if the 1394 node is gone or if the 1394 low-level driver was unloaded. - Skip unnecessary work in the eh_abort_handler and eh_device_reset_handler if the node or 1394 low-level driver is gone. - Let scsi's high-level shut down gracefully when sbp2 is being unloaded or detached from the 1394 unit. A call to scsi_remove_device is added for this purpose, which requires us to store a scsi_device pointer. - scsi_device pointer is obtained from slave_alloc hook and cleared by slave_destroy. This avoids usage of the pointer after the scsi device was deleted e.g. by the user via scsi_mod's sysfs interface. Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 105d7b38b08f85c9abc3fd31e5cfa7ee4cf0a402 Author: Jody McIntyre Date: Fri Sep 30 11:59:04 2005 -0700 [PATCH] MAINTAINERS: sbp2 driver is not orphaned. Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d38e24e260daf11365efd4ed621235fe9c0ba7ee Author: Brent Casavant Date: Fri Sep 30 11:59:04 2005 -0700 [PATCH] ioc4_serial: Remove bogus error message This change removes a bogus error message from the IOC4 serial driver interrupt handler. This error message is bogus for two reasons. First, it can never occur given that current code takes care to initialize IOC4 in such a way that these "unknown" interrupts could never occur. Second, this code fails to take into account that other drivers can share the IOC4 interrupt mechanism through SA_SHIRQ, and thus this driver is not in-fact "all-knowing". Finally, this error message triggers every time some "unknown" interrupt occurs -- it's not rate limited or repetition limited in any way, thereby effectively denying use of the console device. Given its bogosity in the first place, it's best to just get rid of it entirely. Acked-by: Pat Gefre Signed-off-by: Brent Casavant Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd190d066b7ded8c44b2b67dd0a14bed01525d3c Author: Miklos Szeredi Date: Fri Sep 30 11:59:02 2005 -0700 [PATCH] fuse: check O_DIRECT Check O_DIRECT and return -EINVAL error in open. dentry_open() also checks this but only after the open method is called. This patch optimizes away the unnecessary upcalls in this case. It could be a correctness issue too: if filesystem has open() with side effect, then it should fail before doing the open, not after. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daa35edc0a967d1f77c2e2c1346f57d04371487a Author: Paolo 'Blaisorblade' Giarrusso Date: Fri Sep 30 11:59:01 2005 -0700 [PATCH] uml: remove empty hostfs_truncate method Calling truncate() on hostfs spits a kernel warning "Something isn't implemented here", but it still works fine. Indeed, hostfs i_op->truncate doesn't do anything. But hostfs_setattr() -> set_attr() correctly detects ATTR_SIZE and calls truncate() on the host. So we should be safe (using ftruncate() may be better, in case the file is unlinked on the host, but we aren't sure to have the file open for writing, and reopening it would cause the same races; plus nobody should expect UML to be so careful). So, the warning is wrong, because the current implementation is working. Al, am I correct, and can the warning be therefore dropped? CC: Al Viro Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd948057357db5febfe64cf7a9ef11d7e347ffec Author: Paolo 'Blaisorblade' Giarrusso Date: Fri Sep 30 11:59:00 2005 -0700 [PATCH] uml: revert "run mconsole "sysrq" in process context" Revert commit 12ebcd73e40e09f0dfddf89e465cc0541e0ff8b1, i.e. [PATCH] uml: run mconsole "sysrq" in process context on request from Jeff Dike. a) sysrq may be run when the scheduler is non-functioning b) the warning I wanted to fix actually came from the fault handler run in atomic context. But I fixed that not to take the semaphore in a separate patch. c) the fault handler is run because of a fault, and that fault was unaffected by this patch. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8923648c125421b0fcb240cde607e2748d099ab8 Author: Paolo 'Blaisorblade' Giarrusso Date: Fri Sep 30 11:59:00 2005 -0700 [PATCH] uml: clear SKAS0/3 flags when running in TT mode SEGV_MAYBE_FIXABLE tests ptrace_faultinfo, and depends on it being 1 only in SKAS3 mode, while currently when running with mode=tt it will be 1 anyway. Fix this, and do the same for proc_mm. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be662a18b7763496a052d489206af9ca2c2e1ac2 Author: Paolo 'Blaisorblade' Giarrusso Date: Fri Sep 30 11:58:59 2005 -0700 [PATCH] uml: fix page faults in SKAS3 mode. I hadn't been running a SKAS3 host when testing the "uml: fix hang in TT mode on fault" patch (commit 546fe1cbf91d4d62e3849517c31a2327c992e5c5), and I didn't think enough to the missing trap_no in SKAS3 mode. In fact, the resulting kernel doesn't work at all in SKAS3 mode. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79dfa4a5a2eea5035de793b1633031750fe8d3ff Author: Michael Krufky Date: Fri Sep 30 11:58:58 2005 -0700 [PATCH] v4l: DViCO FusionHDTV5 Lite GPIO Fix GPIO fix for the composite and tv mute states of bt8xx card #135: DViCO FusionHDTV5 Lite. Without this patch, selecting one of these states could produce unexpected behavior. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d96c4e7bb039ae16c9b7e6809feb4fcfc45fcc87 Author: Andrew Morton Date: Fri Sep 30 11:58:57 2005 -0700 [PATCH] x86: hw_irq.h warning fix include/asm/hw_irq.h:70: warning: `struct hw_interrupt_type' declared inside parameter list include/asm/hw_irq.h:70: warning: its scope is only this definition or declaration, which is probably not what you want Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 353fb07e2043d2df12dddf4e2c39552d0ab9b026 Author: Zach Brown Date: Fri Sep 30 11:58:56 2005 -0700 [PATCH] aio: avoid extra aio_{read,write} call when ki_left == 0 Recently aio_p{read,write} changed to perform retries internally rather than returning -EIOCBRETRY. This inadvertantly resulted in always calling aio_{read,write} with ki_left at 0 which would in turn immediately return 0. Harmless, but we can avoid this call by checking in the caller. Signed-off-by: Zach Brown Signed-off-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 897f15fb587fd2772b9e7ff6ec0265057f3c3975 Author: Zach Brown Date: Fri Sep 30 11:58:55 2005 -0700 [PATCH] aio: remove unlocked task_list test and resulting race Only one of the run or kick path is supposed to put an iocb on the run list. If both of them do it than one of them can end up referencing a freed iocb. The kick path could delete the task_list item from the wait queue before getting the ctx_lock and putting the iocb on the run list. The run path was testing the task_list item outside the lock so that it could catch ki_retry methods that return -EIOCBRETRY *without* putting the iocb on a wait queue and promising to call kick_iocb. This unlocked check could then race with the kick path to cause both to try and put the iocb on the run list. The patch stops the run path from testing task_list by requring that any ki_retry that returns -EIOCBRETRY *must* guarantee that kick_iocb() will be called in the future. aio_p{read,write}, the only in-tree -EIOCBRETRY users, are updated. Signed-off-by: Zach Brown Signed-off-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 998765e5588b197737d457e16f72832d8036190f Author: Zach Brown Date: Fri Sep 30 11:58:54 2005 -0700 [PATCH] aio: lock around kiocbTryKick() Only one of the run or kick path is supposed to put an iocb on the run list. If both of them do it than one of them can end up referencing a freed iocb. The kick patch could set the Kicked bit before acquiring the ctx_lock and putting the iocb on the run list. The run path, while holding the ctx_lock, could see this partial kick and mistake it for a kick that was deferred while it was doing work with the run_list NULLed out. It would then race with the kick thread to add the iocb to the run list. This patch moves the kick setting under the ctx_lock so that only one of the kick or run path queues the iocb on the run list, as intended. Signed-off-by: Zach Brown Signed-off-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e3254c4e2927c117044a02acf5f5b56e1373053 Author: Linus Torvalds Date: Fri Sep 30 12:38:27 2005 -0700 Revert "x86-64: Reverse order of bootmem lists" As requested by Thomas Gleixner : "5d3d0f7704ed0bc7eaca0501eeae3e5da1ea6c87 breaks a couple of ARM boards, which depend on the historical bootmem allocation order. There is a cleaner solution around to remove the pgdat list completely, but this is a topic for post 2.6.14 Andi signalled ACK already." Signed-off-by: Linus Torvalds commit 13402580021a52e49c6d1068ff28ade4d5a175f1 Author: James Morris Date: Fri Sep 30 14:24:34 2005 -0400 [PATCH] SELinux - fix SCTP socket bug and general IP protocol handling The following patch updates the way SELinux classifies and handles IP based protocols. Currently, IP sockets are classified by SELinux as being either TCP, UDP or 'Raw', the latter being a default for IP socket that is not TCP or UDP. The classification code is out of date and uses only the socket type parameter to socket(2) to determine the class of IP socket. So, any socket created with SOCK_STREAM will be classified by SELinux as TCP, and SOCK_DGRAM as UDP. Also, other socket types such as SOCK_SEQPACKET and SOCK_DCCP are currently ignored by SELinux, which classifies them as generic sockets, which means they don't even get basic IP level checking. This patch changes the SELinux IP socket classification logic, so that only an IPPROTO_IP protocol value passed to socket(2) classify the socket as TCP or UDP. The patch also drops the check for SOCK_RAW and converts it into a default, so that socket types like SOCK_DCCP and SOCK_SEQPACKET are classified as SECCLASS_RAWIP_SOCKET (instead of generic sockets). Note that protocol-specific support for SCTP, DCCP etc. is not addressed here, we're just getting these protocols checked at the IP layer. This fixes a reported problem where SCTP sockets were being recognized as generic SELinux sockets yet still being passed in one case to an IP level check, which then fails for generic sockets. It will also fix bugs where any SOCK_STREAM socket is classified as TCP or any SOCK_DGRAM socket is classified as UDP. This patch also unifies the way IP sockets classes are determined in selinux_socket_bind(), so we use the already calculated value instead of trying to recalculate it. Signed-off-by: James Morris Signed-off-by: Stephen Smalley Signed-off-by: Linus Torvalds commit b33fa1f3c3ec05e54e73f06c4578948c55d89ef6 Author: Nick Piggin Date: Sat Oct 1 02:34:42 2005 +1000 [PATCH] i386: include linux/irq.h rather than asm/hw_irq.h I need the following patch to compile -git8 here, otherwise these files fail to compile (asm/hw_irq.h needs definitions from linux/irq.h and that file provides the required include ordering). I did not do a full audit, though there looks to be many other places that should get the same treatment, if this is the right way to do it. Signed-off-by: Linus Torvalds commit 03cdc0c304e1c068d49adc32264f07af76253e4c Author: Daniel Ritz Date: Thu Sep 29 21:39:32 2005 +0200 [PATCH] usb/core/hcd-pci.c: don't free_irq() on suspend the free_irq() in USB suspend breaks resume on some setups where USB (ohci/ehci) shares the interrupt with an other device. Signed-off-by: Daniel Ritz Signed-off-by: Linus Torvalds commit 1294b118cb53fb14515666e2b218ad5ab40318c1 Author: Kirill Korotaev Date: Fri Sep 30 10:32:19 2005 +0400 [PATCH] x86_64: Add missing () around arguments of pte_index macro x86-64: Add missing () around arguments of pte_index macro Signed-Off-By: Alexey Kuznetsov Signed-Off-By: Kirill Korotaev Signed-off-by: Linus Torvalds commit 794fb8370db3d5f26592b9b45d69aeca2f583efb Author: Al Viro Date: Fri Sep 30 05:09:34 2005 +0100 [PATCH] useless includes of linux/irq.h (arch/ppc) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a3ca066efb18524bf3f07137a8f8ff434022c4f2 Author: Al Viro Date: Fri Sep 30 04:20:57 2005 +0100 [PATCH] missing qualifiers in readb() et.al. on ppc Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 66df3bbf0701b7408a1067c4b819aceee2686bba Author: Al Viro Date: Fri Sep 30 04:19:43 2005 +0100 [PATCH] volatile unsigned short f(...) doesn't make sense Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c215a16a4ad620b612b51495cbb99dbbb59bb585 Author: Al Viro Date: Fri Sep 30 03:36:50 2005 +0100 [PATCH] bogus BUILD_BUG_ON() in bpa_iommu BUILD_BUG_ON(1) is asking for trouble (and getting it) when used in that manner - dead code elimination happens after we parse it and invalid type is invalid type, dead code or not. It might be version-dependent, but at least 4.0.1 refuses to accept that. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4735885701d7c24ed54f35f5102d32b3aabee55e Author: Al Viro Date: Fri Sep 30 03:29:05 2005 +0100 [PATCH] uml get_user() NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit eacaa1f5aa4a41a48349f55abcd9258506943e76 Author: Al Viro Date: Fri Sep 30 03:26:43 2005 +0100 [PATCH] cpuset crapectomy Switched cpuset_common_file_read() to simple_read_from_buffer(), killed a bunch of useless (and not quite correct - e.g. min(size_t,ssize_t)) code. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 46d7031ecb8a8360b0022abd8014f38cc1197166 Author: Al Viro Date: Fri Sep 30 03:21:45 2005 +0100 [PATCH] cassini annotations and fixes - __user annotations - NULL noise removal - C99 initializers - s/u32/pm_message_t/ in ->suspend() - removal of bogus casts in iounmap() arguments - if_mii() instead of open-coded variant Remains to be done: ethtool conversion. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 74ba1fd96666170338dc732480b35b7a83cd164b Author: Al Viro Date: Fri Sep 30 03:16:43 2005 +0100 [PATCH] useless linux/irq.h includes (arch/um) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 192eaa28ba7b44485e521df7ba7a2ccbc4cc4d13 Author: Al Viro Date: Fri Sep 30 03:15:08 2005 +0100 [PATCH] missing ERR_PTR in 9fs Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 217874feed0d3a6543a6b7127782f4a08bffd731 Author: Gen FUKATSU Date: Fri Sep 30 16:09:17 2005 +0100 [ARM] 2940/1: Fix BTB entry flush in arch/arm/mm/cache-v6.S Patch from Gen FUKATSU Invalidate BTB entry instruction flushes two instruction at a time. Therefore this instruction should be done four times after invalidate instruction cache line. Signed-off-by: Gen Fukatsu Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit a06f5466c4576dcbf838a50a87903b0082774da7 Author: Catalin Marinas Date: Fri Sep 30 16:07:05 2005 +0100 [ARM] 2942/1: Fix the warning in arch/arm/common/gic.c Patch from Catalin Marinas The warning is caused by the gic_set_cpu() function being defined but not used if CONFIG_SMP is not defined. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 481467d6fa4489aa42321a067e78bad26349488f Author: Catalin Marinas Date: Fri Sep 30 16:07:04 2005 +0100 [ARM] 2939/1: Fix compilation error in arch/arm/mm/flush.c Patch from Catalin Marinas When CONFIG_CPU_CACHE_VIPT is defined, the flush_pfn_alias() function is implicitely declared and it later conflicts with its actual definition. This patch moves the function definition to the beginning of the file. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit a4199b0b9aa540a27935251de788cd0f5f5a87aa Author: Al Viro Date: Thu Sep 29 19:49:17 2005 -0700 [CASSINI]: sparse annotations and fixes - __user annotations - NULL noise removal - C99 initializers - s/u32/pm_message_t/ in ->suspend() - removal of bogus casts in iounmap() arguments - if_mii() instead of open-coded variant Remains to be done: ethtool conversion. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 9d30c1718b8baf9a3bb1b81d78afc1e667863477 Author: Horms Date: Thu Sep 29 19:47:06 2005 -0700 [IPVS]: Add netdev and me as maintainer contacts Signed-off-by: Horms Signed-off-by: David S. Miller commit 017fb98e70351e9fb5635c299c4d1c50e2f8b823 Author: David S. Miller Date: Thu Sep 29 19:26:51 2005 -0700 [RADEON]: Fix unaligned I/O port access during probe. The driver does a readl() on DEVICE_ID which is 2-byte aligned and 2-bytes in size. It's doing this read just to flush write buffers. Create IN16() and OUT16() macros, and use the former to do this I/O load. Signed-off-by: David S. Miller commit 717463d806a53380a691eeb0136a4b750a9f9ae0 Author: David S. Miller Date: Thu Sep 29 18:50:34 2005 -0700 [SPARC64]: Fix several bugs in flush_ptrace_access(). 1) Use cpudata cache line sizes, not magic constants. 2) Align start address in cheetah case so we do not get unaligned address traps. (pgrep was good at triggering this, via /proc/${pid}/cmdline accesses) Signed-off-by: David S. Miller commit 4cb29d18129fb425c6202ab535c3fc1856391b99 Author: David S. Miller Date: Thu Sep 29 18:05:28 2005 -0700 [SPARC64]: Kill arch/sparc64/prom/memory.c No longer used. Signed-off-by: David S. Miller commit 13edad7a5cef1c952459742482482a6b05e1a8a1 Author: David S. Miller Date: Thu Sep 29 17:58:26 2005 -0700 [SPARC64]: Rewrite convoluted physical memory probing. Delete all of the code working with sp_banks[] and replace with clean acquisition and sorting of physical memory parameters from the firmware. Signed-off-by: David S. Miller commit 75b895c15b3ea2a3cd5c8e8f3c62e4598ef4d2ba Author: Scott Talbert Date: Thu Sep 29 17:31:30 2005 -0700 [ATM]: [lec] reset retry counter when new arp issued From: Scott Talbert Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 4a7097fcc431ab2ccf509d8342831873138c814a Author: Scott Talbert Date: Thu Sep 29 17:30:54 2005 -0700 [ATM]: [lec] attempt to support cisco failover From: Scott Talbert Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 09e9ec87111ba818d8171262b15ba4c357eb1d27 Author: Alexey Kuznetsov Date: Thu Sep 29 17:17:15 2005 -0700 [TCP]: Don't over-clamp window in tcp_clamp_window() From: Alexey Kuznetsov Handle better the case where the sender sends full sized frames initially, then moves to a mode where it trickles out small amounts of data at a time. This known problem is even mentioned in the comments above tcp_grow_window() in tcp_input.c, specifically: ... * The scheme does not work when sender sends good segments opening * window and then starts to feed us spagetti. But it should work * in common situations. Otherwise, we have to rely on queue collapsing. ... When the sender gives full sized frames, the "struct sk_buff" overhead from each packet is small. So we'll advertize a larger window. If the sender moves to a mode where small segments are sent, this ratio becomes tilted to the other extreme and we start overrunning the socket buffer space. tcp_clamp_window() tries to address this, but it's clamping of tp->window_clamp is a wee bit too aggressive for this particular case. Fix confirmed by Ion Badulescu. Signed-off-by: David S. Miller commit 01ff367e62f0474e4d39aa5812cbe2a30d96e1e9 Author: David S. Miller Date: Thu Sep 29 17:07:20 2005 -0700 [TCP]: Revert 6b251858d377196b8cea20e65cae60f584a42735 But retain the comment fix. Alexey Kuznetsov has explained the situation as follows: -------------------- I think the fix is incorrect. Look, the RFC function init_cwnd(mss) is not continuous: f.e. for mss=1095 it needs initial window 1095*4, but for mss=1096 it is 1096*3. We do not know exactly what mss sender used for calculations. If we advertised 1096 (and calculate initial window 3*1096), the sender could limit it to some value < 1096 and then it will need window his_mss*4 > 3*1096 to send initial burst. See? So, the honest function for inital rcv_wnd derived from tcp_init_cwnd() is: init_rcv_wnd(mss)= min { init_cwnd(mss1)*mss1 for mss1 <= mss } It is something sort of: if (mss < 1096) return mss*4; if (mss < 1096*2) return 1096*4; return mss*2; (I just scrablled a graph of piece of paper, it is difficult to see or to explain without this) I selected it differently giving more window than it is strictly required. Initial receive window must be large enough to allow sender following to the rfc (or just setting initial cwnd to 2) to send initial burst. But besides that it is arbitrary, so I decided to give slack space of one segment. Actually, the logic was: If mss is low/normal (<=ethernet), set window to receive more than initial burst allowed by rfc under the worst conditions i.e. mss*4. This gives slack space of 1 segment for ethernet frames. For msses slighlty more than ethernet frame, take 3. Try to give slack space of 1 frame again. If mss is huge, force 2*mss. No slack space. Value 1460*3 is really confusing. Minimal one is 1096*2, but besides that it is an arbitrary value. It was meant to be ~4096. 1460*3 is just the magic number from RFC, 1460*3 = 1095*4 is the magic :-), so that I guess hands typed this themselves. -------------------- Signed-off-by: David S. Miller commit dce79affd5d04e9cbabe35016eda55213b9b36f6 Author: Daniel Jacobowitz Date: Fri Sep 30 00:17:35 2005 +0100 [ARM] 2941/1: Fix running legacy binaries from a soft-float root filesystem with CONFIG_IWMMXT. Patch from Daniel Jacobowitz Thread flags are inherited on fork(). In order for a binary which has the iWMMXt coprocessor enabled to run a binary which needs the FPA emulation, we need to explicitly clear TIF_USING_IWMMXT if we are not going to set it. Signed-off-by: Daniel Jacobowitz Signed-off-by: Russell King commit a44fe13eab664ac488ced0845d9885b019bd24c5 Author: Benjamin Herrenschmidt Date: Fri Sep 30 08:25:17 2005 +1000 [PATCH] Fix ppc64 smu driver locking The SMU driver has a small mistake in the locking of the interrupt code, if polled access and interrupt access race, interrupt may take a lock and return without releasing it. This fixes it. With that patch, the driver is rock solid with my experimental thermal control (which bangs it pretty hard) racing with real time clock and cpufreq handling. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 411b67b4b6a4dd1e0292a6a58dd753978179d173 Author: Kostik Belousov Date: Wed Sep 28 18:21:28 2005 +0300 [PATCH] readv/writev syscalls are not checked by lsm it seems that readv(2)/writev(2) syscalls do not call file_permission callback. Looks like this is overlook. I have filled the issue into redhat bugzilla as https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=169433 and got the recommendation to post this on lsm mailing list. The following trivial patch solves the problem. Signed-off-by: Kostik Belousov Signed-off-by: Chris Wright commit 7644143cd6f7e029f3a8ea64f5fb0ab33ec39f72 Author: Mike Waychison Date: Fri Sep 30 00:01:27 2005 +0200 [PATCH] x86_64: Fix mce_log The attempt to fixup the lockless mce log buffer introduced an infinite loop when trying to find a free entry. And: Using rcu_dereference() to load mcelog.next doesn't seem to be sufficient enough to ensure that mcelog.next is loaded each time around the loop in mce_log(). Instead, use an explicit rmb() to ensure that the compiler gets it right. AK: turned the smp_wmbs into true wmbs to make sure they are not reordered by the compiler on UP. Signed-off-by: Mike Waychison Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7d318d774789657c37a5e994a4a2cf59d4879ae7 Author: Andi Kleen Date: Thu Sep 29 22:05:55 2005 +0200 [PATCH] Fix up TLB flush filter disabling I checked with AMD and they requested to only disable it for family 15. Also disable it for i386 too. And some style fixes. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5acbc5cb507e6c381b70093b1081854708e82b16 Author: Roland McGrath Date: Thu Sep 29 14:54:42 2005 -0700 [PATCH] Fix task state testing properly in do_signal_stop() Any tests using < TASK_STOPPED or the like are left over from the time when the TASK_ZOMBIE and TASK_DEAD bits were in the same word, and it served to check for "stopped or dead". I think this one in do_signal_stop is the only such case. It has been buggy ever since exit_state was separated, and isn't testing the exit_state value. Signed-off-by: Roland McGrath Signed-off-by: Linus Torvalds commit 4a8342d233a39ee582e9f7260e12d2f5fd194a05 Author: Linus Torvalds Date: Thu Sep 29 15:18:21 2005 -0700 Revert task flag re-ordering, add comments Roland points out that the flags end up having non-obvious dependencies elsewhere, so revert aa55a08687059aa169d10a313c41f238c2070488 and add some comments about why things are as they are. We'll just have to fix up the broken comparisons. Roland has a patch. Signed-off-by: Linus Torvalds commit aa55a08687059aa169d10a313c41f238c2070488 Author: Oleg Nesterov Date: Thu Sep 29 19:58:53 2005 +0400 [PATCH] fix TASK_STOPPED vs TASK_NONINTERACTIVE interaction do_signal_stop: for_each_thread(t) { if (t->state < TASK_STOPPED) ++sig->group_stop_count; } However, TASK_NONINTERACTIVE > TASK_STOPPED, so this loop will not count TASK_INTERRUPTIBLE | TASK_NONINTERACTIVE threads. See also wait_task_stopped(), which checks ->state > TASK_STOPPED. Signed-off-by: Oleg Nesterov [ We really probably should always use the appropriate bitmasks to test task states, not do it like this. Using something like #define TASK_RUNNABLE (TASK_RUNNING | TASK_INTERRUPTIBLE | \ TASK_UNINTERRUPTIBLE | TASK_NONINTERACTIVE) and then doing "if (task->state & TASK_RUNNABLE)" or similar. But the ordering of the task states is historical, and keeping the ordering does make sense regardless. ] Signed-off-by: Linus Torvalds commit b38708fca9cc60d8a073a67c3b366116e38011c5 Author: Deepak Saxena Date: Wed Sep 28 18:07:01 2005 -0700 [PATCH] Fix thinko in previous ARM 2917/1 patch Previous patch accidently add IXDP425 mach entry when IXDP465 is configured. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit 82810a906f8734ae6503ea11436a7164d2f86f2e Author: Deepak Saxena Date: Wed Sep 28 16:42:54 2005 -0700 [PATCH] Fix ixp4xx MTD driver module build Missing ';' breaks module build. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit fe984bba30a29398578da3d8c0503fa39e84b838 Author: Ben Dooks Date: Thu Sep 29 05:24:38 2005 +0800 [PATCH] s3c2410fb: Minor warning fix The function s3c2410fb_activate_var does not return a value, therefore it should be declared void. Signed-off-by: Ben Dooks Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 375726d7ed08bd8cf2fe3cfe6b164ffb37fa7e90 Author: Antonino A. Daplas Date: Thu Sep 29 05:19:51 2005 +0800 [PATCH] intelfb: Fix regression (blank display) from ioremap patch - Workaround for the ioremap patch that produces a blank display on some chipsets - Make hwcursor = 0 the default. The hardware cursor does not work with all hardware. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit b2846dfa4aa1bbbf3f9977d67566952d7f621009 Author: Al Viro Date: Thu Sep 29 00:42:27 2005 +0100 [PATCH] mv64x60_wdt __user annotations and cleanups - use nonseekable_open() instead of messing with if (*ppos != file->f_pos) return -EISPIPE in ->write() (->read is NULL). - trivial __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ae8aed0314064da3002879fedc2d262c72865a17 Author: Al Viro Date: Thu Sep 29 00:37:34 2005 +0100 [PATCH] saa6588 __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit be88ec74cb48d1f60d0c0f059843f846f4481d87 Author: Al Viro Date: Thu Sep 29 00:36:10 2005 +0100 [PATCH] i810-i2c iomem annotations Signed-off-by: Al Viro Acked-by: Antonino Daplas Signed-off-by: Linus Torvalds commit a7625d6e49cb4fd94be7576d85422c33003101b7 Author: Al Viro Date: Thu Sep 29 00:34:30 2005 +0100 [PATCH] mv64x60 iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9fcdfcd90526c8c5c2bd117fd3713f8f0f1a46a8 Author: Al Viro Date: Thu Sep 29 00:31:14 2005 +0100 [PATCH] ppc32 ld.script fix for building on ppc64 In arch/ppc/boot/ld.script we need OUTPUT_ARCH(powerpc:common) for the same reasons why we need it in vmlinux.lds.S; when we build on ppc64 box, we need to be explicit about the target. See http://linus.bkbits.net:8080/linux-2.5/cset@1.1784.8.10 for the corresponding fix in vmlinux.lds.S. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ea8a918eb71b503be13b861dbe18b93932fd6b62 Author: Al Viro Date: Thu Sep 29 00:17:49 2005 +0100 [PATCH] ppc64 get_user annotations long is not uintptr_t, unsigned long is. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c28144763a7dcdceb2c16a5ac9c8e0022d547d28 Author: Al Viro Date: Thu Sep 29 00:16:02 2005 +0100 [PATCH] s390 signal annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0cc13a5442901835192ba47427f0f4e4d525d935 Author: Al Viro Date: Thu Sep 29 00:12:13 2005 +0100 [PATCH] ia64 basic __user annotations - document places where we pass kernel address to low-level primitive that deals with kernel/user addresses - uintptr_t is unsigned long, not long Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 272cd2b71d478371e0a5bf2c76a1e50cbf178698 Author: Al Viro Date: Thu Sep 29 00:10:01 2005 +0100 [PATCH] arm/rpc iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2ad4f86b60b649fd7428265c08d73a3bd360c81b Author: Al Viro Date: Thu Sep 29 00:09:02 2005 +0100 [PATCH] arm/versatile iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 775b048d09c85d87a65a7ccd9c4f9372953a5d95 Author: Al Viro Date: Thu Sep 29 00:07:29 2005 +0100 [PATCH] cyblafb: portability fixes, sanitized work with pointers Signed-off-by: Al Viro Acked-by: Knut Petersen Signed-off-by: Linus Torvalds commit 87e0f3dbd3693bc4583474ab191cbdd5e3d9d0fa Author: Alexey Dobriyan Date: Thu Sep 29 00:05:58 2005 +0100 [PATCH] n_r3964: drop bogus fmt casts - print pointers with %p - casting pointer structure field to int and printing it with %d... Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 666002218d59db271e5c1ede1d80227170c51987 Author: Al Viro Date: Wed Sep 28 22:32:57 2005 +0100 [PATCH] proc_mkdir() should be used to create procfs directories A bunch of create_proc_dir_entry() calls creating directories had crept in since the last sweep; converted to proc_mkdir(). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ecba97d4aacf4e80c56eb73e39af0369cb8539a4 Author: Al Viro Date: Wed Sep 28 22:27:23 2005 +0100 [PATCH] uml makefiles sanitized UML makefiles sanitized: - number of generated headers reduced to 2 (from user-offsets.c and kernel-offsets.c resp.). The rest is made constant and simply includes those two. - mk_... helpers are gone now that we don't need to generate these headers - arch/um/include2 removed since everything under arch/um/include/sysdep is constant now and symlink can point straight to source tree. - dependencies seriously simplified. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 195331d7c9813fe7f1a93c09afa2c7dcdf2790a8 Author: Wim Van Sebroeck Date: Thu Sep 29 16:22:30 2005 +0200 [WATCHDOG] pcwd_pci.c add debug module_param Add debugging code for the pcwd_pci driver. Signed-off-by: Wim Van Sebroeck commit a0800f6da7c4590d49ae513d9d5ee8b1ad203b82 Author: Wim Van Sebroeck Date: Thu Sep 29 16:21:50 2005 +0200 [WATCHDOG] pcwd_pci.c control status + boot-code clean-up * Clean-up control status code (use control status defines + change pcipcwd_clear_status) * Clean-up boot-code (move card info to pcipcwd_show_card_info() ) Signed-off-by: Wim Van Sebroeck commit fc611a1a50caa04bae82ed3c1fc6505132f8343f Author: Russell King Date: Thu Sep 29 11:15:51 2005 +0100 [ARM] Don't include mach-types.h unnecessarily It's pointless to include mach-types.h if you're not going to use anything from it. These references were removed as a result of: grep -lr 'asm/mach-types\.h' . | xargs grep -L 'machine_is_\|MACH_TYPE_\|MACHINE_START\|machine_type' Signed-off-by: Russell King commit d0877904470c149c6553f1309cfed6c90d67cf91 Author: Russell King Date: Thu Sep 29 11:12:52 2005 +0100 [ARM] Don't include asm/arch/hardware.h directly Since asm/hardware.h's only reason for existing is to include asm/arch/hardware.h, it's completely pointless to include both. Signed-off-by: Russell King commit eb9181a2f85d46cdbbd3cb18b4541f8ab2df0933 Author: Russell King Date: Thu Sep 29 09:49:25 2005 +0100 [ARM] Fix warning in arch/arm/mach-pxa/generic.c Fix arch/arm/mach-pxa/generic.c:242: warning: 'struct i2c_pxa_platform_data' declared inside parameter list caused by missing asm/arch/i2c.h include. Signed-off-by: Russell King commit ca5da7106214e03f5302ca630bd38a9145b27391 Author: Russell King Date: Thu Sep 29 09:44:54 2005 +0100 [ARM] pxafb: Remove #if DEBUG, convert DPRINTK to pr_debug Fix warning: drivers/video/pxafb.h:119:5: warning: "DEBUG" is not defined by removing the whole #if DEBUG #define DPRINTK(fmt, args...) printk...etc... #else #define DPRINTK(fmt, args...) #endif stuff - we have pr_debug() for this. Signed-off-by: Russell King commit 01d40f28b125e0a9aa0ec24642be67fc4c5dfaff Author: David S. Miller Date: Wed Sep 28 22:37:53 2005 -0700 [NET]: Fix reversed logic in eth_type_trans(). I got the second compare_eth_addr() test reversed, oops. Signed-off-by: David S. Miller commit ed3ffaf7b5e0262cb860f106a6632933671cc88f Author: David S. Miller Date: Wed Sep 28 21:48:25 2005 -0700 [SPARC64]: Solidify check in cheetah_check_main_memory(). Need to make sure the address is below high_memory before passing it to kern_addr_valid(). Signed-off-by: David S. Miller commit 10147570f9eaff3920f0c67bad7244c2eb958d4f Author: David S. Miller Date: Wed Sep 28 21:46:43 2005 -0700 [SPARC64]: Kill all external references to sp_banks[] Thus, we can mark sp_banks[] static in arch/sparc64/mm/init.c Signed-off-by: David S. Miller commit 0836a0eb4073c3e0a09c5965833b9dec19f5abc7 Author: David S. Miller Date: Wed Sep 28 21:38:08 2005 -0700 [SPARC64]: Move phys_base, kern_{base,size}, and sp_banks[] init to paging_init Also, move prom_probe_memory() into arch/sparc64/mm/init.c Signed-off-by: David S. Miller commit 801ab3c731e77324c055769491711e620100dbfb Author: David S. Miller Date: Wed Sep 28 21:31:25 2005 -0700 [SPARC]: Declare paging_init() in asm/pgtable.h Signed-off-by: David S. Miller commit efdc1e2083e04cc70721d55803889b346c1a3de2 Author: David S. Miller Date: Wed Sep 28 21:06:47 2005 -0700 [SPARC64]: Simplify user fault fixup handling. Instead of doing byte-at-a-time user accesses to figure out where the fault occurred, read the saved fault_address from the current thread structure. For the sake of defensive programming, if the fault_address does not fall into the user buffer range, simply assume the whole area faulted. This will cause the fixup for copy_from_user() to clear the entire kernel side buffer. Signed-off-by: David S. Miller commit 5fd29752f09cabff582f65c0ce35518db4c64937 Author: David S. Miller Date: Wed Sep 28 20:41:45 2005 -0700 [SPARC64]: Fix fault handling in unaligned trap handler. We were not calling kernel_mna_trap_fault() correctly. Instead of being fancy, just return 0 vs. -EFAULT from the assembler stubs, and handle that return value as appropriate. Create an "__retl_efault" stub for assembler exception table entries and use it where possible. Signed-off-by: David S. Miller commit 8cf14af0a740fb7e9f94a203b5a989beb875d58f Author: David S. Miller Date: Wed Sep 28 20:21:11 2005 -0700 [SPARC64]: Convert to use generic exception table support. The funny "range" exception table entries we had were only used by the compat layer socketcall assembly, and it wasn't even needed there. For free we now get proper exception table sorting and fast binary searching. Signed-off-by: David S. Miller commit d70ed6075f15bdbb0548d162394bf10332769c88 Author: Roland Dreier Date: Wed Sep 28 19:56:57 2005 -0700 [IPoIB] Rename IPoIB's path_lookup() to avoid name clashes Rename IPoIB driver's path_lookup() to ipoib_path_lookup() to avoid a clashes with the kernel global path_lookup(). We don't hit this with the current kernel source, but some external patches seem to trigger this, and it's cleaner to avoid clashing with global names anyway. Signed-off-by: Roland Dreier refs/heads/for-linus commit 705747ab87c96f1b4b8e73ba617c323d9087f6ac Author: David S. Miller Date: Wed Sep 28 16:48:40 2005 -0700 [SPARC64]: Fix bug in unaligned load endianness swapping The in-memory value was being swapped, not the value we loaded into the register. Signed-off-by: David S. Miller commit 735631a9196db42631b8817892605ee72e13a58b Author: Martin Whitaker Date: Wed Sep 28 16:35:22 2005 -0700 [ATM]: fix bug in atm address list handling From: Martin Whitaker Signed-off-by: Chas Williams commit 9301e320e98ff19a0e48881b038d0c24ca76e6c0 Author: Chas Williams Date: Wed Sep 28 16:35:01 2005 -0700 [ATM]: track and close listen sockets when sigd exits Signed-off-by: Chas Williams commit e2c4b72158a9f1286df41dee478e774f1b94e93a Author: Roman Kagan Date: Wed Sep 28 16:34:24 2005 -0700 [ATM]: net/atm/ioctl.c: autoload pppoatm and br2684 Signed-off-by: Roman Kagan Signed-off-by: Chas Williams commit 6b251858d377196b8cea20e65cae60f584a42735 Author: David S. Miller Date: Wed Sep 28 16:31:48 2005 -0700 [TCP]: Fix init_cwnd calculations in tcp_select_initial_window() Match it up to what RFC2414 really specifies. Noticed by Rick Jones. Signed-off-by: David S. Miller commit 54bb5675a6e966a58755ac44e3407f8ec2272b82 Author: Dominik Brodowski Date: Wed Sep 28 19:29:59 2005 +0200 [PATCH] pcmcia: only start up nonstatic sockets if both mem and io are available Only start up nonstatic sockets if both IO and MEM resources are available. Thanks to Russell King and Matthew Wilcox for tracking this down. Signed-off-by: Dominik Brodowski commit 1146bc743e074760ef0dd08b3457f35a68069a54 Author: Dominik Brodowski Date: Wed Sep 28 19:28:37 2005 +0200 [PATCH] pcmcia: allow one port excludes Allow for excluding only one port in /etc/pcmcia/config.otps Signed-off-by: Dominik Brodowski commit 664cceb0093b755739e56572b836a99104ee8a75 Author: David Howells Date: Wed Sep 28 17:03:15 2005 +0100 [PATCH] Keys: Add possessor permissions to keys [try #3] The attached patch adds extra permission grants to keys for the possessor of a key in addition to the owner, group and other permissions bits. This makes SUID binaries easier to support without going as far as labelling keys and key targets using the LSM facilities. This patch adds a second "pointer type" to key structures (struct key_ref *) that can have the bottom bit of the address set to indicate the possession of a key. This is propagated through searches from the keyring to the discovered key. It has been made a separate type so that the compiler can spot attempts to dereference a potentially incorrect pointer. The "possession" attribute can't be attached to a key structure directly as it's not an intrinsic property of a key. Pointers to keys have been replaced with struct key_ref *'s wherever possession information needs to be passed through. This does assume that the bottom bit of the pointer will always be zero on return from kmem_cache_alloc(). The key reference type has been made into a typedef so that at least it can be located in the sources, even though it's basically a pointer to an undefined type. I've also renamed the accessor functions to be more useful, and all reference variables should now end in "_ref". Signed-Off-By: David Howells Signed-off-by: Linus Torvalds commit 5134fc15b643dc36eb9aa77e4318b886844a9ac5 Author: Paul Jackson Date: Wed Sep 28 06:42:24 2005 -0700 [PATCH] cpuset read past eof memory leak fix Don't leak a page of memory if user reads a cpuset file past eof. Signed-off-by: KUROSAWA Takahiro Signed-off-by: Paul Jackson Signed-off-by: Linus Torvalds commit 5c382300876f2337f7b945c159ffcaf285f296ea Author: Alok N Kataria Date: Tue Sep 27 21:45:46 2005 -0700 [PATCH] kmalloc_node IRQ safety fix In kmalloc_node we are checking if the allocation is for the same node when interrupts are "on". This may lead to an allocation on another node than intended. This patch just shifts the check for the current node in __cache_alloc_node when interrupts are disabled. Signed-off-by: Alok N Kataria Acked-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f9578b70a9f112bfb541e1d5ab486a376e64503 Author: Benjamin Herrenschmidt Date: Tue Sep 27 21:45:45 2005 -0700 [PATCH] ppc64: More hugepage fixes My previous patch fixing invalidation of huge PTEs wasn't good enough, we still had an issue if a PTE invalidation batch contained both small and large pages. This patch fixes this by making sure the batch is flushed if the page size fed to it changes. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 485ef69edefd7fc7f351c94d0d77b3ed8a242f7b Author: Alasdair G Kergon Date: Tue Sep 27 21:45:45 2005 -0700 [PATCH] device-mapper: Fix queue_if_no_path initialisation When creating a multipath device, if the queue_if_no_path parameter is specified it gets ignored. While the queue_if_no_path variable is correctly set to 1, the saved_queue_if_no_path gets set to 0. When the device is subsequently made live (resumed), the saved value (0) always overwrites the live value (1) so the option *always* gets turned off. The fix adds a parameter to the queue_if_no_path() function to indicate whether the previous value should be preserved or not - if not, as when the device is being set up, the saved value is set to the new value (1). Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 269fd2a6f84828fd96218d164dace8c413fa5c03 Author: goggin, edward Date: Tue Sep 27 21:45:44 2005 -0700 [PATCH] device-mapper: Trigger an event when a table is deleted If anything is waiting on a device's table when the device is removed, we must first wake it up so it will release its reference. Otherwise the table's reference count will not drop to zero and the table will not get removed. Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f7347c20c410c300be0db4c132945fd02e54110 Author: Rafael J. Wysocki Date: Tue Sep 27 21:45:43 2005 -0700 [PATCH] swsusp: avoid problems if there are too many pages to save The following patch makes swsusp avoid problems during resume if there are too many pages to save on suspend. It adds a constant that allows us to verify if we are going to save too many pages and implements the check (this is done as early as we can tell that the check will trigger, which is in swsusp_alloc()). Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f65a4d10c8a4eb9f919cf416e5dcd720b7d20f50 Author: Benjamin Herrenschmidt Date: Tue Sep 27 21:45:41 2005 -0700 [PATCH] orinoco: Fix flood of kernel log with stupid WE warnings Latest wireless extensions moved a field from netdev -> wireless_handlers. The WE core will now printk a warning on every call to get_wireless_stats() on a driver that still uses the old field. This patch fixes orinoco. Signed-off-by: Benjamin Herrenschmidt Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3ca80935100af47f226be439cb266378dab7bf7 Author: Anton Blanchard Date: Tue Sep 27 21:45:38 2005 -0700 [PATCH] ppc64: Add missing barrier() in kexec code Mikey and I were testing kexec and hit a lockup. It turns out gcc 4.0 optimises the kexec_prepare_cpus loop so we avoid reloading paca.hw_cpu_id. A gcc barrier() fixes the problem. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed90fb4a19956cece996eb1d26534f592918730e Author: Paul Jackson Date: Tue Sep 27 21:45:37 2005 -0700 [PATCH] cpuset maintainers Specify the cpuset maintainers. Signed-off-by: Paul Jackson Signed-off-by: Simon Derr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c132b5fe6579ed4b4892c02fe6c05f7e3afc579 Author: john stultz Date: Tue Sep 27 21:45:36 2005 -0700 [PATCH] x86-64: Fix bad assumption that dualcore cpus have synced TSCs This should resolve the issue seen in bugme bug #5105, where it is assumed that dualcore x86_64 systems have synced TSCs. This is not the case, and alternate timesources should be used instead. For more details, see: http://bugzilla.kernel.org/show_bug.cgi?id=5105 Andi's earlier concerns that the TSCs should be synced on dualcore systems have been resolved by confirmation from AMD folks that they can be unsynced. Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9d014afc3609e3094fd06176380ed057edd4a1b Author: Corey Minyard Date: Tue Sep 27 21:45:35 2005 -0700 [PATCH] Add IPMI poweroff control to sysfs Put the IPMI poweroff_powercycle parameter into sysfs. This field is dynamically settable and is valuable to have in sysfs. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4208b9a9538baabad197276076bc1d4f52d42b9 Author: Benjamin Herrenschmidt Date: Tue Sep 27 21:45:35 2005 -0700 [PATCH] ppc: fix stupid thinko in oprofile fix I did something stupid in my oprofile fix, here's the obvious fix: Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f36462f078403c1859a7e58177b28e01b3a179e4 Author: Rusty Russell Date: Tue Sep 27 21:45:34 2005 -0700 [PATCH] Ignore trailing whitespace on kernel parameters correctly Dave Jones says: ... if the modprobe.conf has trailing whitespace, modules fail to load with the following helpful message.. snd_intel8x0: Unknown parameter `' Previous version truncated last argument. Signed-off-by: Rusty Russell Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3306dd5f7eb2e699f36a4a313fca4b48b18d5e1 Author: Davide Libenzi Date: Tue Sep 27 21:45:33 2005 -0700 [PATCH] epoll: handle timeout overflow Handle the timeout upper boundary for epoll. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2d613799af915da1fd78463ba8ec5086a0d6f92 Author: Rafael J. Wysocki Date: Tue Sep 27 21:45:32 2005 -0700 [PATCH] swsusp: prevent possible memory leak Prevent swsusp from leaking some memory in case of an error in read_pagedir(). It also prevents the BUG_ON() from triggering if there's an error while reading swap. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 254b54771cc4c00002f796be65d2885191dca9dc Author: Rafael J. Wysocki Date: Tue Sep 27 21:45:31 2005 -0700 [PATCH] swsusp: remove wrong code from data_free The following patch removes some wrong code from the data_free() function in swsusp. This function could only be called if there's an error while writing the suspend image to swap, so it is not triggered easily. However, if triggered, it would probably corrupt some memory. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 249a6771afcdfaca0ac178f63343aff2c4dc2853 Author: Peter Osterlund Date: Tue Sep 27 21:45:30 2005 -0700 [PATCH] pktcdvd: MAINTAINERS record Add a MAINTAINERS entry for the pktcdvd driver. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88bdcc5d5e9a7ea280f99262f48b70aba9d949bf Author: Jon Burgess Date: Tue Sep 27 21:45:26 2005 -0700 [PATCH] dvb: fix NULL pointer dereference when loading the budget-av module Ralph Metzler wrote: > AFAIR, there is a bug in tda10021.c in tda10021_readreg() which > references state->frontend.dvb->num > This is fatal if the frontend is not at the probed address and thus > not yet registered (no dvb entry set yet -> NULL pointer ...). The attached patch should get rid of the oops. Signed-off-by: Jon Burgess Cc: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b8dd17762194ec77066d339e0b2866b0c66b715 Author: Latchesar Ionkov Date: Tue Sep 27 21:45:24 2005 -0700 [PATCH] v9fs: fix races in fid allocation Fid management cleanup. The patch attempts to fix the races in dentry's fid management. Dentries don't keep the opened fids anymore, they are moved to the file structs. Ideally there should be no more than one fid with fidcreate equal to zero in the dentry's list of fids. v9fs_fid_create initializes the important fields (fid, fidcreated) before v9fs_fid is added to the list. v9fs_fid_lookup returns only fids that are not created by v9fs_create. v9fs_fid_get_created returns the fid created by the same process by v9fs_create (if any) and removes it from dentry's list Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc7b5fd6b0d3beb41f9e5e3a94dd1eadf52209f3 Author: Chris Sykes Date: Tue Sep 27 21:45:23 2005 -0700 [PATCH] Fix ext3_new_inode() failure paths Fix failure paths in ext3_new_inode() and clean up duplicated code: - DQUOT_DROP() was not being called if ext3_init_security() failed. Signed-off-by: Chris Sykes Cc: Stephen Smalley Cc: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ed6c2fb34a1fb493caec8a9644d05bb880a6923 Author: Chris Sykes Date: Tue Sep 27 21:45:22 2005 -0700 [PATCH] Fix ext2_new_inode() failure paths Fix failure paths in ext2_new_inode() and clean up duplicated code: - DQUOT_DROP() was not being called if ext2_init_security() failed. Signed-off-by: Chris Sykes Cc: Stephen Smalley Cc: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee4e52719ce474af339f4b81ece2ce9ecf920dfd Author: Miklos Szeredi Date: Tue Sep 27 21:45:21 2005 -0700 [PATCH] fuse: check reserved node ID values This patch checks reserved node ID values returned by lookup and creation operations. In case one of the reserved values is sent, return -EIO. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 909021ea7a8f4ef13af54935b87b03a20906e08a Author: Miklos Szeredi Date: Tue Sep 27 21:45:20 2005 -0700 [PATCH] fuse: add required version info Add information about required version of the userspace library/utilities to Documentation/Changes. Also add pointer to this and to FUSE documentation from Kconfig. Thanks to Anton Altaparmakov for the reminder. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b1f3124618b54cf125dea3a074b9cf469117723 Author: Nick Piggin Date: Tue Sep 27 21:45:18 2005 -0700 [PATCH] mm: move_pte to remap ZERO_PAGE Move the ZERO_PAGE remapping complexity to the move_pte macro in asm-generic, have it conditionally depend on __HAVE_ARCH_MULTIPLE_ZERO_PAGE, which gets defined for MIPS. For architectures without __HAVE_ARCH_MULTIPLE_ZERO_PAGE, move_pte becomes a noop. From: Hugh Dickins Fix nasty little bug we've missed in Nick's mremap move ZERO_PAGE patch. The "pte" at that point may be a swap entry or a pte_file entry: we must check pte_present before perhaps corrupting such an entry. Patch below against 2.6.14-rc2-mm1, but the same bug is in 2.6.14-rc2's mm/mremap.c, and more dangerous there since it's affecting all arches: I think the safest course is to send Nick's patch and Yoichi's build fix and this fix (build tested) on to Linus - so only MIPS can be affected. Signed-off-by: Nick Piggin Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2212bc7db13268bef0799d9ff4b2e511c284885 Author: David S. Miller Date: Tue Sep 27 22:50:06 2005 -0700 [SPARC64]: Add missing IDs for newer cpus. Also, the us3_cpufreq driver can work on Ultra-IV and IV+. They use the SAFARI bus register to control the clock divider just like Ultra-III and III+ do. Signed-off-by: David S. Miller commit f16af555cc46a724507da371fbac94b430c93315 Author: David S. Miller Date: Tue Sep 27 22:37:08 2005 -0700 [SPARC64]: Add defines for 32MB/256MB PTE page size on Ultra-IV+. Signed-off-by: David S. Miller commit 64233bffbb50f12e576c61d1698a573c8033004a Author: Oliver Dawid Date: Tue Sep 27 16:11:29 2005 -0700 [APPLETALK]: Fix broadcast bug. From: Oliver Dawid we found a bug in net/appletalk/ddp.c concerning broadcast packets. In kernel 2.4 it was working fine. The bug first occured 4 years ago when switching to new SNAP layer handling. This bug can be splitted up into a sending(1) and reception(2) problem: Sending(1) In kernel 2.4 broadcast packets were sent to a matching ethernet device and atalk_rcv() was called to receive it as "loopback" (so loopback packets were shortcutted and handled in DDP layer). When switching to the new SNAP structure, this shortcut was removed and the loopback packet was send to SNAP layer. The author forgot to replace the remote device pointer by the loopback device pointer before sending the packet to SNAP layer (by calling ddp_dl->request() ) therfor the packet was not sent back by underlying layers to ddp's atalk_rcv(). Reception(2) In atalk_rcv() a packet received by this loopback mechanism contains now the (rigth) loopback device pointer (in Kernel 2.4 it was the (wrong) remote ethernet device pointer) and therefor no matching socket will be found to deliver this packet to. Because a broadcast packet should be send to the first matching socket (as it is done in many other protocols (?)), we removed the network comparison in broadcast case. Below you will find a patch to correct this bug. Its diffed to kernel 2.6.14-rc1 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit ba645c16026ed733a51f904df34756f61bc155fc Author: David S. Miller Date: Tue Sep 27 16:03:05 2005 -0700 [NET]: Slightly optimize ethernet address comparison. We know the thing is at least 2-byte aligned, so take advantage of that instead of invoking memcmp() which results in truly horrifically inefficient code because it can't assume anything about alignment. Signed-off-by: David S. Miller commit 2fab35d78f32fc107e1af4b1ec23f557fa20d911 Author: Ben Dooks Date: Tue Sep 27 15:59:43 2005 -0700 [NET]: Fix GCC4 compile error: sysctl in linux/if_ether.h The following is generated when compiling a recent (2.6.14-rc2-git5) kernel configured for ARM, with GCC4. CC init/main.o In file included from include/linux/netdevice.h:29, from include/net/sock.h:48, from init/main.c:50: include/linux/if_ether.h:114: error: array type has incomplete element type It seems that if CONFIG_SYSCTL is not set, then the compiler will throw an error due to the definition of the ether_table[] array Attached is a solution to the problem Signed-off-by: Ben Dooks Signed-off-by: David S. Miller commit 520d1b830a93086c1f9e969d98f7ef01f0356493 Author: Alexey Dobriyan Date: Tue Sep 27 15:45:15 2005 -0700 [ROSE]: fix typo (regeistration) Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit a83cd2cc90bd9390cf03cd40bba204d9ed520633 Author: Alexey Dobriyan Date: Tue Sep 27 15:44:36 2005 -0700 [ROSE]: check rose_ndevs earlier * Don't bother with proto registering if rose_ndevs is bad. * Make escape structure more coherent. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 70ff3b66d79c5110e533f3f2aea1a5b2fc5f8d90 Author: Alexey Dobriyan Date: Tue Sep 27 15:43:46 2005 -0700 [ROSE]: return sane -E* from rose_proto_init() Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit c3c4ed652e8f2c348ebdd3f2e45664a0e238ee52 Author: Alexey Dobriyan Date: Tue Sep 27 15:42:58 2005 -0700 [ROSE]: do proto_unregister() on exit paths Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 1f26dac32057baaf67d10b45c6b5277db862911d Author: David S. Miller Date: Tue Sep 27 15:24:13 2005 -0700 [NET]: Add Sun Cassini driver. Written by Adrian Sun (asun@darksunrising.com). Ported to 2.6.x by Tom 'spot' Callaway . Further cleaned up and integrated by David S. Miller Signed-off-by: David S. Miller commit a79af59efd20990473d579b1d8d70bb120f0920c Author: Frank Filz Date: Tue Sep 27 15:23:38 2005 -0700 [NET]: Fix module reference counts for loadable protocol modules I have been experimenting with loadable protocol modules, and ran into several issues with module reference counting. The first issue was that __module_get failed at the BUG_ON check at the top of the routine (checking that my module reference count was not zero) when I created the first socket. When sk_alloc() is called, my module reference count was still 0. When I looked at why sctp didn't have this problem, I discovered that sctp creates a control socket during module init (when the module ref count is not 0), which keeps the reference count non-zero. This section has been updated to address the point Stephen raised about checking the return value of try_module_get(). The next problem arose when my socket init routine returned an error. This resulted in my module reference count being decremented below 0. My socket ops->release routine was also being called. The issue here is that sock_release() calls the ops->release routine and decrements the ref count if sock->ops is not NULL. Since the socket probably didn't get correctly initialized, this should not be done, so we will set sock->ops to NULL because we will not call try_module_get(). While searching for another bug, I also noticed that sys_accept() has a possibility of doing a module_put() when it did not do an __module_get so I re-ordered the call to security_socket_accept(). Signed-off-by: Frank Filz Signed-off-by: David S. Miller commit 9356b8fc07dc126cd91d2b12f314d760ab48996e Author: Eric Dumazet Date: Tue Sep 27 15:23:16 2005 -0700 [NET]: Reorder some hot fields of struct net_device Place them on separate cache lines in SMP to lower memory bouncing between multiple CPU accessing the device. - One part is mostly used on receive path (including eth_type_trans()) (poll_list, poll, quota, weight, last_rx, dev_addr, broadcast) - One part is mostly used on queue transmit path (qdisc) (queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len) - One part is mostly used on xmit path (device) (xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start) 'features' is placed outside of these hot points, in a location that may be shared by all cpus (because mostly read) name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name() Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 2d7ceece08ad940d0ceac98ab1b5a3b82dfc2a0a Author: Eric Dumazet Date: Tue Sep 27 15:22:58 2005 -0700 [NET]: Prefetch dev->qdisc_lock in dev_queue_xmit() We know the lock is going to be taken. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit bc8dfcb93970ad7139c976356bfc99d7e251deaf Author: Daniel Phillips Date: Tue Sep 27 15:22:35 2005 -0700 [NET]: Use non-recursive algorithm in skb_copy_datagram_iovec() Use iteration instead of recursion. Fraglists within fraglists should never occur, so we BUG check this. Signed-off-by: Daniel Phillips Signed-off-by: David S. Miller commit a1c337afaf4ec4d4eabc75a5e1170d03161de4e1 Author: Jack Morgenstein Date: Tue Sep 27 13:54:44 2005 -0700 [IB] mthca: fix hw_ver value returned from mthca_query_device The IB spec defines the field to be 32 bits, not 16 bits. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 59175839783287d3b03f18460bb3539c69300837 Author: Krzysztof Benedyczak Date: Tue Sep 27 22:21:36 2005 +0200 [PATCH] Make POSIX message queue sys_mq_open() honor umask We ignored umask when creating new queues via mq_open (when creating with open() on mqueue fs it is ok of course). According to the specification this a bug. This trivial patch fixes this. Signed-off-by: Krzysztof Benedyczak Signed-off-by: Linus Torvalds commit c8a6c2963982c68475f409aeee21aa80b923cb9c Author: David S. Miller Date: Tue Sep 27 12:13:38 2005 -0700 [TG3]: Update driver version and release date. Signed-off-by: David S. Miller commit f9804ddbeec2ea709255830a8822bfb4e7584f6a Author: Michael Chan Date: Tue Sep 27 12:13:10 2005 -0700 [TG3]: misc. fixes Fix interrupt test handler by adding check for IRQ assertion in PCI_STATE register in addition to the status block updated bit. Add test for valid ethernet address in tg3_set_mac_addr(). Add tg3_bus_string() to setup the PCI bus speed/width string for all PCI/PCIX/PCI Express devices. This is used to print the bus type during init_one(). Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c94e39418ab6eccf863581f4e0d847da0080b2d3 Author: Michael Chan Date: Tue Sep 27 12:12:42 2005 -0700 [TG3]: 5780 PHY fixes Fix 5780 PHY related problems: 1. MAC_RX_MODE reset must be done before setting up the MAC_MODE register on 5705_PLUS chips or the chip will stop receiving after a while. The MAC_RX_MODE reset is needed to prevent intermittently losing the first receive packet on serdes chips. 2. Skip MAC loopback test on 5780 because of hardware errata. Normal traffic including PHY loopback is not affected by the errata. 3. PHY loopback fails intermittently on 5708S and this is fixed by putting the PHY in loopback mode first before programming the MAC mode register. A MAC_RX_MODE reset is also added. 4. Return -EINVAL in tg3_nway_reset() if device is in TBI mode. Allow nway_reset if 5780S is in parallel detect mode. 5. Add missing PHY IDs in KNOWN_PHY_ID() macro. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 667347f1ca7e099f6833551f194cf2bcc778871b Author: David S. Miller Date: Tue Sep 27 12:07:44 2005 -0700 [NEIGH]: Add debugging check when adding timers. If we double-add a neighbour entry timer, which should be impossible but has been reported, dump the current state of the entry so that we can debug this. Signed-off-by: David S. Miller commit f02b16bea2d8411b21a531fc381e066985895387 Author: Michael S. Tsirkin Date: Mon Sep 26 21:12:26 2005 -0700 [IB] mthca: Round up number of slots in HCA context memory table When allocating a table for mem-free HCA context, don't assume that obj_size * nobj is an even multiple of MTHCA_TABLE_CHUNK_SIZE. In particular, make sure we allocate at least one slot even if the table is smaller than MTHCA_TABLE_CHUNK_SIZE. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 0b1556945475e8529328edf98ff0d201ed133edb Author: Al Viro Date: Mon Sep 26 07:49:27 2005 +0100 [PATCH] missing dependency on arm O= builds arm maketools needs include/asm-arm in place in the build tree. On normal builds it's always there, of course, but on O= it's created (by generic code) too late - when we get to asm-offset.h. We used to get away with that by accident - creation of include/asm-arm/arch symlink creates include/asm-arm and it happened to go before maketools. However, we did not have such dependency, so that luck didn't last - now maketools is picked first and we are screwed. Both the symlink and maketools are prerequisites of the same target (archprepare). This fix is obvious - make the latter explicitly depend on the former and be done with that. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a880948b2b88c05af9a471ca5c52883e64d3f7b8 Author: Al Viro Date: Mon Sep 26 06:19:28 2005 +0100 [PATCH] m32r: more basic __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c74dbac71419cdeaca8cd637ee666d6947961695 Author: Al Viro Date: Mon Sep 26 06:19:28 2005 +0100 [PATCH] m32r: set CHECKFLAGS properly We do _not_ need "sparse" in sparse arguments ;-) What we do need is __BIG_ENDIAN__; right now unconditional, when m32r starts using CPU_LITTLE_ENDIAN, we'll need to adjust. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 24558a0f7a00fccd19a6e6502956463f056ce90e Author: Al Viro Date: Mon Sep 26 06:19:28 2005 +0100 [PATCH] m32r: missing __iomem in ioremap() declaration Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ce3a161e693388aaa66d43d26156053311a39b7d Author: Al Viro Date: Mon Sep 26 05:49:44 2005 +0100 [PATCH] useless includes of linux/irq.h in arch/i386 Most of these guys are simply not needed (pulled by other stuff via asm-i386/hardirq.h). One that is not entirely useless is hilarious - arch/i386/oprofile/nmi_timer_int.c includes linux/irq.h... as a way to get linux/errno.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7625d483a454cbc8090c5d304eea0847210d6b99 Author: Al Viro Date: Mon Sep 26 05:25:59 2005 +0100 [PATCH] missing asm/irq.h (cs89x0) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0dc461069879b45a2d5333bd16990f8080a318fd Author: David S. Miller Date: Mon Sep 26 16:12:18 2005 -0700 [SPARC64]: Do not do TLB pre-filling any more. In order to do it correctly on UltraSPARC-III+ and later we'd need to add some complicated code to set the TAG access extension register before loading the TLB. Since this optimization gives questionable gains, it's best to just remove it for now instead of adding the fix for Ultra-III+ Signed-off-by: David S. Miller commit c5bd50a9533533d7b9ac3469fa679b2368e7e26c Author: David S. Miller Date: Mon Sep 26 16:06:03 2005 -0700 [SPARC64]: Simplify Spitfire D-cache page flush. It tries to batch up the tag loads and comparisons, and then the stores. And this is just complicated instead of efficient. Also, make the symbol of the Cheetah version more grepable. Signed-off-by: David S. Miller commit 1640a2c385a860ef25be4a8d18a528c4b6f02bd6 Author: Mark Haverkamp Date: Tue Sep 20 12:57:11 2005 -0700 [SCSI] aacraid: remove aac_insert_entry Received from Mark Salyzyn from Adaptec. High Priority Queues have *never* been used in the entire history of the aac based adapters. Associated with this, aac_insert_entry can be removed, SavedIrql can be removed & padding variable can be removed. With the movement of SavedIrql out & replaced with an automatic variable qflags, the locking can be refined somewhat. The sparse warnings did not catch the need for byte swapping in the 'dprintk' debugging print macros, so fixed this up when this code was moved outside of the now refined locking. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 63a70eeaafe0e17e7f45cba495cb457d06070419 Author: Mark Haverkamp Date: Tue Sep 20 12:57:04 2005 -0700 [SCSI] aacraid: fib size math fix Received from Mark Salyzyn from Adaptec. The size of the command packet's scatter gather list maximum size was miscalculated in the low range leading to the driver initialization limiting the maximum i/o size that could go to the Adapter. There were no negative operational side effects resulting from this bad math, only a subtle limit in performance of the Adapter at the top end of the range. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 9203344cb8ecc554a1d36eae6661235ed422cf59 Author: Mark Haverkamp Date: Tue Sep 20 12:56:50 2005 -0700 [SCSI] aacraid: initialization timeout Received from Mark Salyzyn from Adaptec. In the rare instances where the adapter, or the motherboard, is misbehaving; driver initialization or shutdown becomes problematic. By introducing a 3 minute timeout on the first interrupt driven command during initialization, or the issuance of the adapter shutdown command during driver unload, we can resolve the lockup problems induced by common (but rare) hardware misbehaviors. The timeout during initialization, should it occur, is accompanied by a message presented to the console and the logs indicating that the user should inspect and resolve problems with interrupt routing. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 08efb7b6116927c8b6e0af5064448e3aa13300e6 Author: Mark Haverkamp Date: Tue Sep 20 12:56:36 2005 -0700 [SCSI] aacraid: error return checking This patch adds some additional error return checking and error return value propagation during initialization. Also, the deprecation of pci_module_init with pci_register_driver along with the change in return values. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 131256cf203d0df62014dda8453a70cb6af0d0bb Author: Mark Haverkamp Date: Mon Sep 26 13:04:56 2005 -0700 [SCSI] aacraid: handle AIF hotplug events (update) Received from Mark Salyzyn from Adaptec. Hotplug sniffs the AIFs (events) from the adapter and if a container change resulting in the device going offline (container zero), online (container zero completed) or changing capacity (morph) it will take actions by calling the appropriate API. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 2f130980d14cb938226011875ca5224cd46dc1f9 Author: Mark Haverkamp Date: Mon Sep 26 13:02:15 2005 -0700 [SCSI] aacraid: aacraid: AIF preallocation (update) Recevied from Mark Salyzyn from Adaptec. Aif pre-allocation is used to pull the kmalloc outside of the locks. Applies to the scsi-misc-2.6 git tree. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 7a8cf29d69e077dfe90e327859201fd9b75a47ce Author: Mark Haverkamp Date: Thu Sep 22 09:15:24 2005 -0700 [SCSI] aacraid: Greater than 2TB capacity support Received from Mark Salyzyn from Adaptec. There are a few adapters that are capable of creating devices with this large of a capacity, but now that we have the large fib support in, the management applications will be capable of generating them. The problem is, once they are created, the driver will not be able to access the devices correctly without this patch. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit c4a3e0a529ab3e65223e81681c7c6b1bc188fa58 Author: Bagalkote, Sreenivas Date: Tue Sep 20 17:46:58 2005 -0400 [SCSI] MegaRAID SAS RAID: new driver Signed-off-by: Sreenivas Bagalkote Signed-off-by: James Bottomley commit 188bab3ae0ed164bc18f98be932512d777dd038b Author: Harald Welte Date: Mon Sep 26 15:25:11 2005 -0700 [NETFILTER]: Fix invalid module autoloading by splitting iptable_nat When you've enabled conntrack and NAT as a module (standard case in all distributions), and you've also enabled the new conntrack netlink interface, loading ip_conntrack_netlink.ko will auto-load iptable_nat.ko. This causes a huge performance penalty, since for every packet you iterate the nat code, even if you don't want it. This patch splits iptable_nat.ko into the NAT core (ip_nat.ko) and the iptables frontend (iptable_nat.ko). Threfore, ip_conntrack_netlink.ko will only pull ip_nat.ko, but not the frontend. ip_nat.ko will "only" allocate some resources, but not affect runtime performance. This separation is also a nice step in anticipation of new packet filters (nf-hipac, ipset, pkttables) being able to use the NAT core. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit b85daee0e497c8fe7c4dc3531674ede645b37cdf Author: David S. Miller Date: Mon Sep 26 15:23:58 2005 -0700 [AF_PACKET]: Remove bogus checks added to packet_sendmsg(). These broke existing apps, and the checks are superfluous as the values being verified aren't even used. Signed-off-by: David S. Miller commit c62dba9011b93fd88fde929848582b2a98309878 Author: Herbert Xu Date: Mon Sep 26 15:10:16 2005 -0700 [IPV6]: Fix [Bug 5306] Oops on IPv6 route lookup > Steps to reproduce: > 1. Boot Linux, do NOT setup any IPv6 routes > 2. ip route get 2001::1 (or any unroutable address) Well caught. We never set rt6i_idev on ip6_null_entry. This patch should make the problem go away. Signed-off-by: Herbert Xu Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit acd042bb2de50d4e6fb969281a00cc8b8b71e46d Author: Evgeniy Polyakov Date: Mon Sep 26 15:06:50 2005 -0700 [CONNECTOR]: async connector mode. If input message rate from userspace is too high, do not drop them, but try to deliver using work queue allocation. Failing there is some kind of congestion control. It also removes warn_on on this condition, which scares people. Signed-off-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit b9d717a7b413f227ebb2d61d9c118335f7292137 Author: Alex Williamson Date: Mon Sep 26 14:28:02 2005 -0700 [NET]: Make sure ctl buffer is aligned properly in sys_sendmsg(). It's on the stack and declared as "unsigned char[]", but pointers and similar can be in here thus we need to give it an explicit alignment attribute. Signed-off-by: Alex Williamson Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 63c47c286d062d93e0501d60797274c84a587e97 Author: Roland Dreier Date: Mon Sep 26 13:01:03 2005 -0700 [IB] uverbs: Close some exploitable races Al Viro pointed out that the current IB userspace verbs interface allows userspace to cause mischief by closing file descriptors before we're ready, or issuing the same command twice at the same time. This patch closes those races, and fixes other obvious problems such as a module reference leak. Some other interface bogosities will require an ABI change to fix properly, so I'm deferring those fixes until 2.6.15. Signed-off-by: Roland Dreier commit 819ccc86a43739e0cf443b6d6641a8722869be01 Author: Vincent Sanders Date: Mon Sep 26 19:52:57 2005 +0100 [ARM] 2936/1: ixp4xx default config fixes Patch from Vincent Sanders A recent patch which made IXP4xx mach_desc's depend on config options had the effect of not building the kernel for several machines it possibly could be, this patch updates the default config to ensure all possible machines are built for by default. Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 6132f9e146150473f803323dc8064a5506e33952 Author: David Vrabel Date: Mon Sep 26 19:52:56 2005 +0100 [ARM] 2935/1: ixp4xx: fix warnings in ixp4xx_set_irq_type Patch from David Vrabel Signed-off-by: David Vrabel Signed-off-by: Russell King commit 44dd823b00fa64bf01e53557d28555011f122a88 Author: Michael S. Tsirkin Date: Mon Sep 26 09:42:09 2005 -0700 [IB] mthca: Fix off by one bug in mthca_map_cmd The loop in mthca_map_cmd() would fill one entry past the end of the mailbox buffer before calling the firmware command. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit f7ed3a5971da98acdc506bdbdef25cfe51c334a2 Author: Michael S. Tsirkin Date: Mon Sep 26 09:29:33 2005 -0700 [IB] mthca: fix off by one in clr_int calculation We should use the first word of the clear interrupt register if the bit we're after is < 32, not < 31. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 018771f435388f22f388eb8658c652086fb3633e Author: Roland Dreier Date: Wed Sep 21 21:40:12 2005 -0700 [IB] mthca: Fix doorbell record resource leak If we allocate a bunch of doorbell records and then free them, we'll end up with completely empty pages, which we then free. However, when we come back to allocate more doorbell pages, we have to reallocate those empty pages rather than always trying to take a slot that we've never used. If we don't, we eventually use up every slot and fail to allocate a doorbell record, even though we have plenty of free space. Signed-off-by: Roland Dreier commit e2fcc61ef0d654887b651bd99ffcb52f7344b836 Author: Anton Altaparmakov Date: Mon Sep 26 17:02:41 2005 +0100 NTFS: Re-fix sparse warnings in a more correct way, i.e. don't use an enum with different types in it but #define the two constants instead. Signed-off-by: Anton Altaparmakov commit cbf8fd9f5aa5164e05cb04d4a34fcbe82f60beeb Author: Russell King Date: Mon Sep 26 15:30:20 2005 +0100 [ARM] Remove SA_IRQNOMASK SA_IRQNOMASK is unused, remove it. Signed-off-by: Russell King commit 4fb7edce52e5b6cf41e3375822d74a27f0b6f2dd Author: Kars de Jong Date: Sun Sep 25 14:39:46 2005 +0200 [PATCH] pcmcia: fix cross-platform issues with pcmcia module aliases - Added a missing TO_NATIVE call to scripts/mod/file2alias.c:do_pcmcia_entry() - Add an alignment attribute to struct pcmcia_device_no to solve an alignment issue seen when cross-compiling on x86 for m68k. Signed-off-by: Kars de Jong Signed-off-by: Dominik Brodowski commit 2570b746484cfddf4b7b4715dbb69d53d5284f4d Author: Dominik Brodowski Date: Sat Sep 17 11:17:56 2005 +0200 [PATCH] pcmcia: update ID for NinjaATA Christian Zoz reported there are multiple NinjaATA devices all sharing the second product ID string, but not the first one. Signed-off-by: Dominik Brodowski commit f9cb8b71e7d6c858b1afe665fd0a09169fdf4390 Author: Daniel Ritz Date: Sat Sep 24 23:12:46 2005 -0700 [PATCH] yenta: more ENE bridges Adds better support for the CB-710, CB-712, CB-720 and CB-722 bridges from EnE Signed-off-by: Daniel Ritz Signed-off-by: Dominik Brodowski commit a42f0dc4376fc574980864f890d1527894719cde Author: Dominik Brodowski Date: Sat Sep 24 23:12:44 2005 -0700 [PATCH] pcmcia: new IDs for serial_cs Add new ID to serial_cs.c; the CIS fimware override is available by the manufacturer at http://www.sierrawireless.com . Remember to name the CIS binary SW_7xx_SER.cis and to put it into /lib/firmware/ Signed-off-by: Dominik Brodowski commit 6c1a10dba92cbacb58563f5eacf93807125b488a Author: Daniel Ritz Date: Tue Sep 20 14:12:17 2005 -0700 [PATCH] yenta: add support for more TI bridges Support some more TI cardbus bridges. most of them are multifunction devices which adds 1394 controllers, smartcard readers etc. this could also help with the various problems with the XX21 controllers seen on the linux-pcmcia list. Signed-off-by: Daniel Ritz Signed-off-by: Dominik Brodowski commit 81000808b636b75a0ff5ef86c28f24fc6f5151eb Author: Komuro Date: Sat Sep 24 23:12:40 2005 -0700 [PATCH] pcmcia: fix Kconfig dependency TCIC depends on ISA. It is used with ISA-bus system only. Signed-off-by: komurojun-mbn@nifty.com Signed-off-by: Dominik Brodowski commit 8e5d17ebe41eb98a538ef13aad36da5136701aab Author: Dominik Brodowski Date: Wed Sep 7 16:00:28 2005 -0700 [PATCH] yenta: tiny cleanup pci_set_power_state is not needed, as we call pci_enable_device() somewhere else. Also, the resource we write to PCI_BASE_ADDRESS_0 needs to be converted to bus-centric view first. Signed-off-by: Dominik Brodowski commit a413c09094e4df714c274690928dcf8125daf7e8 Author: Daniel Ritz Date: Wed Aug 24 17:03:23 2005 +0200 [PATCH] yenta: don't mess with bridge control register In interrupt probing (both ISA and PCI) the bridge control register is used to change interrupt routing to ISA or PCI by changing bit 7. But this bit only controls the routing of card functional interrupts, not the CSC interrupts which are used for interrupt probing. A bad side effect of messing with this register in yenta_probe_irq() is that it can lead to irq storms if a card is inserted and already powered by the BIOS. Usage in yenta_sock_init() and yenta_config_init() seem to be fishy as well. Signed-off-by: Daniel Ritz Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit 8c3520d4eb3b1bbf2e45fbae8dcfb8db06d5e775 Author: Daniel Ritz Date: Sun Aug 21 22:29:26 2005 -0700 [PATCH] yenta: auto-tune EnE bridges for CardBus cards Echo Audio cardbus products are known to be incompatible with EnE bridges. in order to maybe solve the problem a EnE specific test bit has to be set, another cleared...but other setups have a good chance to break when just forcing the bits. so do the whole thingy automatically. The patch adds a hook in cb_alloc() that allows special tuning for the different chipsets. for ene just match the Echo products and set/clear the test bits, defaults to do the same thing as w/o the patch to not break working setups. Signed-off-by: Daniel Ritz Cc: Linus Torvalds Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit 5a8c0cc32bb6e029cd9c36f655c6b0955b0d9967 Author: Anton Altaparmakov Date: Mon Sep 26 10:48:54 2005 +0100 NTFS: More $LogFile handling fixes: when chkdsk has been run, it can leave the restart pages in the journal without multi sector transfer protection fixups (i.e. the update sequence array is empty and in fact does not exist). Signed-off-by: Anton Altaparmakov commit 838bf9675a3d1ede01408aa105357b9ab43faf1b Author: Anton Altaparmakov Date: Mon Sep 26 10:45:46 2005 +0100 NTFS: Fix the definition of the CHKD ntfs record magic. It had an off by two error causing it to be CHKB instead of CHKD. Signed-off-by: Anton Altaparmakov commit 80dc0d6b44ce0f01df58d8899e46612690ed7d81 Author: David S. Miller Date: Mon Sep 26 00:32:17 2005 -0700 [SPARC64]: Probe D/I/E-cache config and use. At boot time, determine the D-cache, I-cache and E-cache size and line-size. Use them in cache flushes when appropriate. This change was motivated by discovering that the D-cache on UltraSparc-IIIi and later are 64K not 32K, and the flushes done by the Cheetah error handlers were assuming a 32K size. There are still some pieces of code that are hard coding things and will need to be fixed up at some point. While we're here, fix the D-cache and I-cache parity error handlers to run with interrupts disabled, and when the trap occurs at trap level > 1 log the event via a counter displayed in /proc/cpuinfo. Signed-off-by: David S. Miller commit 56425306517ef28a9b480161cdb96d182172bc1d Author: David S. Miller Date: Sun Sep 25 16:46:57 2005 -0700 [SPARC64]: Add CONFIG_DEBUG_PAGEALLOC support. The trick is that we do the kernel linear mapping TLB miss starting with an instruction sequence like this: ba,pt %xcc, kvmap_load xor %g2, %g4, %g5 succeeded by an instruction sequence which performs a full page table walk starting at swapper_pg_dir. We first take over the trap table from the firmware. Then, using this constant PTE generation for the linear mapping area above, we build the kernel page tables for the linear mapping. After this is setup, we patch that branch above into a "nop", which will cause TLB misses to fall through to the full page table walk. With this, the page unmapping for CONFIG_DEBUG_PAGEALLOC is trivial. Signed-off-by: David S. Miller commit fe8b2304e54552cea113318e2f66c45628130fdc Author: Christoph Hellwig Date: Sun Sep 25 23:10:33 2005 +0200 [SCSI] sas: fix remote phy removal Brown paperbag bug: sas_rphy_delete was ordered completely wrong. Fix it up to be the same order as sas_phy_delete or fc_rport_terminate and fix rphy objects that leaked after module removal. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 5b58745203f16ab83e50f4a015eea84c416d9279 Author: Ben Dooks Date: Sun Sep 25 23:04:48 2005 +0100 [ARM] 2934/1: Anubis - fix VA offsets for CPLD registers Patch from Ben Dooks The VA addresses of the Anubis CPLD registers confoict with the addresses for the ISA space maps used by the rest of the s3c2410 architecture Signed-off-by: Ben Dooks Signed-off-by: Russell King commit f04da5def8c460b1b52d3142da827ab01efa3a15 Author: Ben Dooks Date: Sun Sep 25 23:02:49 2005 +0100 [ARM] 2933/1: S3C2410 - fix serial port warnings Patch from Ben Dooks Fix the following warnings produced from drivers/char/s3c2410.c. drivers/serial/s3c2410.c:757: warning: 'clk' may be used uninitialized drivers/serial/s3c2410.c:756: warning: 'clksrc' may be used uninitialized Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 44550322cb601ac3f882e7438bbeec971fa1b1a3 Author: Andrew Vasquez Date: Tue Sep 20 13:32:11 2005 -0700 [SCSI] qla2xxx: fix remote port timeout with qla2xxx driver This patch fixes a hole in the rport unblock handling when processing fabric events via the ADISC/PLOGI device state machine. Original code would not properly 'unblock' the port upon the port reloging into the fabric. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 6f3a20242db2597312c50abc11f1e747c5d2326a Author: James Bottomley Date: Thu Sep 22 20:33:28 2005 -0500 [SCSI] allow REPORT LUN scanning even for LUN 0 PQ of 3 Currently we just ignore the device, which means there are a few arrays out there that we don't find. This patch updates the scsi_report_lun_scan() to take a target instead of a device so it can be called on a return of SCSI_SCAN_TARGET_PRESENT, which is what a PQ 3 device returns. Signed-off-by: James Bottomley commit 49bfd8db4a39ea14fb3780b162012b4b3611fce8 Author: adam radford Date: Wed Sep 21 17:20:14 2005 -0700 [SCSI] 3ware 9000: Add support for 9550SX controllers Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 52f26deb7c67d5f34910660200b925c1a2b8df8c Author: David S. Miller Date: Sat Sep 24 23:06:14 2005 -0700 [SPARC64]: Fix mask formation in tomatillo_wsync_handler() "1" needs to be "1UL", this is a 64-bit mask we're creating. Signed-off-by: David S. Miller commit 8ddec7460d2f5db3ac35812c03676b1473d1d668 Author: Harald Welte Date: Sat Sep 24 16:56:08 2005 -0700 [NETFILTER] ip_conntrack: Update event cache when status changes The GRE, SCTP and TCP protocol helpers did not call ip_conntrack_event_cache() when updating ct->status. This patch adds the respective calls. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 8689c07e47e928f8e329f667df8cf697a37425dd Author: Alexey Dobriyan Date: Sat Sep 24 16:55:17 2005 -0700 [IRDA]: *irttp cleanup * Remove useless comment. * Remove useless assertions. * Remove useless comparison. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 15166fadb0308496bbff50c08ed5fe6a18d5cc4f Author: Alexey Dobriyan Date: Sat Sep 24 16:54:50 2005 -0700 [IRDA]: Fix memory leak in irttp_init() Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 45fc3b11f1d419ed6c636e5ca84472d9805f520e Author: Amos Waterland Date: Sat Sep 24 16:53:16 2005 -0700 [NET]: Protect neigh_stat_seq_fops by CONFIG_PROC_FS From: Amos Waterland If CONFIG_PROC_FS is not selected, the compiler emits this warning: net/core/neighbour.c:64: warning: `neigh_stat_seq_fops' defined but not used Which is correct, because neigh_stat_seq_fops is in fact only initialized and used by code that is protected by CONFIG_PROC_FS. So this patch fixes that up. Signed-off-by: Amos Waterland Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit d67b24c40f81823abe5c1eb808bba1038969142b Author: Harald Welte Date: Sat Sep 24 16:52:03 2005 -0700 [NETFILTER]: Fix ip[6]t_NFQUEUE Kconfig dependency We have to introduce a separate Kconfig menu entry for the NFQUEUE targets. They cannot "just" depend on nfnetlink_queue, since nfnetlink_queue could be linked into the kernel, whereas iptables can be a module. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit ff13f98b97cb6c5a2d201dfa4db0a2fd0b4d9d50 Author: Dmitry Torokhov Date: Sat Sep 24 02:02:29 2005 -0500 [PATCH] Input: check switch bitmap when matching handlers The wwitch bitmap was added to input_device_id structure and we should check it when matching handlers and input devices. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit d2f607484f8210cf19b1730dee26d426a5a770a5 Author: Russell King Date: Sat Sep 24 10:42:06 2005 +0100 [ARM] Fix compiler warnings for memcpy_toio/memcpy_fromio/memset_io Add 'volatile' to the __iomem pointers for these functions as per x86. Signed-off-by: Russell King commit 6b9ea4213e3a9c9b8de29a001a2b8d8799cbc1c9 Author: Russell King Date: Sat Sep 24 10:24:37 2005 +0100 [MFD] Fix "bious one-bit signed bitfield" errors ucb1x00-ts declared a couple of one-bit 'int' bitfields. Make them unsigned. Signed-off-by: Russell King commit f993724210744a9b07cf5496808828c4da6ab6df Author: Russell King Date: Sat Sep 24 10:12:47 2005 +0100 [SERIAL] Remove unused variable in clps711x.c Signed-off-by: Russell King commit c8868611389aa28e0e5e0d63f468727781eac68c Author: Stephen Hemminger Date: Fri Sep 23 09:08:30 2005 -0700 [PATCH] skge: fix Yukon-Lite A0 workaround This is one of those workarounds sucked over from sk98lin driver. The skge driver needs to detect the Yukon-Lite A0 chip properly, and turn of Rx FIFO Flush. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 73394322a4bf4108847ba3c2eee33a81b1b44450 Author: Russell King Date: Fri Sep 23 21:49:58 2005 +0100 [ARM] Fix context switch with ARMv6 + TLS We accidentally corrupted the TLS value when clearing out the ARMv6 exclusive monitor. Avoid doing so. Signed-off-by: Russell King commit dbdb90450059e17e8e005ebd3ce0a1fd6008a0c8 Author: Andrew Morton Date: Fri Sep 23 13:24:10 2005 -0700 [PATCH] revert oversized kmalloc check As davem points out, this wasn't such a great idea. There may be some code which does: size = 1024*1024; while (kmalloc(size, ...) == 0) size /= 2; which will now explode. Cc: "David S. Miller" Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86513e726b494796175b6c4fdd705797f01b0ca2 Author: Harald Welte Date: Fri Sep 23 13:24:10 2005 -0700 [PATCH] documentation: sparse no longer uses bk, but git Signed-off-by: Harald Welte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7c965084392e23a3494f0247c75795360a3fa0d Author: Hironobu Ishii Date: Fri Sep 23 13:24:08 2005 -0700 [PATCH] ipmi_msghandler: inconsistent spin_lock usage I found an inconsistent spin_lock usage in ipmi_smi_msg_received. Signed-off-by: Hironobu Ishii Cc: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67b108131df1230bad20a7279a8897de123d690b Author: Benjamin Herrenschmidt Date: Fri Sep 23 13:24:07 2005 -0700 [PATCH] ppc64: Fix huge pages MMU mapping bug Current kernel has a couple of sneaky bugs in the ppc64 hugetlb code that cause huge pages to be potentially left stale in the hash table and TLBs (improperly invalidated), with all the nasty consequences that can have. One is that we forgot to set the "secondary" bit in the hash PTEs when hashing a huge page in the secondary bucket (fortunately very rare). The other one is on non-LPAR machines (like Apple G5s), flush_hash_range() which is used to flush a batch of PTEs simply did not work for huge pages. Historically, our huge page code didn't batch, but this was changed without fixing this routine. This patch fixes both. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2601c2e278863cd48c01bce1377b4c9747893025 Author: Andrew Morton Date: Fri Sep 23 13:24:06 2005 -0700 [PATCH] atyfb c99 fix - fix this: drivers/video/aty/xlinit.c: In function `atyfb_xl_init': drivers/video/aty/xlinit.c:256: warning: ISO C90 forbids mixed declarations and code - repair some kooky coding style - Use ARRAY_SIZE() Cc: Tom 'spot' Callaway Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3b5f0d43863402b03b3af9a7eaec0037a823374 Author: Karsten Keil Date: Fri Sep 23 13:24:05 2005 -0700 [PATCH] hisax: remove URB_ASYNC_UNLINK usb_unlink_urb is always async now, so URB_ASYNC_UNLINK was removed from core USB and we must do as well. Signed-off-by: Karsten Keil Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 188a1eafa03aaa5e5fe6f53e637e704cd2c31c7c Author: Linus Torvalds Date: Fri Sep 23 13:22:21 2005 -0700 Make sure SIGKILL gets proper respect Bhavesh P. Davda noticed that SIGKILL wouldn't properly kill a process under just the right cicumstances: a stopped task that already had another signal queued would get the SIGKILL queued onto the shared queue, and there it would remain until SIGCONT. This simplifies the signal acceptance logic, and fixes the bug in the process. Losely based on an earlier patch by Bhavesh. Signed-off-by: Linus Torvalds commit 898cf0ecb7959db97d71cbce19685ce73a28d47c Author: David S. Miller Date: Fri Sep 23 11:59:44 2005 -0700 [SPARC64]: Mark functions called by paging_init() as __init. Signed-off-by: David S. Miller commit 1c9ea5db001142a96fec8fed0f92f26892a1b6ac Author: David S. Miller Date: Fri Sep 23 11:54:43 2005 -0700 [SPARC64]: Kill unused variable in setup_arch() 'highest_paddr' is set, but never actually used. Signed-off-by: David S. Miller commit ede1327ea4ca8019ec6df24b3e837def091c26b8 Author: Steve French Date: Tue Aug 30 20:10:14 2005 -0700 [PATCH] cifs: Add support for suspend cifsd had been preventing software suspend from completing. Signed-off-by: pavel@suse.de Signed-off-by: Steve French lightly modified Signed-off-by: Linus Torvalds commit 12f44f46bc9c6dc79255e661b085797af395d8da Author: Ivan Kokshaysky Date: Thu Sep 22 21:06:31 2005 -0700 [PATCH] pci: fixup parent subordinate busnr I believe the change that broke things is introduction of pci_fixup_parent_subordinate_busnr(). The patch here does two things: - hunk #1 should fix the problems you've seen when you boot without additional "pci" kernel options; - hunk #2 supposedly fixes boot with "pci=assign-busses" option which otherwise hangs Acer TM81xx machines as reported. Please try this with and without "pci=assign-busses". If it boots, I'd like to see 'lspci -vvx' for both cases. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 715dc636b64b57aee7aee7e8b5bf4f5267a6df48 Author: Anton Altaparmakov Date: Fri Sep 23 11:24:28 2005 +0100 NTFS: Change ntfs_cluster_free() to require a write locked runlist on entry since we otherwise get into a lock reversal deadlock if a read locked runlist is passed in. In the process also change it to take an ntfs inode instead of a vfs inode as parameter. Signed-off-by: Anton Altaparmakov commit 9389d79fbf9a0167ff2de87e8796c6bb803219bf Author: Paul Gortmaker Date: Fri Sep 23 05:18:45 2005 -0400 [PATCH] 8390 Tx fix for non i386 machines While this is true, E8390_CMD is zero on i386, and thus there should be no effect for these machines. Machines like Mac, Amiga etc. which use Alan's clever register mapping may have a non-zero E8390_CMD and result in bogus "transmitter busy" type messages from this bug. Fixes BUG# 3991. commit eb0e0076878a4f9e8e6e7e524ded0d6f7d4a6130 Author: Sridhar Samudrala Date: Thu Sep 22 23:48:38 2005 -0700 [SCTP]: Fix SCTP_SHUTDOWN notifications. Fix to allow SCTP_SHUTDOWN notifications to be received on 1-1 style SCTP SOCK_STREAM sockets. Add SCTP_SHUTDOWN notification to the receive queue before updating the state of the association. Signed-off-by: Sridhar Samudrala Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit 1dfbab59498d6f227c91988bab6c71af049a5333 Author: Harald Welte Date: Thu Sep 22 23:46:57 2005 -0700 [NETFILTER] Fix conntrack event cache deadlock/oops This patch fixes a number of bugs. It cannot be reasonably split up in multiple fixes, since all bugs interact with each other and affect the same function: Bug #1: The event cache code cannot be called while a lock is held. Therefore, the call to ip_conntrack_event_cache() within ip_ct_refresh_acct() needs to be moved outside of the locked section. This fixes a number of 2.6.14-rcX oops and deadlock reports. Bug #2: We used to call ct_add_counters() for unconfirmed connections without holding a lock. Since the add operations are not atomic, we could race with another CPU. Bug #3: ip_ct_refresh_acct() lost REFRESH events in some cases where refresh (and the corresponding event) are desired, but no accounting shall be performed. Both, evenst and accounting implicitly depended on the skb parameter bein non-null. We now re-introduce a non-accounting "ip_ct_refresh()" variant to explicitly state the desired behaviour. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit a82b748930fce0dab22c64075c38c830ae116904 Author: Harald Welte Date: Thu Sep 22 23:45:44 2005 -0700 [NETFILTER] remove unneeded structure definition from conntrack helper Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 67497205b12e3cb408259cc09b50c3a9d12cd935 Author: Alexey Dobriyan Date: Thu Sep 22 23:45:24 2005 -0700 [NETFILTER] Fix sparse endian warnings in pptp helper Signed-off-by: Alexey Dobriyan Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 0ae5d253adcc467b1c52b512bbca9419eb438409 Author: Harald Welte Date: Thu Sep 22 23:44:58 2005 -0700 [NETFILTER] fix DEBUG statement in PPTP helper As noted by Alexey Dobriyan, the DEBUGP statement prints the wrong callID. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 2a7bc3c94cbca32d3d6e03e7d5a71662f591d28a Author: Vlad Drukker Date: Thu Sep 22 23:35:34 2005 -0700 [BRIDGE]: TSO fix in br_dev_queue_push_xmit Signed-off-by: Vlad Drukker Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 83ca28befc43e93849e79c564cda10e39d983e75 Author: Herbert Xu Date: Thu Sep 22 23:32:56 2005 -0700 [TCP]: Adjust Reno SACK estimate in tcp_fragment Since the introduction of TSO pcount a year ago, it has been possible for tcp_fragment() to cause packets_out to decrease. Prior to that, tcp_retrans_try_collapse() was the only way for that to happen on the retransmission path. When this happens with Reno, it is possible for sasked_out to become invalid because it is only an estimate and not tied to any particular packet on the retransmission queue. Therefore we need to adjust sacked_out as well as left_out in the Reno case. The following patch does exactly that. This bug is pretty difficult to trigger in practice though since you need a SACKless peer with a retransmission that occurs just as the cached MTU value expires. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit e484585ec3ee66cd07a627d3a9e2364640a3807f Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:29 2005 -0700 [PATCH] Add dm-snapshot tutorial in Documentation I've recently discovered the real functionality of device-mapper snapshots, and since they are not well known, I've decided to write some docs for them. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10d2c46f9408d404bffef89d5052953a3b1d9288 Author: Nick Wilson Date: Thu Sep 22 21:44:28 2005 -0700 [PATCH] NFS: fix client oops when debugging is on nfs_readpage_release() causes an oops while accessing a file with NFS debugging turned on (echo 32767 > /proc/sys/sunrpc/nfs_debug) and a kernel built with CONFIG_DEBUG_SLAB. This patch moves the debugging statement above nfs_release_request() to avoid accessing freed memory. Signed-off-by: Nick Wilson Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7b3a4359b25311fb5894c8809478a2df6bed480 Author: Rob Landley Date: Thu Sep 22 21:44:27 2005 -0700 [PATCH] Fix bd_claim() error code. Problem: In some circumstances, bd_claim() is returning the wrong error code. If we try to swapon an unused block device that isn't swap formatted, we get -EINVAL. But if that same block device is already mounted, we instead get -EBUSY, even though it still isn't a valid swap device. This issue came up on the busybox list trying to get the error message from "swapon -a" right. If a swap device is already enabled, we get -EBUSY, and we shouldn't report this as an error. But we can't distinguish the two -EBUSY conditions, which are very different errors. In the code, bd_claim() returns either 0 or -EBUSY, but in this case busy means "somebody other than sys_swapon has already claimed this", and _that_ means this block device can't be a valid swap device. So return -EINVAL there. Signed-off-by: Rob Landley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bdac5d1ed892da54b6b2069e50a47b3aa39460f Author: Glauber de Oliveira Costa Date: Thu Sep 22 21:44:26 2005 -0700 [PATCH] ext3: EXT3_DEBUG build fixes Fix some warnings and a build error when EXT3_DEBUG is enabled. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f65d9bea8692d7343e4636763f291408f025834f Author: Clemens Buchacher Date: Thu Sep 22 21:44:24 2005 -0700 [PATCH] oss: don't concatenate __FUNCTION__ with strings It's deprecated. Use "%s", __FUNCTION__ instead. Signed-off-by: Clemens Buchacher Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 288a60cf4d7cc35f84f46cd8ffd0b34f9d8e7346 Author: Chris Zankel Date: Thu Sep 22 21:44:23 2005 -0700 [PATCH] xtensa: remove io_remap_page_range and minor clean-ups Remove io_remap_page_range() from all of Linux 2.6.x (as requested and suggested by Randy Dunlap) and minor clean-ups. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fac97ae0b1a206e2952baf1f9eb46305d673adc6 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:22 2005 -0700 [PATCH] uml: replace printk with "stack-friendly" printf - to report console failure User get *a lot* confused when consoles don't work but we don't report anything. And, as reported in the comment, using printk to report "your console doesn't work" isn't likely to go that far. Fix the problem on the base of this: stack consumption by host printf(). Use kernel sprintf() and os_write_file, using a wild guess that one page will be enough for the message, to preallocate the buffer with kmalloc(). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79ae2cb856ed6a8c48f455d52d5ed5960c671e67 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:21 2005 -0700 [PATCH] uml: use GFP_ATOMIC for allocations under spinlocks. setup_initial_poll is only called with sigio_lock() held, so use appropriate allocation. Also, parse_chan() can also be called when holding a spinlock (see line_open() -> parse_chan_pair()). I have sporadic problems (spinlock taken twice, with spinlock debugging on UP) which could be caused by a sequence like "take spinlock, alloc and go to sleep, take again the spinlock in the other thread". Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46db4a42dd1190a311c2fb45106dfd0842c65a94 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:20 2005 -0700 [PATCH] uml: Fix GFP_ flags usage GFP_ATOMIC | GFP_KERNEL is meaningless and won't work. Actually it never worked, even in 2.4. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fea03cb40a15e3c6647c0927300202e062e6792a Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:20 2005 -0700 [PATCH] uml: avoid fixing faults while atomic Following i386, we should maybe refuse trying to fault in pages when we're doing atomic operations, because to handle the fault we could need to take already taken spinlocks. Also, if we're doing an atomic operation (in the sense of in_atomic()) we're surely in kernel mode and we're surely going to handle adequately the failed fault, so it's safe to behave this way. Currently, on UML SMP is rarely used, and we don't support PREEMPT, so this is unlikely to create problems right now, but it might in the future. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12ebcd73e40e09f0dfddf89e465cc0541e0ff8b1 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:19 2005 -0700 [PATCH] uml: run mconsole "sysrq" in process context Things are breaking horribly with sysrq called in interrupt context. I want to try to fix it, but probably this is simpler. To tell the truth, sysrq is normally run in interrupt context, so there shouldn't be any problem. There's also a warning from the fault handler because it's run in atomic context (I have a patch for that, only I deferred it). This is why I'm doing this. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc36abf34e13aabbe06cdd060c434b3cdd80e7da Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:18 2005 -0700 [PATCH] uml: fix condition in tlb flush Avoid setting w = 0 twice. Spotted this (trivial) thing which is needed for another patch. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 546fe1cbf91d4d62e3849517c31a2327c992e5c5 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:16 2005 -0700 [PATCH] uml: fix hang in TT mode on fault The current code doesn't handle well general protection faults on the host - it thinks that cr2 is always the address of a page fault. While actually, on general protection faults, that address is not accessible, so we'd better assume we couldn't satisfy the fault. Currently instead we think we've fixed it, so we go back, retry the instruction and fault again endlessly. This leads to the kernel hanging when doing copy_from_user(dest, -1, ...) in TT mode, since reading *(-1) causes a GFP, and we don't support kernel preemption. Thanks to Luo Xin for testing UML with LTP and reporting the failures he got. Cc: Luo Xin Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69e1e688f5698287b45fbff22a01de91b20804cd Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:15 2005 -0700 [PATCH] uml: don't redundantly mark pte as newpage in pte_modify pte_modify marks a page as needing flush, which is redundant because the resulting PTE is still set with set_pte, which already handles that. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8bfb94c58238666df0d6856861d18f0f52fc752 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:14 2005 -0700 [PATCH] strlcat: use for uml umid.c Simplify the code by using strlcat() instead of strncat() and manual appending. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a02d6c051cf3c214aab38e4330b4bcec5f6e3f8 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Sep 22 21:44:12 2005 -0700 [PATCH] uml: don't remove umid files in conflict case Only remove the UML pidfile and management socket if we created them. Currently in case two UMLs are started with the same umid, the second will remove the first's ones. Probably we should also panic() at that point, not sure however. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8686bcd0a5f5e3f599ed9f1028ec9e449e7b87e3 Author: Pavel Machek Date: Thu Sep 22 21:44:11 2005 -0700 [PATCH] swsusp: fix comments Fix comments in swsusp. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eafb42707b21beb42bba4eae7b742f837ee9d2e0 Author: Christoph Lameter Date: Thu Sep 22 21:44:10 2005 -0700 [PATCH] __kmalloc: Generate BUG if size requested is too large. I had an issue on ia64 where I got a bug in kernel/workqueue because kzalloc returned a NULL pointer due to the task structure getting too big for the slab allocator. Usually these cases are caught by the kmalloc macro in include/linux/slab.h. Compilation will fail if a too big value is passed to kmalloc. However, kzalloc uses __kmalloc which has no check for that. This patch makes __kmalloc bug if a too large entity is requested. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0cdc82ee1ae36c1ae4631fc3a782faeb0b90df38 Author: Benjamin Herrenschmidt Date: Thu Sep 22 21:44:09 2005 -0700 [PATCH] mesh scsi: fix error handling The PowerMac mesh SCSI driver had some missing error handling which would trigger warnings due to lack of handling of return value from scsi_add_host. This fixes it. Signed-off-by: Benjamin Herrenschmidt Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98b4f5929ce5e616d0d0e13c71baf50083ab7397 Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Thu Sep 22 21:44:08 2005 -0700 [PATCH] atiixp_modem printk fixes Correctly identify atiixp_modem in its error messages. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3fc4cc17ac4dbadab0ba0d5c8233d3b18170d4a Author: Randy Dunlap Date: Thu Sep 22 21:44:07 2005 -0700 [PATCH] corrections to top-level README Corrections to the recent top-level README changes. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0365ba7fb1fa94a41289d6a3d36b4d95960e56cc Author: Benjamin Herrenschmidt Date: Thu Sep 22 21:44:06 2005 -0700 [PATCH] ppc64: SMU driver update & i2c support The SMU is the "system controller" chip used by Apple recent G5 machines including the iMac G5. It drives things like fans, i2c busses, real time clock, etc... The current kernel contains a very crude driver that doesn't do much more than reading the real time clock synchronously. This is a completely rewritten driver that provides interrupt based command queuing, a userland interface, and an i2c/smbus driver for accessing the devices hanging off the SMU i2c busses like temperature sensors. This driver is a basic block for upcoming work on thermal control for those machines, among others. Signed-off-by: Benjamin Herrenschmidt Cc: Jean Delvare Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f329075fb1dbd6845db03e9bb8252024fdbea1f Author: Anton Blanchard Date: Thu Sep 22 21:44:05 2005 -0700 [PATCH] ppc64: Fix 64bit ptrace DABR support Fix my stupid bug in the 64bit version of PTRACE_SET_DEBUGREG. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f951da3757cf46444a6ea52e97b8aa9400fe761a Author: Anton Blanchard Date: Thu Sep 22 21:44:05 2005 -0700 [PATCH] ppc64: Fix build with iommu debug enabled Fix build when iommu debug is enabled. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 586a90eb4c0b512df766e08a7718af7c6b9b2dcf Author: Anton Blanchard Date: Thu Sep 22 21:44:04 2005 -0700 [PATCH] ppc64: Fix LPAR regression The recent iommu fix broke booting on some POWER4 and POWER5 LPAR boxes. It looks like we have been calling the non LPAR iommu_dev_setup on LPAR machines for a while. The recent iommu fix caused that code path to fail. It looks like we just need to hook up the devices iommu_table to the parents one, so do that instead of calling iommu_dev_setup_pSeries and crossing the streams. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 275abf5b06676ca057cf3e15f0d027eafcb204a0 Author: OGAWA Hirofumi Date: Thu Sep 22 21:44:03 2005 -0700 [PATCH] ext3: ext3_show_options fix EXT3_MOUNT_DATA_FLAGS is not a boolean. This fixes it. Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff69416e6323fe9d38c42a06ebdefeb58bbe9336 Author: Christoph Lameter Date: Thu Sep 22 21:44:02 2005 -0700 [PATCH] slab: fix handling of pages from foreign NUMA nodes The numa slab allocator may allocate pages from foreign nodes onto the lists for a particular node if a node runs out of memory. Inspecting the slab->nodeid field will not reflect that the page is now in use for the slabs of another node. This patch fixes that issue by adding a node field to free_block so that the caller can indicate which node currently uses a slab. Also removes the check for the current node from kmalloc_cache_node since the process may shift later to another node which may lead to an allocation on another node than intended. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57487f4376e16558ccbe45a5b41d8cb5192309a4 Author: Rafael J. Wysocki Date: Thu Sep 22 21:44:01 2005 -0700 [PATCH] swsusp: do not trigger BUG_ON() if there is not enough memory The following patch makes swsusp avoid triggering the BUG_ON() in swsusp_suspend() if there is not enough memory for suspend. Signed-off-by: Rafael J. Wysocki Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c87b74c72d42f7272aa4bf8f17c73bb53774eee Author: Robert Love Date: Thu Sep 22 21:44:00 2005 -0700 [PATCH] hdaps: small update. - Handle dmi_system_check() elegantly, now that my bugfix is upstream. - Add support for the X41 and R52. - Cleanup some comments do I do not have to keep updating them with each new whitelisted laptop. Signed-off-by: Robert Love Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 609725f87709724218047a1049913ed233f79d3c Author: Keir Fraser Date: Thu Sep 22 21:43:59 2005 -0700 [PATCH] Fix mmap() of /dev/hpet The address passed to io_remap_pfn_range() in hpet_mmap() does not need to be converted using __pa(): it is already a physical address. This bug was found and the patch suggested by Clay Harris. I introduced this particular bug when making io_remap_pfn_range changes a few months ago. In fact mmap()ing /dev/hpet has *never* previously worked: before my changes __pa() was being executed on an ioremap()ed virtual address, which is also invalid. Signed-off-by: Keir Fraser Cc: Robert Picco Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7243cc05bafdda4c4de77cba00cf87666bd237f7 Author: Ivan Kokshaysky Date: Thu Sep 22 21:43:58 2005 -0700 [PATCH] slab: alpha inlining fix It is essential that index_of() be inlined. But alpha undoes the gcc inlining hackery and index_of() ends up out-of-line. So fiddle with things to make that function inline again. Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b3c86a7452df8608c32a1c1f19c0cc0723c145f Author: Ivan Kokshaysky Date: Thu Sep 22 21:43:57 2005 -0700 [PATCH] alpha: fix kernel panic during SysRq-b acquire_console_sem() does BUG() in interrupt context now, as in the case of SysRq-b. Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 720b9429e8f41f7c4ee9df293403650905042035 Author: Randy Dunlap Date: Thu Sep 22 21:43:56 2005 -0700 [PATCH] SOFTWARE_SUSPEND needs HOTPLUG_CPU on SMP Signed-off-by: Randy Dunlap Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 244bc050d5c9431682b7d834aff92e663fe88bb2 Author: Benjamin Herrenschmidt Date: Thu Sep 22 21:43:55 2005 -0700 [PATCH] ppc32: fix build with oprofile Current -git tree doesn't build when enabling oprofile on a non-bookE CPU (like on a PowerMac for example). While there is no performance counter support for these CPUs implemented yet, it's still nice to be able to use the timer based sampling, and that got broken. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66c81f0059b57e18aad43a5b0d330102c237cd72 Author: Grant Coady Date: Thu Sep 22 21:43:54 2005 -0700 [PATCH] DEBUG redefined in drivers/mtd/devices/docecc.c Fix namespace clash: drivers/mtd/devices/docecc.c:43:1: warning: "DEBUG" redefined In file included from drivers/mtd/devices/docecc.c:40: include/linux/mtd/mtd.h:219:1: warning: this is the location of the previous definition Signed-off-by: Grant Coady Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1e70a262d5cb5a02d2fc171e0178197849482d4 Author: Bernd Petrovitsch Date: Thu Sep 22 21:43:53 2005 -0700 [PATCH] Rename vprintk define in bttpvp.h Rename the (apparently) bttv intern #define vprintk to verbprintk to resolve a name clash. Reason: vprintk() is defined in include/linux/kernel.h similar to printk but with a va_list argument. (akpm: I changed it to bttv_printk) Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f71626a461e7d4af099ca71830ea530e96c22e11 Author: Latchesar Ionkov Date: Thu Sep 22 21:43:53 2005 -0700 [PATCH] v9fs: don't free root dentry & inode if error occurs in v9fs_get_sb If error occurs while in v9fs_get_sb after it calles sget, the dentry object of the root and its inode may be freed twice -- once while handling the error in v9fs_get_sb, and second time when v9fs_get_sb calles deactivate_super (which in turn calls v9fs_kill_super) The patch removes the unnecessary code that frees the root dentry and its inode. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1f9d8d23fef301ba0c0b4983e0aa947168e1c37 Author: Latchesar Ionkov Date: Thu Sep 22 21:43:52 2005 -0700 [PATCH] v9fs: replace strlen on newly allocated by __getname buffers to PATH_MAX v9fs_vfs_readlink allocates space for the link using __getname and errorneously uses strlen on the newly allocated buffer to check if the buffer passed by the user is bigger than the one returned by __getname. The patch replaces the strlen usage to PATH_MAX, which is the actual size of the buffers returned by __getname. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8e63bff521f0387fb4f4e486dede0e78dca8f41 Author: Latchesar Ionkov Date: Thu Sep 22 21:43:51 2005 -0700 [PATCH] v9fs: make copy of the transport prototype instead of using it directly When a new session is created it uses a template object of the specified transport type to instantiate its own copy. The code for the making a copy of the template object was lost, and the object itself is attached to the v9fs session. This leads to many sessions using the same transport instead of having their own copy. The patch puts back the code that makes a copy of the template object. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b067676234715051cbde87083c36c8ea83f77b8 Author: Latchesar Ionkov Date: Thu Sep 22 21:43:50 2005 -0700 [PATCH] v9fs: allocate the Rwalk qid array from the right conv buffer When v9fs_deserealize_fcall deserializes a Rwalk message, it incorrectly allocates space for the qid array in the source instead of the destination buffer. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d06a8fb130085c9f61e4c1a40445163087ecf89f Author: Latchesar Ionkov Date: Thu Sep 22 21:43:48 2005 -0700 [PATCH] v9fs: make conv functions to check for conv buffer overflow buf_check_size function checks if the conv buffer has enough space for the performed operation, but it doesn't return the result back to the calling function, only logs an error in the log. The report-back-error functionality was lost when buf_check_size was converted from macro to inline function. The return in the macro used to exit from the functions that include it, after the conversion it just exits from the inline function itself. The patch makes buf_check_size to return flag and all functions that use it check if they should perform the operation, or exit. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89559a6119e9779c732fdc7aef5e175bf090dd69 Author: Prasanna S Panchamukhi Date: Thu Sep 22 21:43:47 2005 -0700 [PATCH] Update maintainers list with the kprobes maintainers This patch updates the maintainers list with kprobes maintainers. Signed-of-by: Prasanna S Panchamukhi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88d10bbaaec38856f913313b6c0858d9e9b7a066 Author: Eric W. Biederman Date: Thu Sep 22 21:43:46 2005 -0700 [PATCH] suspend: cleanup calling of power off methods. In the lead up to 2.6.13 I fixed a large number of reboot problems by making the calling conventions consistent. Despite checking and double checking my work it appears I missed an obvious one. The S4 suspend code for PM_DISK_PLATFORM was also calling device_shutdown without setting system_state, and was not calling the appropriate reboot_notifier. This patch fixes the bug by replacing the call of device_suspend with kernel_poweroff_prepare. Various forms of this failure have been fixed and tracked for a while. Thanks for tracking this down go to: Alexey Starikovskiy, Meelis Roos , Nigel Cunningham , Pierre Ossman History of this bug is at: http://bugme.osdl.org/show_bug.cgi?id=4320 Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4c94330e3395ae87451bded2840a25d04f27902 Author: Eric W. Biederman Date: Thu Sep 22 21:43:45 2005 -0700 [PATCH] reboot: comment and factor the main reboot functions In the lead up to 2.6.13 I fixed a large number of reboot problems by making the calling conventions consistent. Despite checking and double checking my work it appears I missed an obvious one. This first patch simply refactors the reboot routines so all of the preparation for various kinds of reboots are in their own functions. Making it very hard to get the various kinds of reboot out of sync. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0678e5feaab8b359b18858e8532bb6017edb112b Author: Andrew Morton Date: Thu Sep 22 21:43:44 2005 -0700 [PATCH] proc_task_root_link c99 fix fs/proc/base.c: In function `proc_task_root_link': fs/proc/base.c:364: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8201c61065f3b5a4fe2fde1db1c817e288916be Author: David S. Miller Date: Thu Sep 22 20:31:29 2005 -0700 [SPARC64]: Fix comment typo in head.S Signed-off-by: David S. Miller commit bff06d552240ba7f5b49482a4865871d7bc03dc2 Author: David S. Miller Date: Thu Sep 22 20:11:33 2005 -0700 [SPARC64]: Rewrite bootup sequence. Instead of all of this cpu-specific code to remap the kernel to the correct location, use portable firmware calls to do this instead. What we do now is the following in position independant assembler: chosen_node = prom_finddevice("/chosen"); prom_mmu_ihandle_cache = prom_getint(chosen_node, "mmu"); vaddr = 4MB_ALIGN(current_text_addr()); prom_translate(vaddr, &paddr_high, &paddr_low, &mode); prom_boot_mapping_mode = mode; prom_boot_mapping_phys_high = paddr_high; prom_boot_mapping_phys_low = paddr_low; prom_map(-1, 8 * 1024 * 1024, KERNBASE, paddr_low); and that replaces the massive amount of by-hand TLB probing and programming we used to do here. The new code should also handle properly the case where the kernel is mapped at the correct address already (think: future kexec support). Consequently, the bulk of remap_kernel() dies as does the entirety of arch/sparc64/prom/map.S We try to share some strings in the PROM library with the ones used at bootup, and while we're here mark input strings to oplib.h routines with "const" when appropriate. There are many more simplifications now possible. For one thing, we can consolidate the two copies we now have of a lot of cpu setup code sitting in head.S and trampoline.S. This is a significant step towards CONFIG_DEBUG_PAGEALLOC support. Signed-off-by: David S. Miller commit 4881e2cd25d2d9cf9fca263caff3a0ce732d7d6b Author: Hidetoshi Seto Date: Tue Sep 20 16:34:41 2005 +0900 [IA64] MCA recovery verify pfn_valid Verify the pfn is valid before calling pfn_to_page(), and cut isolation message if nothing was done. Signed-off-by: Hidetoshi Seto Acked-by: Russ Anderson Signed-off-by: Tony Luck commit 20bb86852a6b7d9ca8c48ff921ff3904038959cf Author: Keith Owens Date: Thu Sep 22 18:49:15 2005 +1000 [IA64] Wire in the MCA/INIT handler stacks Wire the MCA/INIT handler stacks into DTR[2] and track them in IA64_KR(CURRENT_STACK). This gives the MCA/INIT handler stacks the same TLB status as normal kernel stacks. Reload the old CURRENT_STACK data on return from OS to SAL. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 40fd3533c93f0062b6d1d8540961ef70fc8ab750 Author: David S. Miller Date: Thu Sep 22 13:03:36 2005 -0700 [SPARC64]: Kill readjust_prom_translations() Testing shows that the prom_unmap() calls do absolutely nothing. Signed-off-by: David S. Miller commit 83a78d9ba792660418d692fd6737871aefdbff36 Author: Peter Chubb Date: Mon Sep 19 09:36:12 2005 +1000 [IA64] Fix simscsi for new SCSI midlayer The sd driver now uses scsi_execute_req() for almost everything. scsi_execute_req() converts requests into scatterlists. Fix the HP SCSI disk simulator to understand scatterlists for more commands. Without this patch the current kernel will not boot on the simulator (the disks are always detected as having no sectors, and so cannot be mounted). Signed-off-by: Peter Chubb Signed-off-by: Tony Luck commit 3fd07d3bf0077dcc0f5a33d2eb1938ea050da8da Author: Kumar Gala Date: Wed Sep 21 23:54:58 2005 -0500 [PATCH] ppc32: Fix configuration of PCI IO space on MPC85xx platform For platforms that don't have PCI IO at 0 the outbound window registers were not being properly configured. Signed-off-by: Andrew Klossner Signed-off-by: Kumar K. Gala Signed-off-by: Linus Torvalds commit 0fc084eaffe0a9a82a0c94da9ee9f7060ade8b04 Author: Alan Stern Date: Thu Sep 22 00:49:51 2005 -0700 [PATCH] USB: Update Documentation/usb/URB.txt This patch (as564) updates Documentation/usb/URB.txt, bringing it roughly up to the current level. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c6c88834b2c6635df9d17695feb50c835bc8efc6 Author: Pete Zaitcev Date: Thu Sep 22 00:49:45 2005 -0700 [PATCH] ub: Comment out unconditional stall clear This code appears to be more trouble than it's worth, considering that no normal users reload drivers. So, we comment it for now. It is not removed outright for the benefit of hackers (that is, myself). Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 3a8c1e2910daaff7590173e9d4ca07153e8a3517 Author: David Hollis Date: Thu Sep 22 00:49:39 2005 -0700 [PATCH] USB: Add Novatel CDMA Wireless PC card IDs to airprime USB: Add device id's for Novatel Wireless CDMA wireless PC card. The Novatel CDMA card behaves the same as the AirPrime by providing a USB serial port. Signed-off-by: David Hollis Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b27c73dcab61826e5f1228d69d56f469b0abfc05 Author: Matthias Urlichs Date: Thu Sep 22 00:49:33 2005 -0700 [PATCH] usb/serial/option.c: Increase input buffer size The card sometimes sends >2000 bytes in one single chunk. Ouch. Signed-Off-By: Matthias Urlichs Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit a85a46f2c38def5150251816890393803fdae7d0 Author: Kevin Vigor Date: Thu Sep 22 00:49:24 2005 -0700 [PATCH] USB: fix pegasus driver Addresses some small bugs in the pegasus ethernet-over-USB driver. Specifically, malformed long packets from the adapter could cause a kernel panic; the interrupt interval calculation was inappropriate for high-speed devices; the return code from read_mii_word was tested incorrectly; and failure to unlink outstanding URBs before freeing them could lead to kernel panics when unloading the driver. Signed-off-by: Kevin Vigor Cc: Petko Manolov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 4b2e790a4d73d729d936cc42f3b08af34f8ea5c6 Author: David Brownell Date: Thu Sep 22 00:49:07 2005 -0700 [PATCH] USB: sl811-hcd minor fixes Three minor sl811-hcd fixes: - Elminate memory leak on one (rare) disable/shutdown path. - For periodic transfers that don't need to be scheduled, update urb->start_frame to represent the transfer phase correctly. - Report the (single) port as removable, by default. Since no drivers yet use start_frame or that part of the hub descriptor, only that leak is likely to ever matter. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds drivers/usb/host/sl811-hcd.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) commit 2ba08e825e5a666f540bff15e9977725675e8de6 Author: Richard Purdie Date: Thu Sep 22 00:48:58 2005 -0700 [PATCH] USB: fix pxa2xx_udc compile warnings This patch fixes several types in the PXA25x udc driver and hence fixes several compiler warnings. Signed-off-by: Richard Purdie Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 72a755fce0243d4168a6153813a1b533b05a7d72 Author: Peter Favrholdt Date: Thu Sep 22 00:48:49 2005 -0700 [PATCH] USB: ftdi_sio: allow baud rate to be changed without raising RTS and DTR I'm using a 2 port USB RS232 dongle to connect to a serial-IR cradle for a bar code reader). Detecting the baudrate of the serial-IR involves keeping DTR low while changing baudrate. This works using normal 16550A serial ports as well as the FTDI driver version 1.4.0 (Linux 2.6.8) but stopped working with the change to "ensure RTS and DTR are raised when changing baudrate" introduced in version 1.4.1 (Linux 2.6.9). The attached patch fixes this, so RTS and DTR is only raised when changing baudrate iff the previous baudrate was B0. Signed-off-by: Peter Favrholdt Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b6137383bda844a433d65e027502df7b20ba45c2 Author: Matthias Urlichs Date: Thu Sep 22 00:48:40 2005 -0700 [PATCH] USB: more device IDs for Option card driver Added support for HUAWEI E600 and Audiovox AirCard User reports say that these devices work without driver modification. Signed-off-by: Matthias Urlichs Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 64bd84538ac7f8ba3080eda4d92c66a8441cc6cc Author: Pete Zaitcev Date: Thu Sep 22 00:48:29 2005 -0700 [PATCH] ub: fix burning cds This patch fixes a few problems with ub and cleans up a couple of things: - Bump UB_MAX_REQ_SG, this allows to burn CDs - Drop initialization of urb.transfer_flags, now that URB_UNLINK_ASYNC is gone - Add forgotten processing of stalls at GetMaxLUN - Remove a few more P3-tagged printks whose time has come - Correct comment about ZIP-100 Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds drivers/block/ub.c | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) commit 02fe75a9ad797b4f8ccf1ee8e49833b77cc30c6a Author: Linda Xie Date: Thu Sep 22 00:48:24 2005 -0700 [PATCH] PCI Hotplug: Fix buffer overrun in rpadlpar_sysfs.c Signed-off-by: Linda Xie Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 3c6de9295d28a4fc868b2c09f23e318e3e7b9b6b Author: Amos Waterland Date: Thu Sep 22 00:48:19 2005 -0700 [PATCH] fix drivers/pci/probe.c warning This function expects an unsigned 32-bit type as its third argument: static u32 pci_size(u32 base, u32 maxbase, u32 mask) However, given these definitions: #define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL) #define PCI_ROM_ADDRESS_MASK (~0x7ffUL) these two calls in drivers/pci/probe.c are problematic for architectures for which a UL is not equivalent to a u32: sz = pci_size(l, sz, PCI_BASE_ADDRESS_MEM_MASK); sz = pci_size(l, sz, PCI_ROM_ADDRESS_MASK); Hence the below compile warning when building for ARCH=ppc64: drivers/pci/probe.c: In function `pci_read_bases': /.../probe.c:168: warning: large integer implicitly truncated to unsigned type /.../probe.c:218: warning: large integer implicitly truncated to unsigned type Here is a simple fix. Signed-off-by: Amos Waterland Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 656da9da3745abcbbbdca598745d04c6de2c8843 Author: Pekka Enberg Date: Thu Sep 22 00:48:11 2005 -0700 [PATCH] PCI: convert kcalloc to kzalloc This patch converts kcalloc(1, ...) calls to use the new kzalloc() function. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 1029d6b58adc3225911c56af26895871dd2ea8cf Author: Bjorn Helgaas Date: Thu Sep 22 00:48:02 2005 -0700 [PATCH] PCI: remove unused "scratch" Unused variable. Signed-off-by: Bjorn Helgaas Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit dba28010b27ab56d2c4cec5f361e0947295addfd Author: Greg Kroah-Hartman Date: Thu Sep 22 00:47:46 2005 -0700 [PATCH] I2C: remove me from the MAINTAINERS file for i2c Remove my name from the I2C maintainer, Jean is more than capable of handling it all now. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Jean Delvare Signed-off-by: Linus Torvalds commit 3e51377dc412df9d4933c4fd1a147b5b560abe10 Author: Bill Nottingham Date: Thu Sep 22 00:47:36 2005 -0700 [PATCH] fix class symlinks in sysfs The class symlinks in sysfs don't properly handle changing device names. To demonstrate, rename your network device from eth0 to eth1. Your pci (or usb, or whatever) device will still have a 'net:eth0' link, except now it points to /sys/class/net/eth1. The attached patch makes sure the class symlink name changes when the class device name changes. It isn't 100% correct, it should be using sysfs_rename_link. Unfortunately, sysfs_rename_link doesn't exist. Signed-off-by: Bill Nottingham Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d305ef5d2a4e77bfa66160513f4a7494126a506b Author: Daniel Ritz Date: Thu Sep 22 00:47:24 2005 -0700 [PATCH] driver core: add helper device_is_registered() add the helper and use it instead of open coding the klist_node_attached() check (which is a layering violation IMHO) idea by Alan Stern. Signed-off-by: Daniel Ritz Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 4c898c7f2f286b204fefc5dddb568f755d195d0c Author: Daniel Ritz Date: Thu Sep 22 00:47:11 2005 -0700 [PATCH] Driver Core: fis bus rescan devices race bus_rescan_devices_helper() does not hold the dev->sem when it checks for !dev->driver(). device_attach() holds the sem, but calls again device_bind_driver() even when dev->driver is set. What happens is that a first device_attach() call (module insertion time) is on the way binding the device to a driver. Another thread calls bus_rescan_devices(). Now when bus_rescan_devices_helper() checks for dev->driver it is still NULL 'cos the the prior device_attach() is not yet finished. But as soon as the first one releases the dev->sem the second device_attach() tries to rebind the already bound device again. device_bind_driver() does this blindly which leads to a corrupt driver->klist_devices list (the device links itself, the head points to the device). Later a call to device_release_driver() sets dev->driver to NULL and breaks the link it has to itself on knode_driver. Rmmoding the driver later calls driver_detach() which leads to an endless loop 'cos the list head in klist_devices still points to the device. And since dev->driver is NULL it's stuck with the same device forever. Boom. And rmmod hangs. Very easy to reproduce with new-style pcmcia and a 16bit card. Just loop modprobe ;cardctl eject; rmmod . Easiest fix is to check if the device is already bound to a driver in device_bind_driver(). This avoids the double binding. Signed-off-by: Daniel Ritz Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 91fbc6edfa7086b5fcdb74ea82ab747104541f1f Author: Anton Altaparmakov Date: Thu Sep 22 13:26:44 2005 +0100 NTFS: Fix sparse warnings that have crept in over time. Signed-off-by: Anton Altaparmakov commit 8420e1b541fe92aee1d8d4d25d9e33eaca756a7b Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 08:29:08 2005 -0300 [LLC]: fix llc_ui_recvmsg, making it behave like tcp_recvmsg In fact it is an exact copy of the parts that makes sense to LLC :-) Signed-off-by: Arnaldo Carvalho de Melo commit d389424e00f9097cd24b3df4ca0ab7221f140eeb Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 07:57:21 2005 -0300 [LLC]: Fix the accept path Borrowing the structure of TCP/IP for this. On the receive of new connections I was bh_lock_socking the _new_ sock, not the listening one, duh, now it survives the ssh connections storm I've been using to test this specific bug. Also fixes send side skb sock accounting. Signed-off-by: Arnaldo Carvalho de Melo commit 2928c19e1086e2f1e90d05931437ab6f1e4cfdc8 Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 05:14:33 2005 -0300 [LLC]: Fix sparse warnings Signed-off-by: Arnaldo Carvalho de Melo commit 2bdb3cb265830aee823444d115a8a84eca2b934e Author: David S. Miller Date: Thu Sep 22 01:08:57 2005 -0700 [SPARC64]: Remove unnecessary paging_init() cruft. Because we don't access the PAGE_OFFSET linear mappings any longer before we take over the trap table from the firmware, we don't need to load dummy mappings there into the TLB and we don't need the bootmap_base hack any longer either. While we are here, check for a larger than 8MB kernel and halt the boot with an error message. We know that doesn't work, so instead of failing mysteriously we should let the user know exactly what's wrong. Signed-off-by: David S. Miller commit 0519d8fbabc4eb215a8263f29143ccd86c328157 Author: Jochen Friedrich Date: Thu Sep 22 04:51:56 2005 -0300 [TR]: Set correct frame type for SNAP packets Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 096f0eb1dff326ddebfedeb128fb48d5b7ca75e1 Author: Jochen Friedrich Date: Thu Sep 22 04:48:46 2005 -0300 [LLC]: Fix llc_fixup_skb() bug llc_fixup_skb() had a bug dropping 3 bytes packets (like UA frames). Token ring doesn't pad these frames. Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 5564af21ae7900889c5151e5b16bd42cdda11a77 Author: Jochen Friedrich Date: Thu Sep 22 04:46:44 2005 -0300 [LLC]: Fix for Bugzilla ticket #5157 Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 5085b4a5492f4f8bd32d0cc5b1cad4bf522c2e1a Author: David S. Miller Date: Thu Sep 22 00:45:41 2005 -0700 [SPARC64]: Do not allocate OBP page tables using bootmem Just allocate them physically starting from the end of the kernel image. This incredibly simplifies our MM bootstrap in that we don't need any mappings in the linear PAGE_OFFSET area working in order to bootstrap ourselves and take over the trap table from the firmware. Many further simplifications are possible now, and this also sets the stage for CONFIG_DEBUG_PAGEALLOC support. Signed-off-by: David S. Miller commit cf309e3fb863b7a245b91f816193957f6daf786f Author: Jochen Friedrich Date: Thu Sep 22 04:44:55 2005 -0300 [LLC]: Fix for Bugzilla ticket #5156 Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 6e2144b76840be09924de1626e2dcd7b315f75b3 Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 04:43:05 2005 -0300 [LLC]: Use refcounting with struct llc_sap Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 04e4223f44b89e50f275cb6b95a58ebe2c4909be Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 04:40:59 2005 -0300 [LLC]: Do better struct sock accounting on skbs Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit afdbe35787ea3390af0f1dd38b3dd9d8a8d313e7 Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 04:37:07 2005 -0300 [LLC]: Use sk_wait_data Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 249ff1c6d35fd32ca945967c3f0b948210a96baa Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 04:32:10 2005 -0300 [LLC]: Use some more likely/unlikely Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 590232a7150674b2036291eaefce085f3f9659c8 Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 04:30:44 2005 -0300 [LLC]: Add sysctl support for the LLC timeouts Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 54fb7f25f19a4539d3ec012e410439913650dc06 Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 04:26:14 2005 -0300 [LLC]: Use the sk_wait_event primitive Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit b35bd11019ed1084a36632f1c1d936244d9cfb5b Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 04:22:39 2005 -0300 [LLC]: Convert llc_ui_wait_for_ functions to use prepare_to_wait/finish_wait And make it look more like the similar routines in the TCP/IP source code. Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 72b1ad4a7e239a2224e87194654acba56fc477d4 Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 04:19:52 2005 -0300 [LLC]: Remove unused functions from llc_c_ev.c Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 405599bd98b01d648becb020efb503abf19f9c9f Author: David S. Miller Date: Thu Sep 22 00:12:35 2005 -0700 [SPARC64]: Break up inherit_prom_mappings() into it's constituent parts. This thing was just a huge monolithic mess, so chop it up. Signed-off-by: David S. Miller commit b9441fc3375a6637a81bc1635c5e12da4dc7acc6 Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 04:09:45 2005 -0300 [LLC]: Use const in llc_c_ev.c Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit af426d327c38bcb8cbb87c60134d42d2e93b20cc Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 03:59:22 2005 -0300 [LLC]: Help the compiler with likely/unlikely, saving some more bytes Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 0eb8017242cb7e8b18af4751b03646436b8f90e3 Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 03:57:55 2005 -0300 [LLC]: Mark llc_find_next_offset as __init, saving some more bytes Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 5a770c0262262e96979fe05d5c2fa1d1f409dbdc Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 03:56:26 2005 -0300 [LLC]: Update comments for llc_ui_bind and llc_ui_autobind to match new behaviour Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 774ccb4f64020dad40d38efa63685220e1f245cc Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 03:53:35 2005 -0300 [LLC]: Remove unneeded temp net_device variables Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit e0dd55190ff8c6485a721c9473ded92d03c0fe01 Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 03:50:15 2005 -0300 [LLC]: introduce llc_conn_tmr_common_cb, to avoid code duplication Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 838a75dae05d59b7d7894c299508ae3d7dea9630 Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 03:44:23 2005 -0300 [LLC]: Remove unneeded f_bit variables Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit bdcc66cca89cc2e97e93054d139b2e9a2b2ec1a7 Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 03:38:15 2005 -0300 [LLC]: Simplify llc_c_ac code, removing unneeded assignments to variables Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit 1d67e6501b8dba54ef8dcabebe2ad049b8ad0d67 Author: Arnaldo Carvalho de Melo Date: Thu Sep 22 03:27:56 2005 -0300 [LLC]: Make llc_frame_alloc take a net_device as an argument So as to set the newly created sk_buff ->dev member with it, that way we stop using dev_base->next, that is the wrong thing to do, as there may well be several interfaces being used with LLC. This was not such a big problem after all as most of the users of llc_alloc_frame were setting the correct dev, but this way code is reduced. This also fixes another bug in llc_station_ac_send_null_dsap_xid_c, that was not setting the skb->dev field. Signed-off-by: Jochen Friedrich Signed-off-by: Arnaldo Carvalho de Melo commit b206fc4c0997ee858bc3ed35f157d7c3cda54cfd Author: David S. Miller Date: Wed Sep 21 22:31:13 2005 -0700 [SPARC64]: Do not allocate prom translations using bootmem. Use __initdata instead. Signed-off-by: David S. Miller commit 1ac4f5ebaa496a23ab4a148c9864d7e30a6c6cd3 Author: David S. Miller Date: Wed Sep 21 21:49:32 2005 -0700 [SPARC64]: Remove ktlb.S instruction patching. This was kind of ugly, and actually buggy. The bug was that we didn't handle a machine with memory starting > 4GB. If the 'prompmd' was allocated in physical memory > 4GB we'd croak because the obp_iaddr_patch and obp_daddr_patch things only supported a 32-bit physical address. So fix this by just loading the appropriate values from two variables in the kernel image, which is locked into the TLB and thus accesses to them can't cause a recursive TLB miss. Signed-off-by: David S. Miller commit e86ee6682b649183c11013a98be02f25e9ae399d Author: Andy Currid Date: Mon Sep 19 06:17:52 2005 -0700 [PATCH] Add NVIDIA device ID in sata_nv Signed-off-by: Andy Currid Signed-off-by: Jeff Garzik commit 0b50f81d5a63428f131ff20596f4e3d473e5b94f Author: Tommy Christensen Date: Wed Sep 21 12:13:57 2005 -0700 [PATCH] r8169: call proper VLAN receive function vlan_hwaccel_rx should be used when in interrupt context. Fixes bug http://bugzilla.kernel.org/show_bug.cgi?id=5284 Signed-off-by: Tommy S. Christensen Cc: Francois Romieu Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 383181ac7e59542ff47e2b81f7e4c40aba39b30b Author: Stephen Hemminger Date: Mon Sep 19 15:37:16 2005 -0700 [PATCH] skge: check length from PHY Cleanup receive buffer allocation and management, Add more error handling checks from PHY and bump version. Signed-off-by: Jeff Garzik commit c3f8be961808313a502c67d59e2b7f930477faf3 Author: Stephen Hemminger Date: Mon Sep 19 15:37:34 2005 -0700 [PATCH] skge: expand ethtool debug register dump Expand the returned data for ethtool debug access to include all of the mapped PCI area; except for the small set of registers that are for diagnostic RAM access. Access to those registers will hang the system. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 059deb693ec191e563ec69533d24f3feff0b78cd Author: David S. Miller Date: Wed Sep 21 19:23:48 2005 -0700 [SPARC64]: Kill SZ_BITS define from dtlb_backend.S This is just a replica of the existing _PAGE_SZBITS, and thus unnecessary. Signed-off-by: David S. Miller commit 552709d5aee9145f325bf07348fb299e84b2e5b3 Author: nsxfreddy@gmail.com Date: Wed Sep 21 14:18:04 2005 -0500 [PATCH] bonding: Fix link monitor capability check (was skge: set mac address oops with bonding) Fix bond_enslave link monitoring warning to check use_carrier status and ethtool_ops in addition to do_ioctl. This version checks ethtool_ops as well as do_ioctl, and also uses the per-bond params.use_carrier instead of the global use_carrier. Signed-off-by: Jason R. Martin Signed-off-by: Jeff Garzik commit 2a7e2990340a1c42321d79dc99755683ea5a1026 Author: David S. Miller Date: Wed Sep 21 18:50:51 2005 -0700 [SPARC64]: Move kernel TLB miss handling into a seperate file. Signed-off-by: David S. Miller commit efb0372bbaf5b829ff8c39db372779928af542a7 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 18:40:49 2005 +0200 [PATCH] uml: fix compile warning after consolidation patch The header declaring this function wasn't included, so the function declaration was totally bogus wrt. the proto - even if this wasn't going to fail at all. It was so bad that the compile warning I got was "control reaches end of non-void function", i.e. missing return. Actually, this has been there for ages, the consolidation patch just added the warning which was needed to clean it up. Nice. Really. Cc: Allan Graves Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit a46c9047642d70f5619e4a14129d74dd1f6ea74f Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 18:40:29 2005 +0200 [PATCH] uml: comment about cast build fix Explain why the casting we do to silence this warning is indeed safe. It is because the field we're casting from, though being 64-bit wide, was filled with a pointer in first place by ourselves. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit ae756df8ddd00a30bb3bdf6774b514c096dda4a4 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 18:40:10 2005 +0200 [PATCH] uml: readd removed unistd.h inclusion Readd this header (deleted in 60d339f6fe0831060600c62418b71a62ad26c281). A warning is spit out here about undeclared getpgrp(). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 41c79dc3825545d9aa2d5e5b1a99f8faabf51455 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 18:39:47 2005 +0200 [PATCH] uml: fix bogus HOST_ELF_CLASS symbol name Even if with a bit of misunderstanding, Al fixed this in commit 95608261dae863bc43292e6fbd946a3abd3aa49f. Well, the symbol was intended to come from userspace (it exists there on normal host), but since some hosts may miss that, using the kernel one is just as fine. However, rename it to be named consistently with the rest. Actually, he missed converting ELFCLASS32 to coming from kernel headers. For consistence, add ELFCLASS64 too. Cc: Al Viro Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit fd7481047882eaa0a692a545d5f8419612ece1b0 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 18:39:32 2005 +0200 [PATCH] uml: Fix conflict between libc and ipv6 gcc is now complaining during link on some hosts - fix it as for other things. Reported by Antoine Martin . Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 8e5cb35a60c8792ffc3ba89ea66ebdd3c2f01cb1 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 18:39:14 2005 +0200 [PATCH] uml: fix uname output on 32-bit binary on 64-bit host Translate uname output taken from the host if needed. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 36decba90b184a25b7f77fb7df1612125cc41ac5 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 18:38:57 2005 +0200 [PATCH] uml: fix modify_ldt - missing break in switch I am a lamer :-(. Luckily, Luo Xin performed LTP testing and found this failure. Btw, the fact that the patch in which I introduced this was merged shows that: a) I'm really trusted by people b) sometimes they're wrong about point a). c) lack of time for reviewers. CC: Luo Xin Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 76629ac154aacfec8883954c3ff9871905d2fb8e Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 18:38:33 2005 +0200 [PATCH] uml: remove verify_area_{tt,skas} When removing verify_area, verify_area_{tt,skas} were forgotten. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 676067cfeaa16f6f338e067e83ce4733b41c0b24 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 18:38:09 2005 +0200 [PATCH] Remove unused var from asm/futex.h As recently done by Russell King for ARM, commit 4732efbeb997189d9f9b04708dc26bf8613ed721 introduces a generic asm/futex.h copied along most arches, which includes a "-ENOSYS support" to be changed if needed. However, it includes an unused var (taken from the "real" version) which GCC warns about. Remove it from all arches having that file version (i.e. same GIT id). $ git-diff-tree -r HEAD and $ git-ls-tree -r HEAD include/|grep 9feff4ce1424bc390608326240be369eb13aa648 may be more interesting than looking at the patch itself, to make sure I've just copied the arm header to all other archs having the original dummy version of this file. Cc: Jakub Jelinek Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit c51179fb0c77ad91df5825f8f7eb670da97e137e Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 18:37:14 2005 +0200 [PATCH] uml: adapt asm/futex.h to our arch Follow up to 4732efbeb997189d9f9b04708dc26bf8613ed721 - uml must just reuse as-is the backing architecture support. There is a micro-fixup is needed for the included file, which won't affect i386 behaviour at all. I've not tested compilation on x86_64, only on x86, but the code is almost the same except the culprit test, so everything should be ok on x86_64 too. Cc: Jakub Jelinek Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 68ce1eb54056e4fad6e73968e958b926d28cb0dd Author: Andrew Morton Date: Wed Sep 21 09:46:54 2005 -0700 [SCSI] lpfc build fix gcc-2.95.x doesn't do anonymous unions. Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 6a1ced59b3ac5d1088f597fd0613a724cdf19e2c Author: Catalin Marinas Date: Wed Sep 21 22:14:05 2005 +0100 [ARM] 2932/1: Avoid the "noreturn" warning in arch/arm/kernel/traps.c Patch from Catalin Marinas This patch prevents the "noreturn function does return" warning in the __bug() function in arch/arm/kernel/traps.c Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit f2065e4242e5078d53c521b973c5cd4eae91eca2 Author: Hal Rosenstock Date: Wed Sep 21 12:33:09 2005 -0700 [IB] Fix RMPP receive length calculation Based on simplification idea from Sean Hefty Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 972d512a17c1bb7c4b784a9da2ca75745fcc6989 Author: Sean Hefty Date: Wed Sep 21 12:31:26 2005 -0700 [IB] Add MAD data field size definitions Clean up code by using enums instead of hard-coded magic numbers. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 62a36c43c898d45efcfe3376ea1da6a9a182e1ad Author: Stephane Kardas Date: Wed Sep 21 09:55:45 2005 -0700 [PATCH] fat: fix adate During a forensic analysis on the fat file system, I found than the result for the last access date on this file system was different between the stat command and the istat command (package tct-utils). The istat command display a true date (the right windows date) but the stat primitive (so stat, find, ls command) displays a wrong date. Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89d7cbf73e1a85241eb42339f6cb7a429fec178c Author: Randy Dunlap Date: Wed Sep 21 09:55:44 2005 -0700 [PATCH] update URL for HPET spec. Correct URL for HPET spec. Signed-off-by: Randy Dunlap Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7980cbbb30bf044e6f40912a3f6456204ddfc27e Author: Eric Dumazet Date: Wed Sep 21 09:55:43 2005 -0700 [PATCH] Adds sys_set_mempolicy() in include/linux/syscalls.h Signed-off-by: Eric Dumazet Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b1ac9ab15c1fc1e0b73d887a0c0cafe92991f97 Author: Stephen Hemminger Date: Wed Sep 21 09:55:41 2005 -0700 [PATCH] skge: add maintainer Add MAINTAINER record for Andrew ;-) Signed-off-by: Stephen Hemminger Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f91648dcb0685d58aa046b25c69ce0d5f284f8c Author: Christoph Hellwig Date: Wed Sep 21 09:55:40 2005 -0700 [PATCH] fixup Documentation/DocBook/kernel-hacking.tmpl __FUNCTION__ is the prefered kernel idiom, __func__ is not supported by gcc 2.95 (we actually map __FUNCTION__ to __func__ for more recent compilers, but it should never be used directly) Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e2cff42cfac27c25202648c5c89f9171e5bc085 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 09:55:39 2005 -0700 [PATCH] mm: add a note about partially hardcoded VM_* flags Hugh made me note this line for permission checking in mprotect(): if ((newflags & ~(newflags >> 4)) & 0xf) { after figuring out what's that about, I decided it's nasty enough. Btw Hugh itself didn't like the 0xf. We can safely change it to VM_READ|VM_WRITE|VM_EXEC because we never change VM_SHARED, so no need to check that. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e871b6c8f1f4fda41e51ef86147facecac3be9f Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 09:55:38 2005 -0700 [PATCH] mm: update stale comment for removal of page->list Update comment for the 2.6.6-rc1 conversion from page->list and address_space->{clean,dirty,locked}_pages to radix tree tagging and ->lru. I've mostly avoided to mention page lists (at least I've shortened the comment). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f875a1a6650edce859bd21051a22e1c27ac7ea63 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 09:55:37 2005 -0700 [PATCH] README update from the stone age We have no options which the user can set in the Makefile. Only the EXTRAVERSION, which is also useful in place of the "backup modules" suggestion. We don't have configuration options in the top Makefile. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f10df6860498c7f52db4f00ff00a1ba334bcfea0 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Sep 21 09:55:37 2005 -0700 [PATCH] fix locking comment in unmap_region() That comment is plain wrong (we even take the pagetable lock inside unmap_region()). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b20f6da20d874a58becc7a08b130c4382ea7325 Author: Deepak Saxena Date: Wed Sep 21 09:55:35 2005 -0700 [PATCH] Fix I2O config-osm init to return proper error We currently unregister the config-osm driver if initialization of the legacy ioctl() handlers failed but still return success. We should be returning -EBUSY in this case. Signed-off-by: Deepak Saxena Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40da47e1159b89f2df5c718d2d5e269ced72b541 Author: Benjamin Herrenschmidt Date: Wed Sep 21 09:55:34 2005 -0700 [PATCH] ppc64: Build zImage.vmode for G5 zImage.vmode was recently added. It's a version of zImage in which the ELF note section used by open firmware indicates that it requires a virtual mode instance of OF instead of real mode. This allows it to work with Apple OF, and thus is directly bootable (or netbootable) from OF command line. (Unfortunately, pSeries OF sort-of requires real mode and Apple OF sort-of requires virtual mode, and both tend to be unhappy if no notes section specifies the mode at all). However, we forgot to add zImage.vmode to the default G5 build. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbcc6bee9e5bf45ec35e87a4e0755dff09fe25d4 Author: Christoph Hellwig Date: Wed Sep 21 09:55:33 2005 -0700 [PATCH] remove blkdev_scsi_issue_flush_fn again This function was removed a while ago, but crept in again via a recent scsi merge. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bc2a3bb86688ffca691ba2ad30a2d5dcba774cf Author: Anton Blanchard Date: Wed Sep 21 09:55:33 2005 -0700 [PATCH] ppc64: Fix issue with non zero boot cpu The new version of the flattened device tree passes the boot cpuid in the header instead of via a linux,boot-cpu property. We need to update the in kernel OF parsing code to do this, otherwise machines with a non zero boot cpuid fail to come up. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6dbf42ee36d4f9ffc2a93877c19937c81974124 Author: Mike Miller Date: Wed Sep 21 09:55:32 2005 -0700 [PATCH] cciss: busy_initializing bug fix This patch fixes the problem Bjorn reported. The busy_initializing flag should have cleared before going into the for loop. Signed-off-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c2822ccb1f8cc96fc006aa82e68e1944290014a Author: Olof Johansson Date: Wed Sep 21 09:55:31 2005 -0700 [PATCH] PPC64: Fix boot for some pre-POWER4 systems Some RS64 systems (such as F80) have non-python host bridges with EADS. However, they have two EADS with 4 buses each under them, so the old logic that assumed no more than 7 busses per PHB failed miserably. Big thanks to Olaf Hering for helping me test this, he's got one of the few machines that broke from the previous logic. Also, to be a bit smarter at detecting the need for a PHB-level IOMMU table by checking for the presence of an ISA bus. Only PHBs with ISA bridges should need the PHB-level table. Signed-off-by: Olof Johansson Cc: Anton Blanchard Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31f6d9d628739c097964b8dbae939ea997da94a3 Author: Andrew Morton Date: Wed Sep 21 09:55:30 2005 -0700 [PATCH] Add printk_clock() ia64's sched_clock() accesses per-cpu data which isn't set up at boot time. Hence ia64 cannot use printk timestamping, because printk() will crash in sched_clock(). So make printk() use printk_clock(), defaulting to sched_clock(), overrideable by the architecture via attribute(weak). Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66dcca062847bcd261ebb3ac96d51101f31a8630 Author: Sripathi Kodi Date: Mon Sep 19 18:26:12 2005 -0500 [PATCH] Fix invisible threads problem When the main thread of a thread group has done pthread_exit() and died, the other threads are still happily running, but will not be visible under /proc because their leader is no longer accessible. This fixes the access control so that we can see the sub-threads again. Signed-off-by: Sripathi Kodi Acked-by: Al Viro Signed-off-by: Linus Torvalds commit d79e743e9fcf03f521300a970eb1ab69641910ba Author: Paul Mackerras Date: Wed Sep 21 14:14:22 2005 +1000 [PATCH] ppc64: Fix PCI flags when using OF device tree My code to set up the PCI tree from the Open Firmware device tree was setting IORESOURCE_* flags on the resources for the devices, but not the PCI_BASE_ADDRESS_* flags. This meant that some drivers misbehaved, and /proc/pci showed the wrong types for the resources. This fixes it. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit a131430c200f6bda313bf5d0a8e238c41afdfe0a Author: Christopher Zimmermann Date: Wed Sep 21 00:41:22 2005 -0700 [SPARC] cs4231: Fix SBUS support in this driver. From: Christopher Zimmermann This patch enables SBus support for the cs4231 sound driver. It is tested on an Ultra2. Capture and playback both work. I experienced lags and crashes using certain threaded players like ogg123 and mp3blaster, while the former is lagging far more. This behavior may be specific to SMP systems. It is reproducable using the dummy sound card driver. Sox works flawlessly. Setting up the calculation of ptr in snd_cs4231_playback_pointer was a bit strange. I got it to work by not incrementing the [pc]_periods_sent counter when starting DMA the first time in cs4231_dma_trigger. Therefore this dummy thing. [ I did some minor cleanups -DaveM ] Signed-off-by: David S. Miller commit 1a3e64aa480101d11d8cac94ca57fd8bbe2536b7 Author: Tom 'spot' Callaway Date: Wed Sep 21 00:29:16 2005 -0700 [ATYFB]: Fix build with CONFIG_FB_ATY_GENERIC_LCD disabled. Signed-off-by: Tom 'spot' Callaway Signed-off-by: David S. Miller commit 7957aed72b104f7528da484f292442c6f3a131a1 Author: Stephen Hemminger Date: Wed Sep 21 00:19:46 2005 -0700 [TCP]: Set default congestion control correctly for incoming connections. Patch from Joel Sing to fix the default congestion control algorithm for incoming connections. If a new congestion control handler is added (via module), it should become the default for new connections. Instead, the incoming connections use reno. The cause is incorrect initialisation causes the tcp_init_congestion_control() function to return after the initial if test fails. Signed-off-by: Stephen Hemminger Acked-by: Ian McDonald Signed-off-by: David S. Miller commit 78c6671a88313fd3c4364dc46e8c8186612616b8 Author: Stephen Hemminger Date: Wed Sep 21 00:15:39 2005 -0700 [FIB_TRIE]: message cleanup Cleanup the printk's in fib_trie: * Convert a couple of places in the dump code to BUG_ON * Put log level's on each message The version message really needed the message since it leaks out on the pretty Fedora bootup. Signed-off-by: Stephen Hemminger Acked-by: Robert Olsson , Signed-off-by: David S. Miller commit 0fb375fb9b93b7d822debc6a734052337ccfdb1f Author: Eric W. Biederman Date: Wed Sep 21 00:11:37 2005 -0700 [AF_PACKET]: Allow for > 8 byte hardware addresses. The convention is that longer addresses will simply extend the hardeware address byte arrays at the end of sockaddr_ll and packet_mreq. In making this change a small information leak was also closed. The code only initializes the hardware address bytes that are used, but all of struct sockaddr_ll was copied to userspace. Now we just copy sockaddr_ll to the last byte of the hardware address used. For error checking larger structures than our internal maximums continue to be allowed but an error is signaled if we can not fit the hardware address into our internal structure. Signed-off-by: Eric W. Biederman Signed-off-by: David S. Miller commit 6d67e34de5a378de2f461137944c5d931283d557 Author: Antonino A. Daplas Date: Wed Sep 21 07:32:49 2005 +0800 [PATCH] fbdev: Fix reversed back and front porches In fbdev perspective, the frontporch is the lower/right margin and the backporch is the upper/left margin. Correct. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 7a482425f45e695a2e2821b32a887865f016fbf9 Author: Antonino A. Daplas Date: Wed Sep 21 07:30:21 2005 +0800 [PATCH] nvidiafb: Fix absence of cursor in nvidiafb A recent change in nvidiafb caused nvidiafb_cursor to always return -ENXIO instead of using the soft_cursor. This will happen if the parameter "hwcur" is not set, which happens to be the default. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit a9f7baf4d695dbe3028d40ca374c1d11499eaee6 Author: Russell King Date: Tue Sep 20 21:01:13 2005 +0100 [ARM] Fix pcf8583 to build Seems that the Acorn RTC driver missed an update. Fix it. Signed-off-by: Russell King commit 438282d85de2c8f8c5183fdf55140e51a0b18670 Author: Dave Kleikamp Date: Tue Sep 20 14:58:11 2005 -0500 JFS: don't dereference tlck->ip from txUpdateMap The inode pointer may no longer be valid Signed-off-by: Dave Kleikamp commit 729b4f7de68191478b20fab19a6d0c6b8c4380c9 Author: David S. Miller Date: Tue Sep 20 12:18:38 2005 -0700 [SPARC64]: Verify vmalloc TLB misses more strictly. Arrange the modules, OBP, and vmalloc areas such that a range verification can be done quite minimally. Signed-off-by: David S. Miller commit 71eea47d853bb0ce0c6befe11b3e08111263170f Author: Michael S. Tsirkin Date: Tue Sep 20 10:54:48 2005 -0700 [PATCH] IB/mthca: Fix device removal memory leak Clean up QP table array on device removal. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 8d2cae0651502028bf64844508ab18528bbd65c2 Author: Roland Dreier Date: Tue Sep 20 10:52:04 2005 -0700 [PATCH] IPoIB: Don't flush workqueue from within workqueue ipoib_mcast_restart_task() is always called from within the single-threaded IPoIB workqueue, so flushing the workqueue from within the function can lead to a recursion overflow. But since we're running in a single-threaded workqueue, we're already synchronized against other items in the workqueue, so just get rid of the flush in ipoib_mcast_restart_task(). Signed-off-by: Roland Dreier commit 840ff6a4f6174d7fe19c206b5f36ff64123a2f45 Author: Russell King Date: Tue Sep 20 17:52:13 2005 +0100 [ARM] Prevent deadlock in page fault handler As per x86, we may deadlock while trying to get the mmap semaphore. Implement the same fix, which allows (eg) recursive faults to cause an oops instead of deadlocking. Signed-off-by: Russell King commit 5fe10ab19046d84f3fd243436cbd5fa01019e809 Author: Ben Dooks Date: Tue Sep 20 17:24:33 2005 +0100 [ARM] 2928/1: S3C2410 - make machine init code static Patch from Ben Dooks This code is not being exported, declare it static Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 9d0fd1eb8a3c19f3ede5418540b3c9f64fac4b86 Author: Ben Dooks Date: Tue Sep 20 16:45:20 2005 +0100 [ARM] 2927/1: .arch.info - postfix section with .init for `make buildcheck` Patch from Ben Dooks The `make buildcheck` is erroneously reporting that the .arch.info list is referencing items in the .init section as it is not itself postfixed with .init Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 02b7dd1244aab9267ae4078e1ad6a2fdaabeb6ed Author: Ben Dooks Date: Tue Sep 20 16:35:03 2005 +0100 [ARM] 2926/1: .proc.info - postfix section with .init for `make buildcheck` Patch from Ben Dooks The `make buildcheck` is erroneously reporting that the .proc.info list is referencing items in the .init section as it is not itself postfixed with .init Signed-off-by: Ben Dooks Signed-off-by: Russell King commit bfe6815e0465035d013b2b676444376fe2b3716e Author: Ben Dooks Date: Tue Sep 20 16:25:12 2005 +0100 [ARM] 2925/3: earlyparam - postfix section with .init for `make buildcheck` Patch from Ben Dooks The `make buildcheck` is erroneously reporting that the earlyparam list is referencing items in the .init section as it is not itself postfixed with .init Also, as per rmk's suggestion, rename the __early_param to .early_param to bring it into line with everything else Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 58dd48a6575d3ba86ba659eb8c6fc23246783fba Author: Vincent Sanders Date: Tue Sep 20 16:21:42 2005 +0100 [ARM] 2922/1: compile fix for shark Patch from Vincent Sanders Shark platform fails to build with gcc 4 because of a bad lvalue assignement Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 9506057fca54464f3291b62156e6cd907c4cbc95 Author: Ben Dooks Date: Tue Sep 20 16:20:49 2005 +0100 [ARM] 2924/3: taglist - postfix section with .init for `make buildcheck` Patch from Ben Dooks The `make buildcheck` is erroneously reporting that the taglist is referencing items in the .init section as it is not itself postfixed with .init Signed-off-by: Ben Dooks Signed-off-by: Russell King commit eed8b2dee7cff46dd4bf5b82dc53465d229162ba Author: Anton Altaparmakov Date: Tue Sep 20 14:19:30 2005 +0100 NTFS: More runlist handling fixes from Richard Russon and myself. Signed-off-by: Anton Altaparmakov commit 6a9b490d5fd7f23c5bcd75f970e01633ad3136e3 Author: David S. Miller Date: Mon Sep 19 20:11:57 2005 -0700 [SPARC64]: Move DCACHE_ALIASING_POSSIBLE define to asm/page.h This showed that arch/sparc64/kernel/ptrace.c was not getting the define properly, and thus the code protected by this ifdef was never actually compiled before. So fix that too. Signed-off-by: David S. Miller commit 676d55ae30ea3b688f0386f70553489f25f24d55 Author: Linus Torvalds Date: Mon Sep 19 20:00:41 2005 -0700 Linux v2.6.14-rc2 Avast, ye scurvy land-lubbers! Time to try out a new release. Arrr! commit e0487992ce1dd7ae7da9c6aabdb19570bb95432b Author: Ed L. Cashin Date: Mon Sep 19 19:57:36 2005 -0700 [BYTEORDER]: Document alignment and byteorder macros This patch comments the fact that although passing le64_to_cpup et al. is within the intended use of the byteorder macros, using get_unaligned is the recommended way to go. Signed-off-by: Ed L. Cashin Signed-off-by: David S. Miller commit ff171d8f66a7fe1a000e610e9de11224749f9a22 Author: David S. Miller Date: Mon Sep 19 19:56:06 2005 -0700 [SPARC64]: Handle little-endian unaligned loads/stores correctly. Because we use byte loads/stores to cons up the value in and out of registers, we can't expect the ASI endianness setting to take care of this for us. So do it by hand. This case is triggered by drivers/block/aoe/aoecmd.c in the ataid_complete() function where it goes: /* word 100: number lba48 sectors */ ssize = le64_to_cpup((__le64 *) &id[100<<1]); This &id[100<<1] address is 4 byte, rather than 8 byte aligned, thus triggering the unaligned exception. Signed-off-by: David S. Miller commit f805fbdaacf4367ce566743a665622387768ac0d Author: Linus Torvalds Date: Mon Sep 19 19:54:29 2005 -0700 Make fsnotify possibly work better for the inode removal case Checking i_nlink is dubious, but the alternatives look even less appetizing. Signed-off-by: Linus Torvalds commit 6d1cfe3f1752f17e297df60c8bcc6cd6e0a58449 Author: Mark J Cox Date: Mon Sep 19 17:55:30 2005 -0700 [PATCH] raw_sendmsg DoS on 2.6 Fix unchecked __get_user that could be tricked into generating a memory read on an arbitrary address. The result of the read is not returned directly but you may be able to divine some information about it, or use the read to cause a crash on some architectures by reading hardware state. CAN-2004-2492. Fix from Al Viro, ack from Dave Miller. Signed-off-by: Linus Torvalds commit e14c3caf605dfd29bd1aac3097e39db94afc9f07 Author: Herbert Xu Date: Mon Sep 19 18:18:38 2005 -0700 [TCP]: Handle SACK'd packets properly in tcp_fragment(). The problem is that we're now calling tcp_fragment() in a context where the packets might be marked as SACKED_ACKED or SACKED_RETRANS. This was not possible before as you never retransmitted packets that are so marked. Because of this, we need to adjust sacked_out and retrans_out in tcp_fragment(). This is exactly what the following patch does. We also need to preserve the SACKED_ACKED/SACKED_RETRANS marking if they exist. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 3c3f8f25c177e4f9e4e00bcc1b90b28b1be37937 Author: Alexey Dobriyan Date: Mon Sep 19 15:41:28 2005 -0700 [8021Q]: Add endian annotations. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 2cf655cd65888e9fed0803d77e9e4f7d1db674cc Author: Krzysztof Halasa Date: Mon Sep 19 15:39:32 2005 -0700 [WAN] hdlc_cisco: Fix regression introduced by skb->tail changes. The following commit breaks cisco mode with my WAN drivers: author David S. Miller Tue, 28 Jun 2005 22:25:31 +0000 (15:25 -0700) commit 689be43945e9ca7dd704522e55af1b8a73a994d3 "[NET]: Remove gratuitous use of skb->tail in network drivers." The following patch fixes it - please apply (cisco_hard_header does skb_push(4 bytes)). Signed-off-by: David S. Miller commit 8922bc93aa78a202c2b68b2de19b71329cb321e1 Author: Harald Welte Date: Mon Sep 19 15:35:57 2005 -0700 [NETFILTER]: Export ip_nat_port_{nfattr_to_range,range_to_nfattr} Those exports are needed by the PPTP helper following in the next couple of changes. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit a41bc00234a0a2ccaa99a194341ae108ae17ddc8 Author: Patrick McHardy Date: Mon Sep 19 15:35:31 2005 -0700 [NETFILTER]: Rename misnamed function Both __ip_conntrack_expect_find and ip_conntrack_expect_find_get take a reference to the expectation, the difference is that callers of __ip_conntrack_expect_find must hold ip_conntrack_lock. Signed-off-by: Patrick McHardy Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit e674d0f38de6109b59dbe30fba8b296a03229b8e Author: Yasuyuki Kozakai Date: Mon Sep 19 15:34:40 2005 -0700 [NETFILTER] ip6tables: remove duplicate code Some IPv6 matches have very similar loops to find IPv6 extension header and we can unify them. This patch introduces ipv6_find_hdr() to do it. I just checked that it can find the target headers in the packet which has dst,hbh,rt,frag,ah,esp headers. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 926b50f92a30090da2c1a8675de954c2d9b09732 Author: Harald Welte Date: Mon Sep 19 15:33:08 2005 -0700 [NETFILTER]: Add new PPTP conntrack and NAT helper This new "version 3" PPTP conntrack/nat helper is finally ready for mainline inclusion. Special thanks to lots of last-minute bugfixing by Patric McHardy. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 772cb712b1373d335ef2874ea357ec681edc754b Author: Robert Olsson Date: Mon Sep 19 15:31:18 2005 -0700 [IPV4]: fib_trie RCU refinements * This patch is from Paul McKenney's RCU reviewing. Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 1d25cd6cc2528e4af12ab18e84fe95ed78f3f21a Author: Robert Olsson Date: Mon Sep 19 15:29:52 2005 -0700 [IPV4]: fib_trie tnode stats refinements * Prints the route tnode and set the stats level deepth as before. Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit eff4c654b1a4a5e5493fbdc3affa6dd48765c085 Author: Hal Rosenstock Date: Mon Sep 19 13:51:01 2005 -0700 [PATCH] IB: Fix data length for RMPP SA sends We need to subtract off the header length from our payload length when sending multi-packet SA messages. Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 13e1e1f08c1c098c7574c1fa72bd8c67792dc89b Author: Andreas Herrmann Date: Mon Sep 19 16:56:17 2005 +0200 [SCSI] zfcp: add additional fc_host attributes this patch adds some fc host attributes and removes its equivalents from the zfcp_adapter structure and zfcp specific sysfs subtree. Furthermore it removes superfluous calls to fc_remort_port_delete when an adapter is set offline because rports will be removed by fc_remove_host anyway. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit aef4a983090fa590481a86d9690dc3fa6bb121fa Author: Maxim Shchetynin Date: Tue Sep 13 21:51:16 2005 +0200 [SCSI] zfcp: provide support for NPIV N_Port ID Virtualization (NPIV) allows a single FCP port to appear as multiple, distinct ports providing separate port identification. NPIV is supported by FC HBAs on System z9. zfcp was adapted to support this new feature. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 8a36e4532ea10471f0a8605207d071361d7be2c3 Author: Maxim Shchetynin Date: Tue Sep 13 21:50:38 2005 +0200 [SCSI] zfcp: enhancement of zfcp debug features Debug features (DBFs) els_dbf, cmd_dbf and abt_dbf were removed and san_dbf, hba_dbf and scsi_dbf were introduced. The erp_dbf did not change. The new traces improve debugging of problems with zfcp, scsi-stack, multipath and hardware in the SAN. san_dbf traces things like ELS and CT commands, hba_dbf saves HBA specific information of requests, and scsi_dbf saves FCP and SCSI specific information of requests. Common to all new DBFs is that they provide a so called structured view. This significantly improves readability of the traces. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 810f1e3ea5cc0a812816af97020a27c73441f8e9 Author: Andreas Herrmann Date: Tue Sep 13 21:49:52 2005 +0200 [SCSI] zfcp: shorten eh_bus_reset and eh_host_reset handlers Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 77eb1699c76177af2f3d65c8ae7934cf304e0254 Author: Andreas Herrmann Date: Tue Sep 13 21:48:33 2005 +0200 [SCSI] zfcp: remove function zfcp_fsf_req_wait_and_cleanup Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 059c97d0434834d291eff94669ca2dd3eaac9d28 Author: Andreas Herrmann Date: Tue Sep 13 21:47:52 2005 +0200 [SCSI] zfcp: remove union zfcp_req_data, use unit refcount for FCP commands o union zfcp_req_data removed o increment unit refcount when processing FCP commands (This fixes a theoretical race: When all scsi commands of a unit are aborted and the scsi_device is removed then the unit could be removed before all fsf_requests of that unit are completely processed.) Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 3734d24b2e8d85796de70c13705cfb7cbb1d77df Author: Andreas Herrmann Date: Tue Sep 13 21:47:11 2005 +0200 [SCSI] zfcp: fix race conditions when accessing erp_action lists o always use locking when changing erp_action lists, o avoid escalation to ERP_ACTION_REOPEN_PORT_FORCED if erp_action is still in use for ERP_ACTION_REOPEN_PORT Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit e0fc15bef0e8c6b5abad6e10cfe3d42e278ae8e8 Author: Moore, Eric Dean Date: Thu Sep 15 13:17:14 2005 -0600 [SCSI] fusion SAS support (mptsas driver) minor fix On Thursday, September 15, 2005 6:22 AM, Christoph Hellwig wrote: > Looks good to me, except for the spurious scsi_print_command prototype > in mptscsih.h. The attached patch addresses that concern. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 466544d8898fc87ed6e2e62ac14af7c50ab7a1a4 Author: Moore, Eric Dean Date: Wed Sep 14 18:09:10 2005 -0600 [SCSI] fusion SAS support (mptsas driver) updates Summary of Changes: * splitting mpt_interrupt per Christophs suggestion about a month ago * rename ScsiCfgData to SpiCfgData structure, then move all the raid related info into new structure called RaidCfgData. This is done because SAS supports RAID, as well as SPI, so the raid stuff should be seperate. * incorrect timeout calculation for cntdn inside WaitForDoorbellAck and WaitForDoortbellInt * add support for interpreting SAS Log Info * Increase Event Log Size from 0xA to 0x32 * Fix bug in mptsas/mptfc/mptspi - when controller has Initiator Mode Disabled, and only running in TargetMode, the mptctl would panic when loading. The fix is to return 0, instead of -ENODEV, in SCSI LLD respective probe routines * Fix bug in mptlan.c - driver will panic if there is host reset, due to dev being set to zero in mpt_lan_ioc_reset * Fix's for SPI - Echo Buffer * Several fix's in mptscsih_io_done - FCP Response info, RESIDUAL_MISMATCH, Data Underrun, etc. * Cleanup Error Handling - EH handlers, mptscsih_flush_cmds, and zeroing out ScsiLookup from mptscsih_qcmd * Cleanup asyn event handling from mptscsih -> mptscsih_event_process. Also added support for SAS Persistent Table Full, an asyn event Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 0c33b27deb93178f10778b3d2669af1674793cef Author: Christoph Hellwig Date: Fri Sep 9 16:27:19 2005 +0200 [SCSI] fusion SAS support (mptsas driver) Adds the actual mptsas driver, based upon the LSI driver with new work for SAS transport class integration from Eric Moore and me. This obviously depends on the SAS transport class. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 82ffb67164064752a56669511545316075b41e1d Author: Christoph Hellwig Date: Fri Sep 9 16:25:54 2005 +0200 [SCSI] fusion core changes for SAS support - various bits for SAS support from the LSI driver. - use the device private data for the fusion target private data. this should be using the midlayer target data framework, but we can't move over to that until fusion has been switched to the generic DV code - use target ID and channel from the fusion target private data, because those in scsi_device will be different for mptsas Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 997a51ae373df6484cdd4a5fc61a9c9bec82cd68 Author: Ivan Kokshaysky Date: Mon Sep 19 18:55:51 2005 +0400 [PATCH] Alpha: ISA IRQs fixup for dp264 Basically, this extends original dp264 fixup to all dp264 variations. Here is one minor change: mask out bits 4-7 of a value assigned by SRM, because - newer consoles report ISA IRQs with offset 0xe0; - even if console IRQ value is bogus, we'll have a value < 16 so it should be harmless as it won't clash with native IRQs. Particularly this fixes USB interrupt problem on xp1000 and es40. Signed-off-by: Ivan Kokshaysky Acked-by: Richard Henderson Signed-off-by: Linus Torvalds commit 6577ae51cf52f5fb0e4a85e673dd7bf2d0074e3e Author: Roland Dreier Date: Mon Sep 19 09:17:56 2005 -0700 [PATCH] IB/mthca: Don't try to set srq->last for userspace SRQs Userspace SRQs don't have a buffer allocated for them in the kernel, so it doesn't make sense to set srq->last during initialization. In fact, this can crash trying to follow a nonexistent buffer pointer. Signed-off-by: Roland Dreier commit 3ed7a4704beb66a155acd67b78b7e9a5674d55fb Author: James Bottomley Date: Mon Sep 19 09:50:04 2005 -0500 [SCSI] Fix thread termination for the SCSI error handle From: Alan Stern This patch (as561) fixes the error handler's thread-exit code. The kthread_stop call won't wake the thread from a down_interruptible, so the patch gets rid of the semaphore and simply does set_current_state(TASK_INTERRUPTIBLE); Signed-off-by: Alan Stern Modified to simplify the termination loop and correct the sleep condition. Signed-off-by: James Bottomley commit 939647ee308e0ad924e776657704c7bedd498664 Author: James Bottomley Date: Sun Sep 18 15:05:20 2005 -0500 [SCSI] fix oops on usb storage device disconnect We fix the oops by enforcing the host state model. There have also been two extra states added: SHOST_CANCEL_RECOVERY and SHOST_DEL_RECOVERY so we can take the model through host removal while the recovery thread is active. Signed-off-by: James Bottomley commit f6098cf449b81c14a51e48dd22ae47d03126a1de Author: Anton Altaparmakov Date: Mon Sep 19 09:41:39 2005 +0100 NTFS: Fix ntfs_{read,write}page() to cope with concurrent truncates better. Signed-off-by: Anton Altaparmakov commit 4e64c88693fde1b1cbaa4cfecad43a0c3fad354e Author: Anton Altaparmakov Date: Mon Sep 19 09:38:41 2005 +0100 NTFS: Fix handling of compressed directories that I broke in earlier changeset. Signed-off-by: Anton Altaparmakov commit 5c9f6de3b80ca46000bd1b63d892820f9ee32138 Author: Anton Altaparmakov Date: Mon Sep 19 09:33:40 2005 +0100 NTFS: Fix various bugs in the runlist merging code. (Based on libntfs changes by Richard Russon.) Signed-off-by: Anton Altaparmakov commit 3853194c2e174cee4da093c67bd54cbf9a38559a Author: Roland Dreier Date: Sun Sep 18 14:00:17 2005 -0700 [PATCH] IB/mthca: Fix posting work requests to shared receive queues The error handling paths in mthca_tavor_post_srq_recv() and mthca_arbel_post_srq_recv() are quite bogus, the result of a screwed up merge. Fix them so they work as intended. Pointed out by Michael S. Tsirkin Signed-off-by: Roland Dreier commit c915033fc62d7186d243d89f88782d6be33fd8f6 Author: Roland Dreier Date: Sun Sep 18 13:52:06 2005 -0700 [PATCH] IB/mthca: Initialize eq->nent before we use it In mthca_create_eq(), we call get_eqe() before setting eq->nent. This is wrong, because get_eqe() uses eq->nent. Fix this, and clean up the code a little while we're at it. (We got lucky with the current code, because eq->nent was cleared to 0, which get_eqe() made happen to do the right thing) Pointed out by Michael S. Tsirkin Signed-off-by: Roland Dreier commit ce5b65cc9626feac0d4ffb96f798407e50c45575 Author: Hal Rosenstock Date: Sun Sep 18 13:47:53 2005 -0700 [PATCH] IPoIB: Fix SA client retransmission strategy We got a little mixed up with what the backoff member holds in the IPoIB multicast group structure: sometimes it was used as a number of seconds, and sometimes it was used as a number of jiffies. Fix the code so that backoff is always in seconds. Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit d6cff021e24515255b296d399ec517a68bf2ed08 Author: Roland Dreier Date: Tue Sep 13 10:41:03 2005 -0700 [PATCH] IB/mthca: fix posting of first work request Fix posting first WQE for mem-free HCAs: we need to link to previous WQE even in that case. While we're at it, simplify code for Tavor-mode HCAs. We don't really need the conditional test there either; we can similarly always link to the previous WQE. Based on Michael S. Tsirkin's analogous fix for userspace libmthca. Signed-off-by: Roland Dreier commit bb4a7f0da75ce9f3e933880428d39b2aa1f16961 Author: Roland Dreier Date: Mon Sep 12 14:08:51 2005 -0700 [PATCH] IB/mthca: assign ACK timeout field correctly The hardware reads the ACK timeout field from the most significant 5 bits of struct mthca_qp_path's ackto field, not the least significant bits. This fix has the driver put the timeout in the right place. Without this, we get a timeout that is 2^8 times too small. Signed-off-by: Roland Dreier commit 51574e0398a2d93cbf7f26e36b673cd919062268 Author: Michael S. Tsirkin Date: Mon Sep 12 09:52:28 2005 -0700 [PATCH] IPoIB: fix module removal race Since ipoib uses queue_delayed_work to run flush task on port state events, it must flush scheduled work after unregistering the event handler. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 118ec0b3e02e7d22cf27b9f5a2836fa6f395b61a Author: Russell King Date: Sun Sep 18 22:16:41 2005 +0100 [ARM] Fix warning in arch/arm/mach-sa1100/generic.c Fix: arch/arm/mach-sa1100/generic.c:224: warning: 'struct mcp_plat_data' declared inside parameter list caused by mussing structure and function declaration. Signed-off-by: Russell King commit 63150fcf73dbfb752a850a5e2fe3aed570154433 Author: Russell King Date: Sun Sep 18 21:49:29 2005 +0100 [ARM] Fix warning in arch/arm/kernel/semaphore.c Newer binutils complains: /tmp/cc07pbI9.s:146: Warning: ignoring changed section type for .sched.text Fix this warning by adding %progbits to the .section. Signed-off-by: Russell King commit a64358db1253b35d508a411e80a3ad23b859ec88 Author: Alan Stern Date: Tue Jul 26 10:27:10 2005 -0400 [SCSI] SCSI scanning and removal fixes This patch (as545) fixes the list traversals in __scsi_remove_target and scsi_forget_host. In each case the existing code list_for_each_entry_safe in an _unsafe_ manner, because the list was not protected from outside modification while the iteration was running. The new scsi_forget_host routine takes the moderately controversial step of iterating over devices for removal rather than iterating over targets. This makes more sense to me because the current scheme treats targets as second-class citizens, created and removed on demand, rather than as objects corresponding to actual hardware. (Also I couldn't figure out any safe way to iterate over the target list, since it's not so easy to tell when a target has already been removed.) Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit e0a200894efa33ea1ac9957717ae151afa02bb6f Author: Deepak Saxena Date: Sun Sep 18 21:11:56 2005 +0100 [ARM] 2917/1: Make IXP4xx mach_desc's depend on config options Patch from Deepak Saxena Building a kernel for IXDP425 currently includes the machine descriptors for IXDP465 and PRPMC1100 even if those machines are not configured. This means we can build a kernel that boots on those machines even though the machine_is_xxx() macro will always return 0 and other bits such as PCI won't be compiled in. This can lead to many wasted hours wondering what you have done to your kernel to make it randomly crash thus requireing large quantities of beer to be consumed. While I am all for consumption of large quantities of beer, there are better reasons to do so then stupid kernel bugs. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 7f8c0fd78dccaf30e60cb4303bd7a21c7d9e6da3 Author: Russell King Date: Sun Sep 18 21:11:08 2005 +0100 [ARM] Fix warning in asm/futex.h The recently added futex.h contains an unused variable, which gcc naturally warns about. Remove this unused variable. Signed-off-by: Russell King commit 628f87f3d585bd0c2b0e39df039585d7a5831cc9 Author: Harald Welte Date: Sun Sep 18 00:33:02 2005 -0700 [NETFILTER]: Solve Kconfig dependency problem As suggested by Roman Zippel. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 987905ded3d19c196dae25cac46c569cac9594b8 Author: Mitsuru KANDA Date: Sun Sep 18 00:30:08 2005 -0700 [IPV6]: Check connect(2) status for IPv6 UDP socket (Re: xfrm_lookup) I think we should cache the per-socket route(dst_entry) only when the IPv6 UDP socket is connect(2)'ed. (which is same as IPv4 UDP send behavior) Signed-off-by: Mitsuru KANDA Signed-off-by: David S. Miller commit 40abc27066c49b2c13c817154d438431b0303b96 Author: Florin Malita Date: Sun Sep 18 00:24:12 2005 -0700 [BOND]: Fix bond_init() error path handling. From: Florin Malita bond_init() is not releasing rtnl_sem after register_netdevice() and before calling unregister_netdevice() (from bond_free_all()) in the exception path. As the device registration is not completed (dev->reg_state == NETREG_REGISTERING), the call to unregister_netdevice() triggers BUG_ON(dev->reg_state != NETREG_REGISTERED). Signed-off-by: Florin Malita Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 88f964db6ef728982734356bf4c406270ea29c1d Author: Arnaldo Carvalho de Melo Date: Sun Sep 18 00:19:32 2005 -0700 [DCCP]: Introduce CCID getsockopt for the CCIDs Allocation for the optnames is similar to the DCCP options, with a range for rx and tx half connection CCIDs. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 561713cf475de1f671cc89c437927ec008a20209 Author: Arnaldo Carvalho de Melo Date: Sun Sep 18 00:18:52 2005 -0700 [DCCP]: Don't use necessarily the same CCID for tx and rx Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 65299d6c3cfb49cc3eee4fc483e7edd23ea7b2ed Author: Arnaldo Carvalho de Melo Date: Sun Sep 18 00:18:32 2005 -0700 [CCID3]: Introduce include/linux/tfrc.h Moving the TFRC sender and receiver variables to separate structs, so that we can copy these structs to userspace thru getsockopt, dccp_diag, etc. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit ae31c3399d17b1f7bc1742724f70476b5417744f Author: Arnaldo Carvalho de Melo Date: Sun Sep 18 00:17:51 2005 -0700 [DCCP]: Move the ack vector code to net/dccp/ackvec.[ch] Isolating it, that will be used when we introduce a CCID2 (TCP-Like) implementation. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit bc5e8fdfc622b03acf5ac974a1b8b26da6511c99 Author: Linus Torvalds Date: Sat Sep 17 15:41:04 2005 -0700 x86-64/smp: fix random SIGSEGV issues They seem to have been due to AMD errata 63/122; the fix is to disable TLB flush filtering in SMP configurations. Confirmed to fix the problem by Andrew Walrond [ Let's see if we'll have a better fix eventually, this is the Q&D "let's get this fixed and out there" version ] Signed-off-by: Linus Torvalds commit 61ffcafafb3d985e1ab8463be0187b421614775c Author: Karsten Keil Date: Sat Sep 17 23:52:42 2005 +0200 [PATCH] Fix ST 5481 USB driver The old driver was not fully adapted to new USB ABI and does not work. Signed-off-by: Karsten Keil Signed-off-by: Linus Torvalds commit b95be99d52ce4f9db9ff0bd5f10e9e2066da6d2e Author: Alan Stern Date: Thu Sep 15 13:52:51 2005 -0400 [SCSI] fix oops in scsi_release_buffers() I found one other thing that needs to be fixed. The call to scsi_release_buffers in scsi_unprep_request causes an oops, because the sgtable has already been freed in scsi_io_completion. The following patch is needed. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit 27b2f6792f3b482e4636818c7efaf4c43fef32a3 Author: Adam Kropelin Date: Fri Sep 16 19:28:20 2005 -0700 [PATCH] qla2xxx: Use dword accessors for PCI_ROM_ADDRESS PCI_ROM_ADDRESS is a 32 bit register and as such should be accessed using pci_bus_{read,write}_config_dword(). A recent audit of drivers/ turned up several cases of byte- and word-sized accesses. The harmful ones were fixed by Linus directly. This patches up one of the remaining harmless-but-still-wrong cases caught in the dragnet. Signed-off-by: Adam Kropelin Cc: Andrew Vasquez Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06c6d271f41ffa20f2dadc9bfe100a89f7f1dd1d Author: Adam Kropelin Date: Fri Sep 16 19:28:19 2005 -0700 [PATCH] shpchp: Use dword accessors for PCI_ROM_ADDRESS PCI_ROM_ADDRESS is a 32 bit register and as such should be accessed using pci_bus_{read,write}_config_dword(). A recent audit of drivers/ turned up several cases of byte- and word-sized accesses. The harmful ones were fixed by Linus directly. This patches up one of the remaining harmless-but-still-wrong cases caught in the dragnet. Signed-off-by: Adam Kropelin Cc: Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2fa4f4ad8ddf4b9fac344f1da7a25d4868f08f5 Author: Adam Kropelin Date: Fri Sep 16 19:28:18 2005 -0700 [PATCH] pciehp: Use dword accessors for PCI_ROM_ADDRESS PCI_ROM_ADDRESS is a 32 bit register and as such should be accessed using pci_bus_{read,write}_config_dword(). A recent audit of drivers/ turned up several cases of byte- and word-sized accesses. The harmful ones were fixed by Linus directly. This patches up one of the remaining harmless-but-still-wrong cases caught in the dragnet. Signed-off-by: Adam Kropelin Cc: Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d648daca1170945600756b31866d0362a67f2aae Author: Adam Kropelin Date: Fri Sep 16 19:28:17 2005 -0700 [PATCH] ibmphp: Use dword accessors for PCI_ROM_ADDRESS PCI_ROM_ADDRESS is a 32 bit register and as such should be accessed using pci_bus_{read,write}_config_dword(). A recent audit of drivers/ turned up several cases of byte- and word-sized accesses. The harmful ones were fixed by Linus directly. This patches up one of the remaining harmless-but-still-wrong cases caught in the dragnet. Signed-off-by: Adam Kropelin Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef0f6a437f92fbd96c725086555b37b29371e107 Author: Timothy Thelin Date: Fri Sep 16 19:28:16 2005 -0700 [PATCH] ide: fix null request pointer for taskfile ioctl When doing ioctl HDIO_DRIVE_TASKFILE, the ide_task_t's request pointer is never set, but flagged_taskfile and do_rw_taskfile pass it as a parameter to the prehandler. The kernel will oops taskfile pio-out commands because of this (taskfile pio-in doesn't use a prehandler). This fix sets the request pointer at the time the request is created to stop this oops. Signed-off-by: Timothy Thelin Cc: "Bartlomiej Zolnierkiewicz" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9564df1ff3c61f41bdc54283715417ccdfb6782b Author: Jens Axboe Date: Fri Sep 16 19:28:15 2005 -0700 [PATCH] fix pf request handling Here's the patch from http://bugzilla.kernel.org/show_bug.cgi?id=4853 It is a feeble attempt at fixing the request handling in pf, it is totally foobar right now. Signed-off-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef402268f7c9ab1872cafa1e638eb78a75b7c18f Author: OGAWA Hirofumi Date: Fri Sep 16 19:28:13 2005 -0700 [PATCH] FAT: miss-sync issues on sync mount (miss-sync on write) This patch fixes miss-sync issue on write() system call. This updates inode attrs flags, mtime and ctime on every comit_write call, due to locking. Signed-off-by: Hiroyuki Machida Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4fb3a53860cee2aaaf81186c451b7da0b95b45c1 Author: Dipankar Sarma Date: Fri Sep 16 19:28:13 2005 -0700 [PATCH] files: fix preemption issues With the new fdtable locking rules, you have to protect fdtable with either ->file_lock or rcu_read_lock/unlock(). There are some places where we aren't doing either. This patch fixes those places. Signed-off-by: Dipankar Sarma Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af4e5a218e18ad588d60a4f9d6f8fb5db1a32587 Author: Pekka J Enberg Date: Fri Sep 16 19:28:11 2005 -0700 [PATCH] CodingStyle: memory allocation This patch adds a new chapter on memory allocation to Documentation/CodingStyle. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f647e08a55d2c88c4e7ab17a0a8e3fcf568fbc65 Author: Andrew Morton Date: Fri Sep 16 19:28:10 2005 -0700 [PATCH] joystick-vs-x.org fix Fix http://bugzilla.kernel.org/show_bug.cgi?id=5241 2.6.13 broke compilation of the xorg tree, which apprarently insists on including that file. Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a464adeb7e8f1cd65ca911e20a7c02e452dc2c17 Author: Zach Brown Date: Fri Sep 16 19:28:09 2005 -0700 [PATCH] Add smp_mb__after_clear_bit() to unlock_kiocb() Add smp_mb__after_clear_bit() to unlock_kiocb() AIO's use of wait_on_bit_lock()/wake_up_bit() forgot to add a barrier between clearing its lock bit and calling wake_up_bit() so wake_up_bit()'s unlocked waitqueue_active() can race. This puts AIO's use in line with the others and the comment above wake_up_bit(). Signed-off-by: Zach Brown Acked-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ac2120d90273c590cf7662f03d103519101685b Author: Jean Delvare Date: Fri Sep 16 19:28:08 2005 -0700 [PATCH] i2c: kill an unused i2c_adapter struct member Kill an unused member of the i2c_adapter structure. This additionally fixes a potential bug, because doesn't include , so different files including could see a different definition of the i2c_adapter structure, depending on them including (or other header files themselves including ) before , or not. Credits go to Jörn Engel for pointing me to the problem. Signed-off-by: Jean Delvare Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 393ad299658d8464149820363ee09bdf3fd45566 Author: Robert Love Date: Fri Sep 16 19:28:07 2005 -0700 [PATCH] hdaps driver update - Remove the relative input device - Add an absolute input device - Misc. cleanup and bug fixing The patch is sizable due to the cleanup from removing the relative input device (net -112 lines). Signed-off-by: Robert Love Cc: Dmitry Torokhov Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53d2be79d5981b7efc8c5ec1169613bba95bde20 Author: Davide Libenzi Date: Fri Sep 16 19:28:06 2005 -0700 [PATCH] epoll: fix delayed initialization bug Al found a potential problem in epoll_create(), where the file->private_data member was set after fd_install(). This is obviously wrong since another thread might do a close() on that fd# before we set the file->private_data member. This goes over 2.6.13 and passes a few basic tests I've done here. (akpm: snuck in a kzalloc() cleanup too) Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dda8577fb5a00507e5aea737833190a10516b257 Author: Andrew Morton Date: Fri Sep 16 19:28:05 2005 -0700 [PATCH] dell_rbu tidy Whitespace standardisation. Cc: Abhay Salunke Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e61c0e336f3931842f09e6709d76146bfd81184e Author: Abhay Salunke Date: Fri Sep 16 19:28:04 2005 -0700 [PATCH] dell_rbu: enhancements and fixes BUG fixes: The driver used to allocate memory with spinlock held which has been fixed in this patch. The driver was printing the entire buffer when it received a invalid entry in image_type. The fix is to only print a warning message and not the buffer. Usability enhancements: It is possible that due to user error the /sys/class/firmware/dell_rbu entries might be missing, this can happen if the user does the following echo 1 > /sys/class/firmware/dell_rbu/loading echo 0 > /sys/class/firmware/dell_rbu/loading This will make the entries in /sys/class/firmware/ to disappear and the only way get them back was bby unloading and loading the driver. This patch makes the user recreate these entries by echoing init in to image_type. This patch has been tested with Libsmbios and Dell OpenManage. Signed-off-by: Abhay Salunke Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3013449243adc3421b507696e5d247a3d292ee0c Author: Jeff Dike Date: Fri Sep 16 19:28:03 2005 -0700 [PATCH] uml: UML/i386 cmpxchg fix Using native cmpxchg offers a slight performance improvement in uml/i386. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2030c0fd3db3332378f95f479c286181e3920644 Author: Michael Kerrisk Date: Fri Sep 16 19:28:02 2005 -0700 [PATCH] PR_GET_DUMPABLE returns incorrect info 2.6.13 incorporated Alan Cox's patch for /proc/sys/fs/suid_dumpable (one version of this patch can be found here http://marc.theaimsgroup.com/?l=linux-kernel&m=109647550421014&w=2 ). This patch also made corresponding changes in kernel/sys.c to change the prctl() PR_SET_DUMPABLE operation so that the permitted range of 'arg2' was modified from 0..1 to 0..2. However, a corresponding change was not made for PR_GET_DUMPABLE: if the dumpable flag is non-zero, then PR_GET_DUMPABLE always returns 1, so that the caller can't determine the true setting of this flag. Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afeda2c24e74cbddde376e06fdd82c215f9cb637 Author: Marcelo Tosatti Date: Fri Sep 16 19:28:01 2005 -0700 [PATCH] relayfs documentation typo Small typo in relayfs documentation. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 514ccd4e6c414d8064d53235f7fc09fc02ec2078 Author: Vitaly Bordug Date: Fri Sep 16 19:28:00 2005 -0700 [PATCH] ppc32: Add ppc_sys descriptions for PowerQUICC I devices Added ppc_sys device and system definitions for PowerQUICC I devices. This will allow drivers for PQI to be proper platform device drivers. Currently sys section contains only MPC885 and MPC866. Identification should be done with identify_ppc_sys_by_name call, with board-specific "name" string passed, since PQI do not have any register that could identify the SOC. Signed-off-by: Vitaly Bordug Signed-off-by: Kumar Gala Signed-off-by: Marcelo Tosatti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0faf3d3d08bb20d803ba090a1bc1ffedaea6ced6 Author: Thomas Maguin Date: Fri Sep 16 19:27:58 2005 -0700 [PATCH] scsi_ioctl: Add WRITE_LONG_2 as write safe command Add WRITE_LONG_2 as write safe commands, which which allows normal users to make a c1-, c2- and cu-scan (so called cxscan) with readcd on cxscan-capable cd/dvd-writers Signed-off-by: Jens Axboe Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a70ce8a4b1c9d39e0a180173728a8d102274631 Author: Anton Blanchard Date: Fri Sep 16 19:27:58 2005 -0700 [PATCH] ppc64: build fix I forgot to include siginfo.h when I added data breakpoint support. We must include it in a round-a-bout way in mainline. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9afa57b04ca08ff061e54787e3becf5c40283149 Author: Serge Hallyn Date: Fri Sep 16 19:27:57 2005 -0700 [PATCH] seclvl: use securityfs (fix) That should be -EINVAL for both. Signed-off-by: Serge Hallyn Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d15c5749eb81dee94d40fe12584ca8461858b4cb Author: Andrew Morton Date: Fri Sep 16 19:27:56 2005 -0700 [PATCH] seclvl-use-securityfs tidy We don't put braces around single statements, thanks. Cc: Serge Hallyn Cc: James Morris Cc: Chris Wright Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73a0b538ee573a76cba59cdc9f177a71776d4678 Author: Andrew Morton Date: Fri Sep 16 19:27:55 2005 -0700 [PATCH] x86_64: desc.h-needs smp.h include/asm/desc.h: In function `load_LDT': include/asm/desc.h:209: warning: implicit declaration of function `get_cpu' include/asm/desc.h:211: warning: implicit declaration of function `put_cpu' Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3519f91942f2b43942400348c16d63fe9327f04 Author: Dave Hansen Date: Fri Sep 16 19:27:54 2005 -0700 [PATCH] fix mm/Kconfig spelling Signed-off-by: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9491ac835829e6a34e2bbaa8adad261c71bf990 Author: Andrew Morton Date: Fri Sep 16 19:27:54 2005 -0700 [PATCH] x86_64: e820.c needs module.h For EXPORT_SYMBOL. Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e36d394deb1b59d004ab057e0b5c505ffc5d8c0a Author: Richard Purdie Date: Fri Sep 16 19:27:53 2005 -0700 [PATCH] Fix up some pm_message_t types Fix up some pm_message_t types Signed-Off-By: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f87b1e6e6050c0afe8b4afc279121f99043dc54 Author: Jeff Dike Date: Fri Sep 16 19:27:52 2005 -0700 [PATCH] uml: remove include of asm/elf.h asm/elf.h is bad on x86_64, and i386 doesn't need it any more after Al's cleanup. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2867ace6751adc20bb37cfb09478510c49110b27 Author: Jeff Dike Date: Fri Sep 16 19:27:51 2005 -0700 [PATCH] uml: return a real error code do_aio used to return -1 on error instead of errno. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 114069f7384c15a7a9f8d3e333caf4d470dfe520 Author: Jeff Dike Date: Fri Sep 16 19:27:51 2005 -0700 [PATCH] uml: merge mem_user.c and mem.c The serial UML OS-abstraction layer patch (um/kernel dir). This joins mem_user.c and mem.c files. Signed-off-by: Gennady Sharapov Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f80bc85c587e8fdeecece4f294a47eca4922ea2 Author: Jeff Dike Date: Fri Sep 16 19:27:50 2005 -0700 [PATCH] uml: move libc code out of mem_user.c and tempfile.c The serial UML OS-abstraction layer patch (um/kernel dir). This moves all system calls from mem_user.c and tempfile.c files under os-Linux dir. Signed-off-by: Gennady Sharapov Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4fd310e163477236a241580b3b8c29aee65f4cc Author: Jeff Dike Date: Fri Sep 16 19:27:49 2005 -0700 [PATCH] uml: preserve errno in error paths The poster child for this patch is the third tuntap_user hunk. When an ioctl fails, it properly closes the opened file descriptor and returns. However, the close resets errno to 0, and the 'return errno' that follows returns 0 rather than the value that ioctl set. This caused the caller to believe that the device open succeeded and had opened file descriptor 0, which caused no end of interesting behavior. The rest of this patch is a pass through the UML sources looking for places where errno could be reset before being passed back out. A common culprit is printk, which could call write, being called before errno is returned. In some cases, where the code ends up being much smaller, I just deleted the printk. There was another case where a caller of run_helper looked at errno after a failure, rather than the return value of run_helper, which was the errno value that it wanted. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64b7673f91c0c3614028c5942b0d6a91d0b64a98 Author: Jeff Dike Date: Fri Sep 16 19:27:48 2005 -0700 [PATCH] uml: Remove some build warnings These ugly double-casts are the result of gdb complaining about size Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9f0d9151083a9a77331a020a7fee498cf828e3b Author: Jeff Dike Date: Fri Sep 16 19:27:47 2005 -0700 [PATCH] uml: Remove a useless include linux/inet.h isn't needed, and on my system, is empty. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit edcc2205d33d6baefc773c915b6e7ce517bc0b19 Author: Jeff Dike Date: Fri Sep 16 19:27:47 2005 -0700 [PATCH] uml: Remove an unused file This removes a file which is no longer used. Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3eddddcf239c89bbd3c50d1440001a3d384ed40a Author: Jeff Dike Date: Fri Sep 16 19:27:46 2005 -0700 [PATCH] uml: breakpoint an arbitrary thread This patch implements a stack trace for a thread, not unlike sysrq-t does. The advantage to this is that a break point can be placed on showreqs, so that upon showing the stack, you jump immediately into the debugger. While sysrq-t does the same thing, sysrq-t shows *all* threads stacks. It also doesn't work right now. In the future, I thought it might be acceptable to make this show all pids stacks, but perhaps leaving well enough alone and just using sysrq-t would be okay. For now, upon receiving the stack command, UML switches context to that thread, dumps its registers, and then switches context back to the original thread. Since UML compacts all threads into one of 4 host threads, this sort of mechanism could be expanded in the future to include other debugging helpers that sysrq does not cover. Note by jdike - The main benefit to this is that it brings an arbitrary thread back into context, where it can be examined by gdb. The fact that it dumps it stack is secondary. This provides the capability to examine a sleeping thread, which has existed in tt mode, but not in skas mode until now. Also, the other threads, that sysrq doesn't cover, can be gdb-ed directly anyway. Signed-off-by: Allan Graves Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6e34c6af6f18bd6c66bfb1c6a7c57068412aa73 Author: Jeff Dike Date: Fri Sep 16 19:27:43 2005 -0700 [PATCH] uml: _switch_to code consolidation This patch moves code that is in both switch_to_tt and switch_to_skas to the top level _switch_to function, keeping us from duplicating code. It is required for the stack trace patch to work properly. Signed-off-by: Allan Graves Signed-off-by: Jeff Dike Cc: Paolo Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6add9f7f529b124938d14ae9db5a952d1272075a Author: Peter Oberparleiter Date: Fri Sep 16 19:27:42 2005 -0700 [PATCH] s390: kernel stack corruption When an asynchronous interruption occurs during the execution of the 'critical section' within the generic interruption handling code (entry.S), a faulty check for a userspace PSW may result in a corrupted kernel stack pointer which subsequently triggers a stack overflow check. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26ff6ad9786abf6f40a6d3cbb89753b4fa50cb00 Author: Srivatsa Vaddagiri Date: Fri Sep 16 19:27:40 2005 -0700 [PATCH] CPU hotplug breaks wake_up_new_task Fix a problem wherein a new-born task is added to a dead CPU. Signed-off-by: Srivatsa Vaddagiri Acked-by: Nick Piggin Acked-by: Shaohua Li Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa72e26a640e551637f91122d782d5a85d514f5b Author: Domen Puncer Date: Fri Sep 16 19:27:36 2005 -0700 [PATCH] Remove arch/arm26/boot/compressed/hw-bse.c Remove nowhere referenced file (egrep "hw-bse\." didn't find anything). Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c782268be8892962a1ae2c09a2e87e7849454ef1 Author: Volker Sameske Date: Fri Sep 16 19:27:35 2005 -0700 [PATCH] s390: diag 0x308 reipl Add code to support the re-IPL method using diagnose 0x308. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7ae9dd80a3ecf070ea0c5fe1d405cd7687d6c51 Author: Heiko Carstens Date: Fri Sep 16 19:27:34 2005 -0700 [PATCH] s390: show_cpuinfo fix Disable preemption in show_cpuinfo to avoid problems and the warning about smp_processor_id. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90f4e12112284f1a41594e2950e6eced5b064efc Author: Martin Schwidefsky Date: Fri Sep 16 19:27:34 2005 -0700 [PATCH] s390: crypto driver patch take 2 Got confused with the crypto update. The last patch added a call to destroy_workqueue() for a non-existent workqueue with the comment "Remove device workqueue on module unload". This is nonsense. Remove the offending hunk again. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d176795b3eedc18f95160ecc0d7cdf0d2bc5a578 Author: Heiko Carstens Date: Fri Sep 16 19:27:33 2005 -0700 [PATCH] s390: bl_dev array size Calculate correct size for bl_dev array. It should be 8KB instead of 512KB for 2^16 bits. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1306a2b2be35179449db737ac0562b067cb96ddb Author: Martin Schwidefsky Date: Fri Sep 16 19:27:32 2005 -0700 [PATCH] s390: default configuration Update default configuration of s390. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62052d42a5327281fc43fd7bcfb73ac7d36ffc2e Author: Richard Purdie Date: Fri Sep 16 19:27:31 2005 -0700 [PATCH] MTD: Update SharpSL partition definitions Add partition definitions for the new Sharp Zaurus models Spitz (SL-C3000), Akita (SL-C1000) and Borzoi (SL-C3100) Signed-off-by: Richard Purdie Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12e8780813c8c515b685b86c1306d169a4cae5fe Author: Richard Purdie Date: Fri Sep 16 19:27:30 2005 -0700 [PATCH] SharpSL: Add missing hunk from backlight update This hunk from the sharpsl/corgi backlight update appears to have got lost somewhere along the way. Its needed to match the other changes. Signed-Off-By: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7e70ba45fd9850296ebb78ff5827f6a375f650c Author: H. Peter Anvin Date: Fri Sep 16 19:27:29 2005 -0700 [PATCH] RAID6 Altivec fix This patch fixes a signedness bug with RAID6 for Altivec, and makes the Altivec code testable in userspace. Signed-off-by: H. Peter Anvin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c58ec93245a1fb7354f9e331960380827b9f41db Author: Michael Chan Date: Sat Sep 17 00:46:27 2005 -0700 [TG3]: Fix 4GB boundary tx handling Fix and simplify the workaround code for the 4GB boundary tx buffer hardware bug. 1. Need to unmap the original SKB's dma addresses if a new SKB cannot be allocated. 2. Need to pass the base flag to tigon3_4gb_hwbug_workaround() or TSO won't work properly. 3. The guilty entry and length parameters for tigon3_4gb_hwbug_workaround() are removed as they are not necessary. 4. Remove assumption that only one fragment can hit the 4GB boundary. Another fragment can hit 8GB for example. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit eb8edb085716621605cc2e7131a6369d2223d992 Author: Arnaldo Carvalho de Melo Date: Sat Sep 17 00:42:26 2005 -0700 [DCCP]: Add MAINTAINERS and CREDITS entries Also remove the SPX entry in MAINTAINERS, forgot to do that when I removed it. Signed-off-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 9eb0eec74d9425f4376df653304783339a027d79 Author: Harald Welte Date: Sat Sep 17 00:41:21 2005 -0700 [NETFILTER] move nfnetlink options to right location in kconfig menu Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 777ed97f3e549832845d70dcae96cb36c41a543a Author: Harald Welte Date: Sat Sep 17 00:41:02 2005 -0700 [NETFILTER] Fix Kconfig dependencies for nfnetlink/ctnetlink Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 22abe310bc4b0c684fd3716af6b6116ff1011707 Author: Peter Hagervall Date: Fri Sep 16 17:01:03 2005 -0700 [TG3]: Sparse fixes for tg3 Change 0 to NULL where appropriate. Signed-off-by: Peter Hagervall Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit a8f39143ac67ffa2e26ce48aaac6bf5dc7dae95f Author: Harald Welte Date: Fri Sep 16 17:00:38 2005 -0700 [NETFILTER]: Fix oops in conntrack event cache ip_ct_refresh_acct() can be called without a valid "skb" pointer. This used to work, since ct_add_counters() deals with that fact. However, the recently-added event cache doesn't handle this at all. This patch is a quick fix that is supposed to be replaced soon by a cleaner solution during the pending redesign of the event cache. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 136e92bbec0a6d4c2dd1e5b5ac869ab5470547a4 Author: KOVACS Krisztian Date: Fri Sep 16 17:00:04 2005 -0700 [NETFILTER] CLUSTERIP: use a bitmap to store node responsibility data Instead of maintaining an array containing a list of nodes this instance is responsible for let's use a simple bitmap. This provides the following features: * clusterip_responsible() and the add_node()/delete_node() operations become very simple and don't need locking * the config structure is much smaller In spite of the completely different internal data representation the user-space interface remains almost unchanged; the only difference is that the proc file does not list nodes in the order they were added. (The target info structure remains the same.) Signed-off-by: KOVACS Krisztian Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 4451362445b2d83886003f1d739b94e4f000eeeb Author: KOVACS Krisztian Date: Fri Sep 16 16:59:46 2005 -0700 [NETFILTER] CLUSTERIP: introduce reference counting for entries The CLUSTERIP target creates a procfs entry for all different cluster IPs. Although more than one rules can refer to a single cluster IP (and thus a single config structure), removal of the procfs entry is done unconditionally in destroy(). In more complicated situations involving deferred dereferencing of the config structure by procfs and creating a new rule with the same cluster IP it's also possible that no entry will be created for the new rule. This patch fixes the problem by counting the number of entries referencing a given config structure and moving the config list manipulation and procfs entry deletion parts to the