commit 9e6c67fd2716720d9029d38ea25884efcfdedeb6 tree 590d07900b52f148036fd99e1313a222b52cca51 parent 8225ccbaf01b459cf1e462047a51b2851e756bc1 parent 9ffb83bcc5c5337f980dc0576bf13ac9bd4fd33d author Linus Torvalds Sat, 12 Nov 2005 12:23:25 -0800 committer Linus Torvalds Sat, 12 Nov 2005 12:23:25 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 8225ccbaf01b459cf1e462047a51b2851e756bc1 tree a8949f6a3596a77370b5a698ff927674b830b511 parent a2d7222f0f5861ce13b9308c30bd18f28ebeb583 author Thomas Graf Sat, 12 Nov 2005 12:15:16 -0800 committer David S. Miller Sat, 12 Nov 2005 12:15:16 -0800 [IPV6]: Fix unnecessary GFP_ATOMIC allocation in fib6 dump Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit a2d7222f0f5861ce13b9308c30bd18f28ebeb583 tree 09d4dafe35b9cd4de344c4a8a63ef7d922466c2a parent efacfbcb6c88677809f44a574fbcd9824835dccb author Vlad Drukker Sat, 12 Nov 2005 12:13:14 -0800 committer David S. Miller Sat, 12 Nov 2005 12:13:14 -0800 [NETFILTER] {ip,nf}_conntrack TCP: Accept SYN+PUSH like SYN Some devices (e.g. Qlogic iSCSI HBA hardware like QLA4010 up to firmware 3.0.0.4) initiates TCP with SYN and PUSH flags set. The Linux TCP/IP stack deals fine with that, but the connection tracking code doesn't. This patch alters TCP connection tracking to accept SYN+PUSH as a valid flag combination. Signed-off-by: Vlad Drukker Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit efacfbcb6c88677809f44a574fbcd9824835dccb tree 6fea7fcaf7c979a0be6c370c3bb99736753e4ada parent 4f005551a8fac21b6fec8d10d57cd12d373d79e1 author Herbert Xu Sat, 12 Nov 2005 12:12:05 -0800 committer David S. Miller Sat, 12 Nov 2005 12:12:05 -0800 [IPV6]: Fix rtnetlink dump infinite loop The recent change to netlink dump "done" callback handling broke IPv6 which played dirty tricks with the "done" callback. This causes an infinite loop during a dump. The following patch fixes it. This bug was reported by Jeff Garzik. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9ffb83bcc5c5337f980dc0576bf13ac9bd4fd33d tree 51d71d16b65077943284408cd80b290f8c6596df parent 535f8d65d808421a6e1730990e39d41885b1f951 author Christoph Hellwig Sat, 12 Nov 2005 12:11:12 -0800 committer David S. Miller Sat, 12 Nov 2005 12:11:12 -0800 [SBUSFB]: implement ->compat_ioctl This patch adds a new function, sbusfb_compat_ioctl() to drivers/video/sbuslib.c and uses it as compat_ioctl in all sbus fb drivers This remove the last per-arch compat ioctl bits in arch/sparc64/kernel/ioctl32.c so it would be nice if people could test if this actually copiles and works and if yes apply it :) Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 535f8d65d808421a6e1730990e39d41885b1f951 tree abfa0474dc3442e0584a8173cc6a5b1969556cb1 parent 4f005551a8fac21b6fec8d10d57cd12d373d79e1 author Christoph Hellwig Sat, 12 Nov 2005 12:10:54 -0800 committer David S. Miller Sat, 12 Nov 2005 12:10:54 -0800 [SPARC]: Fix RTC compat ioctl kernel log spam. On Fri, Nov 11, 2005 at 12:58:40PM -0800, David S. Miller wrote: > > This change: > > diff-tree 8ca2bdc7a98b9584ac5f640761501405154171c7 (from feee207e44d3643d19e648aAuthor: Christoph Hellwig > Date: Wed Nov 9 12:07:18 2005 -0800 > > [SPARC] sbus rtc: implement ->compat_ioctl > > Signed-off-by: Christoph Hellwig > Signed-off-by: David S. Miller > > results in the console now getting spewed on sparc64 systems > with messages like: > > [ 11.968298] ioctl32(hwclock:464): Unknown cmd fd(3) cmd(401c7014){00} arg(efc > What's happening is hwclock tries first the SBUS rtc device ioctls > then the normal rtc driver ones. > > So things actually worked better when we had the SBUS rtc compat ioctl > directly handled via the generic compat ioctl code. > > There are _so_ many rtc drivers in the kernel implementing the > generic rtc ioctls that I don't think putting a ->compat_ioctl > into all of them to fix this problem is feasible. Unless we > write a single rtc_compat_ioctl(), export it to modules, and hook > it into all of those somehow. > > But even that doesn't appear to have any pretty implementation. > > Any better ideas? We had similar problems with other ioctls where userspace did things like that. What we did there was to put the compat handler to generic code. The patch below does that, adding a big comment about what's going on and removing the COMPAT_IOCTL entires for these on powerpc that not only weren't ever useful but are duplicated now aswell. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 4f005551a8fac21b6fec8d10d57cd12d373d79e1 tree da64987344a6d30a80a3bb8fe559ba42951d43b4 parent 44e6f84e3597905816a0440e7218d2ed072120da author Dmitry Torokhov Sat, 12 Nov 2005 00:55:15 -0500 committer Linus Torvalds Sat, 12 Nov 2005 11:42:32 -0800 [PATCH] I8K: fix /proc reporting of blank service tags Make /proc/i8k display '?' when service tag is blank in BIOS. This fixes segfault in i8k gkrellm plugin. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit 44e6f84e3597905816a0440e7218d2ed072120da tree cc39924c84f2b2fb4412af5786c304d93ace2824 parent ae5684ceb478bfbb7c3c5a49970e20f4701dbdf7 author Prakash Punnoor Sat, 12 Nov 2005 09:17:38 +0100 committer Linus Torvalds Sat, 12 Nov 2005 10:52:30 -0800 [PATCH] fix b2c2 dvb undefined symbol This fixes drivers/built-in.o: In function `flexcop_frontend_init': : undefined reference to `lgdt330x_attach' [ Side note: I really dislike that dvb people want to include every possible frontend into the kernel - I only need the mt312 one for my Skystar2 card. I'd highly appreciate it this would be made selectable again... ] Signed-off-by: Prakash Punnoor Signed-off-by: Linus Torvalds commit ae5684ceb478bfbb7c3c5a49970e20f4701dbdf7 tree 75a3fb196cc0c6d345fefcd49d304eb13d77a4ac parent 0fde7f591860e48dd210144ff24c061da03bfa39 parent 02eaa66629a29cd5712fe81a360c3ab5b1fc9531 author Linus Torvalds Sat, 12 Nov 2005 10:39:03 -0800 committer Linus Torvalds Sat, 12 Nov 2005 10:39:03 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 0fde7f591860e48dd210144ff24c061da03bfa39 tree b91c008b335a8fb252c636fd9ebc95f948556174 parent 3beb2077125d8457118140653e75efc998ac6630 author Linus Torvalds Sat, 12 Nov 2005 10:14:02 -0800 committer Linus Torvalds Sat, 12 Nov 2005 10:14:02 -0800 Revert "[PATCH] fbcon: Add rl (Roman Large) font" This reverts 998e6d51162707685336ff99c029c8911b270d32 commit. commit 3beb2077125d8457118140653e75efc998ac6630 tree 130dd33c810471790554d21eab32f5f859715fd7 parent 5a7c47eefb31f6b4982add7473ef3e551b058ea4 author Tejun Heo Thu, 10 Nov 2005 18:22:36 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:57:05 +0100 [BLOCK] elevator: elv_latter/former_request update With generic dispatch queue update, implicit former/latter request handling using rq->queuelist.prev/next doesn't work as expected anymore. Also, the only iosched dependent on this feature was noop-iosched and it has been reimplemented to have its own latter/former methods. This patch removes implicit former/latter handling. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 5a7c47eefb31f6b4982add7473ef3e551b058ea4 tree 6bff2f1ab58080d759c8788680e05359ba0d5f69 parent b740d98f5614e34b4cff2e1e67826f007c8d4f30 author Tejun Heo Thu, 10 Nov 2005 18:21:30 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:56:52 +0100 [BLOCK] noop-iosched: reimplementation of request dispatching The original implementation directly used dispatch queue. As new generic dispatch queue imposes stricter rules over ioscheds and dispatch queue usage, this direct use becomes somewhat problematic. This patch reimplements noop-iosched such that it complies to generic iosched model better. Request merging with q->last_merge and rq->queuelist.prev/next work again now. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe Thu, 10 Nov 2005 18:20:16 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:56:36 +0100 [BLOCK] cfq-iosched: fix slice_left calculation When cfq slice expires, remainder of slice is calculated and stored in cfqq->slice_left. Current code calculates the opposite of remainder - how many jiffies the cfqq has used past slice end. This patch fixes the bug. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit be56123568072d223263a6a70a087d1e7faabb83 tree e6044bff3c9dba3392dfe1a4b172d87081d55334 parent 15853af9f07673680439b224519c692f1352b959 author Tejun Heo Thu, 10 Nov 2005 08:55:01 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:56:21 +0100 [BLOCK] fix string handling in elv_iosched_store elv_iosched_store doesn't terminate string passed from userspace if it's too long. Also, if the written length is zero (probably not possible), it accesses elevator_name[-1]. This patch fixes both bugs. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 15853af9f07673680439b224519c692f1352b959 tree e6a8fc1cd34dec568883cd62102e1e626d9241d9 parent 1b5ed5e1f1315e37380e55102f58bcae3344d2a7 author Tejun Heo Thu, 10 Nov 2005 08:52:05 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:56:06 +0100 [BLOCK] Implement elv_drain_elevator for improved switch error detection This patch adds request_queue->nr_sorted which keeps the number of requests in the iosched and implement elv_drain_elevator which performs forced dispatching. elv_drain_elevator checks whether iosched actually dispatches all requests it has and prints error message if it doesn't. As buggy forced dispatching can result in wrong barrier operations, I think this extra check is worthwhile. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 1b5ed5e1f1315e37380e55102f58bcae3344d2a7 tree 785dc9675e2f22b60017030063ba103740c72f16 parent 407df2aa29a33fe16f6ee4bac8cdfa414783b9f1 author Tejun Heo Thu, 10 Nov 2005 08:49:19 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:55:51 +0100 [BLOCK] cfq-iosched: cfq forced dispatching fix cfq forced dispatching might not return all requests on the queue. This bug can hang elevator switchinig and corrupt request ordering during flush sequence. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 407df2aa29a33fe16f6ee4bac8cdfa414783b9f1 tree 137e536d79e9fc777adc8c5bde842fea8b53d88a parent 47a004103d663bbba8c7c433a710a86f44351cf3 author Tejun Heo Thu, 10 Nov 2005 08:48:21 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:55:37 +0100 [BLOCK] elevator: run queue in elevator_switch elevator_dispatch needs to run queue after forced dispatching; otherwise, the queue might stall. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 47a004103d663bbba8c7c433a710a86f44351cf3 tree 91bf9479fa43e7a13b02b2f6b957373b5b28b5ef parent cff3ba2204a0797b05150a4b2b7f40a55023d952 author Jens Axboe Wed, 09 Nov 2005 13:38:47 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:55:21 +0100 [BLOCK] Document the READ/WRITE splitup of the disk stats Use the symbolic name where appropriate and add a comment to the disk_stats structure. Signed-off-by: Jens Axboe commit cff3ba2204a0797b05150a4b2b7f40a55023d952 tree 56d3527958ec1aee1f2c0b185134883095175012 parent b8ea2cb5120a92fe63053a2896be42abbb919a76 author Zachary Amsden Wed, 09 Nov 2005 13:24:20 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:55:05 +0100 [BLOCK] elevator init fixes #2 In addition to the first patch, which is probably goodness, I found the cause of my panic - applying this patch fixes it and now I am booting. If the chosen_elevator[] is not found, fall back to noop. Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit b8ea2cb5120a92fe63053a2896be42abbb919a76 tree edbe103c6c5c2fe971ee270d8b0e3ae7dab8af83 parent cd52d1ee9a92587b242d946a2300a3245d3b885a author Zachary Amsden Wed, 09 Nov 2005 13:23:01 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:54:48 +0100 [BLOCK] elevator init fixes I got a panic in the elevator code, backtrace : Unable to handle kernel NULL pointer dereference at virtual address 00000060 .. EIP is at elevator_put+0x0/0x30 (null elevator_type passed) .. elevator_init+0x38 blk_init_queu_node+0xc9 floppy_init+0xdb do_initcalls+0x23 init+0x10a init+0x0 Clearly if the kmalloc here fails, e->elevator_type is not yet set; this appears to be the correct fix, but I think I probably hit the second case due to a race condition. Someone more familiar with the elevator code should look at this more closely until I can determine if I can reproduce. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit 02eaa66629a29cd5712fe81a360c3ab5b1fc9531 tree 3223957cc38c553155b80435d946f828ecb38f6b parent 828d09de4a6c922517f533093583b9fe8cbf5808 author Jeff Garzik Sat, 12 Nov 2005 01:32:19 -0500 committer Jeff Garzik Sat, 12 Nov 2005 01:32:19 -0500 [libata ahci] set port ATAPI bit correctly Although according to the documentation this largely only affects desktop LED control, let's make sure we set the ATAPI bit when we have an ATAPI device attached to the port. commit 828d09de4a6c922517f533093583b9fe8cbf5808 tree 44ceae8c3ead9f534a0c31b03038dc253658ad9c parent cd52d1ee9a92587b242d946a2300a3245d3b885a author Jeff Garzik Sat, 12 Nov 2005 01:27:07 -0500 committer Jeff Garzik Sat, 12 Nov 2005 01:27:07 -0500 [libata ahci, qstor] fix miscount of scatter/gather entries Don't directly reference qc->n_elem, as that might cause an off-by-one error for misaligned (padded) ATAPI transfers.