commit 2ba84684e8cf6f980e4e95a2300f53a505eb794e tree f8a746aca3ca8aeb832d83e9297f2ffe636082c6 parent b4b08e581fac8e0ba9ae348bdc13246c9798c99e author Linus Torvalds Sun, 14 Aug 2005 18:21:30 -0700 committer Linus Torvalds Sun, 14 Aug 2005 18:21:30 -0700 Revert PCIBIOS_MIN_IO changes for 2.6.13 This reverts commits 71db63acff69618b3d9d3114bd061938150e146b [PATCH] increase PCIBIOS_MIN_IO on x86 and 0b2bfb4e7ff61f286676867c3508569bea6fbf7a ACPI: increase PCIBIOS_MIN_IO on x86 since Lukas Sandströ reports that this breaks his on-board nvidia audio. We should re-visit this later. For now we revert the change Signed-off-by: Linus Torvalds commit b4b08e581fac8e0ba9ae348bdc13246c9798c99e tree b09ea9a12a65f0a03fa7a15b0e661756913a0262 parent 27876d02b30aa34bb1ad35b81ccc40c174282f31 author Linus Torvalds Sun, 14 Aug 2005 15:43:39 -0700 committer Linus Torvalds Sun, 14 Aug 2005 15:43:39 -0700 Revert "dc395x: Fix support for highmem" It introduces a repeatable oops in the driver, which is a bigger problem than the patch tries to solve. From the original description: Author: Jamie Lenehan Date: Thu Mar 3 14:41:40 2005 +0200 [PATCH] dc395x: Fix support for highmem From: Guennadi Liakhovetski Removes the page_to_virt and maps sg lists dynamically. This makes the driver work with highmem pages. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Jamie Lenehan Signed-off-by: James Bottomley Signed-off-by: Guennadi Liakhovetski Signed-off-by: Linus Torvalds commit 27876d02b30aa34bb1ad35b81ccc40c174282f31 tree ba07379df3c12bd963363d0a3205a201688a5e4d parent d024709deb4997aced6140a62e8ee82b10666c5f author Steve French Sun, 14 Aug 2005 16:55:23 -0500 committer Linus Torvalds Sun, 14 Aug 2005 15:27:24 -0700 [PATCH] CIFS: Fix path name conversion for long filenames Fix path name conversion for long filenames when mapchars mount option was specified at mount time. Signed-off-by: Steve French (sfrench@us.ibm.com) Signed-off-by: Linus Torvalds commit d024709deb4997aced6140a62e8ee82b10666c5f tree c383ee45809d28079b4dcd554f9953509c57da1b parent 1b0a74d1c002320d5488333dd9c72126af1aab02 author Steve French Sun, 14 Aug 2005 16:55:23 -0500 committer Linus Torvalds Sun, 14 Aug 2005 15:27:24 -0700 [PATCH] CIFS: Fix missing entries in search results Fix missing entries in search results when very long file names and more than 50 (or so) of such long search entries in the directory. FindNext could send corrupt last byte of resume name when resume key was a few hundred bytes long file name or longer. Fixes Samba Bug # 2932 Signed-off-by: Steve French (sfrench@us.ibm.com) Signed-off-by: Linus Torvalds commit 1b0a74d1c002320d5488333dd9c72126af1aab02 tree 78eed6efb9cb5d97abe75cf793e5bd866381c6f9 parent f73bc8cae3481adc4188a5f34a89025c10133b0a author Jan Kara Sat, 13 Aug 2005 13:15:34 +0200 committer Linus Torvalds Sat, 13 Aug 2005 21:54:13 -0700 [PATCH] Fix error handling in reiserfs Initialize key object ID in inode so that we don't try to remove the inode when we fail on some checks even before we manage to allocate something. Signed-off-by: Jan Kara Signed-off-by: Linus Torvalds commit f73bc8cae3481adc4188a5f34a89025c10133b0a tree 794793d9d6d67cfaa55d141083527297bcc14bd1 parent 4bb82551e165f887448f6f61055d7bcd90aefa2a author Paul Mundt Sat, 13 Aug 2005 20:28:06 +0300 committer Linus Torvalds Sat, 13 Aug 2005 14:23:39 -0700 [PATCH] sh: Make _syscall6() do the right thing. There was a rather silly and embarrassing typo in the sh _syscall6(). For the syscall ABI we have the trapa value specified as 0x10 + number of arguments, this was being set incorrectly in the _syscall6() case which ended up causing some problems for users. Signed-off-by: Paul Mundt Signed-off-by: Linus Torvalds commit 4bb82551e165f887448f6f61055d7bcd90aefa2a tree e52389322e063c5b784ead6ec314503f7646c765 parent 2da5bf80f754e28cc153362e5ed1edaa9740897a author Linus Torvalds Sat, 13 Aug 2005 14:22:59 -0700 committer Linus Torvalds Sat, 13 Aug 2005 14:22:59 -0700 Fix up mmap of /dev/kmem This leaves the issue of whether we should deprecate the whole thing (or if we should check the whole mmap range, for that matter) open. Just do the minimal fix for now. commit 2da5bf80f754e28cc153362e5ed1edaa9740897a tree 875b37dea35256467ff21fbd1bd6ebd9e4c72ebf parent 63788ea9245688772d13b979bea05bd72b239aad author Evgeniy Polyakov Fri, 12 Aug 2005 11:46:22 -0700 committer Linus Torvalds Fri, 12 Aug 2005 12:55:02 -0700 [PATCH] w1: more debug level decrease. Do not spam syslog each 10 seconds when there is nothing on the wire. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 63788ea9245688772d13b979bea05bd72b239aad tree 13f00cc8f6da1ed6c583947652bbedb2a0e27693 parent 349188f66da2fd88f8cb2407763051d8e136c9aa parent d7b9dfc8ea43936e6e8eec3040dcf4f110563868 author Linus Torvalds Fri, 12 Aug 2005 09:22:34 -0700 committer Linus Torvalds Fri, 12 Aug 2005 09:22:34 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 349188f66da2fd88f8cb2407763051d8e136c9aa tree d14fad61cfc65cd4fc2ee74e8f5753500379c8b6 parent 7d69fa6266770eeb6317eddd46b64456e8a515bf author Eric W. Biederman Thu, 11 Aug 2005 22:26:25 -0600 committer Linus Torvalds Fri, 12 Aug 2005 09:22:04 -0700 [PATCH] x86_64: Fix apicid versus cpu# confusion. Oops. I knew I didn't have the physical versus logical cpu identifiers right when I generated that patch. It's not nearly as bad as I feared at the time though. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit d7b9dfc8ea43936e6e8eec3040dcf4f110563868 tree fb2bf6e88cab914fb1f11d4143bb72dd953d35a8 parent 53fb95d3c14290fd6ee808b221e35493f096246f author Matt Mackall Thu, 11 Aug 2005 19:28:05 -0700 committer David S. Miller Thu, 11 Aug 2005 19:28:05 -0700 [NETPOLL]: remove unused variable Remove unused variable Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 53fb95d3c14290fd6ee808b221e35493f096246f tree 146c31c79bbc66d8fde3afa5ae37a04b63041eba parent 2652076507b662fc88ba16c27b59c7bdd9ccd956 author Matt Mackall Thu, 11 Aug 2005 19:27:43 -0700 committer David S. Miller Thu, 11 Aug 2005 19:27:43 -0700 [NETPOLL]: fix initialization/NAPI race This fixes a race during initialization with the NAPI softirq processing by using an RCU approach. This race was discovered when refill_skbs() was added to the setup code. Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 2652076507b662fc88ba16c27b59c7bdd9ccd956 tree dff28a2168431921a607062f56faebe9fd1b0fd0 parent 0db1d6fc1ea051af49ebe03c503d23996a7c5bbb author Ingo Molnar Thu, 11 Aug 2005 19:26:42 -0700 committer David S. Miller Thu, 11 Aug 2005 19:26:42 -0700 [NETPOLL]: pre-fill skb pool we could do one thing (see the patch below): i think it would be useful to fill up the netlogging skb queue straight at initialization time. Especially if netpoll is used for dumping alone, the system might not be in a situation to fill up the queue at the point of crash, so better be a bit more prepared and keep the pipeline filled. [ I've modified this to be called earlier - mpm ] Signed-off-by: Ingo Molnar Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 0db1d6fc1ea051af49ebe03c503d23996a7c5bbb tree 6afab02002a46b045a3b8769342ad277402f0d95 parent f0d3459d0722782c7d9d0e35a1ed0815e75fcde5 author Matt Mackall Thu, 11 Aug 2005 19:25:54 -0700 committer David S. Miller Thu, 11 Aug 2005 19:25:54 -0700 [NETPOLL]: add retry timeout Add limited retry logic to netpoll_send_skb Each time we attempt to send, decrement our per-device retry counter. On every successful send, we reset the counter. We delay 50us between attempts with up to 20000 retries for a total of 1 second. After we've exhausted our retries, subsequent failed attempts will try only once until reset by success. Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit f0d3459d0722782c7d9d0e35a1ed0815e75fcde5 tree 84c07d42090b81705d23103bda29b0c186fffa49 parent 6b0b31572985c2e64f7216c798766302fb782281 author Matt Mackall Thu, 11 Aug 2005 19:25:11 -0700 committer David S. Miller Thu, 11 Aug 2005 19:25:11 -0700 [NETPOLL]: netpoll_send_skb simplify Minor netpoll_send_skb restructuring Restructure to avoid confusing goto and move some bits out of the retry loop. Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 6b0b31572985c2e64f7216c798766302fb782281 tree 29617ffbfff1ce75fc73dbcd8dcb4c3fdbb49f06 parent a636e1357911afdea7c8344ee65f78d36caf3c16 author Matt Mackall Thu, 11 Aug 2005 19:24:33 -0700 committer David S. Miller Thu, 11 Aug 2005 19:24:33 -0700 [NETPOLL]: e1000 netpoll tweak Suggested by Steven Rostedt, matches his patch included in e100. Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit a636e1357911afdea7c8344ee65f78d36caf3c16 tree 644495567b6a66d29116e0831a96198d82d788e9 parent 11513128bb66b0b09d5d0df069b58afdb01752a2 author Jeff Moyer Thu, 11 Aug 2005 19:23:50 -0700 committer David S. Miller Thu, 11 Aug 2005 19:23:50 -0700 [NETPOLL]: deadlock bugfix This fixes an obvious deadlock in the netpoll code. netpoll_rx takes the npinfo->rx_lock. netpoll_rx is also the only caller of arp_reply (through __netpoll_rx). As such, it is not necessary to take this lock. Signed-off-by: Jeff Moyer Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 11513128bb66b0b09d5d0df069b58afdb01752a2 tree 2c6cb83eb623e7e0ac997f8cb21c0998fe082b2e parent a0d3bea3cf6c7c1b53a46432bd490b5dc784ca42 author Jeff Moyer Thu, 11 Aug 2005 19:23:04 -0700 committer David S. Miller Thu, 11 Aug 2005 19:23:04 -0700 [NETPOLL]: rx_flags bugfix Initialize npinfo->rx_flags. The way it stands now, this will have random garbage, and so will incur a locking penalty even when an rx_hook isn't registered and we are not active in the netpoll polling code. Signed-off-by: Jeff Moyer Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit a0d3bea3cf6c7c1b53a46432bd490b5dc784ca42 tree 2c0f1d9e4c94f6b4052ca7f51442a3f5922124e3 parent 7d69fa6266770eeb6317eddd46b64456e8a515bf author Alexey Dobriyan Thu, 11 Aug 2005 16:05:50 -0700 committer David S. Miller Thu, 11 Aug 2005 16:05:50 -0700 [NET]: Make skb->protocol __be16 There are many instances of skb->protocol = htons(ETH_P_*); skb->protocol = __constant_htons(ETH_P_*); and skb->protocol = *_type_trans(...); Most of *_type_trans() are already endian-annotated, so, let's shift attention on other warnings. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 7d69fa6266770eeb6317eddd46b64456e8a515bf tree e70456aa61c6f82bc8409c1fea65124e6eec3f57 parent b5da623ae9be680ea59f268eeb339f0acb2d88c4 author Johannes Stezenbach Thu, 11 Aug 2005 11:54:24 +0200 committer Linus Torvalds Thu, 11 Aug 2005 10:08:59 -0700 [PATCH] Fix DVB URL Signed-off-by: Johannes Stezenbach Signed-off-by: Linus Torvalds commit b5da623ae9be680ea59f268eeb339f0acb2d88c4 tree b41844950a11240000d74fb65ce9c4ea82ef2a17 parent bc68552faad0e134eb22281343d5ae5a4873fa80 author Herbert Xu Wed, 10 Aug 2005 18:32:36 -0700 committer David S. Miller Wed, 10 Aug 2005 18:32:36 -0700 [TCP]: Adjust {p,f}ackets_out correctly in tcp_retransmit_skb() Well I've only found one potential cause for the assertion failure in tcp_mark_head_lost. First of all, this can only occur if cnt > 1 since tp->packets_out is never zero here. If it did hit zero we'd have much bigger problems. So cnt is equal to fackets_out - reordering. Normally fackets_out is less than packets_out. The only reason I've found that might cause fackets_out to exceed packets_out is if tcp_fragment is called from tcp_retransmit_skb with a TSO skb and the current MSS is greater than the MSS stored in the TSO skb. This might occur as the result of an expiring dst entry. In that case, packets_out may decrease (line 1380-1381 in tcp_output.c). However, fackets_out is unchanged which means that it may in fact exceed packets_out. Previously tcp_retrans_try_collapse was the only place where packets_out can go down and it takes care of this by decrementing fackets_out. So we should make sure that fackets_out is reduced by an appropriate amount here as well. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit bc68552faad0e134eb22281343d5ae5a4873fa80 tree 2dc4d4339e6012049be4c1c548d226d78fc1090a parent 0893dd327ffacb83dcca9033d2891d57b4024d6b parent 001ab02a8c04f0b4dc773c474da698ad7405ae68 author Linus Torvalds Wed, 10 Aug 2005 12:21:25 -0700 committer Linus Torvalds Wed, 10 Aug 2005 12:21:25 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 0893dd327ffacb83dcca9033d2891d57b4024d6b tree dc7f614efa213e5939b32ef71209d832b28256fc parent 606867443764edac5a2c542f2fa0a12ef7a7c7fd parent 42517438f9c1011a03e49a542cba32ac5a80dd8e author Linus Torvalds Wed, 10 Aug 2005 11:56:19 -0700 committer Linus Torvalds Wed, 10 Aug 2005 11:56:19 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 606867443764edac5a2c542f2fa0a12ef7a7c7fd tree 61110afaef5e8be41be940815a8bd6065e32c5da parent 3462b925414a146d4c2252de97d20f89218d1ffb author James Bottomley Wed, 10 Aug 2005 11:29:15 -0700 committer Linus Torvalds Wed, 10 Aug 2005 11:55:19 -0700 [PATCH] remove name length check in a workqueue We have a chek in there to make sure that the name won't overflow task_struct.comm[], but it's triggering for scsi with lots of HBAs, only scsi is using single-threaded workqueues which don't append the "/%d" anyway. All too hard. Just kill the BUG_ON. Cc: Ingo Molnar Signed-off-by: Andrew Morton [ kthread_create() uses vsnprintf() and limits the thing, so no actual overflow can actually happen regardless ] Signed-off-by: Linus Torvalds commit 001ab02a8c04f0b4dc773c474da698ad7405ae68 tree 760d373edc5603ff3e3b05d274236e35bffdebdd parent 86b3786078d63242d3194ffc58ae8dae1d1bbef3 author Steven Whitehouse Wed, 10 Aug 2005 11:32:57 -0700 committer David S. Miller Wed, 10 Aug 2005 11:32:57 -0700 [DECNET]: Use sk_stream_error function rather than DECnet's own Signed-off-by: Steven Whitehouse Signed-off-by: David S. Miller commit 3462b925414a146d4c2252de97d20f89218d1ffb tree 69c56646fdcb3092cb064b9a7fa88a1ed3936789 parent e62b8b2bc73b2433239a2ac394c2fafd50c43d9e author Pierre Ossman Mon, 11 Jul 2005 14:19:35 +0200 committer Linus Torvalds Wed, 10 Aug 2005 11:08:56 -0700 [PATCH] wbsd version bump Even though the changes are minor for the next release an increasing version number simplifies my support issues. Signed-off-by: Pierre Ossman Signed-off-by: Linus Torvalds commit e62b8b2bc73b2433239a2ac394c2fafd50c43d9e tree 37905efc6ff5a7c451cc37b4697eed2cdb820992 parent 70679ee34f244499cf1c6775647895123eb1a326 author Benjamin Herrenschmidt Wed, 10 Aug 2005 11:12:09 +0200 committer Linus Torvalds Wed, 10 Aug 2005 11:07:40 -0700 [PATCH] ppc64: Fix Fan control for new PowerMac G5 2.7GHz machines The workaround for broken device-tree that prevents fan control from working on recent G5 models need to be "enabled" for machines with revision 0x37 of the bridge in addition to machines with revision 0x35. Signed-off-by: Geoff Levand Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 70679ee34f244499cf1c6775647895123eb1a326 tree f072c008a577663f2e4f3385ed854e0dceaffe34 parent 435d444a532af652ba8bdfd4db4424982bea2f69 parent b876386ee47e3ac9375a36e9107b8bd32e0599fc author Linus Torvalds Wed, 10 Aug 2005 11:05:56 -0700 committer Linus Torvalds Wed, 10 Aug 2005 11:05:56 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp commit 435d444a532af652ba8bdfd4db4424982bea2f69 tree a6baaf42fe41c22fd08b8ffab612194bb1c7004a parent 22d0def9d09111513f5a8d38583210620f97d710 parent 484ae6bd9506488089c33784eff35b190fa80e03 author Linus Torvalds Wed, 10 Aug 2005 11:05:28 -0700 committer Linus Torvalds Wed, 10 Aug 2005 11:05:28 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 22d0def9d09111513f5a8d38583210620f97d710 tree b17c0fd6d98afc0af6920d18e096e7ab814189de parent c0438174e8272d23fe43a5d3f23d777f5b412e87 author Alexander Nyberg Wed, 10 Aug 2005 10:11:36 -0700 committer Linus Torvalds Wed, 10 Aug 2005 11:03:02 -0700 [PATCH] ns558 list handling fix Need to use list_for_entry_safe(), as we're removing items during the traversal. list_for_each_entry() uses the first ptr also as an iterator, if you kfree() it slab takes it, might poison it and then you try to use it to iterate to the next object in list. Cc: Vojtech Pavlik Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0438174e8272d23fe43a5d3f23d777f5b412e87 tree 5c7ef2706004c7ebf620f5f347b914e57f3b093d parent 48d28fd55e7fd349fb16a50244379b4da3a4943c author Ralf Baechle DL5RB Wed, 10 Aug 2005 10:03:20 -0700 committer Linus Torvalds Wed, 10 Aug 2005 11:03:02 -0700 [PATCH] 6pack persistence fix Fix the p-persistence CSMA algorithm which in simplex mode was starting with a slottime delay before doing anything else as if there was carrier collision resulting in bad performance on simplex links. Signed-off-by: Ralf Baechle DL5RB Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42517438f9c1011a03e49a542cba32ac5a80dd8e tree e754cb76bd2db916dd38e6ba5f65a2e56a701b84 parent fae009847c9ea3d668bbee21ce1d76764eca5039 author Tejun Heo Wed, 10 Aug 2005 13:38:27 -0400 committer Jeff Garzik Wed, 10 Aug 2005 13:38:27 -0400 libata: fix EH-related lockup by properly cleaning EH command list Yet another hack due to the fact that libata is the only user of SCSI's ->eh_strategy_handler() hook. commit fae009847c9ea3d668bbee21ce1d76764eca5039 tree b0272cf5f64ce8e0e7ae15018e9318ac7b0ad732 parent 86b3786078d63242d3194ffc58ae8dae1d1bbef3 author Tejun Heo Sun, 07 Aug 2005 14:53:40 +0900 committer Jeff Garzik Wed, 10 Aug 2005 13:34:58 -0400 [PATCH] sata: fix sata_sx4 dma_prep to not use sg->length sata_sx4 directly references sg->length to calculate total_len in pdc20621_dma_prep(). This is incorrect as dma_map_sg() could have merged multiple sg's into one and, in such case, sg->length doesn't reflect true size of the entry. This patch makes it use sg_dma_len(sg). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 48d28fd55e7fd349fb16a50244379b4da3a4943c tree a6239419973b87c0560de36ab9e11516d45173e8 parent 86b3786078d63242d3194ffc58ae8dae1d1bbef3 parent 5bb8345db8f2aef367e0fddf99a42b7a6029b31f author Linus Torvalds Wed, 10 Aug 2005 09:36:02 -0700 committer Linus Torvalds Wed, 10 Aug 2005 09:36:02 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 commit 484ae6bd9506488089c33784eff35b190fa80e03 tree 389ab376598b97db693d8a8f468ecdb174a0a881 parent c59d071d4a32e1c45cac6d47f5b59ec36a9a997b author Ben Dooks Wed, 10 Aug 2005 16:45:14 +0100 committer Russell King Wed, 10 Aug 2005 16:45:14 +0100 [PATCH] ARM: 2849/1: S3C24XX - USB host update (2848/1) Patch from Ben Dooks Rename the s3c2410_report_oc() to s3c2410_usb_report_oc() as this is an usb specific function. Change port power on the usb-simtec implementation to only power up the output if both are set, as per the usb 1.1 specification Signed-off-by: Ben Dooks Signed-off-by: Russell King commit c59d071d4a32e1c45cac6d47f5b59ec36a9a997b tree 671909f7778b7ec30bfe821c85b5c4802e7f2479 parent 8d3722667762af1490db18ba927386d3be89a32b author Ben Dooks Wed, 10 Aug 2005 16:45:14 +0100 committer Russell King Wed, 10 Aug 2005 16:45:14 +0100 [PATCH] ARM: 2847/1: S3C24XX - Documentation for USB OHCI host Patch from Ben Dooks Documentation for the in-built OHCI host controller and the support for it in Linux. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 8d3722667762af1490db18ba927386d3be89a32b tree 5b96d7b33c40b1abca00030f0b3b42bed5567b0c parent 6626a7076d39f0a18156cdd97d4e2cbef91ad701 author Nicolas Pitre Wed, 10 Aug 2005 16:45:13 +0100 committer Russell King Wed, 10 Aug 2005 16:45:13 +0100 [PATCH] ARM: 2846/1: proper handling of CKEN for pxafb Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 6626a7076d39f0a18156cdd97d4e2cbef91ad701 tree 13909ea6ae009b9b418cf3302baebe1baaa0dbd4 parent 1b9749e7f15bf2db19f5d201f88401c7517910b7 author Russell King Wed, 10 Aug 2005 16:18:35 +0100 committer Russell King Wed, 10 Aug 2005 16:18:35 +0100 [ARM] Control v6 'global' bit via Linux PTE entries Unfortunately, we can't use the "user" bit in the page tables to control whether a page table entry is "global" or "asid" specific, since the vector page is mapped as "user" accessible but is not process specific. Therefore, give direct control of the ARMv6 "nG" (not global) bit to the mm layers. Signed-off-by: Russell King commit 1b9749e7f15bf2db19f5d201f88401c7517910b7 tree 43654821aa73118f73f0e98e40bfb470f089e96d parent 86b3786078d63242d3194ffc58ae8dae1d1bbef3 author Russell King Wed, 10 Aug 2005 16:15:32 +0100 committer Russell King Wed, 10 Aug 2005 16:15:32 +0100 [ARM] Use #defined constants for manipulating v6 hardware PTE bits Signed-off-by: Russell King commit b876386ee47e3ac9375a36e9107b8bd32e0599fc tree 9bd30de345a0bf8260db1e3edbb657dc46bbe1e9 parent 3c4ee4e2520775896efc6ab850c4c27971fbcf2a author Russell King Wed, 10 Aug 2005 14:52:52 +0100 committer Russell King Wed, 10 Aug 2005 14:52:52 +0100 [ARM SMP] Clear the exclusive monitor on ARMv6 CPUs on context switch Ensure that the exclusive monitor is cleared on context switch with ARMv6 CPUs. Signed-off-by: Russell King commit 3c4ee4e2520775896efc6ab850c4c27971fbcf2a tree 0b1512bf41bde9d89c4076b305df7ceab9db2465 parent 86b3786078d63242d3194ffc58ae8dae1d1bbef3 author Russell King Wed, 10 Aug 2005 14:41:45 +0100 committer Russell King Wed, 10 Aug 2005 14:41:45 +0100 [ARM SMP] Only enable V6K instructions on V6 MP core CPUs Signed-off-by: Russell King commit 86b3786078d63242d3194ffc58ae8dae1d1bbef3 tree 518f62158f0923573decb8f072ac7282fb7575cb parent aeb3f76350e78aba90653b563de6677b442d21d6 author Christoph Lameter Tue, 09 Aug 2005 19:59:21 -0700 committer Linus Torvalds Tue, 09 Aug 2005 20:21:31 -0700 [PATCH] Fix ide-disk.c oops caused by hwif == NULL 1. Move hwif_to_node to ide.h 2. Use hwif_to_node in ide-disk.c Signed-off-by: Christoph Lameter Signed-off-by: Linus Torvalds commit aeb3f76350e78aba90653b563de6677b442d21d6 tree 1978eafdc5a50528652bf5b8e950afe03af5d5d2 parent e179d8b0552e2fdb45c6022c589af945f8cbecbe author Michael Krufky Tue, 09 Aug 2005 17:48:54 -0700 committer Linus Torvalds Tue, 09 Aug 2005 17:59:52 -0700 [PATCH] DVB: lgdt330x frontend: some bug fixes & add lgdt3303 support This patch removes the tda9887 stuff from lgdt330x.c. It's experimental code which wasn't supposed to leak out and we don't want it in 2.6.13. Signed-off-by: Michael Krufky Acked-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e179d8b0552e2fdb45c6022c589af945f8cbecbe tree 55bea91fb428a84682928b40e0765ce96903df20 parent dc9352a42c6de578c932313448257cf246b2b75f author Michael Krufky Tue, 09 Aug 2005 17:48:54 -0700 committer Linus Torvalds Tue, 09 Aug 2005 17:59:52 -0700 [PATCH] dvb: lgdt330x frontend: trivial text cleanups Two trivial text changes in Kconfig and lgdt330x.c Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc9352a42c6de578c932313448257cf246b2b75f tree cc0a26be95e1a93e675bbe40dd7528db7ed2baa1 parent a7df26da158ad64d56cc32934aa38a07d03a6fc9 author Markus Lidel Tue, 09 Aug 2005 14:30:57 -0700 committer Linus Torvalds Tue, 09 Aug 2005 17:59:52 -0700 [PATCH] I2O: added pci_request_regions() before using the controller Added pci_request_regions() before using the controller to avoid duplicate usage of the I2O controller when the dpt_i2o driver and I2O subsystem is loaded at the same time. Signed-off-by: Markus Lidel Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7df26da158ad64d56cc32934aa38a07d03a6fc9 tree be7cf42be9e84df58332c16db91526f818da020b parent 68e681e87faa142bde356aeefe619c42275ac98e parent fb573856b2d82926b36ed059899d883474a3b9eb author Linus Torvalds Tue, 09 Aug 2005 16:03:19 -0700 committer Linus Torvalds Tue, 09 Aug 2005 16:03:19 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 68e681e87faa142bde356aeefe619c42275ac98e tree 2eba703e7d672238cccf8b9090f4be6b4dcbeb1b parent 25f13053651569bd0c87927ff49d07d9225feadb parent 38c1844b3120e04b7f5bb9c18ebbc19883d1e1d6 author Linus Torvalds Tue, 09 Aug 2005 16:02:15 -0700 committer Linus Torvalds Tue, 09 Aug 2005 16:02:15 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 25f13053651569bd0c87927ff49d07d9225feadb tree 12d9b6a690c314be5b2e3f8423c5a82618b96508 parent db29e85a7ece62de1899917c1ec0ffe55cf1d3a0 parent d64d3873721cfe870d49d73c3744f06260779ce7 author Linus Torvalds Tue, 09 Aug 2005 16:00:05 -0700 committer Linus Torvalds Tue, 09 Aug 2005 16:00:05 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit d64d3873721cfe870d49d73c3744f06260779ce7 tree b49a930e65ed4f30b4f8f2aac4ddb08c41bc4b79 parent 3501466941347f0e1992b2672affb3feb92925fd author Andrew Morton Tue, 09 Aug 2005 15:29:19 -0700 committer David S. Miller Tue, 09 Aug 2005 15:29:19 -0700 [NET]: Fix memory leak in sys_{send,recv}msg() w/compat From: Dave Johnson sendmsg()/recvmsg() syscalls from o32/n32 apps to a 64bit kernel will cause a kernel memory leak if iov_len > UIO_FASTIOV for each syscall! This is because both sys_sendmsg() and verify_compat_iovec() kmalloc a new iovec structure. Only the one from sys_sendmsg() is free'ed. I wrote a simple test program to confirm this after identifying the problem: http://davej.org/programs/testsendmsg.c Note that the below fix will break solaris_sendmsg()/solaris_recvmsg() as it also calls verify_compat_iovec() but expects it to malloc internally. [ I fixed that. -DaveM ] Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 3501466941347f0e1992b2672affb3feb92925fd tree 4db1741d4400b704609d495c68728c962ea3982a parent 00dd1e433967872f3997a45d5adf35056fdf2f56 author David S. Miller Tue, 09 Aug 2005 14:57:12 -0700 committer David S. Miller Tue, 09 Aug 2005 14:57:12 -0700 [SUNRPC]: Fix nsec --> usec conversion. We need to divide, not multiply. While we're here, use NSEC_PER_USEC instead of a magic constant. Based upon a report from Josip Loncaric and a patch by Andrew Morton. Signed-off-by: David S. Miller commit 38c1844b3120e04b7f5bb9c18ebbc19883d1e1d6 tree 62b5387a79777395af440f0fcb601eb692feb2aa parent 4875ccdb304775e9fd830f644643a1513357e043 author David S. Miller Tue, 09 Aug 2005 14:43:14 -0700 committer David S. Miller Tue, 09 Aug 2005 14:43:14 -0700 [SPARC]: envctrl: ERR_PTR() --> PTR_ERR() Fix thinko in Christoph's changes. Signed-off-by: David S. Miller commit 4875ccdb304775e9fd830f644643a1513357e043 tree 8467c7e0f6066613a850945cd3e54993d42bbe3e parent bc2406684b5929cea5d40b9cc4fd872816956779 author Christoph Hellwig Tue, 09 Aug 2005 14:39:10 -0700 committer David S. Miller Tue, 09 Aug 2005 14:39:10 -0700 [SPARC]: remove ifdef CONFIG_PCI from envctrl.c The driver already depends on CONFIG_PCI in Kconfig. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit bc2406684b5929cea5d40b9cc4fd872816956779 tree e7e9f356f14b5353f8b07273948beb1eef0ec8f9 parent 218b29e0c3995ee15782de55ad1dd74cce1a728d author Christoph Hellwig Tue, 09 Aug 2005 13:32:25 -0700 committer David S. Miller Tue, 09 Aug 2005 13:32:25 -0700 [SPARC]: Use kthread infrastructure in bbc_envctrl Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 218b29e0c3995ee15782de55ad1dd74cce1a728d tree e734f30f6123ae2b4e3ba545e9017d6d0498b3e7 parent 00dd1e433967872f3997a45d5adf35056fdf2f56 author Christoph Hellwig Tue, 09 Aug 2005 12:30:07 -0700 committer David S. Miller Tue, 09 Aug 2005 12:30:07 -0700 [SPARC]: Use kthread infrastructure in envctrl envctrl currently uses very odd ways to stop a thread, using various things that should be exposed to drivers at all. This patch (which is untested as I don't have sparc hardware) switches it to use the proper kthread infrastructure. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit db29e85a7ece62de1899917c1ec0ffe55cf1d3a0 tree fcecd11c14fd6e95b1dc7daba899c64bbee25ded parent 36d2f5a18205dfc2fac1e3541d324ce186f418cb author Markus Lidel Tue, 09 Aug 2005 10:08:03 -0700 committer Linus Torvalds Tue, 09 Aug 2005 12:08:22 -0700 [PATCH] i2o: remove new configuration API Remove new configuration API from i2o_config The API-patch is still available from the I2O website (which is mentioned in the kernel config now). It is removed because it creates a new binary sysfs-attribute, which doesn't have the limitiation of 4k. Expect for the Adaptec controllers, which has a limitation in the hardware this attribute doesn't make sense anywhere else. Until the sysfs API provides an attribute which doesn't buffer (like firmware) and let access to at least 64k blocks i provide a separate patch... (akpm: basically, this API was introduced post-2.6.12 and Markus wants to pull it out before 2.6.13). Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36d2f5a18205dfc2fac1e3541d324ce186f418cb tree 6eeb91fa4e58d12183fc7645f0308f51b07db690 parent 311c46273f0e8b140d4cc68e13128cbc22114807 author Kumar Gala Tue, 09 Aug 2005 10:08:02 -0700 committer Linus Torvalds Tue, 09 Aug 2005 12:08:22 -0700 [PATCH] cpm_uart: needs some love to compile with GCC4.0.1 Fixed problems so we can build with gcc-4.0.1 Signed-off-by: Peter Schaefer-Hutter Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 311c46273f0e8b140d4cc68e13128cbc22114807 tree 1e8b4dfe3417e6f8b896d8d6856a72d6d65299b6 parent 3077a260e9f316b611436b1506eec9cc5c4f8aa6 author Kumar Gala Tue, 09 Aug 2005 10:08:00 -0700 committer Linus Torvalds Tue, 09 Aug 2005 12:08:22 -0700 [PATCH] cpm_uart: Fix dpram allocation and non-console uarts * Makes dpram allocations work * Makes non-console UART work on both 8xx and 82xx * Fixed whitespace in files that were touched Signed-off-by: Vitaly Bordug Signed-off-by: Pantelis Antoniou Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3077a260e9f316b611436b1506eec9cc5c4f8aa6 tree 43b7d5faa5f204904c713c463015792d9ff56b01 parent a242b44da6feb604c4c659b78f63dedb69b2d4a3 author Paul Jackson Tue, 09 Aug 2005 10:07:59 -0700 committer Linus Torvalds Tue, 09 Aug 2005 12:08:22 -0700 [PATCH] cpuset release ABBA deadlock fix Fix possible cpuset_sem ABBA deadlock if 'notify_on_release' set. For a particular usage pattern, creating and destroying cpusets fairly frequently using notify_on_release, on a very large system, this deadlock can be seen every few days. If you are not using the cpuset notify_on_release feature, you will never see this deadlock. The existing code, on task exit (or cpuset deletion) did: get cpuset_sem if cpuset marked notify_on_release and is ready to release: compute cpuset path relative to /dev/cpuset mount point call_usermodehelper() forks /sbin/cpuset_release_agent with path drop cpuset_sem Unfortunately, the fork in call_usermodehelper can allocate memory, and allocating memory can require cpuset_sem, if the mems_generation values changed in the interim. This results in an ABBA deadlock, trying to obtain cpuset_sem when it is already held by the current task. To fix this, I put the cpuset path (which must be computed while holding cpuset_sem) in a temporary buffer, to be used in the call_usermodehelper call of /sbin/cpuset_release_agent only _after_ dropping cpuset_sem. So the new logic is: get cpuset_sem if cpuset marked notify_on_release and is ready to release: compute cpuset path relative to /dev/cpuset mount point stash path in kmalloc'd buffer drop cpuset_sem call_usermodehelper() forks /sbin/cpuset_release_agent with path free path The sharp eyed reader might notice that this patch does not contain any calls to kmalloc. The existing code in the check_for_release() routine was already kmalloc'ing a buffer to hold the cpuset path. In the old code, it just held the buffer for a few lines, over the cpuset_release_agent() call that in turn invoked call_usermodehelper(). In the new code, with the application of this patch, it returns that buffer via the new char **ppathbuf parameter, for later use and freeing in cpuset_release_agent(), which is called after cpuset_sem is dropped. Whereas the old code has just one call to cpuset_release_agent(), right in the check_for_release() routine, the new code has three calls to cpuset_release_agent(), from the various places that a cpuset can be released. This patch has been build and booted on SN2, and passed a stress test that previously hit the deadlock within a few seconds. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a242b44da6feb604c4c659b78f63dedb69b2d4a3 tree a493e87fa97137e1ae53a071df7128a23c515e52 parent 01df0e3a79d3913df178e9a1047ade425a7c118f author Ralf Baechle Tue, 09 Aug 2005 10:07:57 -0700 committer Linus Torvalds Tue, 09 Aug 2005 12:08:21 -0700 [PATCH] Build fix for the Sibyte I2C driver Compile fix for the BCM1250 I2C driver. Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01df0e3a79d3913df178e9a1047ade425a7c118f tree 8e2640f616d6611cd32e8b6117d839b94ba5af6b parent 00dd1e433967872f3997a45d5adf35056fdf2f56 author Wim Van Sebroeck Tue, 09 Aug 2005 10:07:56 -0700 committer Linus Torvalds Tue, 09 Aug 2005 12:08:21 -0700 [PATCH] i8xx_tco.c: arm watchdog only when started i8xx_tco.c v0.08: only "arm" the watchdog when the watchdog has been started. (Kernel Bug 4251: system reset when battery is read and i8xx_tco driver loaded) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bb8345db8f2aef367e0fddf99a42b7a6029b31f tree f37ca7a3bd02f4eac8bb5b62d0068451666569f9 parent 5c44cd2afad3f7b015542187e147a820600172f1 author Salyzyn, Mark Tue, 09 Aug 2005 12:57:58 -0400 committer James Bottomley Tue, 09 Aug 2005 12:09:53 -0500 [SCSI] dpt_i2o pci_request_regions fix Originally From: Andrew Morton Altered By: "Salyzyn, Mark" There is an additional 'build fix' patch that Andrew Morton submitted on the kernel list (I have changed out his dpr_i2o with dpt_i2o below though). Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 00dd1e433967872f3997a45d5adf35056fdf2f56 tree 234735d17dc912f34a14eefd6299313357bfd5c5 parent dc836b5b6fcde95f750a4790d8200fabaf563dc9 author John McCutchan Mon, 08 Aug 2005 22:13:05 -0400 committer Linus Torvalds Mon, 08 Aug 2005 19:22:42 -0700 [PATCH] fsnotify-cleanups This removes the now unused fsnotify_unlink & fsnotify_rmdir code. Compile tested. Signed-off-by: John McCutchan Signed-off-by: Linus Torvalds commit dc836b5b6fcde95f750a4790d8200fabaf563dc9 tree 893613626de4794a7b13fe6793bdebc79420c433 parent 138b9dd1fd7b44176af4f3b672060c790b0eaf55 author Linus Torvalds Mon, 08 Aug 2005 18:46:09 -0700 committer Linus Torvalds Mon, 08 Aug 2005 18:46:09 -0700 Revert "[PATCH] PCI: restore BAR values..." Revert commit fec59a711eef002d4ef9eb8de09dd0a26986eb77, which is breaking sparc64 that doesn't have a working pci_update_resource. We'll re-do this after 2.6.13 when we'll do it all properly. commit 138b9dd1fd7b44176af4f3b672060c790b0eaf55 tree aba0bffcaaee3fd29c1e3142a4c10331b4858293 parent 92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98 author Dave Jones Mon, 08 Aug 2005 16:13:15 -0700 committer Linus Torvalds Mon, 08 Aug 2005 16:21:32 -0700 [PATCH] icn driver fails to unload when no hardware present Fix a null dereference in module unload path. Found by a simple modprobe icn ; rmmod icn Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98 tree 74a41755d00b908b6e6e31a69ba77774558bf26f parent 03c6b749b364fe7b8e47ed8e1ce26baca167c322 parent ca9334523c853e407da7b3a0bd02f54d0fa59414 author Linus Torvalds Mon, 08 Aug 2005 16:06:01 -0700 committer Linus Torvalds Mon, 08 Aug 2005 16:06:01 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit fb573856b2d82926b36ed059899d883474a3b9eb tree 310364196ff73647fcdce8e5f3746e2538ad5b0b parent 688d191821de7893043f5a37970472627aaffa4e author Ken Chen Mon, 08 Aug 2005 15:25:00 -0700 committer Tony Luck Mon, 08 Aug 2005 15:39:47 -0700 [IA64] fix nohalt boot option this changeset broke the "nohalt" kernel boot option. 8df5a500a3e97f7811cdce0f553ca1917ccd4220 default_idle() is looking at new variable can_do_pal_halt. However, that variable did not get cleared upon "nohalt" boot option. Result is that "nohalt" option is ignored until perfmon is exercised. Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit 03c6b749b364fe7b8e47ed8e1ce26baca167c322 tree e1d84aa44d53f8c67d0ba1e0e633c167d7761a58 parent 5e708484d710bcbb44893400f429579f5728cd7d author Olaf Hering Mon, 08 Aug 2005 14:49:18 -0700 committer Linus Torvalds Mon, 08 Aug 2005 15:29:13 -0700 [PATCH] x86_64: add MODULE_ALIAS for aes modprobe aes does not work on x86_64. i386 has a similar line, this could be the right fix. Would be nice to have in 2.6.13 final. Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e708484d710bcbb44893400f429579f5728cd7d tree 8297ba1f5e1e8c9020026afdd67c96d9c4fff29c parent b612cacb02f0fb58f07a9002c7719a901882718c author Kumar Gala Mon, 08 Aug 2005 14:49:17 -0700 committer Linus Torvalds Mon, 08 Aug 2005 15:29:13 -0700 [PATCH] ppc32: Fix MPC834x USB memory map offsets The memory mappings for MPC8349 USB MPH and DR modules were reversed. Signed-off-by: Li Yang Signed-off-by: Jiang Bo Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c44cd2afad3f7b015542187e147a820600172f1 tree ef4b63ee55d0481569b1bd680e376b0d94b2b6f0 parent 9c472dd9197429a37691e91c938660a062bf20b0 author James.Smart@Emulex.Com Fri, 10 Jun 2005 22:24:30 -0400 committer James Bottomley Mon, 08 Aug 2005 17:14:55 -0500 [SCSI] fix target scanning oops with fc transport class We have some nasty issues with 2.6.12-rc6. Any request to scan on the lpfc or qla2xxx FC adapters will oops. What is happening is the system is defaulting to non-transport registered targets, which inherit the parent of the scan. On this second scan, performed by the attribute, the parent becomes the shost instead of the rport. The slave functions in the 2 FC adapters use starget_to_rport() routines, which incorrectly map the shost as an rport pointer. Additionally, this pointed out other weaknesses: - If the target structure is torn down outside of the transport, we have no method for it to be regenerated at the proper parent. - We have race conditions on the target being allocated by both the midlayer scan (parent=shost) and by the fc transport (parent=rport). Signed-off-by: James Bottomley commit ca9334523c853e407da7b3a0bd02f54d0fa59414 tree 3c4f8050d9bc0e062038c1f7e22722e0e6447bfc parent 4d479e40e1748a877a24015fc6727b27b77110cd author Heikki Orsila Mon, 08 Aug 2005 14:26:52 -0700 committer David S. Miller Mon, 08 Aug 2005 14:26:52 -0700 [IPV4]: Debug cleanup Here's a small patch to cleanup NETDEBUG() use in net/ipv4/ for Linux kernel 2.6.13-rc5. Also weird use of indentation is changed in some places. Signed-off-by: Heikki Orsila Signed-off-by: David S. Miller commit 4d479e40e1748a877a24015fc6727b27b77110cd tree 6b6983091e6c7ef6f648282c57ed7a725a2db72d parent 7d3f4c97723c4ec4e5d85e6e70084b02e6be8788 author David S. Miller Mon, 08 Aug 2005 13:48:02 -0700 committer David S. Miller Mon, 08 Aug 2005 13:48:02 -0700 [NETLINK]: Allocate and kill some netlink numbers. NETLINK_ARPD is unused, allocate it to the Open-iSCSI folks. NETLINK_ROUTE6 and NETLINK_TAPBASE are no longer used, delete them. Signed-off-by: David S. Miller commit b612cacb02f0fb58f07a9002c7719a901882718c tree f528e2ee1b39ad3c70336b29469d0b5645bc9e97 parent 7a91bf7f5c22c8407a9991cbd9ce5bb87caa6b4a parent 71abe99980e6d7ff8aee8acc7da817b3ad7d8a89 author Linus Torvalds Mon, 08 Aug 2005 12:19:24 -0700 committer Linus Torvalds Mon, 08 Aug 2005 12:19:24 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 7a91bf7f5c22c8407a9991cbd9ce5bb87caa6b4a tree ffd77cfbf621a990052c1277d8a18451b9363dda parent 1963c907b21e140082d081b1c8f8c2154593c7d7 author John McCutchan Mon, 08 Aug 2005 13:52:16 -0400 committer Linus Torvalds Mon, 08 Aug 2005 11:53:47 -0700 [PATCH] fsnotify_name/inoderemove The patch below unhooks fsnotify from vfs_unlink & vfs_rmdir. It introduces two new fsnotify calls, that are hooked in at the dcache level. This not only more closely matches how the VFS layer works, it also avoids the problem with locking and inode lifetimes. The two functions are - fsnotify_nameremove -- called when a directory entry is going away. It notifies the PARENT of the deletion. This is called from d_delete(). - inoderemove -- called when the files inode itself is going away. It notifies the inode that is being deleted. This is called from dentry_iput(). Signed-off-by: John McCutchan Signed-off-by: Linus Torvalds commit 1963c907b21e140082d081b1c8f8c2154593c7d7 tree 71410cd2ad9f4bdab2f2466a6621ba2930f16b5f parent 66aea23ff84ca81bfaeaf7d63e248b873f5c2616 author Michael Krufky Mon, 08 Aug 2005 09:22:43 -0700 committer Linus Torvalds Mon, 08 Aug 2005 11:49:57 -0700 [PATCH] dvb: lgdt330x frontend: some bug fixes & add lgdt3303 support - Structural changes within lgdt330x driver, framework now supports both chips... tested OK on lgdt3302 and lgdt3303. - Add LG/TUA6034 dvb_pll_desc for ATSC with LG TDVS-H062F & DViCO FusionHDTV5. - Fixed LGDT330X signal strength: For now, always set it to 0. - Corrected LGDT330X boundary condition error in read_snr: dB calculation. Signed-off-by: Mac Michaels Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66aea23ff84ca81bfaeaf7d63e248b873f5c2616 tree 1dfa4af1f8b33c7d7b069c407d9c37ddd1ecae32 parent 8b83bc77bf77cc8459cb94e52b08e775104c4c48 author Cornelia Huck Mon, 08 Aug 2005 09:22:36 -0700 committer Linus Torvalds Mon, 08 Aug 2005 11:49:57 -0700 [PATCH] s390: use klist in qeth driver From: Martin Schwidesky Convert qeth to the new klist interface and make it compiling again. Signed-off-by: Frank Pavlic Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b83bc77bf77cc8459cb94e52b08e775104c4c48 tree 89f84bdd6a13763882636913852c6ce2eaea199c parent 48de5beeb0ee821859c79ba5b9462654604d8bf3 author Harald Welte Mon, 08 Aug 2005 11:50:55 +0200 committer Linus Torvalds Mon, 08 Aug 2005 11:48:28 -0700 [PATCH] don't try to do any NAT on untracked connections With the introduction of 'rustynat' in 2.6.11, the old tricks of preventing NAT of 'untracked' connections (e.g. NOTRACK target in 'raw' table) are no longer sufficient. The ip_conntrack_untracked.status |= IPS_NAT_DONE_MASK effectively prevents iteration of the 'nat' table, but doesn't prevent nat_packet() to be executed. Since nr_manips is gone in 'rustynat', nat_packet() now implicitly thinks that it has to do NAT on the packet. This patch fixes that problem by explicitly checking for ip_conntrack_untracked in ip_nat_fn(). Signed-off-by: Harald Welte Signed-off-by: Linus Torvalds commit 48de5beeb0ee821859c79ba5b9462654604d8bf3 tree 69ce3026aea31e44a83f23ed8ea0d700d19b4ef5 parent 6d85f29bb54235d2e184e7155dcd4de908324fe6 author James Morris Mon, 08 Aug 2005 10:29:08 -0400 committer Linus Torvalds Mon, 08 Aug 2005 11:46:25 -0700 [PATCH] Update contact info for James Morris commit 6d85f29bb54235d2e184e7155dcd4de908324fe6 tree 1ab80c4bb980fec383047e8e07a0fb8fa77b5994 parent db6778db7eb1d974e1ae0da326530f09c13585ac author Ivan Kokshaysky Mon, 08 Aug 2005 12:55:54 +0400 committer Linus Torvalds Mon, 08 Aug 2005 11:46:24 -0700 [PATCH] VIA VT8235 PCI quirk Like many other southbridges from different manufacturers, VIA VT8235 chip has two non-standard BARs for power management and SMBus registers (see the datasheet at http://www.via.com.tw). This new quirk routine fixes boot problem with 2.6.13-rc2/rc6 kernels on Targa Visionary 811 Athlon64 laptop, as reported by Mikael Pettersson . Signed-off-by: Ivan Kokshaysky Signed-off-by: Linus Torvalds commit db6778db7eb1d974e1ae0da326530f09c13585ac tree 0e645dfdd902e76c47884c8629b69a4089cca05e parent 0f0767c67a497173294bdf6725a3d85f7f29e397 author Antonino Daplas Mon, 08 Aug 2005 14:22:43 +0800 committer Linus Torvalds Mon, 08 Aug 2005 11:46:24 -0700 [PATCH] nvidiafb: Fix initial display corruption on certain laptops Reported by:Vincent Fortier (Bugzilla Bug 4768) "At boot time the screen appears moved to the mid right portion of the actual video pannel making the end of the line appears at the left edge... It simply looks like moved half way to the right" His particular hardware has a display with an unusual dimension (1920x1200) but unfortunately has no EDID block. None of the entries in the global mode database is correct for this particular display, and it particularly has difficulty scaling up 640x480 (the default startup mode of nvidiafb) to 1920x1200 which causes the above described problem. 1, Add 1920x1200 to the global mode database. 2. Let nvidiafb base the startup mode from the flatpanel dimensions only if the EDID block is absent, no boot mode parameter is specified by the user, and a flatpanel/LCD display is attached. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 0f0767c67a497173294bdf6725a3d85f7f29e397 tree 08c11f2a68489598bbd3e6b755b8c2b0a366322c parent 2c875bbda9303b359af94f671d25639840ce2a59 author Paul Mackerras Mon, 08 Aug 2005 14:16:43 +1000 committer Linus Torvalds Mon, 08 Aug 2005 11:46:24 -0700 [PATCH] ppc64: update defconfigs Update the default/example configs for ppc64. Pretty boring... Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 2c875bbda9303b359af94f671d25639840ce2a59 tree 9c9f5e4413205fd8062fc213af327e74bf7775af parent 6fc32179de9e14c542e0b1760e412bc670611c53 author Arnd Bergmann Mon, 08 Aug 2005 14:12:42 +1000 committer Linus Torvalds Mon, 08 Aug 2005 11:46:24 -0700 [PATCH] ppc64: add default config for BPA This adds a bpa_defconfig file and make target. The config settings are made for the current version of the Cell Processor Based Blade, so there are not too many drivers enabled. A few more drivers might get added in the future though. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 9c472dd9197429a37691e91c938660a062bf20b0 tree ffe17c0aa00728c0d4e1bebd203c68b9d16af58f parent 6fc32179de9e14c542e0b1760e412bc670611c53 author James Bottomley Mon, 08 Aug 2005 11:51:38 -0500 committer James Bottomley Mon, 08 Aug 2005 11:51:38 -0500 [SCSI] Bug 4940 Repeatable Kernel Panic on Adaptec 2015S I20 device on bootup From: "Salyzyn, Mark" Prevent driver from loading if another driver (i2o) has already claimed the resources associated with the card. Discussion associated with this bug can be referenced at http://bugzilla.kernel.org/show_bug.cgi?id=4940 where it was agreed to use pci_request_regions in both the dpt_i2o and the i2o driver to prevent both drivers loading on the same adapter(s). Signed-off-by: Mark Salyzyn Rejections fixed up and Signed-off-by: James Bottomley commit 71abe99980e6d7ff8aee8acc7da817b3ad7d8a89 tree 73c492d859266b54a556ec92471c76d035c926e9 parent fc1df37e3b195cb73ecb14c30d41b7aace3f844a author Christoph Hellwig Sun, 07 Aug 2005 14:23:42 +0100 committer Russell King Sun, 07 Aug 2005 14:23:42 +0100 [PATCH] ARM: switch fd1772.c from sleep_on to wait_event Doesn't make the local irq disabling around it less buggy, but at least we replace the offender with the right kind of primitive. Signed-off-by: Christoph Hellwig Signed-off-by: Russell King commit fc1df37e3b195cb73ecb14c30d41b7aace3f844a tree 9180f60ee3a816632b5ff9f8c8d774259af3d686 parent 0d317fb72fe3cf0f611608cf3a3015bbe6cd2a66 author Russell King Sun, 07 Aug 2005 14:20:26 +0100 committer Russell King Sun, 07 Aug 2005 14:20:26 +0100 [PATCH] ARM: Make sa1100fb_display_dma_period() an inline function This function produces a warning when CPU_FREQ=n. Since it's a very simple calculation, make it inline instead of adding preprocessor directives around it. Signed-off-by: Russell King commit 7d3f4c97723c4ec4e5d85e6e70084b02e6be8788 tree 790200fcdef86e91224903394023b964a3a52e47 parent 6fc0b4a7a73a81e74d0004732df358f4f9975be2 author David S. Miller Sat, 06 Aug 2005 06:35:48 -0700 committer David S. Miller Sat, 06 Aug 2005 06:35:48 -0700 [TG3]: Save initial PCI state before registering the netdevice. Else on SMP systems it is possible for hotplug to execute, invoke tg3_open(), and end up loading the uninitialized PCI register save area into the card. Signed-off-by: David S. Miller commit 6fc0b4a7a73a81e74d0004732df358f4f9975be2 tree ac2c68e206efbfe378728a50be30ef0bccd0cdff parent 534afb90a9cd0b9643f62d660c164e1d924f39cf author Herbert Xu Sat, 06 Aug 2005 06:33:15 -0700 committer David S. Miller Sat, 06 Aug 2005 06:33:15 -0700 [IPSEC]: Restrict socket policy loading to CAP_NET_ADMIN. The interface needs much redesigning if we wish to allow normal users to do this in some way. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller