commit f3a2c3ee458bd614231e548c13acb0cf33a68631 Merge: 656829e... f5e1052... Author: Linus Torvalds Date: Tue Jan 9 19:48:15 2007 -0800 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: Don't execute QUERY_QP firmware command for QP in RESET state IB/ehca: Use proper GFP_ flags for get_zeroed_page() IB/mthca: Fix PRM compliance problem in atomic-send completions RDMA/ucma: Don't report events with invalid user context RDMA/ucma: Fix struct ucma_event leak when backlog is full RDMA/iwcm: iWARP connection timeouts shouldn't be reported as rejects IB/iser: Return error code when PDUs may not be sent IB/mthca: Fix off-by-one in FMR handling on memfree commit f5e10529a9a835a267f6aa7806e291d6df845e14 Author: Dotan Barak Date: Wed Dec 27 15:46:06 2006 +0200 IB/mthca: Don't execute QUERY_QP firmware command for QP in RESET state If a QP being queried is in the RESET state, don't execute the QUERY_QP firmware command (because it will fail). Signed-off-by: Dotan Barak Signed-off-by: Roland Dreier commit f2d9136133de257abbd97fec6f624d3a73d1e1fd Author: Hoang-Nam Nguyen Date: Tue Jan 9 18:04:14 2007 +0100 IB/ehca: Use proper GFP_ flags for get_zeroed_page() Here is a patch for ehca to use proper flag, ie. GFP_ATOMIC resp. GFP_KERNEL, when calling get_zeroed_page() to prevent "Bug: scheduling while atomic...". This error does not cause a kernel panic but makes ipoib un-usable afterwards. It is reproducible on 2.6.20-rc4 if one does ifconfig down during a flood ping test. I have not observed this error in earlier releases incl. 2.6.20-rc1. This error occurs when a qp event/irq is received and ehca event handler allocates a control block/page to obtain HCA error data block. Use of GFP_ATOMIC when in interrupt context prevents this issue. Signed-off-by Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit 656829e2d052b1da4a72aa2ac39ad733a78530ce Merge: 76a2f04... a037b0a... Author: Linus Torvalds Date: Tue Jan 9 09:40:34 2007 -0800 Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: [ALSA] version 1.0.14rc1 [ALSA] usbaudio - Fix kobject_add() error at reconnection [ALSA] usb: usbmixer error path fix [ALSA] _snd_cmipci_uswitch_put doesn't set zero flags [ALSA] hda-codec - Fix NULL dereference in generic hda code [ALSA] hda_intel: ALSA HD Audio patch for Intel ICH9 [ALSA] usb-audio: work around wrong frequency in CM6501 descriptors [ALSA] Fix potential NULL pointer dereference in echoaudio midi [ALSA] Audio: Add nvidia HD Audio controllers of MCP67 support to hda_intel.c commit 76a2f047880c2c7779f8950c50ee8f3855a5e6df Merge: 97bee8e... cb48cfe... Author: Linus Torvalds Date: Tue Jan 9 09:37:18 2007 -0800 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: [TCP]: Fix iov_len calculation in tcp_v4_send_ack(). [NETFILTER]: nf_conntrack_netbios_ns: fix uninitialized member in expectation [TG3]: Add PHY workaround for 5755M. [BNX2]: Update version and reldate. [BNX2]: Fix bug in bnx2_nvram_write(). [BNX2]: Fix 5709 Serdes detection. [BNX2]: Don't apply CRC PHY workaround to 5709. NetLabel: correct CIPSO tag handling when adding new DOI definitions NetLabel: correct locking in selinux_netlbl_socket_setsid() [Bluetooth] Correct SCO buffer for Broadcom based Dell laptops [Bluetooth] Correct SCO buffer for Broadcom based HP laptops [Bluetooth] Correct SCO buffer size for another ThinkPad laptop [Bluetooth] Handle device registration failures [Bluetooth] Fix uninitialized return value for RFCOMM sendmsg() [Bluetooth] More checks if DLC is still attached to the TTY [Bluetooth] Add packet size checks for CAPI messages [X25]: Trivial, SOCK_DEBUG's in x25_facilities missing newlines [INET]: Fix incorrect "inet_sock->is_icsk" assignment. commit 97bee8e25da4dfc3b7a369fb2c2f280f5c1918c2 Merge: 8ba1f27... 77aab8b... Author: Linus Torvalds Date: Tue Jan 9 09:36:06 2007 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: pcnet_cs : add new id chelsio: error path fix s390: iucv Kconfig help description changes s390: qeth driver fixes: atomic context fixups s390: qeth driver fixes: packet socket s390: qeth driver fixes: VLAN hdr, perf stats forcedeth: sideband management fix Revert "[PATCH] e1000: disable TSO on the 82544 with slab debugging" qeth: fix uaccess handling and get rid of unused variable qla3xxx: Add delay to NVRAM register access. qla3xxx: Remove NETIF_F_LLTX from driver features. ixgb: Write RA register high word first, increment version ixgb: Maybe stop TX if not enough free descriptors ixgb: Fix early TSO completion [PATCH] ipw2100: Fix dropping fragmented small packet problem [PATCH] ieee80211: WLAN_GET_SEQ_SEQ fix (select correct region) commit 8ba1f2798224086c72c1132acd6fdb45068279d7 Merge: 599c853... dc40127... Author: Linus Torvalds Date: Tue Jan 9 09:35:16 2007 -0800 Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix bugs in the hypervisor call stats code [POWERPC] Fix corruption in hcall9 [POWERPC] iSeries: fix setup initcall [POWERPC] iSeries: fix viopath initialisation [POWERPC] iSeries: fix lpevents initialisation [POWERPC] iSeries: fix proc/iSeries initialisation [POWERPC] iSeries: fix mf proc initialisation [POWERPC] disable PReP and EFIKA during make oldconfig [POWERPC] Fix mpc52xx serial driver to work for arch/ppc again [POWERPC] Don't include powerpc/sysdev/rom.o for arch/ppc builds [POWERPC] Fix mpc52xx fdt to use correct device_type for sound devices [POWERPC] 52xx: Don't use device_initcall to probe of_platform_bus [POWERPC] Add legacy iSeries to ppc64_defconfig [POWERPC] Update ppc64_defconfig [POWERPC] Fix manual assembly WARN_ON() in enter_rtas(). [POWERPC] Avoid calling get_irq_server() with a real, not virtual irq. [POWERPC] Fix unbalanced uses of of_node_put [POWERPC] Fix bogus BUG_ON() in in hugetlb_get_unmapped_area() commit 599c853195f43dfbcbf28b362e6ae80ffa33fec7 Merge: 2f5c33b... bf3dbdc... Author: Linus Torvalds Date: Tue Jan 9 09:34:20 2007 -0800 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] locking problem with __cpcmd. [S390] don't call handle_mm_fault() if in an atomic context. [S390] Fix vmalloc area size calculation. [S390] Fix cpu hotplug (missing 'online' attribute). [S390] cio: use barrier() in stsch_reset. [S390] memory detection misses 128k. commit 2f5c33b3180169f3eafb698b66686962d637fb0e Author: Mark M. Hoffman Date: Mon Jan 8 22:11:29 2007 -0500 [PATCH] i2c/pci: fix sis96x smbus quirk once and for all The sis96x SMBus PCI device depends on two different quirks to run in a specific order. Apart from being fragile, this was found to actually break on (at least) recent FC4, FC5, and FC6 kernels. This patch fixes the quirks so that they work without relying on the compiler and/or linker to put them in any specific order. http://lists.lm-sensors.org/pipermail/lm-sensors/2006-April/015962.html https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=189719 I tested this patch. Signed-off-by: Mark M. Hoffman Cc: Andrew Morton Cc: Adrian Bunk Cc: Greg K-H Cc: Jean Delvare Signed-off-by: Linus Torvalds commit a037b0a43f6abafc4f725f7c7f46d577d1c44c96 Author: Jaroslav Kysela Date: Tue Jan 9 10:57:25 2007 +0100 [ALSA] version 1.0.14rc1 Signed-off-by: Jaroslav Kysela commit bf3dbdcd0bfca74c16ad0b2b5a978907c864ed4c Author: Christian Borntraeger Date: Tue Jan 9 10:19:03 2007 +0100 [S390] locking problem with __cpcmd. Changeset 740b5706b9c4b3767f597b3ea76654c6f2a800b2 moved the protecting spinlock from __cpcmd to cpcmd. Therefore vmcp can no longer use __cpcmd, instead we have to use cpcmd. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit d8ad075ef60ca33f1bd8e227eed2202108fd6cd8 Author: Heiko Carstens Date: Tue Jan 9 10:18:50 2007 +0100 [S390] don't call handle_mm_fault() if in an atomic context. There are several places in the futex code where a spin_lock is held and still uaccesses happen. Deadlocks are avoided by increasing the preempt count. The pagefault handler will then not take any locks but will immediately search the fixup tables. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit de338a3795bbcb3c3d77591f65118cbec776cc39 Author: Heiko Carstens Date: Tue Jan 9 10:18:47 2007 +0100 [S390] Fix vmalloc area size calculation. setup_memory_end() uses VMALLOC_END instead of VMALLOC_END_INIT to calculate the maximum supported size of physical memory. Since VMALLOC_END is zero, this will cause a crash on 31 bit systems. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 6721f77810dfcb7cbf8e97be6fa43fe2740dd0aa Author: Heiko Carstens Date: Tue Jan 9 10:18:44 2007 +0100 [S390] Fix cpu hotplug (missing 'online' attribute). 72486f1f8f0a2bc828b9d30cf4690cf2dd6807fc inverts the logic if an 'online' attribute in /sys/devices/system/cpu/cpuX should appear. So we end up with no hotpluggable cpus at all... Set the hotpluggable value to one to make sure the online attribute appears again. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 6faf4444f2445b068a4f75a86ae81b104c0eed2c Author: Heiko Carstens Date: Tue Jan 9 10:18:41 2007 +0100 [S390] cio: use barrier() in stsch_reset. Use barrier() in stsch_reset() instead of duplicating the stsch() inline assembly and adding "memory" to the clobberlist. Pointed out by Chuck Ebbert. Real fix would be to add a fixup section to the stsch() and extend the basic program check handler so it searches the exception tables in case of a program check. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit dd401e2b9250e3bb07ef388ddccbbf80aa106fc7 Author: Hongjie Yang Date: Tue Jan 9 10:18:36 2007 +0100 [S390] memory detection misses 128k. Fix a memory leak problem in the memory detection routines. A memory leak of 128k occurs when we have a contiguous memory with mixed access-mode (read or write) ranges. Signed-off-by: Hongjie Yang Signed-off-by: Martin Schwidefsky commit cb48cfe8079ddda78425a16d6c1be57d822b365b Author: Craig Schlenter Date: Tue Jan 9 00:11:15 2007 -0800 [TCP]: Fix iov_len calculation in tcp_v4_send_ack(). This fixes the ftp stalls present in the current kernels. All credit goes to Komuro for tracking this down. The patch is untested but it looks *cough* obviously correct. Signed-off-by: Craig Schlenter Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 88044c8c9635b2ec67a27c6f334965e5b97eb2c7 Author: Patrick McHardy Date: Tue Jan 9 00:03:26 2007 -0800 [NETFILTER]: nf_conntrack_netbios_ns: fix uninitialized member in expectation ->helper is uninitialized in the expectation registered by the netbios_ns helper and it later copied to the expected connection, which causes invalid memory dereferences when trying to call the helper. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c1d2a1965a00693bddaddf75d57488a0d8e891af Author: Michael Chan Date: Mon Jan 8 19:57:20 2007 -0800 [TG3]: Add PHY workaround for 5755M. Some PHY trim values need to be fine-tuned on 5755M to be IEEE-compliant. Update version to 3.72. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit d6aa4acebafe3acb0aade7704ec5b2f03742ea14 Author: Michael Chan Date: Mon Jan 8 19:56:31 2007 -0800 [BNX2]: Update version and reldate. Update version to 1.5.3. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit e6be763f63420c334710a5a0818e6bfcf5d593f8 Author: Michael Chan Date: Mon Jan 8 19:56:13 2007 -0800 [BNX2]: Fix bug in bnx2_nvram_write(). The bug was a bogus pointer being passed to kfree(). The pointer was incremented in the write loop and then passed to kfree(). The fix is to use align_buf to save the original address. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 253c8b75546c5f21d5321d691df92c1e84d9b0fb Author: Michael Chan Date: Mon Jan 8 19:56:01 2007 -0800 [BNX2]: Fix 5709 Serdes detection. 5709 has a new register to detect copper/fiber PHYs. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 261dd5ca05c6f36c9216f2d60b018f59f92620c4 Author: Michael Chan Date: Mon Jan 8 19:55:46 2007 -0800 [BNX2]: Don't apply CRC PHY workaround to 5709. The workaround is only needed on 5706/5708 and cannot be applied on 5709. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 2a2f11c227bdf292b3a2900ad04139d301b56ac4 Author: Paul Moore Date: Fri Jan 5 15:08:22 2007 -0500 NetLabel: correct CIPSO tag handling when adding new DOI definitions The current netlbl_cipsov4_add_common() function has two problems which are fixed with this patch. The first is an off-by-one bug where it is possibile to overflow the doi_def->tags[] array. The second is a bug where the same doi_def->tags[] array was not always fully initialized, which caused sporadic failures. Signed-off-by: Paul Moore Signed-off-by: James Morris commit 797951200679f1d5ea12a2e58cc7bdbc2848764c Author: Paul Moore Date: Fri Jan 5 15:08:21 2007 -0500 NetLabel: correct locking in selinux_netlbl_socket_setsid() The spinlock protecting the update of the "sksec->nlbl_state" variable is not currently softirq safe which can lead to problems. This patch fixes this by changing the spin_{un}lock() functions into spin_{un}lock_bh() functions. Signed-off-by: Paul Moore Signed-off-by: James Morris commit 86112ffdccab3ee75bc9d9dfae6745df73189e37 Author: Marcel Holtmann Date: Mon Jan 8 02:16:53 2007 +0100 [Bluetooth] Correct SCO buffer for Broadcom based Dell laptops The SCO buffer size values on Dell laptops with a Bluetooth chip from Broadcom are wrong. The USB Bluetooth driver has to set a quirk to correct the SCO buffer size values. Signed-off-by: Marcel Holtmann commit da942704c10129ecd0337a48ed4a0b0db59936b9 Author: Marcel Holtmann Date: Mon Jan 8 02:16:50 2007 +0100 [Bluetooth] Correct SCO buffer for Broadcom based HP laptops The SCO buffer size values on HP laptops with a Bluetooth chip from Broadcom are wrong. The USB Bluetooth driver has to set a quirk to correct the SCO buffer size values. Signed-off-by: Marcel Holtmann commit 5939be43a5718dadda2810b011c786c3e2c581ce Author: Marcel Holtmann Date: Mon Jan 8 02:16:46 2007 +0100 [Bluetooth] Correct SCO buffer size for another ThinkPad laptop The ThinkPad R60E uses a Broadcom based Bluetooth chip and even this version needs the quirk to correct the SCO buffer size values. Signed-off-by: Marcel Holtmann commit c893779e9fbe78575cbd04596f1fcafdb48e8f3f Author: Marcel Holtmann Date: Mon Jan 8 02:16:38 2007 +0100 [Bluetooth] Handle device registration failures In the case the device registration for a new Bluetooth low-level connection fails there is no need to unregister it when the temporary data structure has been removed. Signed-off-by: Marcel Holtmann commit 4d6a2188bd456969f52c03edf1988de90f08d9f5 Author: Marcel Holtmann Date: Mon Jan 8 02:16:31 2007 +0100 [Bluetooth] Fix uninitialized return value for RFCOMM sendmsg() When calling send() with a zero length parameter on a RFCOMM socket it returns a positive value. In this rare case the variable err is used uninitialized and unfortunately its value is returned. Signed-off-by: Marcel Holtmann commit b6e557fbf1dbba8cfa667a25503e5dbd0e9330b7 Author: Marcel Holtmann Date: Mon Jan 8 02:16:27 2007 +0100 [Bluetooth] More checks if DLC is still attached to the TTY If the DLC device is no longer attached to the TTY device, then return errors or default values for various callbacks of the TTY layer. Signed-off-by: Marcel Holtmann commit f4777569204cb59f2f04fbe9ef4e9a6918209104 Author: Marcel Holtmann Date: Mon Jan 8 02:16:23 2007 +0100 [Bluetooth] Add packet size checks for CAPI messages With malformed packets it might be possible to overwrite internal CMTP and CAPI data structures. This patch adds additional length checks to prevent these kinds of remote attacks. Signed-off-by: Marcel Holtmann commit d2e7543c41755f4ec75385536b109d5f084fe734 Author: Andrew Hendry Date: Thu Jan 4 17:00:56 2007 -0800 [X25]: Trivial, SOCK_DEBUG's in x25_facilities missing newlines Trivial. Newlines missing on the SOCK_DEBUG's for X.25 facility negotiation. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit cbbd7d4f36a61631f8c0d73be43df985d1e7d6a6 Author: Paul Moore Date: Thu Jan 4 16:56:46 2007 -0800 [INET]: Fix incorrect "inet_sock->is_icsk" assignment. The inet_create() and inet6_create() functions incorrectly set the inet_sock->is_icsk field. Both functions assume that the is_icsk field is large enough to hold at least a INET_PROTOSW_ICSK value when it is actually only a single bit. This patch corrects the assignment by doing a boolean comparison whose result will safely fit into a single bit field. Signed-off-by: Paul Moore Signed-off-by: David S. Miller commit 2a2a5dddece676acbe3775e5ca9961f325717022 Author: Takashi Iwai Date: Mon Jan 8 17:42:22 2007 +0100 [ALSA] usbaudio - Fix kobject_add() error at reconnection Fixed the error from kobject_add() at reconnection the usb audio device. This happens when an app keeps opening a device while the device is replugged, due to the confliction of the internal bookkept index and the really empty slot. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7fbe3ca571e4b0795b729658e3d76824be54cb18 Author: Mariusz Kozlowski Date: Mon Jan 8 11:25:30 2007 +0100 [ALSA] usb: usbmixer error path fix Without the patch below namelist[0] will not be freed in case of kmalloc error. Signed-off-by: Mariusz Kozlowski Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8c670714223d58086695d007b76b3e3ead54e4f5 Author: Timofei V. Bondarenko Date: Wed Dec 20 19:20:07 2006 +0100 [ALSA] _snd_cmipci_uswitch_put doesn't set zero flags Playing with spdif output on cmipci i've noticed the SPDO5V option does not change appropriate bits the register. The _snd_cmipci_uswitch_put checks the change in flags in wrong way. If 'active' state of an option corresponds to a _zero_ bits in a hw register then function fails. The SPDO5V is the sample. In the most cases 'active' state of option is set through an non-zerio bits in a register. This case works fine. The fix attached. Unfortunately i was unable to change spdif output voltage anyway. Although the register changes right at least. From: Timofei V. Bondarenko Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 6afeb11de5b28e47adea1459c35e598bb98424d6 Author: Takashi Iwai Date: Mon Dec 18 16:16:04 2006 +0100 [ALSA] hda-codec - Fix NULL dereference in generic hda code Fix NULL dereference in hda_generic.c. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f9cc8a8b1887e6e2bb430405d0a4f9b5fb39fa5d Author: Jason Gaston Date: Wed Nov 22 11:53:52 2006 +0100 [ALSA] hda_intel: ALSA HD Audio patch for Intel ICH9 This patch adds the Intel ICH9 HD Audio controller DID's for ALSA. Signed-off-by: Jason Gaston Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 987411b7d899fd9b838d4ce32b45be0741c4ee22 Author: Clemens Ladisch Date: Mon Nov 20 14:14:39 2006 +0100 [ALSA] usb-audio: work around wrong frequency in CM6501 descriptors The C-Media CM6501 chip's descriptors say that altsetting 5 supports 48 kHz, but it actually plays at 96 kHz. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 5929546a96d55962bdcabae0c4e25dfcd9f1fda9 Author: Giuliano Pochini Date: Mon Nov 6 11:42:00 2006 +0100 [ALSA] Fix potential NULL pointer dereference in echoaudio midi Fix races between the timer handler and the close function. Signed-off-by: Giuliano Pochini Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 5b005a0126bc2a2be3ae2c333d56e91bd5e2d8a6 Author: Peer Chen Date: Tue Oct 31 15:33:42 2006 +0100 [ALSA] Audio: Add nvidia HD Audio controllers of MCP67 support to hda_intel.c Add the support for HD audio controllers of MCP51,MCP55,MCP61,MCP65 & MCP67. Signed-off-by: Peer Chen Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 77aab8bf22042d1658d4adbca8b71779e7f2d0ff Author: Komuro Date: Sun Dec 17 19:23:17 2006 +0900 pcnet_cs : add new id pcnet_cs: add new id. corega K.K. (CG-LAPCCTXD) Logitec LPM-LN10TE Signed-off-by: Komuro Signed-off-by: Jeff Garzik commit ab3b1c7e82fe6094a07baa5d2cb0138c4cb40fcb Author: Stephen Hemminger Date: Mon Jan 8 11:24:26 2007 -0800 chelsio: error path fix Fix handling of allocation failure. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 45d2530167027e96686a1b6a7892c55af1f516f5 Author: Frank Pavlic Date: Mon Jan 8 17:30:33 2007 +0100 s390: iucv Kconfig help description changes [PATCH 4/5] s390: iucv Kconfig help description changes From: Ursula Braun remove text from help description which does not apply anymore for 2.6 kernel series. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit ee2db684b4b92d138ee3b7326e69f4297cf4beca Author: Frank Blaschka Date: Mon Jan 8 17:30:11 2007 +0100 s390: qeth driver fixes: atomic context fixups - qeth device functions were not callable in atomic context due to usage of wait_event_xxx operations in qeth. "schedule while atomic" message appeared and kernel dumped when removing slave from bond device. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 2d36c16eb032239cb038ad875ecf83c545002461 Author: Frank Blaschka Date: Mon Jan 8 17:29:58 2007 +0100 s390: qeth driver fixes: packet socket - packet socket support is not complete. Recvfrom a packet socket does not fill the sockaddr_ll structure. device function hard_header_parse is not implemented. For layer 2 mode and layer 3 mode with fake_ll turned on, we have the information to fill sockaddr_ll. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 95c78c8bfe8d0b49a43f392b9a74e2f9e89765ab Author: Frank Blaschka Date: Mon Jan 8 17:29:34 2007 +0100 s390: qeth driver fixes: VLAN hdr, perf stats From: Ursula Braun - VLAN header reordering did not work on packets received through qeth interface in layer 2 mode. This caused dhcpcd not to work with VLAN devices. - set qeth performance statistics initally inactive Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit f35723ec48ca60f2f3493ea40d63a9bc5b585c28 Author: Ayaz Abdulla Date: Thu Feb 20 03:03:54 2003 -0500 forcedeth: sideband management fix This patch contains a fix that implements proper communication with the sideband management unit. Also, it makes sure that the speed is correctly set for gigabit phys in the case where sideband mgmt unit initialized the phy. Refer to bug #7684 for more details. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit dc40127ca5c6e1da48d2b5f9d0c65b5795faac12 Author: Anton Blanchard Date: Tue Jan 9 02:43:02 2007 +1100 [POWERPC] Fix bugs in the hypervisor call stats code There were a few issues with the HCALL_STATS code: - PURR cpu feature checks were backwards - We iterated one entry off the end of the hcall_stats array - Remove dead update_hcall_stats() function prototype I noticed one thing while debugging, and that is we call H_ENTER (to set up the MMU hashtable in early init) before we have done the cpu fixups. This means we will execute the PURR SPR reads even on a CPU that isnt capable of it. I wonder if we can move the CPU feature fixups earlier. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit ab87e8dc88a7cae341c403547cea6b022f5ac023 Author: Anton Blanchard Date: Tue Jan 9 02:37:16 2007 +1100 [POWERPC] Fix corruption in hcall9 It looks to me like we are corrupting r12 in the hcall9 function. Although we have r0 free we cant use offsets against it, so save away r12 in there instead. r12 holds the ninth return value from the hypervisor call, so without this fix, the caller will see the wrong value for the ninth element in the array that gets the return values. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit e75b171768b8b98ec5fd57acb3e87a30c97c9472 Author: Stephen Rothwell Date: Thu Jan 4 17:06:21 2007 +1100 [POWERPC] iSeries: fix setup initcall Clearing the progress indicator should only be done if we are running on legacy iSeries. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit e9966ff85013be0ef56d3c76f3b4d5c02488d964 Author: Stephen Rothwell Date: Thu Jan 4 17:05:13 2007 +1100 [POWERPC] iSeries: fix viopath initialisation /proc/iSeries/config should only be created if we are running on legacy iSeries. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 13d2c9bbb09e37e8a231a36b279a97861d6d5407 Author: Stephen Rothwell Date: Thu Jan 4 17:04:21 2007 +1100 [POWERPC] iSeries: fix lpevents initialisation /proc/iSeries/lpevents should only be created if we are running on legacy iSeries. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 8404e654300cb807428b839d5ae56fd45b5acb92 Author: Stephen Rothwell Date: Thu Jan 4 17:03:16 2007 +1100 [POWERPC] iSeries: fix proc/iSeries initialisation These proc files should only be created if we are running on legacy iSeries. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit d9523aa157e9fbb93467dcd0d1bed9604153bf7f Author: Stephen Rothwell Date: Thu Jan 4 17:01:51 2007 +1100 [POWERPC] iSeries: fix mf proc initialisation This proc file should only be created if we are running on legacy iSeries. Since we can now run the same kernel on legacy iSeries and other machines, we currently get the /proc/iSeries directory and the files in it on non-iSeries machines, and accessing them causes an oops in some cases. This and the following patches make sure that these files are not created on non-iSeries machines, thus avoiding the oops. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 7232846b8d682a56407839e3774d03be0c7806c8 Author: Olaf Hering Date: Wed Jan 3 18:33:56 2007 +0100 [POWERPC] disable PReP and EFIKA during make oldconfig New boards should not be enabled per default. Disable EFIKA and PReP per default. Anyone who really needes the new code can enable it during make oldconfig. Signed-off-by: Olaf Hering Acked-by: Grant Likely Signed-off-by: Paul Mackerras commit c98750c2eb07b0bf49db0630cb5017ede005ce14 Author: Grant Likely Date: Tue Jan 2 15:45:37 2007 -0700 [POWERPC] Fix mpc52xx serial driver to work for arch/ppc again The mpc52xx_uart_of_enumerate() function was added when adding 52xx support to arch/powerpc, but it must not be called for arch/ppc. Signed-off-by: Grant Likely Signed-off-by: Paul Mackerras commit 9b3a6f4ab98809c93ac57fa5e11dff0575046efc Author: Grant Likely Date: Tue Jan 2 15:45:29 2007 -0700 [POWERPC] Don't include powerpc/sysdev/rom.o for arch/ppc builds sysdev/rom.c is for arch/powerpc only. Don't compile it when building an arch/ppc kernel. Signed-off-by: Grant Likely Acked-by: Sylvain Munaut Signed-off-by: Paul Mackerras commit a5b6ad6691763ee5eba46665d014d5abfe433df2 Author: Grant Likely Date: Tue Jan 2 15:44:44 2007 -0700 [POWERPC] Fix mpc52xx fdt to use correct device_type for sound devices This corrects the documented interface for mpc52xx device trees. Sound devices should be using 'sound' for the device_type field, not the type of sound interface. Signed-off-by: Grant Likely Acked-by: Sylvain Munaut Signed-off-by: Paul Mackerras commit 5c334eed6ecd66cebfbc80267149e755510d8bc8 Author: Sylvain Munaut Date: Tue Jan 2 23:29:53 2007 +0100 [POWERPC] 52xx: Don't use device_initcall to probe of_platform_bus Using device_initcall makes it happen for every platform that compiles this file in. This is really bad, for obvious reasons. Instead, we use the .init field of the machine description. If the platform needs the hook to do something specific it can provides its own function and call mpc52xx_declare_of_platform_devices from there. If not, the mpc52xx_declare_of_platform_devices function can directly be used as the init hook. Signed-off-by: Sylvain Munaut Acked-by: Grant Likely Signed-off-by: Paul Mackerras commit 56c336cb05d58991f3e9d5f0ec098ba0f219a15e Author: Stephen Rothwell Date: Tue Jan 2 16:13:50 2007 +1100 [POWERPC] Add legacy iSeries to ppc64_defconfig Since we can now boot legacy iSeries and other machines with the same config, enable legacy iSeries in ppc64_defconfig. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 338e997d94840baca115fb35dcf82867b1f3dc32 Author: Stephen Rothwell Date: Tue Jan 2 16:11:09 2007 +1100 [POWERPC] Update ppc64_defconfig Enabled new netfilter stuff corresponding to what was enabled before under different names, and turned on the gxt4500 video driver; otherwise just took the defaults. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 007d88d042d7b71aa2c9fc615aef97888e20ddf3 Author: David Woodhouse Date: Mon Jan 1 18:45:34 2007 +0000 [POWERPC] Fix manual assembly WARN_ON() in enter_rtas(). When we switched over to the generic BUG mechanism we forgot to change the assembly code which open-codes a WARN_ON() in enter_rtas(), so the bug table got corrupted. This patch provides an EMIT_BUG_ENTRY macro for use in assembly code, and uses it in entry_64.S. Tested with CONFIG_DEBUG_BUGVERBOSE on ppc64 but not without -- I tried to turn it off but it wouldn't go away; I suspect Aunt Tillie probably needed it. This version gets __FILE__ and __LINE__ right in the assembly version -- rather than saying include/asm-powerpc/bug.h line 21 every time which is a little suboptimal. Signed-off-by: David Woodhouse Signed-off-by: Paul Mackerras commit 673aeb76d07f49f2b07792f813bc2a9fee212ab7 Author: Michal Ostrowski Date: Wed Dec 20 07:29:40 2006 -0600 [POWERPC] Avoid calling get_irq_server() with a real, not virtual irq. We can use default_server when masking an interrupt vector. get_irq_server() assumes a virtual irq, so badness may happen if we give it a real one. Signed-off-by: Michal Ostrowski Signed-off-by: Paul Mackerras commit 5e264a5215e4b703b1bbeb2910ea4441886be8d7 Author: Nathan Lynch Date: Tue Jan 2 16:37:06 2007 -0600 [POWERPC] Fix unbalanced uses of of_node_put The (maple|pasemi)_init_IRQ functions call of_node_put(root) once more than they should, causing the refcount of the root node to underflow, which triggers the WARN_ON in kref_get. Signed-off-by: Nathan Lynch Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 6aa3e1e9447134ccda8b04b91c4ba8182274a78e Author: David Gibson Date: Fri Dec 22 09:23:03 2006 +1100 [POWERPC] Fix bogus BUG_ON() in in hugetlb_get_unmapped_area() The powerpc specific version of hugetlb_get_unmapped_area() makes some unwarranted assumptions about what checks have been made to its parameters by its callers. This will lead to a BUG_ON() if a 32-bit process attempts to make a hugepage mapping which extends above TASK_SIZE (4GB). I'm not sure if these assumptions came about because they were valid with earlier versions of the get_unmapped_area() path, or if it was always broken. Nonetheless this patch fixes the logic, and removes the crash. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit efa06708fe77190f31bed5c3cb5da49e211240f5 Merge: 86302f4... 0efc61e... Author: Linus Torvalds Date: Mon Jan 8 15:08:22 2007 -0800 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6 * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6: selinux: Delete mls_copy_context commit 86302f417561fec802f88fdfc343265689d4a596 Merge: 74bda93... 2dbda7d... Author: Linus Torvalds Date: Mon Jan 8 15:07:31 2007 -0800 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] PNX8550: Fix system timer support [MIPS] TX49: Fix use of CDEX build_store_reg() [MIPS] pnx8550: Fix write_config_byte() PCI config space accessor [MIPS] Fix build errors on SEAD [MIPS] SMTC build fix [MIPS] csum_partial and copy in parallel [MIPS] Malta: Add missing MTD file. commit 74bda9310fe9776f3d940057ac2e7881214577d6 Merge: fea5f1e... e97126c... Author: Linus Torvalds Date: Mon Jan 8 15:06:39 2007 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] Provide basic printk_clock() implementation [ARM] Resolve fuse and direct-IO failures due to missing cache flushes [ARM] pass vma for flush_anon_page() [ARM] Fix potential MMCI bug [ARM] Fix kernel-mode undefined instruction aborts [ARM] 4082/1: iop3xx: fix iop33x gpio register offset [ARM] 4070/1: arch/arm/kernel: fix warnings from missing includes [ARM] 4079/1: iop: Update MAINTAINERS commit fea5f1e19611d94fbf3905875a427c4cb959cd06 Author: Linus Torvalds Date: Mon Jan 8 15:04:46 2007 -0800 Revert "[PATCH] x86-64: Try multiple timer variants in check_timer" This reverts commit b026872601976f666bae77b609dc490d1834bf77, which has been linked to several problem reports with IO-APIC and the timer. Machines either don't boot because the timer doesn't happen, or we get double timer interrupts because we end up double-routing the timer irq through multiple interfaces. See for example http://lkml.org/lkml/2006/12/16/101 http://lkml.org/lkml/2007/1/3/9 http://bugzilla.kernel.org/show_bug.cgi?id=7789 about some of the discussion. Patches to fix this cleanup exist (and have been confirmed to work fine at least for some of the affected cases) and we'll revisit it for 2.6.21, but this late in the -rc series we're better off just reverting the incomplete commit that caused the problems. Suggested-by: Adrian Bunk Cc: Eric W. Biederman Cc: Yinghai Lu Cc: Andrew Morton Cc: Andi Kleen Signed-off-by: Linus Torvalds commit 0efc61eaee5471acd7399c8536feff280b4966dd Author: Venkat Yekkirala Date: Tue Dec 12 13:02:41 2006 -0600 selinux: Delete mls_copy_context This deletes mls_copy_context() in favor of mls_context_cpy() and replaces mls_scopy_context() with mls_context_cpy_low(). Signed-off-by: Venkat Yekkirala Acked-by: Stephen Smalley Signed-off-by: James Morris commit 2dbda7dceca81adfe57c8884be5c66e70822d89a Author: Vitaly Wool Date: Thu Dec 28 17:14:05 2006 +0300 [MIPS] PNX8550: Fix system timer support the patch inlined below restores proper time accounting for PNX8550-based boards. It also gets rid of #ifdef in the generic code which becomes unnecessary then. It's functionally identical to the previous patch with the same name but it has minor comments from Atsushi and Sergei taken into account. Signed-off-by: Vitaly Wool Signed-off-by: Ralf Baechle commit 33b06b513e804ae64ebd5105fb703ec90bd7e173 Author: Atsushi Nemoto Date: Mon Dec 18 00:38:21 2006 +0900 [MIPS] TX49: Fix use of CDEX build_store_reg() The commit a923660d786a53e78834b19062f7af2535f7f8ad accidently prevents TX49 from using CDEX. Use build_dst_pref() only if prefetch for store was really available. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit d98f92371461c5c8cc24e12a212c59b3f437b581 Author: Davy Chan Date: Fri Jan 5 13:56:46 2007 +0800 [MIPS] pnx8550: Fix write_config_byte() PCI config space accessor There's a serious typo in the function: arch/mips/pci/ops-pnx8550.c:write_config_byte() The parameter passed to the function config_access() is PCI_CMD_CONFIG_READ instead of PCI_CMD_CONFIG_WRITE. This renders any attempts to write a single byte to the PCI configuration registers useless. This problem does not exist for write_config_word() nor write_config_dword(). This problem has been there since kernel v2.6.17 and is still there as of kernel v2.6.19.1. Signed-off-by: Ralf Baechle commit f75f369fd783d194cb45632617561ca4d7045849 Author: Atsushi Nemoto Date: Mon Jan 8 01:27:40 2007 +0900 [MIPS] Fix build errors on SEAD Quick and dirty fix for build errors on SEAD. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f9bba75e378776ee4e97adc0555db16695d341e1 Author: Atsushi Nemoto Date: Mon Jan 8 00:50:34 2007 +0900 [MIPS] SMTC build fix Pass "irq" to __DO_IRQ_SMTC_HOOK() macro. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f860c90bd6ce22c6a0a352cc16acc74fba3d628e Author: Atsushi Nemoto Date: Wed Dec 13 01:22:06 2006 +0900 [MIPS] csum_partial and copy in parallel Implement optimized asm version of csum_partial_copy_nocheck, csum_partial_copy_from_user and csum_and_copy_to_user which can do calculate and copy in parallel, based on memcpy.S. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 61e84f99877fa8caaf1be86d51d825406e8d8bc1 Author: Ralf Baechle Date: Tue Dec 12 11:52:34 2006 +0000 [MIPS] Malta: Add missing MTD file. Signed-off-by: Ralf Baechle commit e97126cd9056b3b42cdc862ace2ed66f8026f55b Author: Russell King Date: Mon Jan 8 19:49:12 2007 +0000 [ARM] Provide basic printk_clock() implementation Current sched_clock() implementations on ARM cause unbootable kernels with PRINTK_TIME support enabled. To avoid this, provide a basic printk_clock() implementation which avoids sched_clock() being called before the page tables have been set up. Signed-off-by: Russell King commit 6020dff09252e3670a89edb36baaa4afb9b10d15 Author: Russell King Date: Sat Dec 30 23:17:40 2006 +0000 [ARM] Resolve fuse and direct-IO failures due to missing cache flushes fuse does not work on ARM due to cache incoherency issues - fuse wants to use get_user_pages() to copy data from the current process into kernel space. However, since this accesses userspace via the kernel mapping, the kernel mapping can be out of date wrt data written to userspace. This can lead to unpredictable behaviour (in the case of fuse) or data corruption for direct-IO. This resolves debian bug #402876 Signed-off-by: Russell King commit a6f36be32622730710b2fadacb6e2649defa4371 Author: Russell King Date: Sat Dec 30 22:24:19 2006 +0000 [ARM] pass vma for flush_anon_page() Since get_user_pages() may be used with processes other than the current process and calls flush_anon_page(), flush_anon_page() has to cope in some way with non-current processes. It may not be appropriate, or even desirable to flush a region of virtual memory cache in the current process when that is different to the process that we want the flush to occur for. Therefore, pass the vma into flush_anon_page() so that the architecture can work out whether the 'vmaddr' is for the current process or not. Signed-off-by: Russell King commit e47c222b22cd53c317a5573e1dc5f9e0cbd46380 Author: Russell King Date: Mon Jan 8 16:42:51 2007 +0000 [ARM] Fix potential MMCI bug The MMCI driver might end up aborting the initial command and leaving the data part of the command sequence still in place. Avoid this problem by ensuring that any data sequence is properly cleared out when a command completes. Signed-off-by: Russell King commit 98714cb161b4b1a5d0c5bd0337a8578196b73677 Author: Jack Morgenstein Date: Mon Dec 25 09:24:52 2006 +0200 IB/mthca: Fix PRM compliance problem in atomic-send completions According to the Tavor and Arbel programmer's reference manuals, the number of bytes transferred is not provided in the byte_cnt field of the CQ entry for atomic operation completions. For atomic operations, the number of bytes transferred is always 8 (when the status is "success"), and this constant value should always be used by the driver in the ib_wc entry returned, rather than using the CQE. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 0cefcf0bbc2d252eb48bff3289fb59c3817dd405 Author: Sean Hefty Date: Fri Jan 5 12:35:15 2007 -0800 RDMA/ucma: Don't report events with invalid user context There's a problem with how rdma cm events are reported to userspace that can lead to application crashes. When a new connection request arrives, a context for the connection is allocated in the kernel. The connection event is then reported to userspace. The userspace library retrieves the event and allocates its own context for the connection. The userspace context is associated with the kernel's context when accepting. This allows the kernel to give userspace context with other events. A problem occurs if a second event for the same connection occurs before the user has had a chance to call accept. The userspace context has not yet been set, which causes the librdmacm to crash. (This has been seen when the app takes too long to call accept, resulting in the remote side timing out and rejecting the connection) Fix this by ignoring events for new connections until userspace has set their context. This can only happen if an error occurs on a new connection before the user accepts it. This is okay, since the accept will just fail later. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 30a5ec982e4cfa955f93c454debaefc4d61d2da6 Author: Sean Hefty Date: Thu Dec 14 11:22:19 2006 -0800 RDMA/ucma: Fix struct ucma_event leak when backlog is full We discard new connection requests while the listen backlog is full, but leak a struct ucma_event in the process. Free the structure in this case. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 881a045fc5b454b57c69e010acecd5830d87e242 Author: Steve Wise Date: Fri Dec 15 16:50:17 2006 -0600 RDMA/iwcm: iWARP connection timeouts shouldn't be reported as rejects The iWARP CM should report timeouts as event RDMA_CM_EVENT_UNREACHABLE, not event RDMA_CM_EVENT_REJECTED. Signed-off-by: Steve Wise Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit e6331173c8703602d264b3388b515d00f72fc4ae Author: Jeff Garzik Date: Sun Jan 7 22:57:38 2007 -0500 Revert "[PATCH] e1000: disable TSO on the 82544 with slab debugging" This reverts commit 72f3ab7462f4e153d1e8ac78e379716ad71d6923, which was superceded by commit 683a2aa339f607c8a422835161ceab68b2a5a18a ("e1000: Do not truncate TSO TCP header with 82544 workaround"), which fixed the real problem. Signed-off-by: Jeff Garzik commit 3a6b95c81c522d9dbd36b33d33b08e66c87a6088 Author: Heiko Carstens Date: Thu Dec 28 13:05:36 2006 +0100 qeth: fix uaccess handling and get rid of unused variable [patch] qeth: fix uaccess handling and get rid of unused variable drivers/s390/net/qeth_main.c: In function `qeth_process_inbound_buffer': drivers/s390/net/qeth_main.c:2563: warning: unused variable `vlan_addr' include/asm/uaccess.h: In function `qeth_do_ioctl': drivers/s390/net/qeth_main.c:4847: warning: ignoring return value of `copy_to_user' drivers/s390/net/qeth_main.c:4849: warning: ignoring return value of `copy_to_user' drivers/s390/net/qeth_main.c:4996: warning: ignoring return value of `copy_to_user' Cc: Frank Pavlic Signed-off-by: Heiko Carstens Signed-off-by: Jeff Garzik commit 11897539a967059a817175ea57ad586a1faadd80 Merge: 80b02e5... fe5f8e2... Author: Jeff Garzik Date: Sun Jan 7 22:44:56 2007 -0500 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit 80b02e595c308a5deb2ad49bd6aa3ab1da9cdbdb Author: Ron Mercer Date: Wed Jan 3 16:26:07 2007 -0800 qla3xxx: Add delay to NVRAM register access. When accessing the 93LC86 serial prom the clock high and low times must be at least 250ns each. We have seen on some systems where the access times were much lower casing bit errors. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit ca16497a75d0e658858b6a8601f8c60250e73833 Author: Ron Mercer Date: Wed Jan 3 16:26:06 2007 -0800 qla3xxx: Remove NETIF_F_LLTX from driver features. Driver TX locking was removed some time ago, but the flag was overlooked. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 81ebd4988892869260808286641a5400aafcb3d1 Merge: bf81b46... a3ffab8... Author: Jeff Garzik Date: Sun Jan 7 22:33:56 2007 -0500 Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream-fixes commit f0938401f2252bf39615c0815734650eab9053c8 Author: Erez Zilber Date: Sun Jan 7 12:28:02 2007 +0200 IB/iser: Return error code when PDUs may not be sent iSER limits the number of outstanding PDUs to send. When this threshold is reached, it should return an error code (-ENOBUFS) instead of setting the suspend_tx bit (which should be used only by libiscsi). Signed-off-by: Erez Zilber Signed-off-by: Roland Dreier commit db6ccbb61c1291c8aaefadcc8304444f27eeb88d Author: Russell King Date: Sat Jan 6 22:53:48 2007 +0000 [ARM] Fix kernel-mode undefined instruction aborts If the kernel attempts to execute a CP1 or CP2 instruction and it aborts, and a FP emulator is not loaded, we try to return as if to a user context, instead of the proper kernel context. Since the fault came from kernel mode, we must use the kernel return paths. Signed-off-by: Russell King commit a3ffab87588234e41248d8cebd8cec88db605d3c Author: Aaron Salter Date: Sat Jan 6 09:51:41 2007 -0800 ixgb: Write RA register high word first, increment version We need to disable the AV bit before flushing the low register. Signed-off-by: Signed-off-by: Auke Kok commit dfd341e4e467d146901a3accb761f04fda535433 Author: Jesse Brandeburg Date: Sat Jan 6 09:51:38 2007 -0800 ixgb: Maybe stop TX if not enough free descriptors A similar patch to commit 65c7973fa5b46b024f38be208aa477e8daf9a603 but now for ixgb. Cc: Herbert Xu Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 5d9278537502d2e404e85485d1b905814fe728c0 Author: Jesse Brandeburg Date: Sat Jan 6 09:51:23 2007 -0800 ixgb: Fix early TSO completion This fix was already merged in commit 96f9c2e277768099479fbed7c3b69c294b1fadef but reverted in commit 989316ddfeafd0e8fb51a4d811383769ad62637a. After stresstesting we found that the fix does not add new regressions and works around a TX hang spotted by several users. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 4ac941d2d04ef26a91adf677f3a371818596305d Author: Dan Williams Date: Thu Jan 4 02:14:49 2007 +0100 [ARM] 4082/1: iop3xx: fix iop33x gpio register offset iop33x gpio offset is correct in include/asm-arm/arch-iop33x/iop33x.h, but include/asm-arm/hardware/iop3xx.h adds 4. Signed-off-by: Dan Williams Signed-off-by: Russell King commit 9ca3f07b869c1fbbdfdac3150019a3e4d2948d8e Author: Ben Dooks Date: Sun Dec 24 01:36:35 2006 +0100 [ARM] 4070/1: arch/arm/kernel: fix warnings from missing includes Include to fix the warning: arch/arm/kernel/traps.c:647:6: warning: symbol '__readwrite_bug' was not declared. Should it be static? Include to fix the warning: arch/arm/kernel/time.c:42:1: warning: symbol 'rtc_lock' was not declared. Should it be static? Signed-off-by: Ben Dooks Signed-off-by: Russell King commit e2bdb176ffae3fd2c162db897a05fbad044ff9e9 Author: Dan Williams Date: Tue Jan 2 18:32:37 2007 +0100 [ARM] 4079/1: iop: Update MAINTAINERS Signed-off-by: Dan Williams Signed-off-by: Russell King commit 46707e96b7254663139225ab6c9ab9922cd8c435 Author: Michael S. Tsirkin Date: Wed Jan 3 14:46:30 2007 +0200 IB/mthca: Fix off-by-one in FMR handling on memfree mthca_table_find() will return the wrong address when the table entry being searched for is exactly at the beginning of a sglist entry (other than the first), because it uses >= when it should use >. Example: assume we have 2 entries in scatterlist, 4K each, offset is 4K. The current code will return first entry + 4K when we really want the second entry. In particular this means mapping an FMR on a memfree HCA may end up writing the page table into the wrong place, leading to memory corruption and also causing the HCA to use an incorrect address translation table. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit fe5f8e2a1c5c040209c598a28e19c55f30e1040d Author: Zhu Yi Date: Wed Dec 20 16:11:58 2006 +0800 [PATCH] ipw2100: Fix dropping fragmented small packet problem The rx_data.header struct is ieee80211_hdr_4addr. If a wireless frame uses ieee80211_hdr_3addr header and is less than 6 bytes, it will be discarded. This is not likely going to happen for normal packets (since there is TCP, IP headers). But if fragmentation is used, there will be such small trailing packets. And they will be lost for ever. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 3eb546057dd65ec75c900c9948684ffd5e617630 Author: Zhu Yi Date: Mon Dec 18 17:26:13 2006 +0800 [PATCH] ieee80211: WLAN_GET_SEQ_SEQ fix (select correct region) The WLAN_GET_SEQ_SEQ(seq) macro in ieee80211 is selecting the wrong region. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville