commit 672c6108a51bf559d19595d9f8193dfd81f0f752 tree d88dc7d2e8acb7e70193cf8bb888cc668d168fc6 parent fb80a6e1a521eb298edb4365429d533dd39427fa parent f52359622fa25783cf1a08c0772048d2ed1a7434 author Linus Torvalds Sat, 03 Jun 2006 09:12:50 -0700 committer Linus Torvalds Sat, 03 Jun 2006 09:12:50 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] scsi_lib.c: properly count the number of pages in scsi_req_map_sg() [SCSI] scsi_transport_sas: make write attrs writeable [SCSI] scsi_transport_sas; fix user_scan [SCSI] ppa: fix for machines with highmem [SCSI] mptspi: reset handler shouldn't be called for other bus protocols [SCSI] Blacklist entry for HP dat changer commit fb80a6e1a521eb298edb4365429d533dd39427fa tree c832c3544aea353aaf73b5536e9ac1579d8fbfaf parent 0f3262157899efd422228713a521504bdf0c991e author Stephen Hemminger Fri, 02 Jun 2006 17:51:08 -0700 committer David S. Miller Fri, 02 Jun 2006 17:51:08 -0700 [TCP] tcp_highspeed: Fix problem observed by Xiaoliang (David) Wei When snd_cwnd is smaller than 38 and the connection is in congestion avoidance phase (snd_cwnd > snd_ssthresh), the snd_cwnd seems to stop growing. The additive increase was confused because C array's are 0 based. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 0f3262157899efd422228713a521504bdf0c991e tree 865601393570282133e51a126f380490c27d635b parent 891eca1447a94b25fb59b696f839a2a6897d8f1f parent 89f3da3e06257abba3e70163c92969f3fcd1833d author Linus Torvalds Fri, 02 Jun 2006 16:03:22 -0700 committer Linus Torvalds Fri, 02 Jun 2006 16:03:22 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial * master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] Update parity handling documentation commit 891eca1447a94b25fb59b696f839a2a6897d8f1f tree 2ebdf249e13acb792f6d15c47ae9634221fc0c55 parent 48e49ead3e92d53196a78c42cf24c0eed6ca98dd parent ec8510f6fe57f59e42484809679af31ca7896dcf author Linus Torvalds Fri, 02 Jun 2006 16:02:41 -0700 committer Linus Torvalds Fri, 02 Jun 2006 16:02:41 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3540/1: ixp23xx: deal with gap in interrupt bitmasks [ARM] 3539/1: ixp23xx: fix __arch_ixp23xx_is_coherent() for A1 stepping commit 48e49ead3e92d53196a78c42cf24c0eed6ca98dd tree 021e1b1616258cfcee73556fa4095db5663afc61 parent b1ab41c4943008375c149a63602d7407f61de5b2 parent 0b0968a3e691771bf87e1ce747b2c7d23b5526c8 author Linus Torvalds Fri, 02 Jun 2006 16:02:22 -0700 committer Linus Torvalds Fri, 02 Jun 2006 16:02:22 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix D-cache corruption in mremap [SPARC64]: Make smp_processor_id() functional before start_kernel() commit ec8510f6fe57f59e42484809679af31ca7896dcf tree dc9a9ac88bd7847da9d1e80b532d30815853fd0b parent a77bc69138a4f52d003ca81d075f386953f6b25a author Lennert Buytenhek Fri, 02 Jun 2006 19:51:51 +0100 committer Russell King Fri, 02 Jun 2006 19:51:51 +0100 [ARM] 3540/1: ixp23xx: deal with gap in interrupt bitmasks Patch from Lennert Buytenhek On the ixp23xx, the microengine thread interrupt sources are numbered 56..119, but their mask/status bits are located in bit positions 64..127 in the various registers in the interrupt controller (bit positions 56..63 are unused.) We don't deal with this, so currently, when asked to enable IRQ 64, we will enable IRQ 56 instead. The only interrupts >= 64 are the thread interrupt sources, and there are no in-tree users of those yet, so this is fortunately not a big problem, but this needs fixing anyway. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit a77bc69138a4f52d003ca81d075f386953f6b25a tree 01ea99eb0eaceff5c8771e9a88d4f5fdb9607ef8 parent ba8f5baba79da8eb502f8534c3a8ecb64aceb790 author Lennert Buytenhek Fri, 02 Jun 2006 19:51:50 +0100 committer Russell King Fri, 02 Jun 2006 19:51:50 +0100 [ARM] 3539/1: ixp23xx: fix __arch_ixp23xx_is_coherent() for A1 stepping Patch from Lennert Buytenhek The current __ixp23xx_arch_is_coherent() check assumes that the lower byte of IXP23XX_PRODUCT_ID is identical to the lower byte of processor_id, but this is not the case, and because of this we were incorrectly enabling coherency on A1 stepping CPUs. Stepping A1 of the ixp2350, which has a PRODUCT_ID of 0x401, has '02' in the lower byte of processor_id, while A2, with a PRODUCT_ID of 0x402, has '04' in the lower byte of processor_id. So, to check for >= A2, we really need to check the lower byte of processor_id against >= 4. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit b1ab41c4943008375c149a63602d7407f61de5b2 tree 365413de6ebbfee39aa90c069b7be14a4b9a699e parent b52a834892f17b6c54c34ab65f1fad1a9229e764 author Ingo Molnar Fri, 02 Jun 2006 15:44:58 +0200 committer Linus Torvalds Fri, 02 Jun 2006 11:21:10 -0700 [PATCH] slab.c: fix offslab_limit bug mm/slab.c's offlab_limit logic is totally broken. Firstly, "offslab_limit" is a global variable while it should either be calculated in situ or should be passed in as a parameter. Secondly, the more serious problem with it is that the condition for calculating it: if (!(OFF_SLAB(sizes->cs_cachep))) { offslab_limit = sizes->cs_size - sizeof(struct slab); offslab_limit /= sizeof(kmem_bufctl_t); is in total disconnect with the condition that makes use of it: /* More than offslab_limit objects will cause problems */ if ((flags & CFLGS_OFF_SLAB) && num > offslab_limit) break; but due to offslab_limit being a global variable this breakage was hidden. Up until lockdep came along and perturbed the slab sizes sufficiently so that the first off-slab cache would still see a (non-calculated) zero value for offslab_limit and would panic with: kmem_cache_create: couldn't create cache size-512. Call Trace: [] show_trace+0x96/0x1c8 [] dump_stack+0x13/0x15 [] panic+0x39/0x21a [] kmem_cache_create+0x5a0/0x5d0 [] kmem_cache_init+0x193/0x379 [] start_kernel+0x17f/0x218 [] _sinittext+0x263/0x26a Kernel panic - not syncing: kmem_cache_create(): failed to create slab `size-512' Paolo Ornati's config on x86_64 managed to trigger it. The fix is to move the calculation to the place that makes use of it. This also makes slab.o 54 bytes smaller. Btw., the check itself is quite silly. Its intention is to test whether the number of objects per slab would be higher than the number of slab control pointers possible. In theory it could be triggered: if someone tried to allocate 4-byte objects cache and explicitly requested with CFLGS_OFF_SLAB. So i kept the check. Out of historic interest i checked how old this bug was and it's ancient, 10 years old! It is the oldest hidden and then truly triggering bugs i ever saw being fixed in the kernel! Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 89f3da3e06257abba3e70163c92969f3fcd1833d tree ed67922b84423f0494aa7a6c24093d79a01f2dba parent ba8f5baba79da8eb502f8534c3a8ecb64aceb790 author Peter Korsgaard Fri, 02 Jun 2006 17:47:26 +0100 committer Russell King Fri, 02 Jun 2006 17:47:26 +0100 [SERIAL] Update parity handling documentation Update documentation to match reality. INPCK controls whether input parity checking is enabled. Signed-off-by: Peter Korsgaard Signed-off-by: Russell King commit 0b0968a3e691771bf87e1ce747b2c7d23b5526c8 tree 71787e376b7aef54b48e99d15a0fc11c7cf7ee8d parent 951bc82c53f30ec6b4c2d04a051e74ea9a89b669 author David S. Miller Thu, 01 Jun 2006 17:47:25 -0700 committer David S. Miller Thu, 01 Jun 2006 17:47:25 -0700 [SPARC64]: Fix D-cache corruption in mremap If we move a mapping from one virtual address to another, and this changes the virtual color of the mapping to those pages, we can see corrupt data due to D-cache aliasing. Check for and deal with this by overriding the move_pte() macro. Set things up so that other platforms can cleanly override the move_pte() macro too. Signed-off-by: David S. Miller commit b52a834892f17b6c54c34ab65f1fad1a9229e764 tree 0f66d6a310f108bb1f0badd3ebea3b1db0a163f6 parent ae818a38d4755ba4c16a22a8eacec859511a5393 author Jens Axboe Thu, 01 Jun 2006 18:53:43 +0200 committer Jens Axboe Thu, 01 Jun 2006 18:53:43 +0200 [PATCH] cfq-iosched: busy_rr fairness fix Now that we select busy_rr for possible service, insert entries at the back of that list instead of at the front. Signed-off-by: Jens Axboe commit f52359622fa25783cf1a08c0772048d2ed1a7434 tree b9b06d8b289d6c9bdb401282497079c4a5b2792c parent 9f434d4f84a235f6b61aec6e691d6b07bc46fc24 author Bryan Holty Wed, 22 Mar 2006 06:35:39 -0600 committer James Bottomley Thu, 01 Jun 2006 09:16:55 -0500 [SCSI] scsi_lib.c: properly count the number of pages in scsi_req_map_sg() The calculation of nr_pages in scsi_req_map_sg() doesn't account for the fact that the first page could have an offset that pushes the end of the buffer onto a new page. Signed-off-by: Bryan Holty Signed-off-by: James Bottomley commit ae818a38d4755ba4c16a22a8eacec859511a5393 tree 923ec4b261ab8b633fff2be9e7b9c4afcf704737 parent 25776e3594f841b7fae7b33ebecf009a0a55bed1 author Jens Axboe Thu, 01 Jun 2006 10:13:43 +0200 committer Jens Axboe Thu, 01 Jun 2006 10:13:43 +0200 [PATCH] cfq-iosched: fix bug in timer handling for the idle class There's a small window from when the timer is entered and we grab the queue lock, where cfq_set_active_queue() could be rearming the timer for us. Seen in the wild on a 12-way ppc box. Fix this by just using mod_timer(), which will do the right thing for us. Signed-off-by: Jens Axboe commit 25776e3594f841b7fae7b33ebecf009a0a55bed1 tree 689dcf37ba781ad627ae01be4fcb6f5414f67c1b parent 12e9fddd6eb827937fcaac8ac7712c7303898b1f author Jens Axboe Thu, 01 Jun 2006 10:12:26 +0200 committer Jens Axboe Thu, 01 Jun 2006 10:12:26 +0200 [PATCH] cfq-iosched: Detect hardware queueing If the hardware is doing real queueing, decide that it's worthless to idle the hardware. It does reasonable simultaneous io in that case anyways, and the idling hurts some work loads. Signed-off-by: Jens Axboe commit 12e9fddd6eb827937fcaac8ac7712c7303898b1f tree b3fbb502f46319808a50fd2fc7a93668d697f6ec parent e0de0206a2a37cd3e0ba9954d9f863e11d6d1782 author Jens Axboe Thu, 01 Jun 2006 10:09:56 +0200 committer Jens Axboe Thu, 01 Jun 2006 10:09:56 +0200 [PATCH] cfq-iosched: Detect idle process issuing async request If we are anticipating a sync request from this process and we are waiting for that and see an async request come in, expire that slice and move on. Signed-off-by: Jens Axboe commit e0de0206a2a37cd3e0ba9954d9f863e11d6d1782 tree 58ba74a2f8e0edce59c770c74d019d4e1e3c98fd parent ba8f5baba79da8eb502f8534c3a8ecb64aceb790 author Jens Axboe Thu, 01 Jun 2006 10:07:26 +0200 committer Jens Axboe Thu, 01 Jun 2006 10:07:26 +0200 [PATCH] cfq-iosched: check busy queues before deciding we are idle For just one busy queue (like async write out), we often overlooked that we could queue more io and decided we were idle instead. This causes us quite a bit of performance loss. Signed-off-by: Jens Axboe commit ba8f5baba79da8eb502f8534c3a8ecb64aceb790 tree 39a0438607446681bdf5173c7480ff90f3825945 parent 5cedae9ca752a43cfb1074907d12c9f01fbebd45 parent 44d921b246923380f26b8010e47ac5dfe48fcec5 author Linus Torvalds Wed, 31 May 2006 16:48:05 -0700 committer Linus Torvalds Wed, 31 May 2006 16:48:05 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Treat R14000 like R10000. [MIPS] Remove EXPERIMENTAL from PAGE_SIZE_16KB [MIPS] Update/Fix instruction definitions [MIPS] DSP and MDMX share the same config flag bit. [MIPS] Fix deadlock on MP with cache aliases. [MIPS] Use generic STABS_DEBUG macro. [MIPS] Create consistency in "system type" selection. [MIPS] Use generic DWARF_DEBUG [MIPS] Fix kgdb exception handler from user mode. [MIPS] Update struct sigcontext member names [MIPS] Update/fix futex assembly [MIPS] Remove support for sysmips(2) SETNAME and MIPS_RDNVRAM operations. [MIPS] Fix detection and handling of the 74K processor. [MIPS] Add missing 34K processor IDs [MIPS] Fix marking buddy of pte global for MIPS32 w/36-bit physical address [MIPS] AU1xxx mips_timer_interrupt() fixes [MIPS] Fix typo commit 44d921b246923380f26b8010e47ac5dfe48fcec5 tree a7fb7476fbfc8a6564881d7e7e4ce7e5473d0224 parent 714bfad60f3a127147aba76e9c57860c26b1450d author Kumba Tue, 16 May 2006 22:23:59 -0400 committer Ralf Baechle Thu, 01 Jun 2006 00:28:35 +0100 [MIPS] Treat R14000 like R10000. Signed-off-by: Joshua Kinard Signed-off-by: Ralf Baechle commit 714bfad60f3a127147aba76e9c57860c26b1450d tree 4bb37510e05ca7269c7c1169f0c47329d32b9d17 parent ca30225e9e4c0c74fe781a9fd1d1ad5f85b29c60 author Ralf Baechle Wed, 17 May 2006 14:04:30 +0100 committer Ralf Baechle Thu, 01 Jun 2006 00:28:34 +0100 [MIPS] Remove EXPERIMENTAL from PAGE_SIZE_16KB This is known to be working fine for a while. While at it also update and fix the help texts. Signed-off-by: Ralf Baechle commit ca30225e9e4c0c74fe781a9fd1d1ad5f85b29c60 tree b60ac252150a97a1b49c2ad307539faf6484c411 parent 3301edcbd7aab674bd7598e6b97a314b93874ec0 author Thiemo Seufer Mon, 15 May 2006 18:27:03 +0100 committer Ralf Baechle Thu, 01 Jun 2006 00:28:34 +0100 [MIPS] Update/Fix instruction definitions A small bugfix for up to now unused instruction definitions, and a somewhat larger update to cover MIPS32R2 instructions. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 3301edcbd7aab674bd7598e6b97a314b93874ec0 tree f6c9a1e42f2bb659ca5fb0da94125c6bd6d902a8 parent 7f3f1d01a9020cff2cb2390aaee3f8df0d70e203 author Thiemo Seufer Mon, 15 May 2006 18:24:57 +0100 committer Ralf Baechle Thu, 01 Jun 2006 00:28:33 +0100 [MIPS] DSP and MDMX share the same config flag bit. Clarify comment. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 7f3f1d01a9020cff2cb2390aaee3f8df0d70e203 tree 222c7f054eccce1b98fac8ceafa8dde2afd6b63f parent 78665aaa96fe62b4cee6c226680801c4480aa407 author Ralf Baechle Fri, 12 May 2006 13:20:06 +0100 committer Ralf Baechle Thu, 01 Jun 2006 00:28:33 +0100 [MIPS] Fix deadlock on MP with cache aliases. A proper fix would involve introducing the notion of shared caches but at this stage of 2.6.17 that's going to be too intrusive and not needed for current hardware; aside I think some discussion will be needed. So for now on the affected SMP configurations which happen to suffer from cache aliases we make use of the fact that a single cache will be shared by all processors. This solves the deadlock issue and will improve performance by getting rid of the smp_call_function overhead. Signed-off-by: Ralf Baechle commit 78665aaa96fe62b4cee6c226680801c4480aa407 tree 57f5daa0cd7eef4de59bb812130bf6597435504a parent 3fa986faad2bb015c3ad6d09a0686016482bc01c author Atsushi Nemoto Thu, 11 May 2006 00:41:26 +0900 committer Ralf Baechle Thu, 01 Jun 2006 00:28:33 +0100 [MIPS] Use generic STABS_DEBUG macro. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 3fa986faad2bb015c3ad6d09a0686016482bc01c tree 9ef891ef489d366b4bd54e8a8e90295e643c44cd parent 04b6b3b651b2147ab7e94c0d302b5cab07dfab4c author Martin Michlmayr Tue, 09 May 2006 23:34:53 +0200 committer Ralf Baechle Thu, 01 Jun 2006 00:28:33 +0100 [MIPS] Create consistency in "system type" selection. The "system type" Kconfig options on MIPS are not consistent. For some platforms, only the name is listed while other entries are prepended with "Support for". Remove this as it doesn't make sense when describing the "system type". Signed-off-by: Martin Michlmayr Signed-off-by: Ralf Baechle commit 04b6b3b651b2147ab7e94c0d302b5cab07dfab4c tree 8107c764e9218711a462dce859f827c1724bcfe1 parent 867a521b4cd6c9d26cd736d85bfe84e10c0c05ac author Atsushi Nemoto Wed, 10 May 2006 15:36:04 +0900 committer Ralf Baechle Thu, 01 Jun 2006 00:28:32 +0100 [MIPS] Use generic DWARF_DEBUG When debugging a kernel compiled by gcc 4.1 with gdb 6.4, gdb could not show filename, linenumber, etc. It seems fixed if I used generic DWARF_DEBUG macro. Although gcc 3.x seems work without this change, it would be better to use the generic macro unless there were something MIPS specific. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 867a521b4cd6c9d26cd736d85bfe84e10c0c05ac tree 696ad869518b9512ad25f4a01f00edcfd214a499 parent 1c0c1ae4f3d5057d091677d0ef7dbaeb28122ded author Atsushi Nemoto Tue, 09 May 2006 20:23:49 +0900 committer Ralf Baechle Thu, 01 Jun 2006 00:28:32 +0100 [MIPS] Fix kgdb exception handler from user mode. Fix a calculation of saved vector address in trap_low. (damage done by lmo f4c72cc737561aab0d9c7f877abbc0a853f1c465) Signed-off-by: Ralf Baechle commit 1c0c1ae4f3d5057d091677d0ef7dbaeb28122ded tree 4daae44b0aa73f4fd1bae00e5fc1434b9465db94 parent 6ee1da94c5fed95bacce3eda8e6d9e69324ecab7 author Daniel Jacobowitz Mon, 08 May 2006 15:28:22 -0400 committer Ralf Baechle Thu, 01 Jun 2006 00:28:31 +0100 [MIPS] Update struct sigcontext member names Rename the 64-bit sc_hi and sc_lo arrays to use the same names as the 32-bit struct sigcontext (sc_mdhi, sc_hi1, et cetera). Signed-off-by: Daniel Jacobowitz Signed-off-by: Ralf Baechle commit 6ee1da94c5fed95bacce3eda8e6d9e69324ecab7 tree 730d377f59f66434b479f83b24d2ebad74945705 parent 235a9d3eee9a9588c17d39efff8373d0513549b5 author Ralf Baechle Wed, 03 May 2006 20:42:39 +0100 committer Ralf Baechle Thu, 01 Jun 2006 00:28:31 +0100 [MIPS] Update/fix futex assembly o Implement futex_atomic_op_inuser() operation o Don't use the R10000-ll/sc bug workaround version for every processor. branch likely is deprecated and some historic ll/sc processors don't implement it. In any case it's slow. Signed-off-by: Ralf Baechle commit 235a9d3eee9a9588c17d39efff8373d0513549b5 tree 827e6e52c308abf0919a5a20f93d2f56d4234a80 parent c620953c32d301c2a7bc73f9f780301e110b7d7c author Ralf Baechle Wed, 03 May 2006 02:27:40 +0100 committer Ralf Baechle Thu, 01 Jun 2006 00:28:31 +0100 [MIPS] Remove support for sysmips(2) SETNAME and MIPS_RDNVRAM operations. SETNAME only had a minor defect but probably never had a user and MIPS_RDNVRAM was unimplemented anyway. Signed-off-by: Ralf Baechle commit c620953c32d301c2a7bc73f9f780301e110b7d7c tree 68be959e79ba34ca4704f1e2ad421eb404b34aa2 parent 98a41de99a4e4febe99b22c3a28d434caeb3165c author Chris Dearman Tue, 02 May 2006 14:08:46 +0100 committer Ralf Baechle Thu, 01 Jun 2006 00:28:30 +0100 [MIPS] Fix detection and handling of the 74K processor. Nothing exciting; Linux just didn't know it yet so this is most adding a value to a case statement. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 98a41de99a4e4febe99b22c3a28d434caeb3165c tree 6fed878cc364d268f4e598520d36a3c467695d35 parent 6e9538917c5f62c1a1598da9b898702800801b98 author Nigel Stephens Thu, 27 Apr 2006 15:50:32 +0100 committer Ralf Baechle Thu, 01 Jun 2006 00:28:30 +0100 [MIPS] Add missing 34K processor IDs The 34K is very much like a 24K on steroids. Signed-off-by: Ralf Baechle commit 6e9538917c5f62c1a1598da9b898702800801b98 tree 03ee3776796394870e60f74773f6b23b090dad83 parent 343fdc39713d9c2fe836523e8f2dfc6a3ac39122 author Sergei Shtylyov Sun, 16 Apr 2006 23:27:21 +0400 committer Ralf Baechle Thu, 01 Jun 2006 00:28:30 +0100 [MIPS] Fix marking buddy of pte global for MIPS32 w/36-bit physical address In case of CONFIG_64BIT_PHYS_ADDR, set_pte() and pte_clear() functions only set _PAGE_GLOBAL bit in the pte_low field of the buddy PTEs, forgetting to propagate ito to pte_high. Thus, the both pages might not really be made global for the CPU (since it AND's the G-bit of the odd / even PTEs together to decide whether they're global or not). Thus, if only a single page is allocated via vmalloc() or ioremap(), it's not really global for CPU (and it must be, since this is kernel mapping), and thus its ASID is compared against the current process' one -- so, we'll get into trouble sooner or later... Also, pte_none() will fail on global pages because _PAGE_GLOBAL bit is set in both pte_low and pte_high, and pte_val() will return u64 value consisting of those fields concateneted. Signed-off-by: Sergei Shtylyov Signed-off-by: Ralf Baechle commit 343fdc39713d9c2fe836523e8f2dfc6a3ac39122 tree fe27507b54f570753f9d78f2bd65c84c23042cfe parent 477654fc5d5078d2213817609e68e8c968293261 author Herbert Valerio Riedel Wed, 12 Apr 2006 09:03:08 +0200 committer Ralf Baechle Thu, 01 Jun 2006 00:28:29 +0100 [MIPS] AU1xxx mips_timer_interrupt() fixes common/au1000/irq.c was missing a mips_timer_interrupt() prototype, whereas in common/au1000/time.c the actual mips_timer_interrupt() implementation was missing an irq_exit() invocation, causing a preempt_count() leak. Signed-off-by: Herbert Valerio Riedel Signed-off-by: Ralf Baechle commit 477654fc5d5078d2213817609e68e8c968293261 tree bb570dd6de328ddfcba7e372148235aa8c8ad42e parent e6ed89ac9f5da16fea5111651b6de0ff0a76a5c2 author Ralf Baechle Thu, 27 Apr 2006 15:44:50 +0100 committer Ralf Baechle Thu, 01 Jun 2006 00:28:29 +0100 [MIPS] Fix typo Found by Chris Dearman (chris@mips.com). Signed-off-by: Ralf Baechle commit 5cedae9ca752a43cfb1074907d12c9f01fbebd45 tree 30bff4b8211984984c6614b7fc530ff916630d6b parent 29f767a254be8fd44fb5d2b5a48e9cda8399c4ea author Deepak Saxena Wed, 31 May 2006 16:14:05 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:44 -0700 [PATCH] ARM: Fix XScale PMD setting The ARM Architecture Reference Manual lists bit 4 of the PMD as "implementation defined" and it must be set to zero on Intel XScale CPUs or the cache does not behave properly. Found by Mike Rapoport while debugging a flash issue on the PXA255: http://marc.10east.com/?l=linux-arm-kernel&m=114845287600782&w=1 Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit 29f767a254be8fd44fb5d2b5a48e9cda8399c4ea tree b14e98dd48ad7dd0343d09fe4f7224bc98bc9991 parent c331eb04b995ad276a7ece4608326f1db4e137d8 author Andrew Morton Tue, 30 May 2006 21:27:18 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:11 -0700 [PATCH] net/compat.h build fix From: Andrew Morton Move the forward decl outside the ifdef, since we use it in both legs. Should fix the spacr64 build error reported in http://bugzilla.kernel.org/show_bug.cgi?id=6625 Acked-by: "David S. Miller" Cc: Cedric Pellerin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c331eb04b995ad276a7ece4608326f1db4e137d8 tree d3ef167648eb00266696039cc10b32592747e5fe parent a835fa798ddfbfe4c63ff5e22c93fa5d24c95f7b author NeilBrown Tue, 30 May 2006 21:27:13 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:11 -0700 [PATCH] md: Fix badness in sysfs_notify caused by md_new_event From: NeilBrown If an error is reported by a drive in a RAID array (which is done via bi_end_io - in interrupt context), we call md_error and md_new_event which calls sysfs_notify. However sysfs_notify grabs a mutex and so cannot be called in interrupt context. This patch just creates a variant of md_new_event which avoids the sysfs call, and uses that. A better fix for later is to arrange for the event to be called from user-context. Note: avoiding the sysfs call isn't a problem as an error will not, by itself, modify the sync_action attribute. (We do still need to wake_up(&md_event_waiters) as an error by itself will modify /proc/mdstat). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a835fa798ddfbfe4c63ff5e22c93fa5d24c95f7b tree 41c4af1c4188ae210b01a381415a0184f971a253 parent 8fd66ab852281f9e28e1774c17b49f26c4626fd1 author Jeremy Higdon Tue, 30 May 2006 21:27:07 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:11 -0700 [PATCH] sgiioc4: use mmio ops instead of port io From: Jeremy Higdon This patch fixes a bug in sgiioc4 where it was using the default IDE port I/O operations instead of MMIO. The IDE part of the IOC4 chip uses MMIO to map the chip registers. Unfortunately, the sgiioc4 driver uses the default port IO operations, which happens to have worked for the past few years. That's about to change, however, thus this change from inX/outX to readX/writeX. Signed-off-by: Jeremy Higdon Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8fd66ab852281f9e28e1774c17b49f26c4626fd1 tree f6fa85ed995012eecc453b61751c3aca085a3207 parent c05b7f3d12b9455d746b69b7078ed34d777f560b author Martin Michlmayr Tue, 30 May 2006 21:27:02 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:11 -0700 [PATCH] maxinefb: Fix compilation error From: Martin Michlmayr Fix the following compilation error: CC drivers/video/maxinefb.o drivers/video/maxinefb.c:58: warning: initializer-string for array of chars is too long drivers/video/maxinefb.c:58: warning: (near initialization for \u2018maxinefb_fix.id\u2019) drivers/video/maxinefb.c:110: error: unknown field \u2018fb_get_fix\u2019 specified in initializer drivers/video/maxinefb.c:110: error: \u2018gen_get_fix\u2019 undeclared here (not in a function) drivers/video/maxinefb.c:111: error: unknown field \u2018fb_get_var\u2019 specified in initializer drivers/video/maxinefb.c:111: error: \u2018gen_get_var\u2019 undeclared here (not in a function) make[2]: *** [drivers/video/maxinefb.o] Error 1 Signed-off-by: Martin Michlmayr Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c05b7f3d12b9455d746b69b7078ed34d777f560b tree fcfb05e9c1398f18ae5c3408c78afdab2117df11 parent 5a47d749e3d067e057d276075fed1d91749d3841 author Rodolfo Giometti Tue, 30 May 2006 21:26:57 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:11 -0700 [PATCH] au1100fb: Fix compilation From: Rodolfo Giometti Fix the following warning on compilation: drivers/video/au1100fb.c: In function `au1100fb_fb_setcolreg': drivers/video/au1100fb.c:219: warning: ISO C90 forbids mixed declarations and code drivers/video/au1100fb.c: In function `au1100fb_fb_pan_display': drivers/video/au1100fb.c:321: warning: ISO C90 forbids mixed declarations and code drivers/video/au1100fb.c: In function `au1100fb_fb_mmap': drivers/video/au1100fb.c:387: warning: ISO C90 forbids mixed declarations and code drivers/video/au1100fb.c: In function `au1100fb_drv_probe': drivers/video/au1100fb.c:471: warning: unsigned int format, long unsigned int arg (arg 2) drivers/video/au1100fb.c: At top level: drivers/video/au1100fb.c:617: warning: initialization from incompatible pointer type drivers/video/au1100fb.c:618: warning: initialization from incompatible pointer type Signed-off-by: Rodolfo Giometti Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a47d749e3d067e057d276075fed1d91749d3841 tree 2a03904cd989d508d994a822ca413592d2e04bd4 parent 8d16b76421f0b3216012ee2d7819355e1cb847e5 author Benjamin Herrenschmidt Tue, 30 May 2006 21:26:51 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:11 -0700 [PATCH] powerpc: Fix boot on eMac From: Benjamin Herrenschmidt Prevent calling of some platform functions on the clock chips of the eMac as it seems to cause it to lockup at boot. For now, add a quirk to prevent that from happening. Later, I might find out what's wrong and fix it but that doesn't seem to be important as the machine appear to work fine without running those. It's possible that Darwin doesn't run them. Signed-off-by: Benjamin Herrenschmidt Cc: Nathan Pilatzke Cc: Paul Mackerras Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d16b76421f0b3216012ee2d7819355e1cb847e5 tree a2e82e62bfcf5ea0f58b17faadc4504ec6dfc933 parent 760f1fce030ccc620ec430a8aff8fc604e7891ed author Stephen Hemminger Tue, 30 May 2006 21:26:09 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:11 -0700 [PATCH] hrtimer: export symbols From: Stephen Hemminger I want to use the hrtimer's in the netem (Network Emulator) qdisc. But the necessary symbols aren't exported for module use. Also needed by SystemTap. Signed-off-by: Stephen Hemminger Acked-by: Ingo Molnar Cc: Thomas Gleixner Cc: "Stone, Joshua I" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 760f1fce030ccc620ec430a8aff8fc604e7891ed tree d2e14b5c6d101e4b368300d2a7e6c6fd438133a8 parent d61a3ead268084cc271d7b2aa2950fc822a37cf5 author Andrew Morton Tue, 30 May 2006 21:26:03 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:11 -0700 [PATCH] revert "swsusp add check for suspension of X controlled devices" From: Andrew Morton Revert commit ff4da2e262d2509fe1bacff70dd00934be569c66. It broke APM suspend, probably because APM doesn't switch back to a VT when suspending. Tracked down by Matt Mackall Rafael sayeth: "It only fixed the theoretical issue that a quick-handed user could switch to X after processes have been frozen and before the devices are suspended. With the current userland suspend tools it shouldn't be necessary." Cc: Pavel Machek Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d61a3ead268084cc271d7b2aa2950fc822a37cf5 tree f131ce216814f65a560dd04cc0627e94dfb930f2 parent 44d7aff035118e8c3993aa3fa05d358d1008e982 author Corey Minyard Tue, 30 May 2006 21:25:57 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:10 -0700 [PATCH] IPMI: reserve I/O ports separately From: Corey Minyard This patch is pretty important to get in for IPMI, new systems have been changing the way ACPI and IPMI interact, and this works around the problems for now. This is a temporary fix until we get proper ACPI handling in IPMI. Fixed releasing already-allocated regions when a later request fails, and forward-ported it to HEAD. Some BIOSes reserve disjoint I/O regions in their ACPI tables for the IPMI controller. This causes problems when trying to register the entire I/O region. Therefore we must register each I/O port separately. Signed-off-by: Jordan Hargrave Signed-off-by: Matt Domsch Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44d7aff035118e8c3993aa3fa05d358d1008e982 tree 0b454482cde4dac8200357ddb4e0f015b8e266bb parent de66a695bef17264b2472c06e981c068bfa0636e author Seiji Munetoh Tue, 30 May 2006 21:25:52 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:10 -0700 [PATCH] tpm: more bios log parsing fixes From: Seiji Munetoh Change the binary output format to actual ACPI TCPA log structure since the current format does not contain all event-data information that need to verify the PCRs in TPM. tpm_binary_bios_measurements_show() uses get_event_name() to convert the binary event-data to ascii format, and puts them as binary. However, to verify the PCRs, the event-data must be a actual binary event-data used by SHA1 calc. in BIOS. So, I think actual ACPI TCPA log is good for this binary output format. That way, any userland tools easily parse this data with reference to TCG PC specification. Signed-off-by: Seiji Munetoh Acked-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de66a695bef17264b2472c06e981c068bfa0636e tree fcf9e1073978ed8626642ec404bb1bbadcbf18bb parent 25a6df952542ad9f284421b6ffe28f3eb3df1305 author Seiji Munetoh Tue, 30 May 2006 21:25:47 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:10 -0700 [PATCH] tpm: bios log parsing fixes From: Seiji Munetoh Fix "tcpa_pc_event" misalignment between enum, strings and TCG PC spec and output of the event which contains a hash data. Signed-off-by: Seiji Munetoh Acked-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25a6df952542ad9f284421b6ffe28f3eb3df1305 tree 8b0649ff83f5455fcca4f255bf2189a5cbf81fc8 parent 308af9290ad1844c1b4e93ff4919f8009efbe018 author Yasunori Goto Tue, 30 May 2006 21:25:42 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:10 -0700 [PATCH] spanned_pages is not updated at a case of memory hot-add From: Yasunori Goto If hot-added memory's address is smaller than old area, spanned_pages will not be updated. It must be fixed. example) Old zone_start_pfn = 0x60000, and spanned_pages = 0x10000 Added new memory's start_pfn = 0x50000, and end_pfn = 0x60000 new spanned_pages will be still 0x10000 by old code. (It should be updated to 0x20000.) Because old_zone_end_pfn will be 0x70000, and end_pfn smaller than it. So, spanned_pages will not be updated. In current code, spanned_pages is updated only when end_pfn is updated. But, it should be updated by subtraction between bigger end_pfn and new zone_start_pfn. Signed-off-by: Yasunori Goto Signed-off-by: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 308af9290ad1844c1b4e93ff4919f8009efbe018 tree cd97885e8faf22b57f5f4281114a1479466aca77 parent 6855a3a6c3ab611c3a393be846c1e36120033b18 author David Hollister Tue, 30 May 2006 21:25:36 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:10 -0700 [PATCH] fbcon: fix scrollback with logo issue immediately after boot From: David Hollister After the system boots with the logo, if the first action is a scrollback, the screen may become garbled. This patch ensures that the softback_curr value is updated along with softback_in following the scrollback. Signed-off-by: David Hollister Signed-off-by: Jordan Crouse Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6855a3a6c3ab611c3a393be846c1e36120033b18 tree fc8b79da08a45dead0733ebe2e092ed39e30be01 parent e6ed89ac9f5da16fea5111651b6de0ff0a76a5c2 author Andrew Morton Tue, 30 May 2006 21:25:31 -0700 committer Linus Torvalds Wed, 31 May 2006 16:27:10 -0700 [PATCH] ext3 resize: fix double unlock_super() From: Andrew Morton Spotted by Jan Capek Cc: "Stephen C. Tweedie" Cc: Andreas Dilger Cc: Jan Capek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 951bc82c53f30ec6b4c2d04a051e74ea9a89b669 tree 5c8dfd8c9b56291705053cb98382cd79d990c770 parent e6ed89ac9f5da16fea5111651b6de0ff0a76a5c2 author David S. Miller Wed, 31 May 2006 01:24:02 -0700 committer David S. Miller Wed, 31 May 2006 01:24:02 -0700 [SPARC64]: Make smp_processor_id() functional before start_kernel() Uses of smp_processor_id() get pushed earlier and earlier in the start_kernel() sequence. So just get it working before we call start_kernel() to avoid all possible problems. Signed-off-by: David S. Miller commit e6ed89ac9f5da16fea5111651b6de0ff0a76a5c2 tree 99f8afada42812b3ca5e1546584dc6e915b039f6 parent 9a8fca0499c611ab37b5c0d4481ca09d3f6e8101 author Deepak Saxena Tue, 30 May 2006 14:36:49 -0700 committer Linus Torvalds Tue, 30 May 2006 20:33:20 -0700 [PATCH] ARM: explicitly disable BTB on ixp2350 We don't enable the BTB on the ixp2350 as that can cause weird crashes (erratum #42.) However, some bootloaders enable the BTB, which means that we have to disable the BTB explicitly. Found thanks to Tom Rini. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit 9a8fca0499c611ab37b5c0d4481ca09d3f6e8101 tree 7f79e9c5a0d4e3654eaac6f4988d277853a301d8 parent 822ff019f72ae01baef1893e86735f1a5e36be7d author Linus Torvalds Tue, 30 May 2006 20:32:15 -0700 committer Linus Torvalds Tue, 30 May 2006 20:32:15 -0700 Revert "[PATCH] i386/x86_64: Force pci=noacpi on HP XW9300" This reverts commit 5491d0f3e206beb95eeb506510d62a1dab462df1. As per Andi: "After some discussion with people who have the affected system it seems best to revert for 2.6.17. It broke a common BIOS workaround and PCI-X still doesn't work. Alternative is for people to change the BIOS which seems to be better right now." Signed-off-by: Linus Torvalds commit 822ff019f72ae01baef1893e86735f1a5e36be7d tree 55c5215329b85c1b682bb1845361055500219945 parent 7ca97c6131dac9f06b1856a95a2ec89d43844286 author Andi Kleen Tue, 30 May 2006 22:48:03 +0200 committer Linus Torvalds Tue, 30 May 2006 20:31:06 -0700 [PATCH] x86_64: Don't do syscall exit tracing twice int_ret_from_syscall already does syscall exit tracing, so no need to do it again in the caller. This caused problems for UML and some other special programs doing syscall interception. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7ca97c6131dac9f06b1856a95a2ec89d43844286 tree c69a7dc3a48b9bc9dbb19f08fd48bc0275bbf792 parent 0d01532451710110a93891ae152d1dd1ee006ccf author Robert Hentosh Tue, 30 May 2006 22:48:00 +0200 committer Linus Torvalds Tue, 30 May 2006 20:31:06 -0700 [PATCH] x86_64: Fix off by one in bad_addr checking in find_e820_area From: Robert Hentosh Actually, we just stumbled on a different bug found in find_e820_area() in e820.c. The following code does not handle the edge condition correctly: while (bad_addr(&addr, size) && addr+size < ei->addr + ei->size) ; last = addr + size; if ( last > ei->addr + ei->size ) continue; The second statement in the while loop needs to be a <= b so that it is the logical negavite of the if (a > b) outside it. It needs to read: while (bad_addr(&addr, size) && addr+size <= ei->addr + ei->size) ; In the case that failed bad_addr was returning an address that is exactly size bellow the end of the e820 range. AK: Again together with the earlier avoid edma fix this fixes boot on a Dell PE6850/16GB Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0d01532451710110a93891ae152d1dd1ee006ccf tree 565b85776957df727847ffd752018022e83c63f9 parent b2468e525f29882f866cb0b832956e69328f9647 author Daniel Yeisley Tue, 30 May 2006 22:47:57 +0200 committer Linus Torvalds Tue, 30 May 2006 20:31:06 -0700 [PATCH] x86_64: Handle empty node zero From: Daniel Yeisley It is possible to boot a Unisys ES7000 with CPUs from multiple cells, and not also include the memory from those cells. This can create a scenario where node 0 has cpus, but no associated memory. The system will boot fine in a configuration where node 0 has memory, but nodes 2 and 3 do not. [AK: I rechecked the code and generic code seems to indeed handle that already. Dan's original patch had a change for mm/slab.c that seems to be already in now.] Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b2468e525f29882f866cb0b832956e69328f9647 tree 7a48afb9933732c6fccb2baa1e928e3508a3c940 parent 2ba567cbd7626700b800d4ce9503bd3cd78ed7ef author Jan Beulich Tue, 30 May 2006 22:47:54 +0200 committer Linus Torvalds Tue, 30 May 2006 20:31:05 -0700 [PATCH] x86_64: fix last_tsc calculation of PM timer From: "Jan Beulich" The PM timer code updates vxtime.last_tsc, but this update was done incorrectly in two ways: - offset_delay being in microseconds requires multiplying with cpu_mhz rather than cpu_khz - the multiplication of offset_delay and cpu_khz (both being 32-bit values) on most current CPUs would overflow (observed value of the delay was approximately 4000us, yielding an overflow for frequencies starting a little above 1GHz) Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2ba567cbd7626700b800d4ce9503bd3cd78ed7ef tree 70fe0359add1e1ab0e1d8ecb6581b6a149dfad3c parent dc9a719528d782777b86936b817cc0913d5f0b42 author Jan Beulich Tue, 30 May 2006 22:47:51 +0200 committer Linus Torvalds Tue, 30 May 2006 20:31:05 -0700 [PATCH] i386: apic= command line option should always be From: "Jan Beulich" When using apic= on the kernel command line, this had no effect for machines matched by either the ACPI MADT or the MPS OEM table scan. However, when such option is specified, it should also take effect for this set of systems. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit dc9a719528d782777b86936b817cc0913d5f0b42 tree ee7fb8f042a90a1a9ba55f16ddfd8fd6f1879220 parent 6ae53cd496d36db5f25e6f84b8b9fe7e675999a1 author Andi Kleen Tue, 30 May 2006 22:47:48 +0200 committer Linus Torvalds Tue, 30 May 2006 20:31:05 -0700 [PATCH] x86_64: Fix no IOMMU warning in PCI-GART driver Complaining about the IOMMU not compiled in doesn't make sense here because it is clearly compiled in. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6ae53cd496d36db5f25e6f84b8b9fe7e675999a1 tree 298b1b2c498c5d8e95954809b9bd3890a92ac0fb parent 3793c65c13e4751c7a10f98198bae1758453eb0e author Andi Kleen Tue, 30 May 2006 22:47:45 +0200 committer Linus Torvalds Tue, 30 May 2006 20:31:05 -0700 [PATCH] x86_64: Fix stack/mmap randomization for compat tasks ia32_setup_arg_pages would ignore the passed in random stack top and use its own static value. Now it uses the 8bit of randomness native i386 would use too. This indirectly fixes mmap randomization for 32bit processes too, which depends on the stack randomization. Should also give slightly better virtual cache colouring and possibly better performance with HyperThreading. Signed-off-by: Andi Kleen Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 3793c65c13e4751c7a10f98198bae1758453eb0e tree 90cdca032861efbb982705f9d96e351681e48fef parent e60a48f5ab35737118e19bc965c640900a842f02 author Jens Axboe Tue, 30 May 2006 21:11:04 +0200 committer Linus Torvalds Tue, 30 May 2006 20:31:05 -0700 [PATCH] cfq-iosched: fixup locking and ->queue_list list management - Drop cic from the list when seen as dead. - Fixup the locking, just use a simple spinlock. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit e60a48f5ab35737118e19bc965c640900a842f02 tree 2dfc418bc3df4a73d51e45be1030f5692d0303a6 parent 2c56554ec596adadd562679ef672d83e290f1732 parent 7dd1d9b85cfb63eebf48fa13d3c5d25a3deb3a25 author Linus Torvalds Tue, 30 May 2006 11:54:32 -0700 committer Linus Torvalds Tue, 30 May 2006 11:54:32 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] VIA PT880 Ultra support. [AGPGART] Fix Nforce3 suspend on amd64. [AGPGART] Enable SIS AGP driver on x86-64 for EM64T systems commit 2c56554ec596adadd562679ef672d83e290f1732 tree 391308e07b307714896dc71ed2f25448cef75ed6 parent d1b3f96b0f9c1d9bc305a4d14bee0dc3509101a0 parent 55aa2e097dd5f0546972fc2607d7094181967ce2 author Linus Torvalds Tue, 30 May 2006 11:46:45 -0700 committer Linus Torvalds Tue, 30 May 2006 11:46:45 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [[CIFS] Pass truncate open flag through on file open in case setattr fails [CIFS] Fix typos in previous fix [CIFS] endian fix for new POSIX byte range lock support [CIFS] fix memory leak in cifs session info struct on reconnect [CIFS] ACPI suspend oops [CIFS] Do not limit the length of share names (was 100 for whole UNC name) [CIFS] Fix new POSIX Locking for setting lock_type correctly on unlock commit d1b3f96b0f9c1d9bc305a4d14bee0dc3509101a0 tree 663f12dd5895b62858d89f37036604d282532848 parent 47ce56edb8ecdd4ec2bbec4e8683f3ba91de72e3 parent 7114b0bb6df7b2db266ba4847e4dd8333fa98a9a author Linus Torvalds Tue, 30 May 2006 11:31:10 -0700 committer Linus Torvalds Tue, 30 May 2006 11:31:10 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NETFILTER]: PPTP helper: fix sstate/cstate typo [NETFILTER]: mark H.323 helper experimental [NETFILTER]: Fix small information leak in SO_ORIGINAL_DST (CVE-2006-1343) commit 55aa2e097dd5f0546972fc2607d7094181967ce2 tree 4825ebb4cd4a1aa3d6d264c02ac8fe25d9598aea parent 08775834c412c48f3539ef7ed073fff58e3cf419 author Steve French Tue, 30 May 2006 18:09:31 +0000 committer Steve French Tue, 30 May 2006 18:09:31 +0000 [[CIFS] Pass truncate open flag through on file open in case setattr fails on set size to zero. Signed-off-by: Sebastian Voitzsch Signed-off-by: Steve French commit 08775834c412c48f3539ef7ed073fff58e3cf419 tree efa1a6b41e8d0017f7bcf2352f935b700286e876 parent cec6815a12edc91b123394f29d672cb9fa6cf79f author Steve French Tue, 30 May 2006 18:08:26 +0000 committer Steve French Tue, 30 May 2006 18:08:26 +0000 [CIFS] Fix typos in previous fix Signed-off-by: Steve French commit cec6815a12edc91b123394f29d672cb9fa6cf79f tree 06fb2dd56ff647ece64ea6b43f62b8cfd986c949 parent a424f8bfcbecb8353b88a351394e8d1960136219 author Steve French Tue, 30 May 2006 18:07:17 +0000 committer Steve French Tue, 30 May 2006 18:07:17 +0000 [CIFS] endian fix for new POSIX byte range lock support Signed-off-by: Alexey Dobriyan Signed-off-by: Steve French commit a424f8bfcbecb8353b88a351394e8d1960136219 tree 9a23062fed5969bb88496aa76ec3bb3747b661b4 parent c01f36a896cb11e8533b4f7c132a1722fb15102b author Steve French Tue, 30 May 2006 18:06:04 +0000 committer Steve French Tue, 30 May 2006 18:06:04 +0000 [CIFS] fix memory leak in cifs session info struct on reconnect Signed-off-by: Steve French commit c01f36a896cb11e8533b4f7c132a1722fb15102b tree 95df1608cd828aa74e17e87221ec936a0223ab24 parent a878fb2218c87fe66f2bcf3914840e24c41338f7 author Steve French Tue, 30 May 2006 18:05:10 +0000 committer Steve French Tue, 30 May 2006 18:05:10 +0000 [CIFS] ACPI suspend oops Wasn't able to reproduce a hard hang, but was able to get an oops if suspended the machine during a copy to the cifs mount. This led to some things hanging, including a "sync". Also got I/O errors when trying to access the mount afterwards (even when didn't see the oops), and had to unmount and remount in order to access the filesystem. This patch fixed the oops. Signed-off-by: Dave Kleikamp Signed-off-by: Steve French commit a878fb2218c87fe66f2bcf3914840e24c41338f7 tree 61d958f40abe8db8ef8cc2a34dcae4c7aea8fc64 parent fc94cdb94462e71a4a974bc9bc1f483189ae7805 author Steve French Tue, 30 May 2006 18:04:19 +0000 committer Steve French Tue, 30 May 2006 18:04:19 +0000 [CIFS] Do not limit the length of share names (was 100 for whole UNC name) during mount. Especially important for some non-Western languages. Signed-off-by: Steve French commit fc94cdb94462e71a4a974bc9bc1f483189ae7805 tree 0a4695d80660bda29383d4285948f2302f52089a parent d9ec5ad24ce80b7ef69a0717363db661d13aada5 author Steve French Tue, 30 May 2006 18:03:32 +0000 committer Steve French Tue, 30 May 2006 18:03:32 +0000 [CIFS] Fix new POSIX Locking for setting lock_type correctly on unlock Signed-off-by: Steve French commit 47ce56edb8ecdd4ec2bbec4e8683f3ba91de72e3 tree 89f8f2d7503798ec4f1f6dcdb89c9d5a788aadcf parent ed8f9e2f047de5d9b791e390269f230a101a6a4b author Kenan Esau Mon, 29 May 2006 23:31:12 -0400 committer Dmitry Torokhov Mon, 29 May 2006 23:31:12 -0400 Input: psmouse - DMI updates for lifebook protocol Added different lifebook-versions and the CF-18 to the corresponding dmi-table. Signed-off-by: Kenan Esau Signed-off-by: Dmitry Torokhov commit ed8f9e2f047de5d9b791e390269f230a101a6a4b tree 8bca1bcd3159bf35c57cefe8efc76f24039de186 parent d2f4012f15845761bd3c6f90172e53767c11e359 author Richard Purdie Mon, 29 May 2006 23:31:03 -0400 committer Dmitry Torokhov Mon, 29 May 2006 23:31:03 -0400 Input: change from numbered to named switches Remove the numbered SW_* entries from the input system and assign names to the existing users. Signed-off-by: Richard Purdie Signed-off-by: Dmitry Torokhov commit d2f4012f15845761bd3c6f90172e53767c11e359 tree e9d43394ec5f5c1832f8969349fb6e16e0bf1b9b parent e107b8ee7e97fc20695ca3d5ef862511eca28df0 author Yotam Medini Mon, 29 May 2006 23:30:36 -0400 committer Dmitry Torokhov Mon, 29 May 2006 23:30:36 -0400 Input: alps - fix old protocol decoding Correct touchpad left & right keys assignments for ALPS_OLDPROTO that were swapped. Old protocol is used on UMAX ActionBook-530T notebook. Signed-off-by: Yotam Medini Signed-off-by: Dmitry Torokhov commit e107b8ee7e97fc20695ca3d5ef862511eca28df0 tree 6dc5a68d07e975db87280768a02548cb500eda00 parent 4f8b05efec7a56221c6d1b0e20bcf19671017065 author masc@theaterzentrum.at Mon, 29 May 2006 23:29:36 -0400 committer Dmitry Torokhov Mon, 29 May 2006 23:29:36 -0400 Input: wistron - add support for AOpen Barebook 1559as Signed-off-by: Dmitry Torokhov commit 4f8b05efec7a56221c6d1b0e20bcf19671017065 tree c8d8efb0eb420ce5d3b152b2c63c4dd01ab65361 parent 7363cfc8666692a5263c646e68e54900b536cd7e author Zbigniew Luszpinski Mon, 29 May 2006 23:29:19 -0400 committer Dmitry Torokhov Mon, 29 May 2006 23:29:19 -0400 Input: psmouse - add detection of Logitech TrackMan Wheel trackball Signed-off-by: Dmitry Torokhov commit 7363cfc8666692a5263c646e68e54900b536cd7e tree 33bc3ffb6d9b452dc1f4b2d597f7943a659034b6 parent f39b25bed373cf11a2c0490bee8b0ac430aadff4 author Jesper Juhl Mon, 29 May 2006 23:28:05 -0400 committer Dmitry Torokhov Mon, 29 May 2006 23:28:05 -0400 Input: sidewinder - fix memory leak In sw_connect we leak 'buf' and 'idbuf' when we do not leave via one of the fail* labels. This was spotted by the coverity checker. Patch is compile tested only due to lack of hardware. Signed-off-by: Jesper Juhl Signed-off-by: Dmitry Torokhov commit f39b25bed373cf11a2c0490bee8b0ac430aadff4 tree 6221c20266907925b59ef988febd55e21f080df0 parent d9ec5ad24ce80b7ef69a0717363db661d13aada5 author Matthew Garrett Mon, 29 May 2006 23:27:39 -0400 committer Dmitry Torokhov Mon, 29 May 2006 23:27:39 -0400 Input: add KEY_BATTERY keycode Signed-off-by: Dmitry Torokhov commit 7114b0bb6df7b2db266ba4847e4dd8333fa98a9a tree 049268cb57e572b8cc47d6891638975b6bf80413 parent ca3ba88d0cf4b5d7a628caf505c231162dde9429 author Alexey Dobriyan Sun, 28 May 2006 22:51:05 -0700 committer David S. Miller Sun, 28 May 2006 22:51:05 -0700 [NETFILTER]: PPTP helper: fix sstate/cstate typo Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ca3ba88d0cf4b5d7a628caf505c231162dde9429 tree 7dd89a726da5e29d6767396895a9273363467406 parent 6c813c3fe9e30fcf3c4d94d2ba24108babd745b0 author Patrick McHardy Sun, 28 May 2006 22:50:40 -0700 committer David S. Miller Sun, 28 May 2006 22:50:40 -0700 [NETFILTER]: mark H.323 helper experimental Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6c813c3fe9e30fcf3c4d94d2ba24108babd745b0 tree 05420eaf319033bb5aad5a66b0f97e54ca2f896e parent d9ec5ad24ce80b7ef69a0717363db661d13aada5 author Marcel Holtmann Sun, 28 May 2006 22:50:18 -0700 committer David S. Miller Sun, 28 May 2006 22:50:18 -0700 [NETFILTER]: Fix small information leak in SO_ORIGINAL_DST (CVE-2006-1343) It appears that sockaddr_in.sin_zero is not zeroed during getsockopt(...SO_ORIGINAL_DST...) operation. This can lead to an information leak (CVE-2006-1343). Signed-off-by: Marcel Holtmann Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d9ec5ad24ce80b7ef69a0717363db661d13aada5 tree 0a808684e7d5e61427ccd0ecb7f3849164a32aef parent b82e8005af14b51600714971e0c6420c4e334a50 parent 0737ac895afbfbe210557fa5fbafcca932d5fa7c author Linus Torvalds Sun, 28 May 2006 16:35:52 -0700 committer Linus Torvalds Sun, 28 May 2006 16:35:52 -0700 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] the latest consensus libata resume fix commit b82e8005af14b51600714971e0c6420c4e334a50 tree 1d2f2915d07dfcb0e0aeae9a245fa87e62b49d33 parent 371858568e02698fe2de8ba4bf771e3f40db69e5 author Paul Mackerras Mon, 29 May 2006 08:42:34 +1000 committer Paul Mackerras Mon, 29 May 2006 08:42:34 +1000 ppc: Fix typo in TI_LOCAL_FLAGS definition A typo crept in with commit ea1e847cc202e805769c3c46ba5e5c53714068a1 which defined TI_LOCAL_FLAGS to be the offset of the `flags' field of struct thread_info, rather than the `local_flags' field. This fixes it. The typo was pointed out by Guennadi Liakhovetski. Signed-off-by: Paul Mackerras commit 0737ac895afbfbe210557fa5fbafcca932d5fa7c tree 35b521b93f100f5aba2dc78a978fcec3b42afdae parent ecd68853b852cdafb138f9c437f3a751fe7dc381 author Mark Lord Sun, 28 May 2006 11:28:00 -0400 committer Jeff Garzik Sun, 28 May 2006 16:32:08 -0400 [PATCH] the latest consensus libata resume fix Okay, just to sum things up. This forces libata to wait for up to 2 seconds for BUSY|DRQ to clear on resume before continuing. [jgarzik adds...] During testing we never saw DRQ asserted, but nonetheless (a) this works and (b) testing for DRQ won't hurt. Signed-off-by: Mark Lord Acked-by: Jens Axboe Signed-off-by: Jeff Garzik commit 371858568e02698fe2de8ba4bf771e3f40db69e5 tree 07ec799d7babae7eafda93d9dfd9d11fccff086f parent e82b0f2cc21be905e504573483fa9542b15df96f parent 54f4ee183aea859eb09f141dad3fc3c6f4fe0446 author Linus Torvalds Sat, 27 May 2006 09:40:40 -0700 committer Linus Torvalds Sat, 27 May 2006 09:40:40 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] powerpc: fix RTC/NVRAM accesses on Maple [PATCH] ppc32 CPM_UART: various fixes for pq2 uart users [PATCH] powerpc: linuxppc64.org no more commit e82b0f2cc21be905e504573483fa9542b15df96f tree 241f31052917235824197fc755289f4c9ee7779b parent 74ef872c8f250acc02add54ff9d96f31d17bfeb3 author Jeff Garzik Fri, 26 May 2006 21:58:38 -0400 committer Jeff Garzik Fri, 26 May 2006 21:58:38 -0400 [netdrvr s/390] trim trailing whitespace Previous fix patches added a bunch of trailing whitespace, which git-applymbox complained loudly about. commit 74ef872c8f250acc02add54ff9d96f31d17bfeb3 tree aea207d99f78ce9f741a3dd5dcce9748634c091e parent 27eb5ac8f015687205a51425620064c711784956 author Klaus Wacker Wed, 24 May 2006 09:51:21 +0200 committer Jeff Garzik Fri, 26 May 2006 21:57:45 -0400 [PATCH] s390: lcs driver bug fixes and improvements [2/2] This is the second lcs driver patch containing the rest of lcs fixes. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 27eb5ac8f015687205a51425620064c711784956 tree a075fb770ac0a57119d43dbfe920dfc263557398 parent ba1aa084d6fb725a4c026adf69845ca60bab3b36 author Klaus Wacker Wed, 24 May 2006 09:51:17 +0200 committer Jeff Garzik Fri, 26 May 2006 21:57:45 -0400 [PATCH] s390: lcs driver bug fixes and improvements [1/2] Several problems occured with lcs device driver: - device not operational anymore after cable pull/plug-in. - unpredictable results occured, e.g. kernel panic using cards of type QD8F. - STOPLAN and delete multicast address command were not proper recognized by OSA card under heavy network workload. - channel/device error checks missing in interrupt handler. To fix all problems at once recovery of lcs devices has been improved. missing error checks in lcs interrupt handler has been added. Once a hardware problem occurs lcs will recover the device now properly. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit ba1aa084d6fb725a4c026adf69845ca60bab3b36 tree 0d25a544af74dfe51c9234827b45bf11667e00f5 parent b85e1fa196da91e07c98eaf014ae773c2a2e0c4f author Ursula Braun Wed, 24 May 2006 09:51:13 +0200 committer Jeff Garzik Fri, 26 May 2006 21:56:41 -0400 [PATCH] s390: qeth driver fixes From: Frank Blaschka From: Frank Pavlic - fix fake_ll during initial device bringup. fake_ll was not active after first start of the device. Problem only occured when qeth was built without IPV6 support. - avoid skb usage after invocation of qeth_flush_buffers, because skb might already be freed. - remove yet another useless netif_wake_queue in qeth_softsetup_ipv6 since this function is only called when device is going online. In this case card->state will never be in state UP. So let the net_device queue down . Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit b85e1fa196da91e07c98eaf014ae773c2a2e0c4f tree 30411831501e1af00d4d13b283a70f550c8ab801 parent 7401a4670f0e81d50dcc4e0a7bd2dcb4a5d65e6b author Ursula Braun Wed, 24 May 2006 09:51:11 +0200 committer Jeff Garzik Fri, 26 May 2006 21:56:40 -0400 [PATCH] s390: qeth driver fixes From: Frank Pavlic - correct checking of sscanf-%n value in qeth_string_to_ipaddr(). - don't use netif_stop_queue outside the hard_start_xmit routine. Rather use netif_tx_disable. - don't call qeth_netdev_init on a recovery. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 7401a4670f0e81d50dcc4e0a7bd2dcb4a5d65e6b tree be1ab1298d47ec4b0f2bbb99f637f9246ccd00dc parent a24b163b7c16f9e30e726319115e45ed6e683582 author Cornelia Huck Wed, 24 May 2006 09:51:05 +0200 committer Jeff Garzik Fri, 26 May 2006 21:56:40 -0400 [PATCH] s390: minor fix in cu3088 In case of a parse error for the cu3088 group attribute, return -EINVAL instead of count. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit a24b163b7c16f9e30e726319115e45ed6e683582 tree 64eedaff752008bb4a5622d1e8eac3d906ccf220 parent 80871e63e410c53524ef47eaf475c13e0f164ea6 author Don Fry Thu, 25 May 2006 16:22:40 -0700 committer Jeff Garzik Fri, 26 May 2006 21:33:18 -0400 [PATCH] pcnet32: remove incorrect pcnet32_free_ring During a code scan for another change I discovered that this call to pcnet32_free_ring must be removed. If the open fails due to a lack of memory all the ring structures are removed via the call to free_ring and a subsequent call to open will dereference a null pointer in pcnet32_init_ring. Please apply to 2.6.17. Signed-off-by: Don Fry Signed-off-by: Jeff Garzik commit 80871e63e410c53524ef47eaf475c13e0f164ea6 tree 7cab9aa18a3f9cc1d30d1e8a2cde2f19d357ffdf parent 8fc29ba65bd669b8f23a46b4760f3ba773e2a635 author Auke Kok Tue, 23 May 2006 13:35:57 -0700 committer Jeff Garzik Fri, 26 May 2006 21:31:56 -0400 e1000: add shutdown handler back to fix WOL Someone was waaay too aggressive and removed e1000's reboot notifier instead of porting it to the new way of the shutdown handler. This change broke wake on lan. Add the shutdown handler back in using the same method as e100 uses. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok (cherry picked from c653e6351e371b33b29871e5eedf610ffb3be037 commit) commit 8fc29ba65bd669b8f23a46b4760f3ba773e2a635 tree 583f1fe4d46e19fe010ec50776191d7646b05f88 parent ecd68853b852cdafb138f9c437f3a751fe7dc381 parent 4541a5db0ba33d9c692e5b2f8d7805e336fabe7c author Jeff Garzik Fri, 26 May 2006 21:26:22 -0400 committer Jeff Garzik Fri, 26 May 2006 21:26:22 -0400 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit ecd68853b852cdafb138f9c437f3a751fe7dc381 tree 6b3a3468d0d3dca7f226de7e3551913d907b17a2 parent 087377a4307e18225f6452af5e71fe763c088c4e parent 3041a069090224462e27da1bc9483b463eb40841 author Linus Torvalds Fri, 26 May 2006 15:13:33 -0700 committer Linus Torvalds Fri, 26 May 2006 15:13:33 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NET]: dev.c comment fixes [IPV6] ROUTE: Don't try less preferred routes for on-link routes. [IRDA]: *_DONGLE should depend on IRTTY_SIR [MAINTAINERS]: Add entry for netem commit 3041a069090224462e27da1bc9483b463eb40841 tree 1a1713286963b23f6d39addd24b499695fba80ac parent 4d0c5911660b97f53c2211afc6ded5dafafa9b78 author Stephen Hemminger Fri, 26 May 2006 13:25:24 -0700 committer David S. Miller Fri, 26 May 2006 13:25:24 -0700 [NET]: dev.c comment fixes Noticed that dev_alloc_name() comment was incorrect, and more spellung errors. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4d0c5911660b97f53c2211afc6ded5dafafa9b78 tree 8d6a9fa1f492f92be74a979d98b2e2b72c051abd parent 56bc348ce8a709a70cd80857ffc09749f871d7a8 author YOSHIFUJI Hideaki Fri, 26 May 2006 13:23:41 -0700 committer David S. Miller Fri, 26 May 2006 13:23:41 -0700 [IPV6] ROUTE: Don't try less preferred routes for on-link routes. In addition to the real on-link routes, NONEXTHOP routes should be considered on-link. Problem reported by Meelis Roos . Signed-off-by: YOSHIFUJI Hideaki Acked-by: Meelis Roos Signed-off-by: David S. Miller commit 4541a5db0ba33d9c692e5b2f8d7805e336fabe7c tree afd9c5a020f2111d71cf8f9e09fff1ce4e849970 parent 53072d68cc2deda9f1a8cde864aa9d04f58addd3 author Randy Dunlap Thu, 25 May 2006 11:10:08 -0700 committer John W. Linville Fri, 26 May 2006 16:11:56 -0400 [PATCH] arlan: fix section mismatch warnings Fix section mismatch warnings: WARNING: drivers/net/wireless/arlan.o - Section mismatch: reference to .init.text:arlan_probe from .text between 'init_module' (at offset 0x3526) and 'cleanup_module' WARNING: drivers/net/wireless/arlan.o - Section mismatch: reference to .init.text:init_arlan_proc from .text between 'init_module' (at offset 0x3539) and 'cleanup_module' WARNING: drivers/net/wireless/arlan.o - Section mismatch: reference to .exit.text:cleanup_arlan_proc from .text between 'cleanup_module' (at offset 0x356c) and 'arlan_diagnostic_info_string' Signed-off-by: Randy Dunlap Signed-off-by: John W. Linville commit 53072d68cc2deda9f1a8cde864aa9d04f58addd3 tree d548e87c1b86b8ba733cee1bcded1824103c2e78 parent 705af309505681f197f81618440954d10f120dc0 author Randy Dunlap Thu, 25 May 2006 11:09:21 -0700 committer John W. Linville Fri, 26 May 2006 16:11:56 -0400 [PATCH] wavelan: fix section mismatch Fix section mismatch warning: WARNING: drivers/net/wireless/wavelan.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x371e) and 'cleanup_module' Signed-off-by: Randy Dunlap Signed-off-by: John W. Linville commit 087377a4307e18225f6452af5e71fe763c088c4e tree cd8ea73ad5ba8ba80f92f17f747628fdddb236f0 parent 5d5daa162a5187bc0f98eb2bc7a063392b0de311 author Kylene Jo Hall Thu, 25 May 2006 18:44:27 -0700 committer Linus Torvalds Fri, 26 May 2006 11:55:47 -0700 [PATCH] tpm: fix bug for TPM on ThinkPad T60 and Z60 The TPM chip on the ThinkPad T60 and Z60 machines is returning 0xFFFF for the vendor ID which is a check the driver made to double check it was actually talking to the memory mapped space of a TPM. This patch removes the check since it isn't absolutely necessary and was causing device discovery to fail on these machines. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d5daa162a5187bc0f98eb2bc7a063392b0de311 tree 8a6e7e78f60d9197dc51e038d582fd5a75c88aca parent ac88bcff2fa536e015a97e144b7190c740225144 author Randy Dunlap Thu, 25 May 2006 18:44:26 -0700 committer Linus Torvalds Fri, 26 May 2006 11:55:46 -0700 [PATCH] scx200_acb: fix section mismatch warning WARNING: drivers/i2c/busses/scx200_acb.o - Section mismatch: reference to .init.text: from .text after 'scx200_add_cs553x' (at offset 0x528) Signed-off-by: Randy Dunlap Signed-off-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac88bcff2fa536e015a97e144b7190c740225144 tree 2b05cdf1d6d4f7b6aa99de96e1799b00c715d66f parent 0fba3a1f39f8b0a50b56c8b068fa52131cbc84c2 author Ben Dooks Thu, 25 May 2006 18:44:25 -0700 committer Linus Torvalds Fri, 26 May 2006 11:55:46 -0700 [PATCH] s3c24xx: fix spi driver with CONFIG_PM Fix compile bug with the S3C24XX SPI driver when CONFIG_PM is set. Signed-off-by: Ben Dooks Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fba3a1f39f8b0a50b56c8b068fa52131cbc84c2 tree 35b5b68cb783305fa783988cbb7042531cb8a316 parent 3ac8141366932a74fd8620afaebd66960c91196d author Johannes Berg Thu, 25 May 2006 18:44:24 -0700 committer Linus Torvalds Fri, 26 May 2006 11:55:46 -0700 [PATCH] PowerMac: force only suspend-to-disk to be valid For a very long time, echoing 'standby' or 'mem' into /sys/power/state has killed the machine on powerpc. This patch fixes that. This patch adds the .valid callback to pm_ops on PowerMac so that only the suspend to disk state can be entered. Note that just returning 0 would suffice since the upper layers don't pass PM_SUSPEND_DISK down, but we handle it there regardless just in case that changes. Acked-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ac8141366932a74fd8620afaebd66960c91196d tree 1e6d0cc5bbf10f940ba93346b489c9893c7a2bf7 parent 9084533e797f131c923c8883adf91cc2f7ddcfae author Florin Malita Thu, 25 May 2006 18:44:23 -0700 committer Linus Torvalds Fri, 26 May 2006 11:55:46 -0700 [PATCH] affs: possible null pointer dereference in affs_rename() If affs_bread() fails, the exit path calls mark_buffer_dirty_inode() with a NULL argument. Coverity CID: 312. Signed-off-by: Florin Malita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9084533e797f131c923c8883adf91cc2f7ddcfae tree a5ef83c83d2053e2a8aa9a294ceab425c6e1c92d parent f09de595b5eda6040cd733ecf1eb222e00b42517 author David Brownell Thu, 25 May 2006 18:44:20 -0700 committer Linus Torvalds Fri, 26 May 2006 11:55:46 -0700 [PATCH] ads7846 conversion accuracy This improves accuracy of the touchscreen and hwmon sensor readings, addressing an issue noted by Imre Deak: there's an extra bit written before the sample (12 bits) gets written out. It also catches up to various comments, and makes the /proc/interrupts entry sensible again. Signed-off-by: David Brownell Cc: Imre Deak Cc: Jean Delvare Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f09de595b5eda6040cd733ecf1eb222e00b42517 tree bfba2a2c72082bd30527a215c3b36994e30eabe7 parent 6bf08cb246b5ac639b2429533d303f5026f2520c author Jens Axboe Thu, 25 May 2006 18:44:19 -0700 committer Linus Torvalds Fri, 26 May 2006 11:55:46 -0700 [PATCH] x86: wire up vmsplice syscall Signed-off-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6bf08cb246b5ac639b2429533d303f5026f2520c tree 33b9234ddd26959c9342b4932f596a9b009bf3bd parent c71d48877e6f3d5e3eb22fcaaa612081bce3d089 author Paul Mackerras Thu, 25 May 2006 18:44:17 -0700 committer Linus Torvalds Fri, 26 May 2006 11:55:46 -0700 [PATCH] Add CMSPAR to termbits.h for powerpc and alpha Some driver wants to use CMSPAR, but it was missing on alpha and powerpc. This adds it, with the same value as every other architecture uses. (akpm: fixes the build of an upcoming gregkh USB patch) Signed-off-by: Paul Mackerras Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c71d48877e6f3d5e3eb22fcaaa612081bce3d089 tree 2adf081ab975f2f1f33b5ba1c04163fcbdf02077 parent 309c68cc17ba1f6f733038562b7469b5340e1a1d author Neil Brown Fri, 26 May 2006 10:39:25 +1000 committer Linus Torvalds Fri, 26 May 2006 11:52:11 -0700 [PATCH] Unlock md devices when stopping them on reboot. otherwise we get nasty messages about locks not being released. Signed-off-by: Neil Brown Signed-off-by: Linus Torvalds commit 309c68cc17ba1f6f733038562b7469b5340e1a1d tree 68f582ca59e1b4dd0d89a8ec4cd8d841e4f01ff3 parent 705af309505681f197f81618440954d10f120dc0 parent ab28b171eabc0a414e0404844453c11af3caed10 author Linus Torvalds Fri, 26 May 2006 11:51:08 -0700 committer Linus Torvalds Fri, 26 May 2006 11:51:08 -0700 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IB/mthca: Fix posting lists of 256 receive requests to SRQ for Tavor commit 54f4ee183aea859eb09f141dad3fc3c6f4fe0446 tree 94bfc121c036460c64f7a72f9a46152ee6fdd263 parent 8e30a9a299ca30b6c4072c2182238d5f5dd1590d author Hollis Blanchard Thu, 25 May 2006 16:36:53 -0500 committer Paul Mackerras Fri, 26 May 2006 22:39:00 +1000 [PATCH] powerpc: fix RTC/NVRAM accesses on Maple Due to a firmware device tree bug, RTC and NVRAM accesses (including halt/reboot) on Maple have been broken since January, when an untested build fix went in. This code patches the device tree in Linux. Signed-off-by: Hollis Blanchard Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 8e30a9a299ca30b6c4072c2182238d5f5dd1590d tree 4054dd52f383838c8c2f7d47e33493968c59d16b parent 6d923f98fe0f31c174ace92f8b680d0d153663aa author Vitaly Bordug Wed, 24 May 2006 21:40:18 +0400 committer Paul Mackerras Fri, 26 May 2006 22:38:56 +1000 [PATCH] ppc32 CPM_UART: various fixes for pq2 uart users This fixes various odd things that missed update together with cpm_uart platform_device move. Unified resources names, restructurisation, etc. Also, addressed issue with recent phys/virt translation rework. Being cache-coherent, CPM2's do alloc_bootmem() for the console stuff, and it was used to treat console buffer descriptor mapping 1:1 (as in CPM1 case), which is definitely wrong. Signed-off-by: Vitaly Bordug Signed-off-by: Paul Mackerras commit 6d923f98fe0f31c174ace92f8b680d0d153663aa tree 37be14fe10d68a301ab041e39c47f5bd2dea9fd5 parent 705af309505681f197f81618440954d10f120dc0 author Arthur Othieno Fri, 19 May 2006 06:22:23 -0400 committer Paul Mackerras Fri, 26 May 2006 22:38:54 +1000 [PATCH] powerpc: linuxppc64.org no more http://linuxppc64.org has long been a redirect to the canonical http://penguinppc.org/ppc64/ -- update all instances accordingly, as ACKed by Hollis: On Wed, Jan 18, 2006 at 09:48:08AM -0600, Hollis Blanchard wrote: > On Wed, 2006-01-18 at 13:07 +0100, Olaf Hering wrote: > > On Wed, Jan 18, Arthur Othieno wrote: > > > > > > What about the s/linuxppc64\.org/penguinppc\.org/g case? Or is > > > penguinppc64.org preferable? Or am I just taking it too far? ;) > > > > They are redirected on DNS or HTTP level. > > HTTP level, but that doesn't answer his question. > > As the maintainer of that site, I would prefer to remove the > linuxppc64.org reference. Signed-off-by: Arthur Othieno Signed-off-by: Paul Mackerras commit 56bc348ce8a709a70cd80857ffc09749f871d7a8 tree 63e91f4b4b5f615abeb1599b1f8041d544b0d98b parent be2f2e84549386df63206fec134d9e0fc2212328 author Samuel Ortiz Thu, 25 May 2006 16:17:53 -0700 committer David S. Miller Thu, 25 May 2006 16:17:53 -0700 [IRDA]: *_DONGLE should depend on IRTTY_SIR If a SIR dongle is built in the kernel while IRTTY_SIR is built as a module, kernel compilation will fail. Thus, the SIR dongle config should depend on the IRTTY_SIR. Closes kernel bug# 6512 (http://bugzilla.kernel.org/show_bug.cgi?id=6512) Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit be2f2e84549386df63206fec134d9e0fc2212328 tree 66e5a4a31d00b767f718c3eff56a6a8c2b09e72d parent 705af309505681f197f81618440954d10f120dc0 author Stephen Hemminger Thu, 25 May 2006 16:14:43 -0700 committer David S. Miller Thu, 25 May 2006 16:14:43 -0700 [MAINTAINERS]: Add entry for netem It gets enough reports, that there ought to be a MAINTAINER entry. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 705af309505681f197f81618440954d10f120dc0 tree af6b17647538cb782df3dd25dfb42c1954a7dc9a parent a8bd60705aa17a998516837d9c1e503ad4cbd7fc author Martin Schwidefsky Tue, 23 May 2006 09:22:42 +0200 committer Linus Torvalds Thu, 25 May 2006 12:09:55 -0700 [PATCH] s390: fix typo in stop_hz_timer. Add missing parentheses for type cast to u64. Signed-off-by: Martin Schwidefsky Cc: Dave Jones Signed-off-by: Linus Torvalds commit ab28b171eabc0a414e0404844453c11af3caed10 tree 35c7037516ec32da168468823c1fbba96a930eb2 parent da8bacf6d59288ef3e41389db24886c928dcbd33 author Michael S. Tsirkin Wed, 24 May 2006 18:27:07 +0300 committer Roland Dreier Wed, 24 May 2006 13:43:37 -0700 IB/mthca: Fix posting lists of 256 receive requests to SRQ for Tavor If we post a list of length exactly a multiple of 256, nreq in doorbell gets set to 256 which is wrong: it should be encoded by 0. This is because we only zero it out on the next WR, which may not be there. The solution is to ring the doorbell after posting a WQE, not before posting the next one. This is the same bug that we just fixed for QPs with non-shared RQ. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 7dd1d9b85cfb63eebf48fa13d3c5d25a3deb3a25 tree 5a840856c94644ddec417b2616fc9d2d872181bf parent ca2797ffaabc1f73cf8a73a30f709f0c1a6bef34 author Magnus Kessler Mon, 22 May 2006 10:53:10 +0100 committer Dave Jones Mon, 22 May 2006 13:56:02 -0400 [AGPGART] VIA PT880 Ultra support. This patch enables agpgart on a Via "PT880 Ultra" based motherboard (Asus P4V800D-X). The PCI ID of the PT880 Ultra is 0x0308 instead of 0x0258 of the PT880. The patched via-agp passes testgart. Signed-off-by: Magnus Kessler Signed-off-by: Dave Jones commit ca2797ffaabc1f73cf8a73a30f709f0c1a6bef34 tree d35dfea7bba8018eb6ed1822f7b4bc54a8fb2c04 parent 283a12c53b9abeed89491da4a1eda98f5764947b author Dave Jones Sun, 21 May 2006 17:11:42 -0400 committer Dave Jones Sun, 21 May 2006 17:11:42 -0400 [AGPGART] Fix Nforce3 suspend on amd64. kernel.org bugzilla #6206 Based on patch from Serge Belyshev Signed-off-by: Dave Jones commit 283a12c53b9abeed89491da4a1eda98f5764947b tree 8ba6626dd67d024b485f2ca02905a37ec525554f parent b307e8548921c686d2eb948ca418ab2941876daa author Andi Kleen Tue, 28 Mar 2006 09:38:45 +0200 committer Dave Jones Sun, 21 May 2006 17:10:55 -0400 [AGPGART] Enable SIS AGP driver on x86-64 for EM64T systems Enable SIS AGP driver on x86-64 for EM64T systems Untested so far Signed-off-by: Andi Kleen Signed-off-by: Dave Jones commit 9f434d4f84a235f6b61aec6e691d6b07bc46fc24 tree 741cc0395ea33f5c6ddcf330747dbfa206a129c6 parent 6d99a3f372181160a56d7b1ee3259dbe03663f0d author Eric Moore Wed, 17 May 2006 18:19:43 -0600 committer James Bottomley Sat, 20 May 2006 09:02:28 -0500 [SCSI] scsi_transport_sas: make write attrs writeable A couple write attributes in sas transport layer have a small bug that prevents them from being written to. Those attributes are the link_reset and write_reset. This is due the store field being set to NULL. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 6d99a3f372181160a56d7b1ee3259dbe03663f0d tree 97b4c8487de9b92fe5eb05e6f57a22c783c0594e parent 78a904b65420e02bf964af6a83c1fd7a85e0b59d author James Bottomley Fri, 19 May 2006 10:49:37 -0500 committer James Bottomley Sat, 20 May 2006 09:01:21 -0500 [SCSI] scsi_transport_sas; fix user_scan the user_scan() callback currently has the potential to identify the wrong device in the presence of expanders. This is because it finds the first device with a matching target_id, which might be an expander. Fix this by making it look specifically for end devices. Signed-off-by: James Bottomley commit 78a904b65420e02bf964af6a83c1fd7a85e0b59d tree 3a2a6f6b38f3ffd9705b939ea0ef8ff0ca543b54 parent 4ff42a669a9ad3eb8274da31c7baabd968c2d365 author Randy.Dunlap Fri, 19 May 2006 10:11:02 -0700 committer James Bottomley Fri, 19 May 2006 16:45:00 -0500 [SCSI] ppa: fix for machines with highmem ppa cannot handle highmem pages, and like imm, which already has this patch, the device is slow, so performance is not a big issue, so just force pages to be in low memory (hence mapped). Signed-off-by: Randy Dunlap Signed-off-by: James Bottomley commit 4ff42a669a9ad3eb8274da31c7baabd968c2d365 tree 39a79bc30bcfa41990d6b1986ceadb63c8d1183f parent c3d833685583f943fb0b5511a9e4602becb1668b author James Bottomley Wed, 17 May 2006 18:06:52 -0500 committer James Bottomley Fri, 19 May 2006 16:43:08 -0500 [SCSI] mptspi: reset handler shouldn't be called for other bus protocols All registered reset callback handlers are called during reset processing. The mptspi modules has its own reset callback handler, just recently added for issuing domain validation after host reset. If either the mptsas or mptfc driver are loaded, this callback could be called. Thus resulting in domain validation being issued for sas or fibre end devices. Fix this by having mptbase.c check the bus type against the driver type and only call the reset handler if they match (or if it's a non-bus specific reset handler). Signed-off-by: James Bottomley commit c3d833685583f943fb0b5511a9e4602becb1668b tree af861af9a9020a15c58dd360bafac2c1a97d4810 parent ee433530d96a7b0af24ab616e5b51f1d89f9ae38 author Thomas Bogendoerfer Tue, 16 May 2006 06:38:29 +0200 committer James Bottomley Fri, 19 May 2006 16:41:20 -0500 [SCSI] Blacklist entry for HP dat changer after upgrading our SUN E250 from 2.4 to 2.6 I'm seeing following error when the HP DDS4 DAT changer gets probed: scsi: host 1 channel 0 id 5 lun16777216 has a LUN larger than allowed by the host adapter The device is connected to a symbios 875 host. I've talked to Willy about the problem, and he asked me to try to blacklist the device for reportlun. I did that with the patch below and it solved the problem. It now gets properly detected: target1:0:5: FAST-20 WIDE SCSI 40.0 MB/s ST (50 ns, offset 16) Vendor: HP Model: C5713A Rev: H307 Type: Sequential-Access ANSI SCSI revision: 03 target1:0:5: Beginning Domain Validation target1:0:5: FAST-20 SCSI 20.0 MB/s ST (50 ns, offset 16) target1:0:5: FAST-20 WIDE SCSI 40.0 MB/s ST (50 ns, offset 16) target1:0:5: Domain Validation skipping write tests target1:0:5: Ending Domain Validation Vendor: HP Model: C5713A Rev: H307 Type: Medium Changer ANSI SCSI revision: 03 Signed-off-by: tsbogend@alpha.franken.de Signed-off-by: James Bottomley