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