commit 799dd75b1a8380a967c929a4551895788c374b31 Merge: 6bee582 afa0897 Author: Linus Torvalds Date: Mon Nov 9 09:58:31 2009 -0800 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c: Add an interface to lock/unlock an I2C bus segment i2c-piix4: Modify code name SB900 to Hudson-2 commit 6bee58259fce0baad7b02c7a48146d50fa7f6c3c Merge: d178f27 8dee721 Author: Linus Torvalds Date: Mon Nov 9 09:57:02 2009 -0800 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md/raid5: make sure curr_sync_completes is uptodate when reshape starts md: don't clear endpoint for resync when resync is interrupted. commit d178f27fc5150d680d9df865ea9dfe3269cf00a6 Author: Hugh Dickins Date: Mon Nov 9 15:58:23 2009 +0000 ksm: cond_resched in unstable tree KSM needs a cond_resched() for CONFIG_PREEMPT_NONE, in its unbounded search of the unstable tree. The stable tree cases already have one, and originally there was one down inside get_user_pages(); but I missed it when I converted to follow_page() instead. Signed-off-by: Hugh Dickins Acked-by: Izik Eidus Signed-off-by: Linus Torvalds commit b7b69c7e97bc0a6694e7052a200609fd48baafc2 Merge: 1ce5523 c083234 Author: Linus Torvalds Date: Mon Nov 9 09:52:55 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: fix missing cleanup of gc cache on error cases nilfs2: fix kernel oops in error case of nilfs_ioctl_move_blocks commit 1ce55238e2dd46b978b098a85cb3d3ea494e4a93 Merge: aa90763 2606289 Author: Linus Torvalds Date: Mon Nov 9 09:51:42 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits) net/fsl_pq_mdio: add module license GPL can: fix WARN_ON dump in net/core/rtnetlink.c:rtmsg_ifinfo() can: should not use __dev_get_by_index() without locks hisax: remove bad udelay call to fix build error on ARM ipip: Fix handling of DF packets when pmtudisc is OFF qlge: Set PCIe reset type for EEH to fundamental. qlge: Fix early exit from mbox cmd complete wait. ixgbe: fix traffic hangs on Tx with ioatdma loaded ixgbe: Fix checking TFCS register for TXOFF status when DCB is enabled ixgbe: Fix gso_max_size for 82599 when DCB is enabled macsonic: fix crash on PowerBook 520 NET: cassini, fix lock imbalance ems_usb: Fix byte order issues on big endian machines be2net: Bug fix to send config commands to hardware after netdev_register be2net: fix to set proper flow control on resume netfilter: xt_connlimit: fix regression caused by zero family value rt2x00: Don't queue ieee80211 work after USB removal Revert "ipw2200: fix oops on missing firmware" decnet: netdevice refcount leak netfilter: nf_nat: fix NAT issue in 2.6.30.4+ ... commit aa907639f1d9fe0e3274b4f6c1088542f750a539 Merge: a58695b 1c9d80d Author: Linus Torvalds Date: Mon Nov 9 09:51:15 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: Move of_set_property_mutex acquisition outside of devtree_lock grab. sparc64: replace parentheses in pmul() sparc64: Add a comment about why we only use certain memory barriers these days. commit a58695bb9d63764da9607bf1e7ff09ef03b190a8 Merge: 413623e 0fb18c4 Author: Linus Torvalds Date: Mon Nov 9 09:50:55 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: Revert "ide: try to use PIO Mode 0 during probe if possible" commit 413623e70765ffd5679c600aea28022e23d9f44b Merge: a314b0c f475f67 Author: Linus Torvalds Date: Mon Nov 9 09:50:15 2009 -0800 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: don't use CIFSGetSrvInodeNumber in is_path_accessible cifs: clean up handling when server doesn't consistently support inode numbers commit a314b0cf8c0802ac9a8aba4bbecc8587a0502391 Merge: 49456d8 969e46a Author: Linus Torvalds Date: Mon Nov 9 09:49:58 2009 -0800 Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Replace old style lock initializer sh: Account for cache aliases in flush_icache_range() sh: unwinder: Fix up invalid PC refetch in dwarf unwinder. serial: sh-sci: disable callback typo fix commit 49456d8d2c60a41b82d1ea8f8b49ea425e463b26 Merge: d5d6eba a556bec Author: Linus Torvalds Date: Mon Nov 9 09:47:21 2009 -0800 Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev * 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r: fix arch/m32r/boot/compressed/Makefile commit d5d6eba94b4c390c29e375bacabf9fdc2f01243d Merge: f0ede3f dede17b Author: Linus Torvalds Date: Mon Nov 9 09:30:14 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: snd-aica: declare MODULE_FIRMWARE ALSA: hda - Don't initialize CORB/RIRB for single_cmd mode ALSA: usb-audio: fix combine_word problem sound: Replace old style lock initializer ASoC: S3C64XX I2S: Enable audio-bus clock ASoC: OMAP: Don't try to set unsupported OMAP_DMA_DATA_BURST_16 on OMAP1 ALSA: hda, move hp_bseries_system sound: Use KERN_WARNING instead of KERN_WARN, which does not exist ALSA: intel8x0: Mute External Amplifier by default for another Sony model ALSA: hda - Add OLPC XO-1.5 PCI ID ALSA: hda - Enable GPIO control for mute LED on HP systems commit f0ede3f36188237d124b457d6735941d8e2cf981 Merge: 7c9abfb 43758dd Author: Linus Torvalds Date: Mon Nov 9 09:28:42 2009 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: sleep: another HP/Compaq DMI entries for init_set_sci_en_on_resume ACPI: add DMI entry for SCI_EN resume quirk on HP dv4 thermal: sysfs-api.txt - document passive attribute for thermal zones thermal: sysfs-api.txt - reformat for improved readability acpi: thermal: Add EOL to the trip_point_N_type strings ACPI: Move dereference after NULL test ACPICA: avoid "Info: mapping multiple BARs. Your kernel is fine." ACPI: add __cpuinit to acpi_processor_add() acpi-power-meter: Don't leak ACPI error codes to userspace eeepc-laptop: don't enable camera at startup if it's already on. Revert "eeepc-laptop: Prevent a panic when disabling RT2860 wireless when associated" ACPI: clean up video.c boundary checks and types commit 969e46a8533a3e40ce2146f6764a963b1f5505da Author: Thomas Gleixner Date: Fri Nov 6 22:42:05 2009 +0000 sh: Replace old style lock initializer SPIN_LOCK_UNLOCKED is deprecated. Use __SPIN_LOCK_UNLOCKED instead. Signed-off-by: Thomas Gleixner Cc: linux-sh@vger.kernel.org Signed-off-by: Paul Mundt commit a9d244a2ff163247b607c4bb64803230ca8f8acb Author: Matt Fleming Date: Thu Nov 5 23:14:39 2009 +0000 sh: Account for cache aliases in flush_icache_range() The icache may also contain aliases so we must account for them just like we do when manipulating the dcache. We usually get away with aliases in the icache because the instructions that are read from memory are read-only, i.e. they never change. However, the place where this bites us is when the code has been modified. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 1c9d80ddc60f8ac26344ec3db9830e5f8016c16d Author: David S. Miller Date: Sun Nov 8 17:41:20 2009 -0800 sparc: Move of_set_property_mutex acquisition outside of devtree_lock grab. Otherwise we try to sleep with preemption disabled, etc. Noticed by Thomas Gleixner. Signed-off-by: David S. Miller commit a556bec9955c8e47b40a87dbfeef6f24d3b2228f Author: Hirokazu Takata Date: Mon Nov 9 08:51:35 2009 +0900 m32r: fix arch/m32r/boot/compressed/Makefile - Fix a comment string - Fix a typo of $(suffix-y) Signed-off-by: Hirokazu Takata commit c083234f1592ef3fad3d8083663c5e4a357ec77c Author: Ryusuke Konishi Date: Sun Nov 8 12:09:24 2009 +0900 nilfs2: fix missing cleanup of gc cache on error cases This fixes an -rc1 regression brought by the commit: 1cf58fa840472ec7df6bf2312885949ebb308853 ("nilfs2: shorten freeze period due to GC in write operation v3"). Although the patch moved out a function call of nilfs_ioctl_move_blocks() to nilfs_ioctl_clean_segments() from nilfs_ioctl_prepare_clean_segments(), it didn't move corresponding cleanup job needed for the error case. This will move the missing cleanup job to the destination function. Signed-off-by: Ryusuke Konishi Acked-by: Jiro SEKIBA commit 5399dd1fc8f5e812db931225ef5f67d89f3b1a56 Author: Ryusuke Konishi Date: Sat Nov 7 18:45:16 2009 +0900 nilfs2: fix kernel oops in error case of nilfs_ioctl_move_blocks This fixes a kernel oops reported by Markus Trippelsdorf in the email titled "[NILFS users] kernel Oops while running nilfs_cleanerd". The oops was caused by a bug of error path in nilfs_ioctl_move_blocks() function, which was inlined in nilfs_ioctl_clean_segments(). nilfs_ioctl_move_blocks checks duplication of blocks which will be moved in garbage collection. But, the check should have be done within nilfs_ioctl_move_inode_block() to prevent list corruption among buffers storing the target blocks. To fix the kernel oops, this moves forward the duplication check before the list insertion. I also tested this for stable trees [2.6.30, 2.6.31]. Reported-by: Markus Trippelsdorf Signed-off-by: Ryusuke Konishi Cc: stable commit 2606289779cb297320a185db5997729d29b6700b Author: Sebastian Siewior Date: Fri Nov 6 08:50:28 2009 +0000 net/fsl_pq_mdio: add module license GPL or it will taint the kernel and fail to load becuase of_address_to_resource() is GPL only. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: David S. Miller commit 53a0ef866dc379e577794819d0b8ade5ba338e3a Author: Wolfgang Grandegger Date: Fri Nov 6 23:53:13 2009 +0000 can: fix WARN_ON dump in net/core/rtnetlink.c:rtmsg_ifinfo() On older kernels, e.g. 2.6.27, a WARN_ON dump in rtmsg_ifinfo() is thrown when the CAN device is registered due to insufficient skb space, as reported by various users. This patch adds the rtnl_link_ops "get_size" to fix the problem. I think this patch is required for more recent kernels as well, even if no WARN_ON dumps are triggered. Maybe we also need "get_xstats_size" for the CAN xstats. Signed-off-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 6755aebaaf9fc5416acfd4578ab7a1e122ecbc74 Author: Eric Dumazet Date: Fri Nov 6 00:23:01 2009 +0000 can: should not use __dev_get_by_index() without locks bcm_proc_getifname() is called with RTNL and dev_base_lock not held. It calls __dev_get_by_index() without locks, and this is illegal (might crash) Close the race by holding dev_base_lock and copying dev->name in the protected section. Signed-off-by: Eric Dumazet Signed-off-by: Oliver Hartkopp Signed-off-by: David S. Miller commit 88b938e63e68fd35e603421f722be0f35dde1016 Author: Roel Kluin Date: Sun Nov 8 00:26:56 2009 -0800 sparc64: replace parentheses in pmul() `>>' has a higher precedence than `?' so src2 evaluated to either 16 or 0 dependent on the bits set in rs2. Signed-off-by: Roel Kluin Signed-off-by: David S. Miller commit dede17b8e931eeaa38b0288e8d545d558d904942 Merge: f645073 1a69697 Author: Takashi Iwai Date: Sun Nov 8 09:16:15 2009 +0100 Merge branch 'fix/hda' into for-linus commit f6450739617977b81035edd0d42a3fac514c1a7b Merge: 6fc786d f37325a Author: Takashi Iwai Date: Sun Nov 8 09:16:06 2009 +0100 Merge branch 'fix/misc' into for-linus commit f37325a956f0ee4356793da7d93c699a25b21d92 Author: Ben Hutchings Date: Sat Nov 7 22:13:39 2009 +0000 ALSA: snd-aica: declare MODULE_FIRMWARE Signed-off-by: Ben Hutchings Signed-off-by: Takashi Iwai commit afa08974fe80c198b8650f73ed8ab59135ca10d0 Author: Jean Delvare Date: Sat Nov 7 13:10:46 2009 +0100 i2c: Add an interface to lock/unlock an I2C bus segment Some drivers need to be able to prevent access to an I2C bus segment for a specific period of time. Add an interface for them to do so without twiddling with i2c-core internals. Signed-off-by: Jean Delvare Acked-by: Ben Hutchings commit 3806e94b0148350c72f9a3214274026b6ca03f49 Author: Crane Cai Date: Sat Nov 7 13:10:46 2009 +0100 i2c-piix4: Modify code name SB900 to Hudson-2 Change SB900 to its formal code name Hudson-2. Signed-off-by: Crane Cai Signed-off-by: Jean Delvare commit 1a6969788ef2d5bc3169eee59def6b267182f136 Author: Takashi Iwai Date: Sat Nov 7 09:49:04 2009 +0100 ALSA: hda - Don't initialize CORB/RIRB for single_cmd mode So far, CORB/RIRB still remains even if the driver is switched to the single_cmd mode. The specification says that this should be disabled, but I hoped this isn't the case; indeed most devices worked together with CORB/RIRB. However, Poulsbo (US15W) seems problematic with this setup, and it requires to disable CORB/RIRB when single_cmd is used. Now this patch disables CORB/RIRB initialization when the single_cmd mode is used. Also the unsolicited event is disabled because it can't work without RIRB. Reported-and-tested-by: Troy Kisky Signed-off-by: Takashi Iwai commit f495088210c8b9e20791d995a8210170c68d2deb Author: Julian Anastasov Date: Fri Nov 6 23:44:53 2009 +0200 ALSA: usb-audio: fix combine_word problem Fix combine_word problem where first octet is not read properly. The only affected place seems to be the INPUT_TERMINAL type. Before now, sound controls can be created with the output terminal's name which is a fallback mechanism used only for unknown input terminal types. For example, Line can wrongly appear as Speaker. After the change it should appear as Line. The side effect of this change can be that users can expect the wrong control name in their scripts or programs while now we return the correct one. Probably, these defines should use get_unaligned_le16 and friends. Signed-off-by: Julian Anastasov Cc: Signed-off-by: Takashi Iwai commit 70edc800a39327174d3244f9226ce8cacd01dc91 Author: Thomas Gleixner Date: Fri Nov 6 22:41:29 2009 +0000 sound: Replace old style lock initializer SPIN_LOCK_UNLOCKED is deprecated. Use __SPIN_LOCK_UNLOCKED instead. Signed-off-by: Thomas Gleixner Signed-off-by: Takashi Iwai commit cc05368c52fed7d9efa0f56c5270e95bb569713e Author: Martin Michlmayr Date: Fri Nov 6 14:52:34 2009 +0000 hisax: remove bad udelay call to fix build error on ARM The hisax ISDN driver fails to build on ARM with CONFIG_HISAX_ELSA: | drivers/built-in.o: In function `modem_set_dial': | drivers/isdn/hisax/elsa_ser.c:535: undefined reference to `__bad_udelay' | drivers/isdn/hisax/elsa_ser.c:544: undefined reference to `__bad_udelay' | drivers/built-in.o: In function `modem_set_init': | drivers/isdn/hisax/elsa_ser.c:486: undefined reference to `__bad_udelay' | [...] According to the comment in arch/arm/include/asm/delay.h, __bad_udelay is specifically designed on ARM to produce a build failure when udelay is called with a value > 2000. Signed-off-by: Martin Michlmayr Signed-off-by: David S. Miller commit 23ca0c989e46924393f1d54bec84801d035dd28e Author: Herbert Xu Date: Fri Nov 6 10:37:41 2009 +0000 ipip: Fix handling of DF packets when pmtudisc is OFF RFC 2003 requires the outer header to have DF set if DF is set on the inner header, even when PMTU discovery is off for the tunnel. Our implementation does exactly that. For this to work properly the IPIP gateway also needs to engate in PMTU when the inner DF bit is set. As otherwise the original host would not be able to carry out its PMTU successfully since part of the path is only visible to the gateway. Unfortunately when the tunnel PMTU discovery setting is off, we do not collect the necessary soft state, resulting in blackholes when the original host tries to perform PMTU discovery. This problem is not reproducible on the IPIP gateway itself as the inner packet usually has skb->local_df set. This is not correctly cleared (an unrelated bug) when the packet passes through the tunnel, which allows fragmentation to occur. For hosts behind the IPIP gateway it is readily visible with a simple ping. This patch fixes the problem by performing PMTU discovery for all packets with the inner DF bit set, regardless of the PMTU discovery setting on the tunnel itself. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 73475339005dc68eb0bd2f6b1e93a3a39b628410 Author: Ron Mercer Date: Fri Nov 6 07:44:58 2009 +0000 qlge: Set PCIe reset type for EEH to fundamental. This device requires a fundamental reset when recovering from EEH. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 60fa6c374e7efcbed04bc6d11d3b35645c523b2f Author: Ron Mercer Date: Fri Nov 6 07:44:57 2009 +0000 qlge: Fix early exit from mbox cmd complete wait. This line was accidentally left out of the previous commit # da03945140a035a2962f7f93e359085596f20499 ("qlge: Fix firmware mailbox command timeout."). Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit ee5f784a2d48cdacf561e99b2d01b23364189474 Author: Don Skidmore Date: Fri Nov 6 12:56:20 2009 +0000 ixgbe: fix traffic hangs on Tx with ioatdma loaded When ioatdma was loaded we we were unable to transmit traffic. We weren't using the correct registers in ixgbe_update_tx_dca for 82599 systems. Likewise in ixgbe_configure_tx() we weren't disabling the arbiter before modifying MTQC. Signed-off-by: Don Skidmore Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 26f23d82dd8eae6dcc2ab99c04a9256089576a73 Author: Yi Zou Date: Fri Nov 6 12:56:00 2009 +0000 ixgbe: Fix checking TFCS register for TXOFF status when DCB is enabled When DCB is enabled, the ixgbe_check_tx_hang() should check the corresponding TC's TXOFF in TFCS based on the TC that the tx ring belongs to. Adds a function to map from the tx_ring hw reg_idx to the correspodning TC and read TFCS accordingly. Signed-off-by: Yi Zou Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit b352e40da8977253f49850a24f6448653a459ac0 Author: Yi Zou Date: Fri Nov 6 12:55:38 2009 +0000 ixgbe: Fix gso_max_size for 82599 when DCB is enabled The 32k gso_max_size when DCB is enabled is for 82598 only, not for 82599. Signed-off-by: Yi Zou Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit dcaa6a9414cdc767c0afba4705c25ae9cf6096b5 Author: Finn Thain Date: Tue Nov 3 03:42:40 2009 +0000 macsonic: fix crash on PowerBook 520 No-one seems to know where the PowerBook 500 series store their ethernet MAC addresses. So, rather than crash, use a MAC address from the SONIC CAM. Failing that, generate a random one. Signed-off-by: Finn Thain Signed-off-by: David S. Miller commit 87d75b52414a22c54cf8382bcdd329376b1bce78 Author: Jiri Slaby Date: Thu Nov 5 23:14:29 2009 +0000 NET: cassini, fix lock imbalance Stanse found that one error path in cas_open omits to unlock pm_mutex. Fix that. Signed-off-by: Jiri Slaby Signed-off-by: David S. Miller commit 2b2072e902848a63168570f500a5726744b3873a Author: Sebastian Haas Date: Wed Nov 4 05:48:33 2009 +0000 ems_usb: Fix byte order issues on big endian machines CPC-USB is using a ARM7 core with little endian byte order. The "id" field in can_msg needs byte order conversion from/to CPU byte order. Signed-off-by: Sebastian Haas Signed-off-by: David S. Miller commit 4f2aa89cd263932d61f286307771996df76bf63e Author: Ajit Khaparde Date: Fri Nov 6 02:07:32 2009 +0000 be2net: Bug fix to send config commands to hardware after netdev_register Sending config commands to be2 hardware before netdev_register is completed, is sometimes causing the async link notification to arrive even before the driver is ready to handle it. The commands for vlan config and flow control settings can infact wait till be_open. This patch takes care of that. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 9e90c961134929678022aee0c68b16c1ed520614 Author: Ajit Khaparde Date: Fri Nov 6 02:06:59 2009 +0000 be2net: fix to set proper flow control on resume If be2 goes into suspend after a user changes the flow control settings, we are not programming them back after resume. This patch takes care of it. We now get the flow control settings before going to suspend mode and then apply them during resume. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit bb7b22840141a4fab8f232ee90d30cdf728bb032 Merge: 539054a 66f84d6 Author: David S. Miller Date: Fri Nov 6 18:21:44 2009 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 539054a8fa5141c9a4e9ac6a86d249e3f2bdef45 Author: Jan Engelhardt Date: Fri Nov 6 18:08:32 2009 -0800 netfilter: xt_connlimit: fix regression caused by zero family value Commit v2.6.28-rc1~717^2~109^2~2 was slightly incomplete; not all instances of par->match->family were changed to par->family. References: http://bugzilla.netfilter.org/show_bug.cgi?id=610 Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f475f6775465283494346663f201ad04810d2e8a Author: Jeff Layton Date: Fri Nov 6 14:18:49 2009 -0500 cifs: don't use CIFSGetSrvInodeNumber in is_path_accessible Because it's lighter weight, CIFS tries to use CIFSGetSrvInodeNumber to verify the accessibility of the root inode and then falls back to doing a full QPathInfo if that fails with -EOPNOTSUPP. I have at least a report of a server that returns NT_STATUS_INTERNAL_ERROR rather than something that translates to EOPNOTSUPP. Rather than trying to be clever with that call, just have is_path_accessible do a normal QPathInfo. That call is widely supported and it shouldn't increase the overhead significantly. Cc: Stable Signed-off-by: Jeff Layton Signed-off-by: Steve French commit ec06aedd44541129840ed52e6165afa3796a27bf Author: Jeff Layton Date: Fri Nov 6 14:18:29 2009 -0500 cifs: clean up handling when server doesn't consistently support inode numbers It's possible that a server will return a valid FileID when we query the FILE_INTERNAL_INFO for the root inode, but then zeroed out inode numbers when we do a FindFile with an infolevel of SMB_FIND_FILE_ID_FULL_DIR_INFO. In this situation turn off querying for server inode numbers, generate a warning for the user and just generate an inode number using iunique. Once we generate any inode number with iunique we can no longer use any server inode numbers or we risk collisions, so ensure that we don't do that in cifs_get_inode_info either. Cc: Stable Reported-by: Timothy Normand Miller Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 66f84d6594729c866c0c03fe97159a987dad7d84 Author: Sean Cross Date: Thu Nov 5 20:22:03 2009 +0100 rt2x00: Don't queue ieee80211 work after USB removal This prevents the rt2x00 driver from queueing ieee80211 work after the   USB card has been removed, preventing a kernel panic. Signed-off-by: Sean Cross Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 143d40f3ab8fbd8ca2fe712ec8e072d687142804 Author: John W. Linville Date: Fri Nov 6 12:58:20 2009 -0500 Revert "ipw2200: fix oops on missing firmware" This reverts commit e6c5fc53d0f44a772398402ee8a1879818e42b4e. Based on this regression report: Date: Thu, 05 Nov 2009 15:59:16 +0100 From: Holger Schurig To: linux-wireless@vger.kernel.org Subject: BUG: oops when "rmmod ipw2200" This happened on wireless-testing v2.6.32-rc6-41575-g5e68bfb. I modprobed ipw2200, put it into monitor mode, used tshark a while to monitor, then I stopped tshark, "ifconfig eth2 down" and finally "rmmod ipw2200", and voila: [ 917.189620] ------------[ cut here ]------------ [ 917.189717] kernel BUG at net/wireless/core.c:543! [ 917.189805] invalid opcode: 0000 [#1] PREEMPT SMP [ 917.190002] last sysfs file: /sys/devices/pci0000:00/0000:00:1e.0/0000:02:0d.0/firmware/0000:02:0d.0/loading [ 917.190136] Modules linked in: lib80211_crypt_wep ipw2200(-) libipw lib80211 ath5k mac80211 ath cfg80211 psmouse uhci_hcd [ 917.190680] [ 917.190759] Pid: 1763, comm: rmmod Not tainted (2.6.32-rc6-wl #26) Amilo M1425 [ 917.190886] EIP: 0060:[] EFLAGS: 00010202 CPU: 0 [ 917.190992] EIP is at wiphy_unregister+0xd3/0x175 [cfg80211] [ 917.191083] EAX: f601d4c4 EBX: 00000000 ECX: 00000000 EDX: f79e8600 [ 917.191176] ESI: f601d400 EDI: f95b4350 EBP: f6009eb4 ESP: f6009e8c [ 917.191269] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 [ 917.191360] Process rmmod (pid: 1763, ti=f6008000 task=f79e8130 task.ti=f6008000) [ 917.191486] Stack: [ 917.191562] f601d5a0 f601d484 f6460e98 f6009ea0 c01407ee f6009eb8 00000246 f64604c0 [ 917.191916] <0> f6460e5c f95b4350 f6009ec0 f94fd030 f6460e98 f6009edc f95a9d4f f787bc00 [ 917.192100] <0> f787bc58 f787bc00 f95b4350 f95b4350 f6009ee8 c0207fca f787bc58 f6009ef8 [ 917.192100] Call Trace: [ 917.192100] [] ? trace_hardirqs_on+0xb/0xd [ 917.192100] [] ? unregister_ieee80211+0xe/0x27 [libipw] [ 917.192100] [] ? ipw_pci_remove+0x59/0x227 [ipw2200] [ 917.192100] [] ? pci_device_remove+0x19/0x39 [ 917.192100] [] ? __device_release_driver+0x59/0x9d [ 917.192100] [] ? driver_detach+0x67/0x85 [ 917.192100] [] ? bus_remove_driver+0x69/0x85 [ 917.192100] [] ? driver_unregister+0x4d/0x54 [ 917.192100] [] ? pci_unregister_driver+0x28/0x71 [ 917.192100] [] ? ipw_exit+0x1c/0x1e [ipw2200] [ 917.192100] [] ? sys_delete_module+0x192/0x1ef [ 917.192100] [] ? remove_vma+0x52/0x58 [ 917.192100] [] ? sysenter_exit+0xf/0x18 [ 917.192100] [] ? sysenter_do_call+0x12/0x36 [ 917.192100] Code: 74 07 e8 81 bc 8c c7 eb c8 8d 55 e0 89 f8 e8 d6 6d 66 c7 8b 45 dc 31 d2 e8 81 cc 8c c7 8d 86 c4 00 00 00 39 86 c4 00 00 00 74 04 <0f> 0b eb fe 8b 45 dc 8d 5e 0c e8 5a cc 8c c7 8b 86 94 03 00 00 [ 917.192100] EIP: [] wiphy_unregister+0xd3/0x175 [cfg80211] SS:ESP 0068:f6009e8c [ 917.203718] ---[ end trace bcaaf449945a5100 ]--- Signed-off-by: John W. Linville commit 6fc786d5034ed7ce2d43c459211137de6d99dd28 Author: Jassi Brar Date: Fri Nov 6 18:00:24 2009 +0900 ASoC: S3C64XX I2S: Enable audio-bus clock Added the missing clk_enable after acquiring the 'audio-bus' clock. Signed-off-by: Jassi Brar Signed-off-by: Mark Brown commit 4d187fb830a7aa8afb471124abe41b04caf49401 Author: Janusz Krzysztofik Date: Wed Oct 21 23:10:03 2009 +0200 ASoC: OMAP: Don't try to set unsupported OMAP_DMA_DATA_BURST_16 on OMAP1 After DMA burst mode has been introduced in sound/soc/omap/omap-pcm.c, omap_pcm_prepare() unconditionally calls: omap_set_dma_src_burst_mode(prtd->dma_ch, OMAP_DMA_DATA_BURST_16); omap_set_dma_dest_burst_mode(prtd->dma_ch, OMAP_DMA_DATA_BURST_16); Current implementation of those two functions found in arch/arm/plat-ompa/dma.c doesn't support OMAP_DMA_DATA_BURST_16 on OMAP1 at all, so they both end with BUG() on that machine. That results in ASoC being completely unusable, at least on my OMAP5910 based Amstrad Delta. The patch corrects the problem by not calling those two functions when run on OMAP1 class based machines. Created against linux-2.6.32-rc5. Tested on Amstrad Delta. Signed-off-by: Janusz Krzysztofik Acked-by: Jarkko Nikula Signed-off-by: Mark Brown commit 0fb18c4777ff424c1db694af98443a201fa4fc30 Author: David S. Miller Date: Fri Nov 6 04:52:50 2009 -0800 Revert "ide: try to use PIO Mode 0 during probe if possible" This reverts commit 6029336426a2b43e4bc6f4a84be8789a047d139e. Ok, we really do need to revert this, even with Bart's sis5513.c fix in there. The problem is that several driver's ->set_pio_mode() method depends upon the drive->media type being set properly. Most of them use this to enable prefetching, which can only be done for disk media. But the commit being reverted here calls ->set_pio_mode() before it's setup. Actually it considers everything disk because that is the default media type set by ide_port_init_devices_data(). The set of drivers that depend upon the media type in their ->set_pio_method() are: drivers/ide/alim15x3.c drivers/ide/it8172.c drivers/ide/it8213.c drivers/ide/pdc202xx_old.c drivers/ide/piix.c drivers/ide/qd65xx.c drivers/ide/sis5513.c drivers/ide/slc90e66.c And it is possible that we could fix this by guarding the prefetching and other media dependent setting changes with a test on IDE_PFLAG_PROBING in hwif->port_flags, that's simply too risky for 2.6.32-rcX and -stable. Signed-off-by: David S. Miller commit 887e671f324d9898aaedb29a6ece6c853c394067 Author: Eric Dumazet Date: Fri Nov 6 00:50:39 2009 -0800 decnet: netdevice refcount leak While working on device refcount stuff, I found a device refcount leak through DECNET. This nasty bug can be used to hold refcounts on any !DECNET netdevice. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit f9dd09c7f7199685601d75882447a6598be8a3e0 Author: Jozsef Kadlecsik Date: Fri Nov 6 00:43:42 2009 -0800 netfilter: nf_nat: fix NAT issue in 2.6.30.4+ Vitezslav Samel discovered that since 2.6.30.4+ active FTP can not work over NAT. The "cause" of the problem was a fix of unacknowledged data detection with NAT (commit a3a9f79e361e864f0e9d75ebe2a0cb43d17c4272). However, actually, that fix uncovered a long standing bug in TCP conntrack: when NAT was enabled, we simply updated the max of the right edge of the segments we have seen (td_end), by the offset NAT produced with changing IP/port in the data. However, we did not update the other parameter (td_maxend) which is affected by the NAT offset. Thus that could drift away from the correct value and thus resulted breaking active FTP. The patch below fixes the issue by *not* updating the conntrack parameters from NAT, but instead taking into account the NAT offsets in conntrack in a consistent way. (Updating from NAT would be more harder and expensive because it'd need to re-calculate parameters we already calculated in conntrack.) Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f5209b4446d185cc95f46363f8043a743530c15a Author: Sathya Perla Date: Fri Nov 6 00:31:01 2009 -0800 be2net: Fix CQE_STATUS_EXTD_SHIFT define Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 421b541110b20ccff1a7ff3245439cb24efe9812 Author: Paul Mundt Date: Fri Nov 6 17:23:33 2009 +0900 sh: unwinder: Fix up invalid PC refetch in dwarf unwinder. The dwarf unwinder presently attempts to provide a sane PC value if none is provided, however the logic is broken and cases where a previous valid dwarf frame exists along with a bogus PC value can still proceed. This fixes up the test and prevents the unwinder from blowing up. Signed-off-by: Paul Mundt commit 345e5a7672f561b539b3249cbe437b8d6595ab1b Author: Magnus Damm Date: Thu Nov 5 14:34:57 2009 +0000 serial: sh-sci: disable callback typo fix Avoid invoking the disable callback in case of NULL. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 43758dd88fdf1e5b3897c7a04dfae0afb8313dea Merge: 12308a2 2839d39 Author: Len Brown Date: Fri Nov 6 01:45:11 2009 -0500 Merge branch 'bugzilla-13449' into release commit b4ec824021493ba6cb7eeb61572f4d2f8a80a52e Author: Eric Dumazet Date: Thu Nov 5 20:56:07 2009 -0800 rose: device refcount leak While hunting dev_put() for net-next-2.6, I found a device refcount leak in ROSE, ioctl(SIOCADDRT) error path. Fix is to not touch device refcount, as we hold RTNL Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 1056bd51674e529813213186471bb4ac6689a755 Author: Stephen Hemminger Date: Thu Nov 5 20:46:52 2009 -0800 bridge: prevent bridging wrong device The bridge code assumes ethernet addressing, so be more strict in the what is allowed. This showed up when GRE had a bug and was not using correct address format. Add some more comments for increased clarity. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4eb0c00b6221f28b8988df37c9cb1bc5a2b91b39 Author: David S. Miller Date: Thu Nov 5 20:24:33 2009 -0800 sparc64: Add a comment about why we only use certain memory barriers these days. Based upon feedback from Mathieu Desnoyers. Signed-off-by: David S. Miller commit 2839d396e3ae0891c1fdd87aa1cea218e6f5c4df Author: Vaibhav Verma Date: Thu Nov 5 23:13:36 2009 -0500 ACPI: sleep: another HP/Compaq DMI entries for init_set_sci_en_on_resume http://bugzilla.kernel.org/show_bug.cgi?id=13745 Signed-off-by: Len Brown commit 8a1cbf64977f89e9e9bc1d80dd01503337424f96 Author: Gustavo Maciel Dias Vieira Date: Mon Oct 19 09:41:53 2009 -0200 ACPI: add DMI entry for SCI_EN resume quirk on HP dv4 Fixes the missing battery on sleep problem for yet another HP laptop ("HP Pavilion dv4"). Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=13449 Signed-off-by: Gustavo Maciel Dias Vieira Signed-off-by: Len Brown commit 8dee7211467a56b7eb4e4359efb0aa4a72e1b6f3 Author: NeilBrown Date: Fri Nov 6 14:59:29 2009 +1100 md/raid5: make sure curr_sync_completes is uptodate when reshape starts This value is visible through sysfs and is used by mdadm when it manages a reshape (backing up data that is about to be rearranged). So it is important that it is always correct. Current it does not get updated properly when a reshape starts which can cause problems when assembling an array that is in the middle of being reshaped. This is suitable for 2.6.31.y stable kernels. Cc: stable@kernel.org Signed-off-by: NeilBrown commit 24395a85d8efe6eee477ea35c73d045a8dd7a3a1 Author: NeilBrown Date: Fri Nov 6 14:59:27 2009 +1100 md: don't clear endpoint for resync when resync is interrupted. If a 'sync_max' has been set (via sysfs), it is wrong to clear it until a resync (or reshape or recovery ...) actually reached that point. So if a resync is interrupted (e.g. by device failure), leave 'resync_max' unchanged. This is particularly important for 'reshape' operations that do not change the size of the array. For such operations mdadm needs to monitor the reshape taking rolling backups of the section being reshaped. If resync_max gets cleared, the reshape can get ahead of mdadm and then the backups that mdadm creates are useless. This is suitable for 2.6.31.y stable kernels. Cc: stable@kernel.org Signed-off-by: NeilBrown commit 12308a2f2703d135681b3e9cf582009747f588f7 Merge: 91d3f9b 29226ed 80f0c89 d410ee5 Author: Len Brown Date: Thu Nov 5 18:31:18 2009 -0500 Merge branches 'misc', 'eeepc-laptop' and 'bugzilla-14445' into release commit 29226ed3c3b5cd0b2b0b1fb40ffeac3f796b80e9 Author: Frans Pop Date: Mon Oct 26 08:39:00 2009 +0100 thermal: sysfs-api.txt - document passive attribute for thermal zones Signed-off-by: Frans Pop Acked-by: Zhang Rui Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 38bb0849a6799e05bb474a88f198522ae4ecace2 Author: Frans Pop Date: Mon Oct 26 08:38:59 2009 +0100 thermal: sysfs-api.txt - reformat for improved readability The document currently uses large indentations which make the text too wide for easy readability. Also improve general consistency. Signed-off-by: Frans Pop Acked-by: Zhang Rui Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 625120a42bd4371da98808a4ca3e7589083a06d8 Author: Amit Kucheria Date: Fri Oct 16 12:46:02 2009 +0300 acpi: thermal: Add EOL to the trip_point_N_type strings Make the trip_point_N_type sysfs files return a string ending in EOL for consistency with other sysfs files. Signed-off-by: Amit Kucheria Acked-by: Zhang Rui Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 5cfa245b0b63c3d79568e78a1ee3d00654d5517d Author: Julia Lawall Date: Sat Oct 17 08:34:39 2009 +0200 ACPI: Move dereference after NULL test If the NULL test on pr is needed, then the dereference should be after the NULL test. A simplified version of the semantic match that detects this problem is as follows (http://coccinelle.lip6.fr/): // @match exists@ expression x, E; identifier fld; @@ * x->fld ... when != \(x = E\|&x\) * x == NULL // Signed-off-by: Julia Lawall Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit d410ee5109a1633a686a5663c6743a92e1181f9b Author: Bob Moore Date: Thu Oct 22 09:11:11 2009 +0800 ACPICA: avoid "Info: mapping multiple BARs. Your kernel is fine." Ensure that memory mappings created for operation regions do not cross page boundaries. Crossing a page boundary while mapping regions can cause warnings if the pages have different attributes. Such regions are probably BIOS bugs, and this is the workaround. http://bugzilla.kernel.org/show_bug.cgi?id=14445 [Kernel summit hacking hour] Signed-off-by: Bob Moore Acked-by: Suresh Siddha Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 941b10fab2cbd90ac7ad6bc2338ffe30e1d3ce53 Author: Rakib Mullick Date: Thu Nov 5 16:51:40 2009 -0500 ACPI: add __cpuinit to acpi_processor_add() Annote acpi_processor_add with cpuinit since it calls a cpuinit function acpi_processor_power_init and fixes a section mismatch warning. We were warned by the following warning: LD drivers/acpi/processor.o WARNING: drivers/acpi/processor.o(.text+0x1829): Section mismatch in reference from the function acpi_processor_add() to the function .cpuinit.text:acpi_processor_power_init() The function acpi_processor_add() references the function __cpuinit acpi_processor_power_init(). This is often because acpi_processor_add lacks a __cpuinit annotation or the annotation of acpi_processor_power_init is wrong. Signed-off-by: Rakib Mullick Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 7c9abfb884b8737f0afdc8a88bcea77526f0da87 Merge: e5a9236 abb3911 Author: Linus Torvalds Date: Thu Nov 5 13:24:15 2009 -0800 Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: get_tss_base_addr() should return a gpa_t KVM: x86: Catch potential overrun in MCE setup commit e5a92362226e1685988bbf8d7ed50ab23453acc0 Merge: 4397989 5219f34 Author: Linus Torvalds Date: Thu Nov 5 13:23:29 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: invalidate target of rename fuse: fix kunmap in fuse_ioctl_copy_user fuse: prevent fuse_put_request on invalid pointer commit 4397989fc91ed289909ecf307c2dc21cee0e7905 Merge: 1bbc9a6 de19d02 Author: Linus Torvalds Date: Thu Nov 5 13:23:16 2009 -0800 Merge git://git.infradead.org/users/dwmw2/mtd-2.6.32 * git://git.infradead.org/users/dwmw2/mtd-2.6.32: mtd/maps: gpio-addr-flash: depend on GPIO arch support mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/ mtd: nand: fix htmldocs warnings commit 1bbc9a66d0194449f32c2aa18be40db5744dbd85 Merge: 2c75910 38634e6 Author: Linus Torvalds Date: Thu Nov 5 13:22:49 2009 -0800 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/kvm: Remove problematic BUILD_BUG_ON statement powerpc/pci: Fix regression in powerpc MSI-X powerpc: Avoid giving out RTC dates below EPOCH powerpc/mm: Remove debug context clamping from nohash code powerpc: Cleanup Kconfig selection of hugetlbfs support commit 2c75910f1aa042be1dd769378d2611bf551721ac Author: Chris Lalancette Date: Thu Nov 5 11:47:08 2009 +0100 x86: Make sure get_user_desc() doesn't sign extend. The current implementation of get_user_desc() sign extends the return value because of integer promotion rules. For the most part, this doesn't matter, because the top bit of base2 is usually 0. If, however, that bit is 1, then the entire value will be 0xffff... which is probably not what the caller intended. This patch casts the entire thing to unsigned before returning, which generates almost the same assembly as the current code but replaces the final "cltq" (sign extend) with a "mov %eax %eax" (zero-extend). This fixes booting certain guests under KVM. Signed-off-by: Chris Lalancette Signed-off-by: Linus Torvalds commit 9a6fc8d0f8c3ee3d42417e8315fc8c8fae1d3213 Merge: d4116f8 82d6469 Author: Linus Torvalds Date: Thu Nov 5 10:58:07 2009 -0800 Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen * 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: xen: mask extended topology info in cpuid xen/hvc: make sure console output is always emitted, with explicit polling commit d4116f820496ae3af5225d09450edc7791df0045 Merge: 608221f 4c3da22 Author: Linus Torvalds Date: Thu Nov 5 10:57:39 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: sysfs: Don't leak secdata when a sysfs_dirent is freed. commit 608221fdf9a2170962295dcfbea53dc5c50d1a74 Merge: 72cc129 b84ff7d Author: Linus Torvalds Date: Thu Nov 5 10:56:47 2009 -0800 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Fix kthread_bind() by moving the body of kthread_bind() to sched.c sched: Disable SD_PREFER_LOCAL at node level sched: Fix boot crash by zalloc()ing most of the cpu masks sched: Strengthen buddies and mitigate buddy induced latencies commit 72cc129e8dae988d2a132467cfd0ecd7623c35fb Merge: 411094a ed146b2 Author: Linus Torvalds Date: Thu Nov 5 10:56:25 2009 -0800 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ftrace: Fix unmatched locking in ftrace_regex_write() ring-buffer: Synchronize resizing buffer with reader lock commit 411094acb70f171a111710cf32031c749ffdd28c Merge: 8fcf4e5 89240ba Author: Linus Torvalds Date: Thu Nov 5 10:54:08 2009 -0800 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, fs: Fix x86 procfs stack information for threads on 64-bit x86: Add reboot quirk for 3 series Mac mini x86: Fix printk message typo in mtrr cleanup code dma-debug: Fix compile warning with PAE enabled x86/amd-iommu: Un__init function required on shutdown x86/amd-iommu: Workaround for erratum 63 commit 8fcf4e5a572af520580b14abd9017760e6fcdada Merge: bd90175 45cdd47 Author: Linus Torvalds Date: Thu Nov 5 10:53:49 2009 -0800 Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev * 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r: Should index be positive? m32r: bzip2/lzma kernel compression support m32r: add NOTES to vmlinux.lds.S to remove .note.gnu.build-id section arch/m32r: Use DIV_ROUND_CLOSEST commit bd901751e7ab9ddba335b19643605b3cf8517078 Merge: d39b7dd 17adea0 Author: Linus Torvalds Date: Thu Nov 5 10:53:24 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: fix CECCs reporting amd64_edac: fix a wrong goto clause in amd64_edac.c commit d39b7dd1dcbf394a1cb897457c862dafe9a20ac5 Author: Linus Torvalds Date: Thu Nov 5 10:48:30 2009 -0800 sgi-gru: decrapfiy options_write() function Not a single line of actual code in the function was really fundamentally correct. Problems ranged from lack of proper range checking, to removing the last character written (which admittedly is usually '\n'), to not accepting hex numbers even though the 'show' routine would show the data in that format. This tries to do better. Acked-by: Michael Buesch Tested-and-acked-by: Jack Steiner Cc: stable@kernel.org Cc: Jiri Kosina Cc: Michael Gilbert Signed-off-by: Linus Torvalds commit 78987bdc4e41a425ac113c2c51474f0368fe653a Author: Randy Dunlap Date: Thu Nov 5 09:22:30 2009 -0800 ALSA: hda, move hp_bseries_system Function hp_bseries_system() is always used, outside of CONFIG_ boundaries/controls, so move it. sound/pci/hda/patch_sigmatel.c:5458: error: implicit declaration of function 'hp_bseries_system' Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai commit 22aecebfd9498c4779e5c5bed1d2d054bd99f7a4 Author: Darrick J. Wong Date: Wed Oct 21 18:01:37 2009 -0700 acpi-power-meter: Don't leak ACPI error codes to userspace If the ACPI methods return an error code, we must return -EINVAL to userspace to flag the error. Right now we pass the (positive) number right through, which causes echo to keep writing bogus values. Signed-off-by: Darrick J. Wong Acked-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 22402529df88ec39a59b08a46bced73dd5722b64 Author: Uwe Kleine-König Date: Thu Nov 5 01:32:44 2009 -0800 virtio_net: rename driver struct to please modpost Commit 3d1285b (move virtnet_remove to .devexit.text) introduced the first reference to __devexit in struct virtio_driver virtio_net which upset modpost ("Section mismatch in reference from the variable virtio_net to the function .devexit.text:virtnet_remove()"). Fix this by renaming virtio_net to virtio_net_driver. Signed-off-by: Uwe Kleine-König Reported-by: Michael S. Tsirkin Blame-taken-by: Rusty Russell Signed-off-by: David S. Miller commit f702cf463e1308fbb0c1faa9f3d8e3fa9cb5630f Author: Randy Dunlap Date: Wed Nov 4 16:04:52 2009 -0800 sound: Use KERN_WARNING instead of KERN_WARN, which does not exist Reported-by: Andrew Lyon Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai commit 7e6c3989af5baee999ef9a4424e85938cba8d34a Author: Daniel T Chen Date: Wed Nov 4 21:03:46 2009 -0500 ALSA: intel8x0: Mute External Amplifier by default for another Sony model BugLink: https://bugs.launchpad.net/bugs/474972 This Sony model needs External Amplifier muted for audible playback, so make sure we set the inv_eapd quirk. Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 38634e6769920929385f1ffc8820dc3e893cc630 Author: Benjamin Herrenschmidt Date: Thu Nov 5 17:10:34 2009 +1100 powerpc/kvm: Remove problematic BUILD_BUG_ON statement Signed-off-by: Benjamin Herrenschmidt commit 8435b027b87a78145992c37b0b8ed0f1b7761bf0 Author: Andre Detsch Date: Wed Nov 4 13:03:19 2009 -0200 powerpc/pci: Fix regression in powerpc MSI-X Patch f598282f5145036312d90875d0ed5c14b49fd8a7 exposed a problem in powerpc MSI-X functionality, making network interfaces such as ixgbe and cxgb3 stop to work when MSI-X is enabled. RX interrupts were not being generated. The problem was caused because MSI irq was not being effectively unmasked after device initialization. Signed-off-by: Andre Detsch Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit 978d7eb31d44de34a7f71e04ed4158f3f854688d Author: Benjamin Herrenschmidt Date: Sun Nov 1 19:11:03 2009 +0000 powerpc: Avoid giving out RTC dates below EPOCH Doing so causes xtime to be negative which crashes the timekeeping code in funny ways when doing suspend/resume Signed-off-by: Benjamin Herrenschmidt commit f1167fb318f0ff0bcb9cbb57bb6d16ad450f0cfb Author: Benjamin Herrenschmidt Date: Wed Nov 4 13:39:52 2009 +0000 powerpc/mm: Remove debug context clamping from nohash code I inadvertently left that debug code enabled, causing the number of contexts to be clamped to 31 which is going to slow things down on 4xx and just plain breaks 8xx Signed-off-by: Benjamin Herrenschmidt commit 37b12dd2b07b4d7dc222a5f7f88b25cec532b2aa Author: Larry Finger Date: Wed Nov 4 00:00:25 2009 -0600 rtl8187: Fix kernel oops when device is removed when LEDS enabled As reported by Rick Farina (sidhayn@gmail.com), removing the RTL8187 USB stick, or unloading the driver rtl8187 using rmmod will cause a kernel oops. There are at least two forms of the failure, (1) BUG: Scheduling while atomic, and (2) a fatal kernel page fault. This problem is reported in Bugzilla #14539. This problem does not occur for kernel 2.6.31, but does for 2.6.32-rc2, thus it is technically a regression; however, bisection did not locate any faulty patch. The fix was found by comparing the faulty code in rtl8187 with p54usb. My interpretation is that the handling of work queues in mac80211 changed enough to the LEDs to be unregistered before tasks on the work queues are cancelled. Previously, these actions could be done in either order. (Herton Ronaldo Krzesinski reports that the code is the same in 2.6.31, so this may be a candidate for 2.6.31.x. -- JWL) Signed-off-by: Larry Finger Reported-by: Rick Farina Tested-by: Rick Farina Cc: stable@kernel.org Signed-off-by: John W. Linville commit 4c3da2209b1261af9a948b7509a38904c8eee554 Author: Eric W. Biederman Date: Wed Nov 4 02:50:06 2009 -0800 sysfs: Don't leak secdata when a sysfs_dirent is freed. While refreshing my sysfs patches I noticed a leak in the secdata implementation. We don't free the secdata when we free the sysfs dirent. This is a bug in 2.6.32-rc5 that we really should close. Signed-off-by: Eric W. Biederman Acked-by: Serge Hallyn Signed-off-by: James Morris commit dffc14365bb07812567ee7f3f8699277ef19aaa8 Author: Joe Perches Date: Wed Nov 4 09:38:58 2009 -0800 MAINTAINERS: Add git net-next-2.6 Add a reference to the the git tree where most of the forward going network development occurs. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 286e633ef0ff5bb63c07b4516665da8004966fec Author: Roel Kluin Date: Wed Nov 4 08:31:59 2009 -0800 isdn: hfc_usb: Fix read buffer overflow Check whether index is within bounds before testing the element. Signed-off-by: Roel Kluin Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit a947c8f0313c0cf3691b8d8d2b9aaddf372afdcc Author: Roel Kluin Date: Wed Nov 4 08:31:19 2009 -0800 isdn: hisax: Fix test in waitforxfw The negation makes it a bool before the comparison and hence it will never be 0x40. Signed-off-by: Roel Kluin Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit b9db21f8b964e158f95bb581c887159b6cb98ffa Author: Jiri Slaby Date: Wed Nov 4 08:30:08 2009 -0800 isdn: eicon: Return on error When diva_strace_read_uint returns an error, return even from process_idi_event, because l2_state is uninitialized. Signed-off-by: Jiri Slaby Cc: Karsten Keil Acked-by: Armin Schindler Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 1ea70841f07666af69e481d4ffdd6edb56db3c92 Author: Jiri Slaby Date: Wed Nov 4 08:28:12 2009 -0800 isdn: eicon: Use offsetof Use offsetof instead of explicit implementation. * fixes bug with omitted & like: len = (byte)(((T30_INFO *) 0)->station_id + 20) * avoids compiler warnings with wrong sizes (pointer-to-char cast): len = (byte)(&(((T30_INFO *) 0)->universal_6)); * cleans up the code Signed-off-by: Jiri Slaby Cc: Karsten Keil Acked-by: Armin Schindler Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 08cb3f60b2f866c906a5a779444b30ba8f9a93c8 Author: Dan Carpenter Date: Wed Nov 4 08:27:09 2009 -0800 misdn: Fix reversed 'if' in st_own_ctrl The current code probably returns -EINVAL a lot. Otherwise it would oops. Compile tested only. Found by smatch (http://repo.or.cz/w/smatch.git). Signed-off-by: Dan Carpenter Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 02303d2028aef19889415364fc5f7bb374887157 Author: Jiri Slaby Date: Wed Nov 4 08:25:57 2009 -0800 isdn: hisax: Fix lock imbalance. Add omittted unlocks to 2 functions. Signed-off-by: Jiri Slaby Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 91d3f9bacdb4950d2f79fe2ba296aa249f60d06c Merge: 51bb296 4204878 Author: Linus Torvalds Date: Wed Nov 4 07:05:43 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: drm/i915: Ironlake suspend/resume support drm/i915: kill warning in intel_find_pll_g4x_dp drm/i915: update watermarks before enabling PLLs drm/i915: add FIFO watermark support for G4x drm/i915: quiet DP i2c init drm/i915: fix panel fitting filter coefficient select for Ironlake drm/i915: fix to setup display reference clock control on Ironlake drm/i915: Install a fence register for fbc on g4x drm/i915: save/restore BLC histogram control reg across suspend/resume drm/i915: Fix FDI M/N setting according with correct color depth drm/i915: disable powersave feature for Ironlake currently drm/i915: Fix render reclock availability detection. drm/i915: Save and restore the GM45 FBC regs on suspend and resume. drm/i915: Set the LVDS_BORDER when using LVDS scaling mode drm/i915: disable FBC for Pineview, fixing a boot hang. commit abb3911965c1bd8eea305f64d4840a314259d96d Author: Gleb Natapov Date: Sun Oct 25 17:42:02 2009 +0200 KVM: get_tss_base_addr() should return a gpa_t If TSS we are switching to resides in high memory task switch will fail since address will be truncated. Windows2k3 does this sometimes when running with more then 4G Cc: stable@kernel.org Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit a9e38c3e01ad242fe2a625354cf065c34b01e3aa Author: Jan Kiszka Date: Fri Oct 23 09:37:00 2009 +0200 KVM: x86: Catch potential overrun in MCE setup We only allocate memory for 32 MCE banks (KVM_MAX_MCE_BANKS) but we allow user space to fill up to 255 on setup (mcg_cap & 0xff), corrupting kernel memory. Catch these overflows. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit c8ee5538b091b8aca9ca738c6989c5ad6f9e67c0 Author: Tonyliu Date: Wed Nov 4 05:45:02 2009 -0800 DaVinci EMAC: correct param for ISR emac_irq is declared as: static irqreturn_t emac_irq(int irq, void *dev_id) { struct net_device *ndev = (struct net_device *)dev_id; struct emac_priv *priv = netdev_priv(ndev); ... Clearly emac_irq() needs "struct net_device *" as "void *dev_id", so correct this. Signed-off-by: Tonyliu Signed-off-by: David S. Miller commit 3a19d56c71bd3a08412d609d219ac8eec0819166 Author: Torgny Johansson Date: Wed Nov 4 05:25:02 2009 -0800 cdc_ether: additional Ericsson MBM PID's to the whitelist Signed-off-by: Torgny Johansson Signed-off-by: David S. Miller commit 17adea01b9606e416ea5116a27d02d47fe7e6c8d Author: Borislav Petkov Date: Wed Nov 4 14:04:06 2009 +0100 amd64_edac: fix CECCs reporting Shift error type bits properly. Signed-off-by: Borislav Petkov commit a3c4c58085b23d8e878a58dcdd0f8fcf8fad1ccd Author: Li Hong Date: Mon Oct 19 16:33:29 2009 +0800 amd64_edac: fix a wrong goto clause in amd64_edac.c In amd64_edac_init(void) in amd64_edac.c, cache_k8_northbridges() is called before pci_register_driver. If it fails, should exit with err directly. Signed-off-by: Li Hong Acked-by: Doug Thompson Signed-off-by: Borislav Petkov commit 89240ba059ca468ae7a8346edf7f95082458c2fc Author: Stefani Seibold Date: Tue Nov 3 10:22:40 2009 +0100 x86, fs: Fix x86 procfs stack information for threads on 64-bit This patch fixes two issues in the procfs stack information on x86-64 linux. The 32 bit loader compat_do_execve did not store stack start. (this was figured out by Alexey Dobriyan). The stack information on a x64_64 kernel always shows 0 kbyte stack usage, because of a missing implementation of the KSTK_ESP macro which always returned -1. The new implementation now returns the right value. Signed-off-by: Stefani Seibold Cc: Americo Wang Cc: Alexey Dobriyan Cc: Al Viro Cc: Andrew Morton LKML-Reference: <1257240160.4889.24.camel@wall-e> Signed-off-by: Ingo Molnar commit 798a8a15011e88cc63dbbb15728b42572c152093 Author: Daniel Drake Date: Wed Nov 4 10:11:07 2009 +0000 ALSA: hda - Add OLPC XO-1.5 PCI ID The XO-1.5 laptop now has a unique subvendor/subproduct ID, which can be used to automatically select the correct CXT5066 configuration. Signed-off-by: Daniel Drake Signed-off-by: Takashi Iwai commit 5219f346b0ea2a2a8821f1e966b190788c285b0b Author: Miklos Szeredi Date: Wed Nov 4 10:24:52 2009 +0100 fuse: invalidate target of rename Invalidate the target's attributes, which may have changed (such as nlink, change time) so that they are refreshed on the next getattr(). Signed-off-by: Miklos Szeredi commit 0bd87182d3ab18a32a8e9175d3f68754c58e3432 Author: Jens Axboe Date: Tue Nov 3 11:40:44 2009 +0100 fuse: fix kunmap in fuse_ioctl_copy_user Looks like another victim of the confusing kmap() vs kmap_atomic() API differences. Reported-by: Todor Gyumyushev Signed-off-by: Jens Axboe Signed-off-by: Miklos Szeredi Cc: Tejun Heo Cc: stable@kernel.org commit f60311d5f7670d9539b424e4ed8b5c0872fc9e83 Author: Anand V. Avati Date: Thu Oct 22 06:24:52 2009 -0700 fuse: prevent fuse_put_request on invalid pointer fuse_direct_io() has a loop where requests are allocated in each iteration. if allocation fails, the loop is broken out and follows into an unconditional fuse_put_request() on that invalid pointer. Signed-off-by: Anand V. Avati Signed-off-by: Miklos Szeredi Cc: stable@kernel.org commit 5bdaaada16363d64e10ae081755d1a8d392429f2 Author: Vitaliy Kulikov Date: Wed Nov 4 07:57:45 2009 +0100 ALSA: hda - Enable GPIO control for mute LED on HP systems This patch enables GPIO to control mute LED indicator on the HP systems with the special string in BIOS and applies it with the correct polarity on HP B-series systems. It also restores configuration of the pin intended as the second Headphone on HP B-series systems but configured as something else in the BIOS to pass MS DTM. Signed-off-by: Vitaliy Kulikov Signed-off-by: Takashi Iwai commit ed146b25942b428f8e8056587b7638ce76573c2f Author: Li Zefan Date: Tue Nov 3 08:55:38 2009 +0800 ftrace: Fix unmatched locking in ftrace_regex_write() When a command is passed to the set_ftrace_filter, then the ftrace_regex_lock is still held going back to user space. # echo 'do_open : foo' > set_ftrace_filter (still holding ftrace_regex_lock when returning to user space!) Signed-off-by: Li Zefan LKML-Reference: <4AEF7F8A.3080300@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit f7112949f6a4cd6883d66c882d568c2197321de6 Author: Lai Jiangshan Date: Tue Nov 3 19:42:45 2009 +0800 ring-buffer: Synchronize resizing buffer with reader lock We got a sudden panic when we reduced the size of the ringbuffer. We can reproduce the panic by the following steps: echo 1 > events/sched/enable cat trace_pipe > /dev/null & while ((1)) do echo 12000 > buffer_size_kb echo 512 > buffer_size_kb done (not more than 5 seconds, panic ...) Reported-by: KOSAKI Motohiro Signed-off-by: Lai Jiangshan LKML-Reference: <4AF01735.9060409@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 51bb296b09a83ee1aae025778db38f9d2cc7bb1a Merge: dc79d2f 4b27e1b Author: Linus Torvalds Date: Tue Nov 3 18:16:21 2009 -0800 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: cfq-iosched: limit coop preemption cfq-iosched: fix bad return value cfq_should_preempt() backing-dev: bdi sb prune should be in the unregister path, not destroy Fix bio_alloc() and bio_kmalloc() documentation bio_put(): add bio_clone() to the list of functions in the comment commit dc79d2f21a2dc19df26f0cb0b46be2d6241b627b Merge: b419148 f38e35b Author: Linus Torvalds Date: Tue Nov 3 18:15:18 2009 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: sata_via: Remove redundant device ID for VIA VT8261 drivers/ata/libata: Move dereference after NULL test ahci: Enable SB600 64bit DMA on MSI K9A2 Platinum v2 commit 45cdd473301aae36e1f10664b9fe7ef5aad3f182 Author: Roel Kluin Date: Sun Nov 1 15:33:06 2009 +0100 m32r: Should index be positive? Index `ipi_num' is signed, test whether it is negative to make sure we don't get a negative array element. Signed-off-by: Roel Kluin Signed-off-by: Hirokazu Takata commit 337214e8c6b0c777713b2483749f9c03102a416c Author: Hirokazu Takata Date: Thu Oct 15 09:21:56 2009 +0900 m32r: bzip2/lzma kernel compression support - Support bzip2 and lzma kernel compression for m32r. - Clean up arch/m32r/boot/compressed/misc.c. Signed-off-by: Hirokazu Takata commit e968b8d404ae8ab4ef218cd145f6dcb71e65154b Author: Hirokazu Takata Date: Mon Oct 5 00:10:55 2009 +0900 m32r: add NOTES to vmlinux.lds.S to remove .note.gnu.build-id section Building with --build-id option, .note.gnu.build-id section is added to vmlinux.bin. But some old buggy binutils creates a huge vmlinux.bin, and a bootloader fails to boot its zImage as well. This patch adds a NOTES macro to a linker script vmlinux.ld.S to put .note.gnu.build-id section into .note section. Then, the .note section will be removed, because "-R .note" option is specified in OBJCOPYFLAGS to make a vmlinux.bin binary. Signed-off-by: Hirokazu Takata commit 560235857fb79da48d36e8f866a0ee3b10a232bf Author: Julia Lawall Date: Sun Aug 2 10:47:27 2009 +0200 arch/m32r: Use DIV_ROUND_CLOSEST The kernel.h macro DIV_ROUND_CLOSEST performs the computation (x + d/2)/d but is perhaps more readable. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @haskernel@ @@ @depends on haskernel@ expression x,__divisor; @@ - (((x) + ((__divisor) / 2)) / (__divisor)) + DIV_ROUND_CLOSEST(x,__divisor) // Signed-off-by: Julia Lawall Signed-off-by: Hirokazu Takata commit f38e35b43f2924b3b4e51147b7193f32e9276db4 Author: JosephChan@via.com.tw Date: Mon Nov 2 19:36:08 2009 +0800 sata_via: Remove redundant device ID for VIA VT8261 Just remove redundant device ID for VIA VT8261. The device ID 0x9000 and 0x9040 are redundant (for VT8261). The 0x9040 is reserved for other usage. Signed-off-by: Joseph Chan Signed-off-by: Jeff Garzik commit a1104016ce8f7750ecd8ca6129786bc549aa5c38 Author: Julia Lawall Date: Sat Oct 17 08:41:47 2009 +0200 drivers/ata/libata: Move dereference after NULL test In each case, if the NULL test on qc is needed, then the derefernce should be after the NULL test. A simplified version of the semantic match that detects this problem is as follows (http://coccinelle.lip6.fr/): // @match exists@ expression x, E; identifier fld; @@ * x->fld ... when != \(x = E\|&x\) * x == NULL // Signed-off-by: Julia Lawall Signed-off-by: Jeff Garzik commit e65cc194f7628ecaa02462f22f42fb09b50dcd49 Author: Mark Nelson Date: Tue Nov 3 20:06:48 2009 +1100 ahci: Enable SB600 64bit DMA on MSI K9A2 Platinum v2 Like the Asus M2A-VM, MSI's K9A2 Platinum (MS-7376) can also support 64bit DMA. It is a new enough board that all the BIOS releases work correctly with 64bit DMA enabled. Signed-off-by: Mark Nelson Signed-off-by: Jeff Garzik commit 4b27e1bb442e964903f8a3fa6bdf33a602dc0941 Author: Shaohua Li Date: Tue Nov 3 20:25:02 2009 +0100 cfq-iosched: limit coop preemption CFQ has an optimization for cooperated applications. if several io-context have close requests, they will get boost. But the optimization get abused. Considering thread a, b, which work on one file. a reads sectors s, s+2, s+4, ...; b reads sectors s+1, s+3, s +5, ... Both a and b are sequential read, so they can open idle window. a reads a sector s and goes to idle window and wakeup b. b reads sector s+1, since in current implementation, cfq_should_preempt() thinks a and b are cooperators, b will preempt a. b then reads sector s+1 and goes to idle window and wakeup a. for the same reason, a will preempt b and reads s+2. a and b will continue the circle. The circle will be very long, and a and b will occupy whole disk queue. Other applications will nearly have no chance to run. Fix this limiting coop preempt until a queue is scheduled normally again. Signed-off-by: Shaohua Li Acked-by: Jeff Moyer Signed-off-by: Jens Axboe commit e6ec4fe24572ee265723d895ec4159e5559c8266 Author: Jens Axboe Date: Tue Nov 3 20:21:35 2009 +0100 cfq-iosched: fix bad return value cfq_should_preempt() Commit a6151c3a5c8e1ff5a28450bc8d6a99a2a0add0a7 inadvertently reversed a preempt condition check, potentially causing a performance regression. Make the meta check correct again. Signed-off-by: Jens Axboe commit 8c4db3355b0fcc9ad77431f15b955efa0645b5d0 Author: Jens Axboe Date: Tue Nov 3 20:18:44 2009 +0100 backing-dev: bdi sb prune should be in the unregister path, not destroy Commit 592b09a42fc3ae6737a0f3ecf4fee42ecd0296f8 was different from the tested path, in that it moved the bdi super_block prune from unregister to destroy context. This doesn't fully fix the sync hang bug on unexpected device removal, as need to prune the bdi cache pointer before killing flusher thread. Tested-by: Artur Skawina Signed-off-by: Jens Axboe commit 82d6469916c6fcfa345636a49004c9d1753905d1 Author: Jeremy Fitzhardinge Date: Thu Oct 22 16:41:15 2009 -0700 xen: mask extended topology info in cpuid A Xen guest never needs to know about extended topology, and knowing would just confuse it. This patch just zeros ebx in leaf 0xb which indicates no topology info, preventing a crash under Xen on cpus which support this leaf. Signed-off-by: Jeremy Fitzhardinge Cc: Stable Kernel commit 7825cf10e31c64ece3cac66fb01a742f1094da51 Author: Jeremy Fitzhardinge Date: Tue Oct 20 15:28:21 2009 +0900 xen/hvc: make sure console output is always emitted, with explicit polling We never want to rely on the hvc workqueue to emit output, because the most interesting output is when the kernel is broken. This will improve oops/crash/console message for better debugging. Instead, we force-poll until all output is emitted. Signed-off-by: Jeremy Fitzhardinge Cc: Stable Kernel commit 1d87cff407ceddf0bc4e825949a4b1bf645418bd Merge: 0515475 342688f Author: Ingo Molnar Date: Tue Nov 3 16:54:14 2009 +0100 Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent commit 80f0c895b57f0d936b420de6afea5167a49f62fa Author: Luca Niccoli Date: Fri Oct 16 22:22:47 2009 +0200 eeepc-laptop: don't enable camera at startup if it's already on. Switching the camera takes 500ms, checking if it's on is almost free... The BIOS remembers the setting through reboots, so there's good chance the camera is already enabled. Signed-off-by: Luca Niccoli Cc: Corentin Chary Cc: Alan Jenkins Cc: Matthew Garrett Signed-off-by: Andrew Morton Signed-off-by: Corentin Chary Signed-off-by: Len Brown commit 58ce48a9de1dd47acb5dc00e2837214d2be1d92a Author: Corentin Chary Date: Fri Oct 16 22:22:46 2009 +0200 Revert "eeepc-laptop: Prevent a panic when disabling RT2860 wireless when associated" rt2860sta is fine with the patch as is, but iwl3945 isn't (eeepc_rfkill_set() needs to call eeepc_rfkill_hotplug(true) – which means that we're back to causing the rt2860sta panic This reverts commit b56ab33d68638e6aafdbfc694025e8354a628f49. Signed-off-by: Corentin Chary Signed-off-by: Darren Salt Signed-off-by: Len Brown commit 342688f9db392ec82ab9e6b25a6137f9ee1647d7 Merge: 012abee ca020711 59a40e70 Author: Joerg Roedel Date: Tue Nov 3 12:05:40 2009 +0100 Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes commit b84ff7d6f1b7f8a43414e74d972ec4c8f3361db4 Author: Mike Galbraith Date: Thu Oct 29 11:48:30 2009 +0100 sched: Fix kthread_bind() by moving the body of kthread_bind() to sched.c Eric Paris reported that commit f685ceacab07d3f6c236f04803e2f2f0dbcc5afb causes boot time PREEMPT_DEBUG complaints. [ 4.590699] BUG: using smp_processor_id() in preemptible [00000000] code: rmmod/1314 [ 4.593043] caller is task_hot+0x86/0xd0 Since kthread_bind() messes with scheduler internals, move the body to sched.c, and lock the runqueue. Reported-by: Eric Paris Signed-off-by: Mike Galbraith Tested-by: Eric Paris Cc: Peter Zijlstra LKML-Reference: <1256813310.7574.3.camel@marge.simson.net> [ v2: fix !SMP build and clean up ] Signed-off-by: Ingo Molnar commit 6b9de613ae9c79b637e070136585dde029578065 Author: Mike Galbraith Date: Mon Nov 2 20:36:51 2009 +0100 sched: Disable SD_PREFER_LOCAL at node level Yanmin Zhang reported that SD_PREFER_LOCAL induces an order of magnitude increase in select_task_rq_fair() overhead while running heavy wakeup benchmarks (tbench and vmark). Since SD_BALANCE_WAKE is off at node level, turn SD_PREFER_LOCAL off as well pending further investigation. Reported-by: Zhang, Yanmin Signed-off-by: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 49557e620339cb134127b5bfbcfecc06b77d0232 Author: Rusty Russell Date: Mon Nov 2 20:37:20 2009 +1030 sched: Fix boot crash by zalloc()ing most of the cpu masks I got a boot crash when forcing cpumasks offstack on 32 bit, because find_new_ilb() returned 3 on my UP system (nohz.cpu_mask wasn't zeroed). AFAICT the others need to be zeroed too: only nohz.ilb_grp_nohz_mask is initialized before use. Signed-off-by: Rusty Russell Cc: Peter Zijlstra LKML-Reference: <200911022037.21282.rusty@rustcorp.com.au> Signed-off-by: Ingo Molnar commit 05154752cf3767c544b65b5e340793d40b3f1229 Author: Gottfried Haider Date: Mon Nov 2 11:51:11 2009 +0100 x86: Add reboot quirk for 3 series Mac mini Reboot does not work out of the box on my "Early 2009" Mac mini (3,1). Detect this machine via DMI as we do for recent MacBooks. Signed-off-by: Gottfried Haider Cc: Ozan Çağlayan Cc: Paul Mackerras Signed-off-by: Ingo Molnar commit 5f04eeb8a76521dec371ceb05e8263889a8af2bc Author: Alberto Bertogli Date: Mon Nov 2 11:39:42 2009 +0100 Fix bio_alloc() and bio_kmalloc() documentation Commit 451a9ebf accidentally broke bio_alloc() and bio_kmalloc() comments by (almost) swapping them. This patch fixes that, by placing the comments in the right place. Signed-off-by: Alberto Bertogli Acked-by: Tejun Heo Signed-off-by: Jens Axboe commit ad0bf11070ebb3c95f8ce82e6219dbd79c8e8b69 Author: Alberto Bertogli Date: Mon Nov 2 11:39:22 2009 +0100 bio_put(): add bio_clone() to the list of functions in the comment In bio_put()'s comment, add bio_clone() to the list of functions that can give you a bio reference. Signed-off-by: Alberto Bertogli Signed-off-by: Jens Axboe commit 16121d70fdf9eeb05ead46b241a293156323dbbe Author: Dave Jones Date: Sun Nov 1 19:27:05 2009 -0500 x86: Fix printk message typo in mtrr cleanup code Trivial typo. Signed-off-by: Dave Jones LKML-Reference: Signed-off-by: Ingo Molnar commit 5a1eb5c4453207ad9e7f6e8ca4f8db289743c993 Author: Benjamin Herrenschmidt Date: Fri Oct 30 15:03:54 2009 +1100 powerpc: Cleanup Kconfig selection of hugetlbfs support Signed-off-by: Benjamin Herrenschmidt commit 59a40e70458341b35d123b60aca416a1d97ebbe3 Author: Joerg Roedel Date: Thu Oct 29 16:25:50 2009 +0100 dma-debug: Fix compile warning with PAE enabled When PAE is enabled in the kernel configuration the size of phys_addr_t differs from the size of a void pointer. The gcc prints a warning about that in dma-debug code. This patch fixes the warning by converting the output to unsigned long long instead of a pointer. Signed-off-by: Joerg Roedel commit ca0207114f1708b563f510b7781a360ec5b98359 Author: Joerg Roedel Date: Wed Oct 28 18:02:26 2009 +0100 x86/amd-iommu: Un__init function required on shutdown The function iommu_feature_disable is required on system shutdown to disable the IOMMU but it is marked as __init. This may result in a panic if the memory is reused. This patch fixes this bug. Signed-off-by: Joerg Roedel commit 52a2b11cafb1b14bacfc65a20966da5ba3a863e1 Author: Arjan van de Ven Date: Thu Oct 1 15:48:40 2009 -0700 ACPI: clean up video.c boundary checks and types proc.c and video.c are a bit sloppy around types and style, confusing gcc for a new feature that'll be in 2.6.33 and will cause a warning on the current code. This patch changes if (foo + 1 > sizeof bar) into if (foo >= sizeof(bar)) which is more kernel-style. it also changes a variable in proc.c to unsigned; it gets assigned a value from an unsigned type, and is then only compared for > not for negative, so using unsigned is just outright the right type Signed-off-by: Arjan van de Ven Signed-off-by: Len Brown commit f685ceacab07d3f6c236f04803e2f2f0dbcc5afb Author: Mike Galbraith Date: Fri Oct 23 23:09:22 2009 +0200 sched: Strengthen buddies and mitigate buddy induced latencies This patch restores the effectiveness of LAST_BUDDY in preventing pgsql+oltp from collapsing due to wakeup preemption. It also switches LAST_BUDDY to exclusively do what it does best, namely mitigate the effects of aggressive wakeup preemption, which improves vmark throughput markedly, and restores mysql+oltp scalability. Since buddies are about scalability, enable them beginning at the point where we begin expanding sched_latency, namely sched_nr_latency. Previously, buddies were cleared aggressively, which seriously reduced their effectiveness. Not clearing aggressively however, produces a small drop in mysql+oltp throughput immediately after peak, indicating that LAST_BUDDY is actually doing some harm. This is right at the point where X on the desktop in competition with another load wants low latency service. Ergo, do not enable until we need to scale. To mitigate latency induced by buddies, or by a task just missing wakeup preemption, check latency at tick time. Last hunk prevents buddies from stymieing BALANCE_NEWIDLE via CACHE_HOT_BUDDY. Supporting performance tests: tip = v2.6.32-rc5-1497-ga525b32 tipx = NO_GENTLE_FAIR_SLEEPERS NEXT_BUDDY granularity knobs = 31 knobs + 31 buddies tip+x = NO_GENTLE_FAIR_SLEEPERS granularity knobs = 31 knobs (Three run averages except where noted.) vmark: ------ tip 108466 messages per second tip+ 125307 messages per second tip+x 125335 messages per second tipx 117781 messages per second 2.6.31.3 122729 messages per second mysql+oltp: ----------- clients 1 2 4 8 16 32 64 128 256 .......................................................................................... tip 9949.89 18690.20 34801.24 34460.04 32682.88 30765.97 28305.27 25059.64 19548.08 tip+ 10013.90 18526.84 34900.38 34420.14 33069.83 32083.40 30578.30 28010.71 25605.47 tipx 9698.71 18002.70 34477.56 33420.01 32634.30 31657.27 29932.67 26827.52 21487.18 2.6.31.3 8243.11 18784.20 34404.83 33148.38 31900.32 31161.90 29663.81 25995.94 18058.86 pgsql+oltp: ----------- clients 1 2 4 8 16 32 64 128 256 .......................................................................................... tip 13686.37 26609.25 51934.28 51347.81 49479.51 45312.65 36691.91 26851.57 24145.35 tip+ (1x) 13907.85 27135.87 52951.98 52514.04 51742.52 50705.43 49947.97 48374.19 46227.94 tip+x 13906.78 27065.81 52951.19 52542.59 52176.11 51815.94 50838.90 49439.46 46891.00 tipx 13742.46 26769.81 52351.99 51891.73 51320.79 50938.98 50248.65 48908.70 46553.84 2.6.31.3 13815.35 26906.46 52683.34 52061.31 51937.10 51376.80 50474.28 49394.47 47003.25 Signed-off-by: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 4204878179c99d419d392d78d817729992b4c442 Author: Zhenyu Wang Date: Wed Oct 21 15:27:01 2009 +0800 drm/i915: Ironlake suspend/resume support This adds registers save/restore for Ironlake to make suspend work. Signed-off-by: Guo, Chaohong [zhenyuw: some code re-orgnization, and add more save/restore for FDI link and transcoder registers, also fix palette register for Ironlake] Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit fe798b9718bea5c48938fc38fa78ae9503b8de6c Author: Jesse Barnes Date: Tue Oct 20 07:55:28 2009 +0900 drm/i915: kill warning in intel_find_pll_g4x_dp Initialize clock.vco to silence gcc. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt commit 629598da932cfa5ff398fe10bc123282a6f3049e Author: Jesse Barnes Date: Tue Oct 20 07:37:32 2009 +0900 drm/i915: update watermarks before enabling PLLs When coming back from DPMS or turning on a display, make sure we have the watermarks set up before turning on the display plane, otherwise we may get underruns. Signed-off-by: Jesse Barnes Tested-by: Dirk Hohndel Signed-off-by: Eric Anholt commit 0e442c60dd39ac6924b11a20497734bd2303744c Author: Jesse Barnes Date: Mon Oct 19 10:09:33 2009 +0900 drm/i915: add FIFO watermark support for G4x Turns out G4x needs to have sensible watermarks set, especially for self-refresh enabled modes. Add support for it. Signed-off-by: Jesse Barnes Tested-by: Dirk Hohndel Signed-off-by: Eric Anholt commit d54e9d28241fd52cca3df4f6bc2054a30d453fed Author: Zhenyu Wang Date: Mon Oct 19 15:43:51 2009 +0800 drm/i915: quiet DP i2c init Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit b1f60b7029989da71fd8ea1b1176480fac9e846c Author: Zhenyu Wang Date: Mon Oct 19 15:43:49 2009 +0800 drm/i915: fix panel fitting filter coefficient select for Ironlake Must set filter selection as hardcoded coefficients for medium 3x3 filtering, which matches vbios setting for Ironlake. This fixes display corrupt issue on HP arrandale with new vbios. Cc: Stable Team Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit c038e51e841581cc3fb9a76e5e16331331e9c85c Author: Zhenyu Wang Date: Mon Oct 19 15:43:48 2009 +0800 drm/i915: fix to setup display reference clock control on Ironlake For new stepping of PCH, the display reference clock is fully under driver's control. This one trys to setup all needed reference clock for different outputs. Older stepping of PCH chipset should be ignoring this. This fixes output failure issue on newer PCH which requires driver to take control of reference clock enabling. Cc: Stable Team Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit 0d9c778978ff268228c095ae737c282c03a5986d Author: Chris Wilson Date: Wed Oct 14 20:12:46 2009 +0100 drm/i915: Install a fence register for fbc on g4x To enable framebuffer compression on a g4x, we not only need the buffer to tiled (X only), we also need to hold a fence register for the buffer. Currently we only install a fence register for pre-i965s when setting up the scanout buffer. Rather than adding some convoluted logic to g4x_enable_fbc() to acquire a fence register, and perhaps to g4x_disable_fbc() to release it again, we can extend the acquisition during setup to all chipsets. Signed-off-by: Chris Wilson Cc: Jesse Barnes Signed-off-by: Eric Anholt commit 0eb96d6ed38430b72897adde58f5477a6b71757a Author: Jesse Barnes Date: Wed Oct 14 12:33:41 2009 -0700 drm/i915: save/restore BLC histogram control reg across suspend/resume Turns out some machines, like the ThinkPad X40 don't come back if you don't save/restore this register. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt commit 58a27471d00dc09945cbcfbbc5cbcdcd3c28211d Author: Zhenyu Wang Date: Fri Sep 25 08:01:28 2009 +0000 drm/i915: Fix FDI M/N setting according with correct color depth FDI M/N calculation hasn't taken the current pipe color depth into account, but always set as 24bpp. This one checks current pipe color depth setting, and change FDI M/N calculation a little to use bits_per_pixel first, then convert to bytes_per_pixel later. This fixes display corrupt issue on Arrandle LVDS with 1600x900 panel in 18bpp dual-channel mode. Cc: Stable Team Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit c03342fa6d4617a77cb867ee0ec71665d520eb69 Author: Zhenyu Wang Date: Tue Sep 29 11:01:23 2009 +0800 drm/i915: disable powersave feature for Ironlake currently Until we figure out the right setting for powersave features on Ironlake, disable it for now. Also disable watermark update, which has new registers for it on Ironlake too. Signed-off-by: Zhenyu Wang Reviewed-by: Jesse Barnes [anholt: Resolved against the Pineview FBC changes] Signed-off-by: Eric Anholt commit 181a5336d6cc836f05507410d66988c483ad0154 Author: Andy Lutomirski Date: Tue Oct 13 10:40:52 2009 -0700 drm/i915: Fix render reclock availability detection. If the device didn't support EDP, we would bail out too soon. Signed-off-by: Andy Lutomirski [anholt: Pulled this patch out of the patch for adding quirks to enable reclocking.] Signed-off-by: Eric Anholt commit 06027f9111b9f3244ddc40752428f7847b0b867e Author: Jesse Barnes Date: Mon Oct 5 13:47:26 2009 -0700 drm/i915: Save and restore the GM45 FBC regs on suspend and resume. This hasn't fixed the regressions we were testing against, but clearly should be required. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt commit a3e17eb8f4080a79738a938abe718be255247a44 Author: Zhao Yakui Date: Sat Oct 10 10:42:37 2009 +0800 drm/i915: Set the LVDS_BORDER when using LVDS scaling mode According to the spec the LVDS_BORDER_ENABLE bit decides whether the border data should be included in the active display and data sent to the panel. Border should be used when in VGA centered (un-scaled) mode or when scaling a 4:3 source image to a wide screen panel (typical 16:9). So when the LVDS scaling is used, decide whether the LVDS_BORDER should be enabled or not according to the current scaling mode. At the same time fix the typo error in LVDS center scaling mode. https://bugs.freedesktop.org/show_bug.cgi?id=23789 Signed-off-by: Zhao Yakui tested-by: Zhao Jian Signed-off-by: Eric Anholt commit 9216d44dc13b5e858253f06d83ceea25a9b72f4f Author: Shaohua Li Date: Sat Oct 10 15:20:55 2009 +0800 drm/i915: disable FBC for Pineview, fixing a boot hang. Pineview doesn't have this FBC mechanism, so this code doesn't apply. Signed-off-by: Shaohua Li Signed-off-by: Eric Anholt commit c5cca146aa03e1f60fb179df65f0dbaf17bc64ed Author: Joerg Roedel Date: Fri Oct 9 18:31:20 2009 +0200 x86/amd-iommu: Workaround for erratum 63 There is an erratum for IOMMU hardware which documents undefined behavior when forwarding SMI requests from peripherals and the DTE of that peripheral has a sysmgt value of 01b. This problem caused weird IO_PAGE_FAULTS in my case. This patch implements the suggested workaround for that erratum into the AMD IOMMU driver. The erratum is documented with number 63. Cc: stable@kernel.org Signed-off-by: Joerg Roedel commit de19d02b731478877ce8b1ccf371c2b2142ac80e Author: Mike Frysinger Date: Thu Sep 24 15:11:38 2009 -0400 mtd/maps: gpio-addr-flash: depend on GPIO arch support The driver requires gpio functionality, so make sure we depend on that in the Kconfig menu. Signed-off-by: Mike Frysinger Signed-off-by: David Woodhouse commit f5bae56a501347671b18095731d78e13eee5205f Author: Mike Frysinger Date: Thu Sep 24 15:11:37 2009 -0400 mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/ Now that there are linux/ versions of gpio.h and io.h, include those rather than hitting the asm/ versions. Signed-off-by: Mike Frysinger Signed-off-by: David Woodhouse commit 58475fb908485ab38860d6970a8063987fe1d619 Author: Jaswinder Singh Rajput Date: Thu Sep 24 13:04:53 2009 +0100 mtd: nand: fix htmldocs warnings Fixed following htmldocs warnings: DOCPROC Documentation/DocBook/mtdnand.xml Warning(drivers/mtd/nand/nand_base.c:769): No description found for parameter 'page' Warning(drivers/mtd/nand/nand_base.c:785): No description found for parameter 'page' Warning(drivers/mtd/nand/nand_base.c:824): No description found for parameter 'page' Warning(drivers/mtd/nand/nand_base.c:947): No description found for parameter 'page' Warning(drivers/mtd/nand/nand_base.c:996): No description found for parameter 'page' Warning(drivers/mtd/nand/nand_base.c:1040): No description found for parameter 'page' Signed-off-by: Jaswinder Singh Rajput Signed-off-by: David Woodhouse