commit ce9e3d9953c8cb67001719b5516da2928e956be4 Merge: 64d9a39... 74d9194... Author: Linus Torvalds Date: Wed Oct 18 18:30:00 2006 -0700 Merge branch 'ubuntu-updates' of master.kernel.org:/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6 * 'ubuntu-updates' of master.kernel.org:/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6: [pci_ids] Add Quicknet XJ vendor/device ID's. [valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled. [platinumfb] Ifdef for when CONFIG_NVRAM isn't enabled. [igafb] Add pci dev table for module auto loading. [controlfb] Ifdef for when CONFIG_NVRAM isn't enabled. [hid-core] TurboX Keyboard needs NOGET quirk. [ixj] Add pci dev table for module auto loading. [initio] Add pci dev table for module auto loading. [fdomain] Add pci dev table for module auto loading. [BusLogic] Add pci dev table for auto module loading. [mv643xx] Add pci device table for auto module loading. [alim7101] Add pci dev table for auto module loading. commit 64d9a39ec9ad074384b548c0cead89265c82e166 Merge: 17e6c60... bd452e6... Author: Linus Torvalds Date: Wed Oct 18 17:52:27 2006 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6: hwmon: Fix debug messages in w83781d hwmon: Let w83781d and lm78 load again w83627ehf: Fix the detection of fan5 k8temp: Documentation update smsc47m1: List the SMSC LPC47M112 as supported hwmon: Fix documentation typos adm9240: Update Grant Coady's email address w83791d: Fix unchecked return status commit 17e6c600b2bc4f15dd5f9144ccb8b5c5211dd6e4 Merge: b6aefcc... 4ca5224... Author: Linus Torvalds Date: Wed Oct 18 17:51:05 2006 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6: aoe: fix sysfs_create_file warnings aoe: revert printk macros aoe: update driver version aoe: remove sysfs comment aoe: use bio->bi_idx aoe: module parameter for device timeout aoe: zero copy write 2 of 2 aoe: improve retransmission heuristics aoe: jumbo frame support 2 of 2 aoe: clean up printks via macros aoe: jumbo frame support 1 of 2 aoe: zero copy write 1 of 2 aoe: remove unused NARGS enum aoe: update copyright date aoe: eliminate isbusy message commit b6aefcce747b3bc54d701d3c329416d0c9616f10 Merge: 6574035... 7a54f25... Author: Linus Torvalds Date: Wed Oct 18 17:50:40 2006 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: (22 commits) PCI Hotplug: move pci_hotplug.h to include/linux/ change pci hotplug subsystem maintainer to Kristen PCI: optionally sort device lists breadth-first cpcihp_generic: prevent loading without "bridge" parameter pci: Additional search functions PCI: quirks: switch quirks code offender to use pci_get API PCI: Update MSI-HOWTO.txt according to pci_msi_supported() PCI: Improve pci_msi_supported() comments PCI hotplug: ioremap balanced with iounmap shpchp: remove unnecessary cmd_busy member from struct controller shpchp: fix command completion check pci: Stamp out pci_find_* usage in fakephp PCI: fix pcie_portdrv_restore_config undefined without CONFIG_PM error Fix DMA resource allocation in ACPIPnP PCI: Turn pci_fixup_video into generic for embedded VGA PCI: add ICH7/8 ACPI/GPIO io resource quirks PCI: pcie-check-and-return-bus_register-errors fix PCI: VIA IRQ quirk behaviour change pciehp: Remove unnecessary check in pciehp_ctrl.c pciehp - add missing locking ... commit 65740356ccfa66703e7e0d47fbe372ba5193916b Merge: 6a13a85... 4d66423... Author: Linus Torvalds Date: Wed Oct 18 17:50:16 2006 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: driver core: kmalloc() failure check in driver_probe_device Driver core: bus: remove indentation level Driver core: Don't ignore error returns from probing Driver core: Don't leak 'old_class_name' in drivers/base/core.c::device_rename() driver core fixes: sysfs_create_group() retval in topology.c driver core fixes: device_create_file() retval check in dmapool.c driver core fixes: device_add() cleanup on error driver core fixes: bus_add_device() cleanup on error driver core fixes: bus_add_attrs() retval check driver core fixes: sysfs_create_link() retval check in class.c sysfs: update obsolete comment in sysfs_update_file sysfs: remove duplicated dput in sysfs_update_file HOWTO: bug report addition Fix dev_printk() is now GPL-only Driver core: plug device probe memory leak Documentation: feature-removal-schedule typo commit 6a13a857becef065cd138b67c162dc5c5dd88655 Merge: 3bee9df... ce9b18f... Author: Linus Torvalds Date: Wed Oct 18 17:49:42 2006 -0700 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] update default configuration [S390] cio: update documentation. [S390] dasd: clean up timer. [S390] Fix pte type checking. [S390] monwriter find header logic. [S390] cio: sch_no -> schid.sch_no conversion. [S390] Wire up epoll_pwait syscall. [S390] cio: invalid device operational notification [S390] fix vmlinux link when CONFIG_SYSIPC=n commit 3bee9df0ab55add6f8df92267a8a3d9d339cce08 Merge: 73ed9a8... 9b3377f... Author: Linus Torvalds Date: Wed Oct 18 17:49:19 2006 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Count resched interrupts [IA64] remove unused acpi_kbd_controller_present, acpi_legacy_devices [IA64] update sn2_defconfig [IA64] reformat pal.S to fit in 80 columns, fix typos [IA64] remove unused PAL_CALL_IC_OFF [IA64] - Allow IPIs in timer loop [IA64] move ioremap/ioremap_nocache under __KERNEL__ [IA64] perfmon fix for global IRQ fix commit bd452e6f178a559408c54c2b4ca29191b812d47f Author: Jean Delvare Date: Fri Oct 13 17:03:42 2006 +0200 hwmon: Fix debug messages in w83781d Fix debug messages in w83781d at detection time. We can't use dev_dbg() on an i2c client's device before calling i2c_attach_client() on that client. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit e693810ce8495ce3e227dacaa83f501b3b8ab204 Author: Jean Delvare Date: Fri Oct 13 16:56:28 2006 +0200 hwmon: Let w83781d and lm78 load again Let the w83781d and lm78 hardware monitoring drivers load even when no chip was detected at the ISA address. There can still be supported chips connected to an I2C bus or SMBus. This fixes bug #7293. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 14992c7eff937bb12c8ebf2d91dbaa8c2f0cfc87 Author: Rudolf Marek Date: Sun Oct 8 22:02:09 2006 +0200 w83627ehf: Fix the detection of fan5 Fix the detection of fan5 and preserve the bit between the register writes, because the bit is write only. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 4660cb354a1dacbbc9c96f94eceedc38fe542fe2 Author: Rudolf Marek Date: Sun Oct 8 22:01:26 2006 +0200 k8temp: Documentation update Update the documentation for the k8temp driver. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 6091780eba5d195213747b515a62211ac97641f1 Author: Jean Delvare Date: Sun Oct 8 22:00:44 2006 +0200 smsc47m1: List the SMSC LPC47M112 as supported The SMSC LPC47M112 Super-I/O chip appears to be compatible with the LPC47M10x and LPC47M13x as far as hardware monitoring is concerned. The device ID is even the same, so it's really only a documentation update. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 15fe25ca67234514d7cf41af28096c1330f44950 Author: Jean Delvare Date: Sun Oct 8 21:59:54 2006 +0200 hwmon: Fix documentation typos Fix typos in hardware monitoring documentation. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 2ca7b961c3c9f072d307293aad0f9705522e916a Author: Grant Coady Date: Sun Oct 8 21:57:41 2006 +0200 adm9240: Update Grant Coady's email address Replace a bouncing email that I cannot recover from Mr Google. Signed-off-by: Grant Coady Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 34fc921a253f3ddfc4ad9de1dbc88683f84fbaaa Author: Jim Cromie Date: Sun Oct 8 21:56:29 2006 +0200 w83791d: Fix unchecked return status Replace all unchecked calls to device_create_file with a single group declaration, and one call to sysfs_create_group, and check that one return status. Also remove the files on device detach. Signed-off-by: Jim Cromie Signed-off by: Charles Spirakis Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 4ca5224f3ea4779054d96e885ca9b3980801ce13 Author: Greg Kroah-Hartman Date: Tue Apr 9 12:14:34 2002 -0700 aoe: fix sysfs_create_file warnings Moved the attributes into a group, making the compiler be quiet about ignoring the return value of the file create calls. This also also fixed a bug when removing the files, which were not symlinks. Cc: "Ed L. Cashin" Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit a12c93f08b8fc83b7fcdabaf92b1adcea7489f5e Author: Ed L. Cashin Date: Wed Sep 20 14:36:51 2006 -0400 aoe: revert printk macros This patch addresses the concern that the aoe driver should not introduce unecessary conventions that must be learned by the reader. It reverts patch 6. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 086216db1435f44a58c18454acfa59f013510c95 Author: Ed L. Cashin Date: Wed Sep 20 14:36:51 2006 -0400 aoe: update driver version Update aoe driver version number to 32. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit b849086d8f77f8a1269a01d5552fbf355311f7ac Author: Ed L. Cashin Date: Wed Sep 20 14:36:51 2006 -0400 aoe: remove sysfs comment Remove unecessary comment. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 392e4845f9728114f7ffa8d7612683397fd4d441 Author: Ed L. Cashin Date: Wed Sep 20 14:36:50 2006 -0400 aoe: use bio->bi_idx Instead of starting with bio->bi_io_vec, use the offset in bio->bi_idx. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit b751e8b6590efdb76e1682c85bfcd5f3531ccae4 Author: Ed L. Cashin Date: Wed Sep 20 14:36:50 2006 -0400 aoe: module parameter for device timeout The aoe_deadsecs module parameter sets the number of seconds that elapse before a nonresponsive AoE device is marked as dead. This is runtime settable in sysfs or settable with a module load or kernel boot parameter. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 4f51dc5e9ae195d2e8c22e5f574e004c2f6518a4 Author: Ed L. Cashin Date: Wed Sep 20 14:36:49 2006 -0400 aoe: zero copy write 2 of 2 Avoid memory copy on writes. (This patch follows patch 4.) Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit dced3a053dd5415a7321e1ae153c96dea644da4e Author: Ed L. Cashin Date: Wed Sep 20 14:36:49 2006 -0400 aoe: improve retransmission heuristics Add a dynamic minimum timer for better retransmission behavior. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit ddec63e86752b89776547e93aa68af01f1cbb10c Author: Ed L. Cashin Date: Wed Sep 20 14:36:49 2006 -0400 aoe: jumbo frame support 2 of 2 Add support for jumbo ethernet frames. (This patch follows patch 5.) Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 6bb6285fdb948cedee586c6bebc9ebc5e32a5c35 Author: Ed L. Cashin Date: Wed Sep 20 14:36:49 2006 -0400 aoe: clean up printks via macros Use simple macros to clean up the printks. (This patch is reverted by the 14th patch to follow.) Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 19bf26353c50bc2be375109ec73f2f0bbd616ed1 Author: Ed L. Cashin Date: Wed Sep 20 14:36:49 2006 -0400 aoe: jumbo frame support 1 of 2 Add support for jumbo ethernet frames. (This patch depends on patch 7 to follow.) Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit e407a7f6cd143b3ab4eb3d7e1cf882e96b710eb5 Author: Ed L. Cashin Date: Wed Sep 20 14:36:49 2006 -0400 aoe: zero copy write 1 of 2 Avoid memory copy on writes. (This patch depends on fixes in patch 9 to follow.) Although skb->len should not be set when working with linear skbuffs, the skb->tail pointer maintained by skb_put/skb_trim is not relevant to what happens when the skb_fill_page_desc function is called. This issue was raised without comment in linux-kernel and netdev earlier this month: http://thread.gmane.org/gmane.linux.kernel/446474/ http://thread.gmane.org/gmane.linux.network/45444/ So until there is something analogous to skb_put that works for zero-copy write skbuffs, we will do what the other callers of skb_fill_page_desc are doing. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 2fdc0ea75b26e3009cfdf72e79901e4e16bb99bd Author: Ed L. Cashin Date: Wed Sep 20 14:36:48 2006 -0400 aoe: remove unused NARGS enum The NARGS enum is left over from older code versions. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 2611464d7f36685fb1990275d3de1e72e6aff9d9 Author: Ed L. Cashin Date: Wed Sep 20 14:36:48 2006 -0400 aoe: update copyright date Update the copyright year to 2006. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 463c2c12dce78dd0cb77b65beba93f029a164ba3 Author: Ed L. Cashin Date: Wed Sep 20 14:34:41 2006 -0400 aoe: eliminate isbusy message This message doesn't help users because the circumstance isn't problematic. Signed-off-by: "Ed L. Cashin" Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 4d664238207a82c4018757e2d87cf2a780462dcd Author: Akinobu Mita Date: Mon Oct 9 18:04:30 2006 +0900 driver core: kmalloc() failure check in driver_probe_device driver_probe_device() is missing kmalloc() failure check. Signed-off-by: Akinobu Mita Signed-off-by: Greg Kroah-Hartman commit d9fd4d3b317a231e47f31d64d66c8cc7765d458f Author: Jeff Garzik Date: Wed Oct 4 07:48:03 2006 -0400 Driver core: bus: remove indentation level Before potentially fixing up these functions, this cosmetic change reduces the indentation level to make the code easier to read and maintain. No functional changes at all. Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit f70fa6296c2ec8f541f0a9b406ccc2d9d127d639 Author: Alan Stern Date: Thu Oct 5 17:03:24 2006 -0400 Driver core: Don't ignore error returns from probing This patch (as797) fixes device_add() in the driver core. It needs to pay attention when the driver for a new device reports an error. At the same time, since bus_remove_device() undoes the effects of both bus_add_device() and bus_attach_device(), it needs to check whether the bus_attach_device step failed. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 952ab431cd36c7ab573f685af8679c3677cbdc29 Author: Jesper Juhl Date: Thu Sep 28 23:56:01 2006 +0200 Driver core: Don't leak 'old_class_name' in drivers/base/core.c::device_rename() If kmalloc() fails to allocate space for 'old_symlink_name' in drivers/base/core.c::device_rename(), then we'll leak 'old_class_name'. Spotted by the Coverity checker. Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit 221c324a336770a911b16bda02b9f4adad506a35 Author: Cornelia Huck Date: Fri Sep 22 11:37:32 2006 +0200 driver core fixes: sysfs_create_group() retval in topology.c Return the return value of sysfs_create_group() in topology_add_dev(). Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit 141ecc5320147d363d060cfc8042d197a3cdd496 Author: Cornelia Huck Date: Fri Sep 22 11:37:27 2006 +0200 driver core fixes: device_create_file() retval check in dmapool.c Check for device_create_file() return value in dma_pool_create(). Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit a306eea40952e6365301e8a2f7d5ffa9c6a1921b Author: Cornelia Huck Date: Fri Sep 22 11:37:13 2006 +0200 driver core fixes: device_add() cleanup on error Check for return code of device_create_file() and correct cleanup in the error case in device_add(). Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit 513e7337adc32cdfbffecb99953e45a44e812c2d Author: Cornelia Huck Date: Fri Sep 22 11:37:08 2006 +0200 driver core fixes: bus_add_device() cleanup on error Correct cleanup in the error path of bus_add_device(). Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit 1bb6881acae1c4f11a6e86f04df32ba45e95031d Author: Cornelia Huck Date: Fri Sep 22 11:37:04 2006 +0200 driver core fixes: bus_add_attrs() retval check Check return value of bus_add_attrs() in bus_register(). Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit f0e1761ac528e9d28f3ba06bd268ec41fe872ac8 Author: Cornelia Huck Date: Fri Sep 22 11:37:00 2006 +0200 driver core fixes: sysfs_create_link() retval check in class.c Check for return value of sysfs_create_link() in class_device_add(). Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit 97a501849d60f3dbb8bfcd2300cf65dd5ebc0355 Author: Hidetoshi Seto Date: Wed Sep 20 16:49:02 2006 +0900 sysfs: update obsolete comment in sysfs_update_file And the obsolete comment should be updated (or totally removed). Signed-off-by: Hidetoshi Seto Signed-off-by: Greg Kroah-Hartman commit e42344514c6e8ca7f5427da9b1407b56550dfa01 Author: Hidetoshi Seto Date: Wed Sep 20 16:38:00 2006 +0900 sysfs: remove duplicated dput in sysfs_update_file Following function can drops d_count twice against one reference by lookup_one_len. /** * sysfs_update_file - update the modified timestamp on an object attribute. * @kobj: object we're acting for. * @attr: attribute descriptor. */ int sysfs_update_file(struct kobject * kobj, const struct attribute * attr) { struct dentry * dir = kobj->dentry; struct dentry * victim; int res = -ENOENT; mutex_lock(&dir->d_inode->i_mutex); victim = lookup_one_len(attr->name, dir, strlen(attr->name)); if (!IS_ERR(victim)) { /* make sure dentry is really there */ if (victim->d_inode && (victim->d_parent->d_inode == dir->d_inode)) { victim->d_inode->i_mtime = CURRENT_TIME; fsnotify_modify(victim); /** * Drop reference from initial sysfs_get_dentry(). */ dput(victim); res = 0; } else d_drop(victim); /** * Drop the reference acquired from sysfs_get_dentry() above. */ dput(victim); } mutex_unlock(&dir->d_inode->i_mutex); return res; } PCI-hotplug (drivers/pci/hotplug/pci_hotplug_core.c) is only user of this function. I confirmed that dentry of /sys/bus/pci/slots/XXX/* have negative d_count value. This patch removes unnecessary dput(). Signed-off-by: Hidetoshi Seto Acked-by: Maneesh Soni Signed-off-by: Greg Kroah-Hartman commit 722385f75efd82d9f480f0765a1e97a4d83cac0d Author: Diego Calleja Date: Thu Sep 21 22:37:10 2006 +0200 HOWTO: bug report addition I suspect that not many people is subscribed to the bugzilla mailing list, not surprising since the URLs doesn't seem to be in the tree :) After fixing my english, I wonder if the following patch could be applied... Signed-off-by: Diego Calleja Acked-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 310a922d4307ed38b37982a6f93b11fdf3b8dcb1 Author: Matthew Wilcox Date: Sat Sep 23 23:35:04 2006 -0600 Fix dev_printk() is now GPL-only Make dev_printk usable from non-GPL modules again dev_printk now calls dev_driver_string. We want even proprietary modules to be calling dev_printk, so the export of dev_driver_string needs to be non-GPL-only. Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit 0fbf116d120a2dc5d808204c7d86ad35f7d7846f Author: Duncan Sands Date: Wed Sep 27 23:38:08 2006 +0200 Driver core: plug device probe memory leak Make sure data is freed if the kthread fails to start. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit acbd39fbc5d8757aa920c6045399374df7a6dd68 Author: Dominik Brodowski Date: Sat Sep 30 22:41:43 2006 -0400 Documentation: feature-removal-schedule typo Fix typo in newly added feature remove schedule item. Signed-off-by: Dominik Brodowski Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 7a54f25cef6c763f16c9fd49ae382de162147873 Author: Greg Kroah-Hartman Date: Fri Oct 13 20:05:19 2006 -0700 PCI Hotplug: move pci_hotplug.h to include/linux/ This makes it possible to build pci hotplug drivers outside of the main kernel tree, and Sam keeps telling me to move local header files to their proper places... Signed-off-by: Greg Kroah-Hartman commit fb5f4d7a74a140f8e033d1e6854989e88c36c6b8 Author: Kristen Carlson Accardi Date: Fri Sep 29 10:30:27 2006 -0700 change pci hotplug subsystem maintainer to Kristen Here's a patch adding me to the maintainers file for the pci hotplug subsystem, as we discussed. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 6b4b78fed47e7380dfe9280b154e8b9bfcd4c86c Author: Matt Domsch Date: Fri Sep 29 15:23:23 2006 -0500 PCI: optionally sort device lists breadth-first Problem: New Dell PowerEdge servers have 2 embedded ethernet ports, which are labeled NIC1 and NIC2 on the chassis, in the BIOS setup screens, and in the printed documentation. Assuming no other add-in ethernet ports in the system, Linux 2.4 kernels name these eth0 and eth1 respectively. Many people have come to expect this naming. Linux 2.6 kernels name these eth1 and eth0 respectively (backwards from expectations). I also have reports that various Sun and HP servers have similar behavior. Root cause: Linux 2.4 kernels walk the pci_devices list, which happens to be sorted in breadth-first order (or pcbios_find_device order on i386, which most often is breadth-first also). 2.6 kernels have both the pci_devices list and the pci_bus_type.klist_devices list, the latter is what is walked at driver load time to match the pci_id tables; this klist happens to be in depth-first order. On systems where, for physical routing reasons, NIC1 appears on a lower bus number than NIC2, but NIC2's bridge is discovered first in the depth-first ordering, NIC2 will be discovered before NIC1. If the list were sorted breadth-first, NIC1 would be discovered before NIC2. A PowerEdge 1955 system has the following topology which easily exhibits the difference between depth-first and breadth-first device lists. -[0000:00]-+-00.0 Intel Corporation 5000P Chipset Memory Controller Hub +-02.0-[0000:03-08]--+-00.0-[0000:04-07]--+-00.0-[0000:05-06]----00.0-[0000:06]----00.0 Broadcom Corporation NetXtreme II BCM5708S Gigabit Ethernet (labeled NIC2, 2.4 kernel name eth1, 2.6 kernel name eth0) +-1c.0-[0000:01-02]----00.0-[0000:02]----00.0 Broadcom Corporation NetXtreme II BCM5708S Gigabit Ethernet (labeled NIC1, 2.4 kernel name eth0, 2.6 kernel name eth1) Other factors, such as device driver load order and the presence of PCI slots at various points in the bus hierarchy further complicate this problem; I'm not trying to solve those here, just restore the device order, and thus basic behavior, that 2.4 kernels had. Solution: The solution can come in multiple steps. Suggested fix #1: kernel Patch below optionally sorts the two device lists into breadth-first ordering to maintain compatibility with 2.4 kernels. It adds two new command line options: pci=bfsort pci=nobfsort to force the sort order, or not, as you wish. It also adds DMI checks for the specific Dell systems which exhibit "backwards" ordering, to make them "right". Suggested fix #2: udev rules from userland Many people also have the expectation that embedded NICs are always discovered before add-in NICs (which this patch does not try to do). Using the PCI IRQ Routing Table provided by system BIOS, it's easy to determine which PCI devices are embedded, or if add-in, which PCI slot they're in. I'm working on a tool that would allow udev to name ethernet devices in ascending embedded, slot 1 .. slot N order, subsort by PCI bus/dev/fn breadth-first. It'll be possible to use it independent of udev as well for those distributions that don't use udev in their installers. Suggested fix #3: system board routing rules One can constrain the system board layout to put NIC1 ahead of NIC2 regardless of breadth-first or depth-first discovery order. This adds a significant level of complexity to board routing, and may not be possible in all instances (witness the above systems from several major manufacturers). I don't want to encourage this particular train of thought too far, at the expense of not doing #1 or #2 above. Feedback appreciated. Patch tested on a Dell PowerEdge 1955 blade with 2.6.18. You'll also note I took some liberty and temporarily break the klist abstraction to simplify and speed up the sort algorithm. I think that's both safe and appropriate in this instance. Signed-off-by: Matt Domsch Signed-off-by: Greg Kroah-Hartman commit 49c61cca2b6591a28ffa4abb73c718091f569746 Author: Akinobu Mita Date: Sat Oct 14 03:07:30 2006 +0900 cpcihp_generic: prevent loading without "bridge" parameter cpcihp_generic module requires configured "bridge" module parameter. But it can be loaded successfully without that parameter. Because module init call ends up returning positive value. This patch prevents from loading without setting "bridge" module parameter. Signed-off-by: Akinbou Mita Signed-off-by: Scott Murray Signed-off-by: Greg Kroah-Hartman commit 29f3eb64634cf96903a3cdb56b1f9a80bebad17d Author: Alan Cox Date: Mon Oct 16 16:20:21 2006 -0700 pci: Additional search functions In order to finish converting to pci_get_* interfaces we need to add a couple of bits of missing functionaility pci_get_bus_and_slot() provides the equivalent to pci_find_slot() (pci_get_slot is already taken as a name for something similar but not the same) pci_get_device_reverse() is the equivalent of pci_find_device_reverse but refcounting Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 11f242f04c6d886494cc83097cb6def044eabebb Author: Alan Cox Date: Tue Oct 10 14:39:00 2006 -0700 PCI: quirks: switch quirks code offender to use pci_get API Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 0cc2b3763e06e84ae5a90b63e03cc1d585a109d0 Author: Brice Goglin Date: Thu Oct 5 10:24:42 2006 +0200 PCI: Update MSI-HOWTO.txt according to pci_msi_supported() Update MSI-HOWTO.txt according to pci_msi_supported(). Signed-off-by: Brice Goglin Signed-off-by: Greg Kroah-Hartman commit 0306ebfa3b45386401f80aa87cb4f7570bf3aadb Author: Brice Goglin Date: Thu Oct 5 10:24:31 2006 +0200 PCI: Improve pci_msi_supported() comments Improve pci_msi_supported() comments. Signed-off-by: Brice Goglin Signed-off-by: Grant Grundler Signed-off-by: Greg Kroah-Hartman commit 662a98fb8de5af4adb56e58f78753cdaa27b6459 Author: Amol Lad Date: Thu Oct 5 12:07:32 2006 +0530 PCI hotplug: ioremap balanced with iounmap 1. ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. 2. Handle return value correctly Tested (compilation only) with: - allmodconfig Signed-off-by: Amol Lad Cc: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 6aa562c248e05db993e4a5f405f899c0cfabb7f2 Author: Kenji Kaneshige Date: Thu Sep 28 15:51:36 2006 -0700 shpchp: remove unnecessary cmd_busy member from struct controller This patch removes unnecessary cmd_busy member from struct controller. Read command status register instead of using cmd_busy. Signed-off-by: Kenji Kaneshige Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit d1729ccecd7ba9ceb6dca1c973dbfd87041d0637 Author: Kenji Kaneshige Date: Thu Sep 28 15:51:21 2006 -0700 shpchp: fix command completion check This patch fixes the problem that shpchp driver could mis-detect command failures if the system was under heavy load. Signed-off-by: Kenji Kaneshige Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 094ed76e8988d46158b036ab150e0c22aff6db3a Author: Alan Cox Date: Fri Sep 29 18:36:15 2006 +0100 pci: Stamp out pci_find_* usage in fakephp pci_find is not hotplug safe, so it really doesn't want to be in an actual hotplug driver either. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 0bed208efcb25bed4dc2026488a4417aa68e7c92 Author: Zhang, Yanmin Date: Thu Sep 28 14:35:59 2006 +0800 PCI: fix pcie_portdrv_restore_config undefined without CONFIG_PM error On Thu, 2006-09-28 at 03:42, Olaf Hering wrote: > PCI-Express AER implemetation: pcie_portdrv error handler > > This patch breaks if CONFIG_PM is not enabled, > pcie_portdrv_restore_config() will be undefined. I move the definition of pcie_portdrv_restore_config out of CONFIG_PM. Below patch is against 2.6.18-mm1. Could you try it? Signed-off-by: Zhang Yanmin Signed-off-by: Greg Kroah-Hartman commit ccc4c7bbd6a2d47bf5899c2c8cf2e0d176a4dc0f Author: Vojtech Pavlik Date: Fri Apr 7 20:00:27 2006 +0200 Fix DMA resource allocation in ACPIPnP The ACPIPnP implementation had the understanding of Linux resource flags very wrong, resulting in a nonfunctional implementation of DMA resource allocation. This was usually not a problem, since almost no on-board PnP devices use ISA DMA, with the exception of ECP parallel ports. Even with that, parallel port DMA is preconfigured by the BIOS, so this routine isn't normally called. Except in the case where somebody does 'rmmod parport_pc; modprobe parport_pc', where the rmmod case disables the ECP parallel port resources, and they need to be enabled again to initialize the module. This didn't work, resulting in a non-printing printer. The application doing exactly the above to force reprobing of printers is the YaST printer module. Thus without this fix YaST wedged the printer when configuring it, and was not able to print a test page. Reported-by: Ralf Flaxa Reproduced-by: Jiri Dluhos Signed-off-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit b5e4efe7e061ff52ac97b9fa45acca529d8daeea Author: eiichiro.oiwa.nm@hitachi.com Date: Thu Sep 28 13:55:47 2006 +0900 PCI: Turn pci_fixup_video into generic for embedded VGA pci_fixup_video turns into generic code because there are many platforms need this fixup for embedded VGA as well as x86. The Video BIOS integrates into System BIOS on a machine has embedded VGA although embedded VGA generally don't have PCI ROM. As a result, embedded VGA need the way that the sysfs rom points to the Video BIOS of System RAM (0xC0000). PCI-to-PCI Bridge Architecture specification describes the condition whether or not PCI ROM forwards VGA compatible memory address. fixup_video suits this specification. Although the Video ROM generally implements in x86 code regardless of platform, some application such as X Window System can run this code by dosemu86. Therefore, pci_fixup_video should turn into generic code. Signed-off-by: Eiichiro Oiwa Acked-by: Alan Cox Acked-by: Jesse Barnes Signed-off-by: Greg Kroah-Hartman commit bacedce32b171cd461a7da3160ad794e2240c67a Author: Daniel Ritz Date: Mon Sep 25 16:52:21 2006 -0700 PCI: add ICH7/8 ACPI/GPIO io resource quirks Signed-off-by: Daniel Ritz Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3ec6a8d02efd54a66640bd85afa8c162647b56c3 Author: Andrew Morton Date: Mon Sep 25 16:52:20 2006 -0700 PCI: pcie-check-and-return-bus_register-errors fix __must_check goes on the declaration, not the definition. Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 09d6029f43ebbe7307854abdae204c25d711ff94 Author: Daniel Drake Date: Mon Sep 25 16:52:19 2006 -0700 PCI: VIA IRQ quirk behaviour change The most recent VIA IRQ quirk changes have broken various VIA devices for some users. We are not able to add these devices to the blacklist as they are also available in PCI-card form, and running the quirk on these devices brings us back to square one (running the VIA quirk on non-VIA boards where the quirk is not needed). This patch, based on suggestions from Sergey Vlasov, implements a scheme similar to but more restrictive than the scheme we had in 2.6.16 and earlier. It runs the quirk on all VIA hardware, but *only* if a VIA southbridge was detected on the system. To further reduce the amount of quirked devices, this patch includes a change suggested by Linus at http://lkml.org/lkml/2005/9/27/113 This ensures that devices bound to non-legacy IO-APIC interrupt lines are not quirked. We have made one change to Linus' suggestion: we do a comparison of ">15" rather than ">=15", as 15 is still in the legacy interrupt range. There is still a downside to this patch: if the user inserts a VIA PCI card into a VIA-based motherboard, in some circumstances the quirk will also run on the VIA PCI card. This corner case is hard to avoid. Signed-off-by: Daniel Drake Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9ef9977cabc1b2c1718ef6eb883caec8dcb80b4c Author: Eric Sesterhenn Date: Mon Sep 25 00:56:53 2006 +0200 pciehp: Remove unnecessary check in pciehp_ctrl.c this was spotted by coverity (cid #819). We dereference p_slot earlier in the function, and i found no way it could become NULL anywhere. Signed-off-by: Eric Sesterhenn Signed-off-by: Greg Kroah-Hartman commit dd5619cb4407e830a8921a93c949be37c81105b5 Author: Kenji Kaneshige Date: Fri Sep 22 10:17:29 2006 -0700 pciehp - add missing locking This patch fixes the problem that system will panic if multiple power on/off operations are issued to the same slot in parallel. This problem can be easily reproduced by commands below. # while true; do echo 1 > power; echo 0 > power; done & # while true; do echo 1 > power; echo 0 > power; done & The cause is lack of locking for enable/disable operations. This patch fixes this problem. Signed-off-by: Kenji Kaneshige Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 49ed2b4963cd00993eab518b820a6700f94f222d Author: Kenji Kaneshige Date: Fri Sep 22 10:17:10 2006 -0700 pciehp: fix improper info messages The slot number displayed in info messages would cause a confusion because those are displayed in several ways (decimal and hex). Furthermore, those slot number is not same as slot name (directory name). This patch fixes those improper info messages. Signed-off-by: Kenji Kaneshige Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit b4a1efffcf8070dbc7734f27da10ce49fb9f2a34 Author: Kenji Kaneshige Date: Fri Sep 22 12:52:37 2006 -0700 shpchp: fix shpchp_wait_cmd in poll This patch fixes the problem that issuing SHPC command in poll mode always fails with the following message. shpchp: Command not completed in 2000 msec Signed-off-by: Kenji Kaneshige Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit ce9b18f5cdd628196ca13bb783e8dcd5ad29ceaa Author: Martin Schwidefsky Date: Wed Oct 18 18:30:59 2006 +0200 [S390] update default configuration Signed-off-by: Martin Schwidefsky commit 9b10fe5b70878fb4b7e3e1b300f1bff0c73d4e2e Author: Cornelia Huck Date: Wed Oct 18 18:30:55 2006 +0200 [S390] cio: update documentation. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 867dcd0f32b125f45a663f9374a36fb21193ab21 Author: Stefan Weinhuber Date: Wed Oct 18 18:30:53 2006 +0200 [S390] dasd: clean up timer. Clean up dasd timer when when a dasd device is set offline. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit 833774849d50a59f58e9bdfc3d9c88e682b3596d Author: Martin Schwidefsky Date: Wed Oct 18 18:30:51 2006 +0200 [S390] Fix pte type checking. handle_pte_fault uses pte_present, pte_none and pte_file to find out the type of a pte. That is done without holding the page table lock. This clashes with the way how ptep_clear_flush removes active page table entries from the system. First the ipte instruction is used to invalidate the pte and remove all plt entries for the page. The ipte sets the hardware invalid bit without changing any other bit. After the ipte finished the pte is cleared. A concurrent fault can observe the the previously valid pte with the invalid bit set. With the current encoding of the different pte types an invalidated read-only pte can be misinterpreted as a swap-pte. Signed-off-by: Martin Schwidefsky commit 2c91971f84be168a35f937dd6c61e56e492b2185 Author: Melissa Howland Date: Wed Oct 18 18:30:49 2006 +0200 [S390] monwriter find header logic. Fix logic for finding matching buffers. Signed-off-by: Melissa Howland Signed-off-by: Martin Schwidefsky commit 85a4aa64a85a8bd19b86887f70b13a27a363030d Author: Cornelia Huck Date: Wed Oct 18 18:30:47 2006 +0200 [S390] cio: sch_no -> schid.sch_no conversion. Overlooked one sch_no -> schid.sch_no conversion. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit f5956f84072804712cb7b663c5c64e9800180833 Author: Heiko Carstens Date: Wed Oct 18 18:30:45 2006 +0200 [S390] Wire up epoll_pwait syscall. Signed-off-by: Heiko Carstens commit 8b42f5c20251060cb1ab875459fe66ad7bb92cbd Author: Peter Oberparleiter Date: Wed Oct 18 18:30:43 2006 +0200 [S390] cio: invalid device operational notification Reset device operational notification flag when channel paths become unavailable during path verification. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 1df23957ba2da6eb8c7a5c2ad7bb1d4732132873 Author: Cedric Le Goater Date: Wed Oct 18 18:30:41 2006 +0200 [S390] fix vmlinux link when CONFIG_SYSIPC=n Fix the following compile error: CC init/version.o LD init/built-in.o LD .tmp_vmlinux1 arch/s390/kernel/built-in.o(.text+0xdba4): In function `sys32_ipc': : undefined reference to `compat_sys_semtimedop' arch/s390/kernel/built-in.o(.text+0xdbee): In function `sys32_ipc': : undefined reference to `compat_sys_semctl' arch/s390/kernel/built-in.o(.text+0xdc08): In function `sys32_ipc': : undefined reference to `compat_sys_msgsnd' arch/s390/kernel/built-in.o(.text+0xdc30): In function `sys32_ipc': : undefined reference to `compat_sys_msgrcv' arch/s390/kernel/built-in.o(.text+0xdc58): In function `sys32_ipc': : undefined reference to `compat_sys_msgctl' arch/s390/kernel/built-in.o(.text+0xdc76): In function `sys32_ipc': : undefined reference to `compat_sys_shmat' arch/s390/kernel/built-in.o(.text+0xdcb0): In function `sys32_ipc': : undefined reference to `compat_sys_shmctl' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Cedric Le Goater Signed-off-by: Martin Schwidefsky commit 74d919465a93b6c2b928b29a8ed3e5e41adbfa93 Author: Ben Collins Date: Wed Oct 18 08:55:54 2006 -0400 [pci_ids] Add Quicknet XJ vendor/device ID's. Signed-off-by: Ben Collins commit 996f324767fd24b7cc682801277add2a4f276635 Author: Ben Collins Date: Wed Oct 18 08:53:37 2006 -0400 [valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled. Signed-off-by: Ben Collins commit f3f6f9aaced9c8453ef45956a23295e5c2328124 Author: Ben Collins Date: Wed Oct 18 08:52:48 2006 -0400 [platinumfb] Ifdef for when CONFIG_NVRAM isn't enabled. Signed-off-by: Ben Collins commit b023429ca30fc18b17a7b3e279b55bd652e9a989 Author: Ben Collins Date: Wed Oct 18 08:50:49 2006 -0400 [igafb] Add pci dev table for module auto loading. Signed-off-by: Ben Collins commit 4938d3f4f8f1ffd744fa3626df8085118aeb1d79 Author: Ben Collins Date: Wed Oct 18 08:49:31 2006 -0400 [controlfb] Ifdef for when CONFIG_NVRAM isn't enabled. Signed-off-by: Ben Collins commit d57cdcffe1180cf9b8d1fce048f80d8c6b159827 Author: Ben Collins Date: Wed Oct 18 08:47:37 2006 -0400 [hid-core] TurboX Keyboard needs NOGET quirk. Signed-off-by: Ben Collins commit d77f09e51f5793583ede9733a93bd31a324d051c Author: Ben Collins Date: Wed Oct 18 08:45:30 2006 -0400 [ixj] Add pci dev table for module auto loading. Signed-off-by: Ben Collins commit 012887327875915f76a6208e81fe0d67a682ec15 Author: Ben Collins Date: Wed Oct 18 08:40:57 2006 -0400 [initio] Add pci dev table for module auto loading. Signed-off-by: Ben Collins commit 3985b977441f857404bb604a4b15911bbb0b9c5b Author: Ben Collins Date: Wed Oct 18 08:38:41 2006 -0400 [fdomain] Add pci dev table for module auto loading. Signed-off-by: Ben Collins commit 745b5715fafccc8f0f992a7cccdd1eb2b1f5d23f Author: Ben Collins Date: Wed Oct 18 08:36:57 2006 -0400 [BusLogic] Add pci dev table for auto module loading. Signed-off-by: Ben Collins commit 4596c75c23dde2623cbeec69357d5eb13d28387e Author: Ben Collins Date: Wed Oct 18 08:33:03 2006 -0400 [mv643xx] Add pci device table for auto module loading. Signed-off-by: Ben Collins commit 5cacb9f8bca1ac67cc1f933a4e89b5130ffd1460 Author: Ben Collins Date: Wed Oct 18 08:24:30 2006 -0400 [alim7101] Add pci dev table for auto module loading. Also fixes comment for nowayout module param. Signed-off-by: Ben Collins commit 73ed9a86cd77b6a3b46beec8d353ac3b0d4f50c1 Author: David S. Miller Date: Tue Oct 17 19:29:41 2006 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit f6d7b8a7c9e21a58890a8532143e241409b78664 Author: Krzysztof Helt Date: Tue Oct 17 19:23:23 2006 -0700 [SPARC]: Sparc compilation fix with floppy enabled This patch fixes a typo to make kernel compilable when floppy driver for Sparc is build. Signed-off-by: Krzysztof Helt Signed-off-by: David S. Miller commit 9550e59c4587f637d9aa34689e32eea460e6f50c Author: Martin Habets Date: Tue Oct 17 19:21:48 2006 -0700 [SPARC]: Add sparc profiling support This patch adds profiling support to the sparc architecture. It is a copy of the sparc64 implementation. Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit 872ec6484720e7ddfebb8e15c232fa7ca158ef2e Author: David S. Miller Date: Tue Oct 17 19:19:08 2006 -0700 [SPARC] {bbc_,}envctrl: Use call_usermodehelper(). We should not be calling kernel_execve() directly and this causes module build failures because kernel_execve() is not exported to modules. Signed-off-by: David S. Miller commit b48194bf0dc0f8e2b617fab10df885513fbb3bad Author: Ben Collins Date: Tue Oct 17 19:11:31 2006 -0700 [SPARC]: Fix some section mismatch warnings in sparc drivers. Signed-off-by: Ben Collins Signed-off-by: David S. Miller commit 5aee87c43e3a71a4aa4e72b0dc2180e4952c0848 Author: David S. Miller Date: Tue Oct 17 19:04:44 2006 -0700 [SPARC64]: Fix PCI memory space root resource on Hummingbird. For Hummingbird PCI controllers, we should create the root PCI memory space resource as the full 4GB area, and then allocate the IOMMU DMA translation window out of there. The old code just assumed that the IOMMU DMA translation base to the top of the 4GB area was unusable. This is not true on many systems such as SB100 and SB150, where the IOMMU DMA translation window sits at 0xc0000000->0xdfffffff. So what would happen is that any device mapped by the firmware at the top section 0xe0000000->0xffffffff would get remapped by Linux somewhere else leading to all kinds of problems and boot failures. While we're here, report more cases of OBP resource assignment conflicts. The only truly valid ones are ROM resource conflicts. Signed-off-by: David S. Miller commit 7341df16a1f228be833e918cb42534a34381a37e Author: David S. Miller Date: Tue Oct 17 00:24:14 2006 -0700 [SPARC]: Kill BOOTME_SINGLE. Unused, but still allow the '-s' boot option to be passed down to init. Based upon patches by Martin Habets. Signed-off-by: David S. Miller commit 9950421c1e90d08d52ef47df1fcebe6078b04af3 Author: Linus Torvalds Date: Tue Oct 17 18:03:33 2006 -0700 Fix USB gadget net2280.c compile It would fail the compile due to the newly added error checking testing a bad macro for a "return value" unless USB_GADGET_DEBUG_FILES was enabled. Pointed out by Stephen Hemminger. Acked-by: Stephen Hemminger Signed-off-by: Linus Torvalds commit 699ddda6ecd5751fd05fd5128aa7f93438974468 Merge: acbb67d... ab352c2... Author: Linus Torvalds Date: Tue Oct 17 15:05:22 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (47 commits) USB: Add device id for Sierra Wireless MC8755 USB: cleanup sierra wireless driver a bit USB: Sierra Wireless driver update USB: ftdi_sio whitespace fixes USB-SERIAL:cp2101 Add new device ID USB/gadget/net2280: handle sysfs errors usbtouchscreen: fix data reading for ITM touchscreens UEAGLE: fix ueagle-atm Oops USB: xpad: dance pad support USB: input: extract() and implement() are bit field manipulation routines USB: Memory leak in drivers/usb/serial/airprime.c USB Storage: unusual_devs.h entry for Sony Ericsson P990i USB: fix usbatm tiny race USB: unusual_devs entry for Nokia 6234 USB: mos7840.c: fix a check-after-dereference USB: ftdi-elan.c: remove dead code USB: Mitsumi USB FDD 061M: UNUSUAL_DEV multilun fix USB: fix dereference in drivers/usb/misc/adutux.c USB: add USB serial mos7720 driver USB: move trancevibrator.c to the proper usb directory ... commit acbb67d51ef0ff942d592d44fb8abb4c931041ff Merge: 22a60f1... 1f5c23e... Author: Linus Torvalds Date: Tue Oct 17 15:04:45 2006 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/mthca: Use mmiowb after doorbell ring IB/ipath: Initialize diagpkt file on device init only RDMA/amso1100: Fix a NULL dereference in error path RDMA/amso1100: pci_module_init() conversion commit 9b3377f9921766b6193861d0e3194854b1d765fe Author: Jack Steiner Date: Mon Oct 16 16:17:43 2006 -0500 [IA64] Count resched interrupts Count the number of "resched" interrupts that each cpu receives. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 219902677351665bf0513115592a6dd665cf06e8 Author: Bjorn Helgaas Date: Fri Sep 29 12:58:31 2006 -0600 [IA64] remove unused acpi_kbd_controller_present, acpi_legacy_devices Nobody uses either one anymore. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck commit 8611342f3dda0e13970e724129a8e2066de1362e Author: Jes Sorensen Date: Mon Oct 9 05:24:57 2006 -0400 [IA64] update sn2_defconfig The current sn2_defconfig is obsolete, in particular the recent ATA changes are a pain, so here's a patch to get things in sync ... at least for a day or two :) Update sn_defconfig to match current community kernel tree. Signed-off-by: Jes Sorensen Signed-off-by: Tony Luck commit 4d5a31977cc69be8786e0033d5c148e5c62ae949 Author: Bjorn Helgaas Date: Thu Oct 12 16:21:17 2006 -0600 [IA64] reformat pal.S to fit in 80 columns, fix typos Reformat to fit in 80 columns. Fix a couple typos. Remove a couple unused labels. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck commit c12fb1885787dcc2e20c4b88149e1e607e1293b2 Author: Bjorn Helgaas Date: Thu Oct 12 16:20:59 2006 -0600 [IA64] remove unused PAL_CALL_IC_OFF Linux maps PAL instructions with an ITR, but uses a DTC for PAL data. Section 11.10.2.1.3, "Making PAL Procedures Calls in Physical or Virtual Mode," of the SDM (rev 2.2), says we must therefore make all PAL calls with PSR.ic = 1 so that Linux can handle any TLB faults. PAL_CALL_IC_OFF is currently unused, and as long as we use the ITR + DTC strategy, we can't use it. So remove it. I also removed the code in ia64_pal_call_static() that conditionally cleared PSR.ic. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck commit accaddb27a2d544e38e10ff2a2782b33bbbad913 Author: Jack Steiner Date: Mon Oct 16 12:56:54 2006 -0500 [IA64] - Allow IPIs in timer loop Allow pending IPIs to interrupt a timer interrupt that is looping in the do_timer() "while" loop in timer_interrupt(). (Interrupts are allowed at only 1 spot in the code). Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit ffc45571dfb4b70e7eda8d97f64a05f5e5a992ac Author: Aron Griffis Date: Tue Oct 17 00:28:15 2006 -0400 [IA64] move ioremap/ioremap_nocache under __KERNEL__ I noticed these are declared extern outside of __KERNEL__, but surely they wouldn't be available to userland since they're defined in ioremap.c. Am I missing something here? If I'm right about this, then there's probably a good deal of other stuff in io.h that could move inside __KERNEL__, but at least this is a start. Signed-off-by: Aron Griffis Signed-off-by: Tony Luck commit ab352c2687a4361aec06a184ddb20deb1e5091eb Author: Jan Luebbe Date: Tue Oct 17 00:09:00 2006 +0200 USB: Add device id for Sierra Wireless MC8755 Adds the device id used by the UMTS cards in Lenovo X60s notebooks sold in Europe. Signed-off-by: Jan Luebbe Cc: Kevin Lloyd Signed-off-by: Greg Kroah-Hartman commit 964ee1deb3eac802902cd758ddb94b6a95c77987 Author: Greg Kroah-Hartman Date: Tue Oct 17 10:17:58 2006 -0700 USB: cleanup sierra wireless driver a bit This saves over 30 lines and fixes a warning from sparse and allows debugging to work dynamically like all other usb-serial drivers. Cc: Kevin Lloyd Signed-off-by: Greg Kroah-Hartman commit 033a3fb980b041c5b1c865d3e9dce9217d1dc94b Author: Kevin Lloyd Date: Fri Oct 13 23:53:21 2006 -0700 USB: Sierra Wireless driver update The largest feature in this patch is that it adds significant throughput increase to the Sierra driver and adds support for modem status line control (e.g. the DTR line). This patch also updates the current sierra.c driver so that it supports both 3-port Sierra devices and 1-port legacy devices and removes Sierra's references in other related files (Kconfig and airprime.c). Signed-off-by: Kevin Lloyd Signed-off-by: Greg Kroah-Hartman commit 5c09d144ff94706c2a5df292329ad83a27380173 Author: David Brownell Date: Fri Oct 13 15:57:58 2006 -0700 USB: ftdi_sio whitespace fixes Whitespace fixups for drivers/usb/serial/ftdi_sio.c ... removing end-of-line whitespace, and space-before-tab. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 61926b975d83aa6c0124b5b0ce40c08579e6cc98 Author: Craig Shelley Date: Thu Oct 12 22:09:56 2006 +0100 USB-SERIAL:cp2101 Add new device ID This patch adds device ID 0xEA61. This is another factory default ID used by SILabs. Signed-off-by: Craig Shelley Signed-off-by: Greg Kroah-Hartman commit b3899dacafb10347b1b7a9f589b6c70cf8f08a3e Author: Jeff Garzik Date: Wed Oct 11 21:50:24 2006 -0400 USB/gadget/net2280: handle sysfs errors Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit 5dfb5f1d060a6f7dfddb78dc59f9e4d299088cc1 Author: Daniel Ritz Date: Wed Oct 11 23:40:22 2006 +0200 usbtouchscreen: fix data reading for ITM touchscreens ITM devices seem to report only garbage when not touched. update usbtouchscreen to do data reading like itmtouch. also fix wrong mask on pressure bits. Signed-off-by: Daniel Ritz Signed-off-by: Greg Kroah-Hartman commit 9ab99c8c513313c1c5931bdbd27dcc4bc7a3b7cd Author: matthieu castet Date: Wed Oct 11 14:20:56 2006 -0700 UEAGLE: fix ueagle-atm Oops The array of attribute passed to sysfs_create_group() must be NULL-terminated. The sysfs entries are created before the start of the modem state machine to avoid to stop it in case of errors in sysfs creation. Also {destroy,create}_fs_entries are removed as they do nothing. Signed-off-by: Laurent Riffard Signed-off-by: Matthieu CASTET Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit deb8ee43a23d48116cb23eb8dd1de2348efb1e80 Author: Dominic Cerquetti Date: Tue Oct 10 14:42:48 2006 -0700 USB: xpad: dance pad support Adds support for dance pads to the xpad driver. Dance pads require the d-pad to be mapped to four buttons instead of two axes, so that combinations of up/down and left/right can be hit simultaneously. Known dance pads are detected, and there is a module parameter added to default unknown xpad devices to map the d-pad to buttons if this is desired. (dpad_to_buttons). Minor modifications were made to port the changes in the original patch to a newer kernel version. This patch was originally from Dominic Cerquetti originally written for kernel 2.6.11.4, with minor modifications (API changes for USB, spelling fixes to the documentation added in the original patch) made to apply to the current kernel. I have modified Dominic's original patch per some suggestions from Dmitry Torokhov. (There was nothing in the patch format description about multiple From: lines, so I haven't added myself.) [akpm@osdl.org: cleanups] Signed-off-by: Adam Buchbinder Acked-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 4550718f6c75c9abe8b987fa4c625fd041aa95a2 Author: Grant Grundler Date: Tue Oct 10 14:42:51 2006 -0700 USB: input: extract() and implement() are bit field manipulation routines extract() and implement() have brain damaged attempts to handle 32-bit wide "fields". The problem is the index math in the original code didn't clear all the relevant bits. (offset >> 5) only compensated for 32-bit index. We need (offset >> 6) if we want to use 64-bit loads. But it was also wrong in that it tried to use quasi-aligned loads. Ie "report" was only incremented in multiples of 4 bytes and then the offset was masked off for values greater than 4 bytes. The right way is to pretend "report" points at a byte array. And offset is then only minor adjustment for < 8 bits of offset. "n" (field width) can then be as big as 24 (assuming 32-bit loads) since "offset" will never be bigger than 7. If someone needs either function to handle more than 24-bits, please document why - point at a specification or specific USB hid device - in comments in the code. extract/implement() are also an eyesore to read. Please banish whoever wrote it to read CodingStyle 3 times in a row to a classroom full of 1st graders armed with rubberbands. Or just flame them. Whatever. Globbing all the code together on two lines does NOT make it faster and is Just Wrong. I've tested this patch on j6000 (dual 750Mhz PA-RISC, 32-bit 2.6.12-rc5). Kyle McMartin tested on c3000 (up 400Mhz PA-RISC, same kernel). "p2-mate" (Peter De Schrijver?) tested on sb1250 (dual core Mips, broadcom "swarm" eval board). Signed-off-by: Grant Grundler Signed-off-by: Matthew Wilcox Cc: Vojtech Pavlik Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 0e185b7922ac81516c5c4653dcf6aacbf6341e73 Author: Eric Sesterhenn Date: Tue Oct 10 14:42:50 2006 -0700 USB: Memory leak in drivers/usb/serial/airprime.c the commit http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=5dda171202f94127e49c12daf780cdae1b4e668b added a memory leak. In case we cant allocate an urb, we dont free the buffer and leak it. Coverity id #1438 Signed-off-by: Eric Sesterhenn Acked-by: Andy Gay Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit c0fc0ee06f6c9ab37f53afc62b0d94a700fa7a97 Author: Jan Mate Date: Tue Oct 10 14:42:47 2006 -0700 USB Storage: unusual_devs.h entry for Sony Ericsson P990i USB Storage: this patch adds support for Sony Ericsson P990i Signed-off-by: Jan Mate Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 521b600b58376b7c85a7c615ee32fae185c20b16 Author: Andrew Morton Date: Tue Oct 10 14:42:46 2006 -0700 USB: fix usbatm tiny race ia64: drivers/usb/atm/usbatm.c: In function `usbatm_do_heavy_init': drivers/usb/atm/usbatm.c:1004: warning: implicit declaration of function `get_current' drivers/usb/atm/usbatm.c:1004: error: invalid type argument of `->' Signed-off-by: Duncan Sands Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3ccf25ce185d4798e66a91812a7622f7fe6987df Author: Alan Stern Date: Fri Oct 13 09:59:17 2006 -0400 USB: unusual_devs entry for Nokia 6234 This patch (as803) adds an unusual_devs entry for the Nokia 6234 mobile phone. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit ad18027f4909c8fc107056460c97dbedb6635128 Author: Adrian Bunk Date: Mon Oct 9 01:16:32 2006 +0200 USB: mos7840.c: fix a check-after-dereference This patch fixes an obvious check-after-dereference spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit c19ecd654209725444d1f47a4422e6f48846b53c Author: Adrian Bunk Date: Mon Oct 9 01:16:24 2006 +0200 USB: ftdi-elan.c: remove dead code The Coverity checker spotted this obviously dead code. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 1ff15e8efc1703eaae1eeec6fc09db6af1e4049f Author: Tobias Lorenz Date: Sun Oct 8 22:56:40 2006 -0700 USB: Mitsumi USB FDD 061M: UNUSUAL_DEV multilun fix From: Tobias Lorenz Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit a65dc301c7448a9a8d24bf1cbfe292541d1fa390 Author: Eric Sesterhenn Date: Fri Oct 6 00:09:29 2006 +0200 USB: fix dereference in drivers/usb/misc/adutux.c in two of the error cases, dev is still NULL, and we dereference it. Spotted by coverity (cid#1428, 1429) Signed-off-by: Eric Sesterhenn Cc: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 0f64478cbc7a008fe7b7e9ae79a73d8a6904ead8 Author: Greg Kroah-Hartman Date: Tue Apr 9 12:14:34 2002 -0700 USB: add USB serial mos7720 driver Add support for Moschip 7720 USB dual port usb to serial device. This driver is originally based on the drivers/usb/io_edgeport.c driver. Cleaned up and forward ported by me. Cc: VijayaKumar Cc: AjayKumar Cc: Gurudeva Signed-off-by: Greg Kroah-Hartman commit 9fcde235270e6783600d1aee5bcda78c8282bcdd Author: Greg Kroah-Hartman Date: Tue Oct 10 13:47:35 2006 -0700 USB: move trancevibrator.c to the proper usb directory It's not a input driver, so it doesn't belong in the input directory. Cc: Sam Hocevar Cc: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit a9fc6338bd51a3d5735839e756fe7b741c2e6fad Author: Arnd Bergmann Date: Mon Oct 9 00:08:02 2006 +0200 usbnet: add a mutex around phy register access When working on the mcs7830, I noticed the need for a mutex in its mdio_read/mdio_write functions. A related problem seems to be present in the asix driver in the respective functions. This introduces a mutex in the common usbnet driver and uses it from the two hardware specific drivers. Acked-by: David Hollis Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman commit c41286fd42f3545513f8de9f61028120b6d38e89 Author: Arnd Bergmann Date: Mon Oct 9 00:08:01 2006 +0200 usbnet: improve generic ethtool support This adds generic support for the ethtool commands get_settings, set_settings, get_link and nway_reset to usbnet. These are now implemented using mii functions when a low-level driver supports mdio_read/mdio_write and does not override the usbnet ethtool commands with its own. Currently, this applies to the asix and the mcs7830 drivers. I have tested it on mcs7830. Signed-off-by: Arnd Bergmann Acked-by: David Hollis Signed-off-by: Greg Kroah-Hartman commit 2a36d7083438ccb607055abae633f39495a99947 Author: Arnd Bergmann Date: Mon Oct 9 00:08:00 2006 +0200 USB: driver for mcs7830 (aka DeLOCK) USB ethernet adapter This driver adds support for the DeLOCK USB ethernet adapter and potentially others based on the MosChip MCS7830 chip. It is based on the usbnet and asix drivers as well as the original device driver provided by MosChip, which in turn was based on the usbnet driver. It has been tested successfully on an OHCI, but interestingly there seems to be a problem with the mcs7830 when connected to the ICH6/EHCI in my thinkpad: it keeps receiving lots of broken packets in the RX interrupt. The problem goes away when I'm using an active USB hub, so I assume it's not related to the device driver, but rather to the hardware. Signed-off-by: David Brownell Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman commit 27d39e2627dc7493f554bc0549d8c63953762478 Author: Akinobu Mita Date: Mon Oct 9 18:09:33 2006 +0900 usb devio: handle class_device_create() error This patch adds missing class_device_create() error check, and makes notifier return NOTIFY_BAD. Signed-off-by: Akinobu Mita Signed-off-by: Greg Kroah-Hartman commit f8ac232ad7388bfff680b26e84b3ac63889d1cea Author: Alexey Dobriyan Date: Sun Oct 8 16:02:00 2006 +0400 USB: drivers/usb/net/*: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Signed-off-by: Greg Kroah-Hartman commit d5477c11111467e19787f00d3cab20fb48c2699e Author: Alan Stern Date: Tue Oct 10 11:56:26 2006 -0400 usbcore: fix endpoint device creation This patch (as800) straightens out the USB endpoint class device creation routine, fixing a refcount bug in the process. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c40fd5ea565587c05b0e2c49c02cad2c35fd85c6 Author: Alan Stern Date: Tue Oct 10 11:55:47 2006 -0400 usbcore: fix refcount bug in endpoint removal This patch (as799) fixes a nasty refcount error in the USB endpoint class. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 22a60f1951256ed493bf1430f8c3edcb31c0dbaa Merge: 4e4bc30... 7281c24... Author: Linus Torvalds Date: Tue Oct 17 14:46:31 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] switch to new pci_get_bus_and_slot API [ARM] Update mach-types [ARM] Fix Zaurii keyboard/touchscreen drivers [ARM] Fix fallout from IRQ regs changes [ARM] 3890/1: [Jornada7xx] Addition of MCU commands into jornada720.h [ARM] 3889/1: [Jornada7xx] Addition of correct SDRAM params into cpu-sa1110.c [ARM] 3888/1: add pxa27x SSP FSRT register bit definition commit b62df4516981745d4b5de01ceec1d65a9174a524 Author: Alan Stern Date: Tue Oct 10 10:54:00 2006 -0400 UHCI: workaround for Asus motherboard This patch (as798) adds a workaround to uhci-hcd. At least one Asus motherboard is wired in such a way that any device attached to a suspended UHCI controller will prevent the system from entering suspend-to-RAM by immediately waking it up. The only way around the problem is to turn the controller off instead of suspending it. This fixes Bugzilla #6193. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 96a518928e1fd00a6d0eb344f420ea82aeec8ab9 Author: Greg Kroah-Hartman Date: Mon Oct 9 12:24:49 2006 -0700 USB: ftdi-elan: fix sparse warnings Deleted some unused code that could do bad things on non-x86 platforms. Also fixed some minor formatting errors. Thanks to Al Viro for pointing out the sparse errors. Cc: Tony Olech Cc: Al Viro Signed-off-by: Greg Kroah-Hartman commit 516077c1ee8a4a47cc41634a29954b636f3975ea Author: Oliver Neukum Date: Thu Oct 5 09:04:11 2006 +0200 USB: fix suspend support for usblp this implements suspend support for usblp. According to the CUPS people ENODEV will make CUPS retry the job. Thus it is returned in the runtime case. My printer survives suspend/resume cycles with it. Signed-off-by: Oliver Neukum Signed-off-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit 44960af1b6ab3e8fd23dc134fcf7862caf42936b Author: Duncan Sands Date: Thu Oct 5 11:05:50 2006 +0200 cxacru: add the ZTE ZXDSL 852 From http://doc.ubuntu-fr.org/materiel/zxdsl852. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 6a4f1b41357d2bd65d39f7a5d44e92f69daaf04b Author: Duncan Sands Date: Thu Oct 5 10:40:55 2006 +0200 speedtch: "extended reach" The speedtouch modem setup code was reverse engineered many years ago from a prehistoric windows driver. Less ancient windows drivers, even those from a few years ago, perform extra initialization steps which this patch adds to the linux driver. David Woodhouse observed that this initialization along with the firmware bin/sachu3/zzzlp2.eni from the driver at http://www.speedtouch.co.uk/downloads/330/301/UK3012%20Extended.zip improves line sync speeds by about 20%. He provided the original patch, which I've modified to use symbolic names (BMaxDSL, ModemMode, ModemOption) rather than magic numbers. These names may not seem like much of an improvement (after all, what is "ModemOption" exactly?), but they do have one big advantage: they are the names used in the windows registry. I've made them available as module parameters. Thanks are due to Aurelio Arroyo, who noticed the relationship between these magic numbers and the entries in Phonebook.ini. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit ccf40d62c70128990cf2e8775853cc3287cd7ce3 Author: Duncan Sands Date: Thu Oct 5 09:56:44 2006 +0200 usbatm: fix tiny race If usbatm_do_heavy_init finishes before usbatm_heavy_init writes the pid, the disconnect method could shoot down the wrong process if the pid has been recycled. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit e4a20daa7b44ab9805979eb716f6bb7532bc67b9 Author: Alan Stern Date: Wed Oct 4 16:31:15 2006 -0400 USB: unusual_devs entry for Nokia 6131 This patch (as796) adds an unusual_devs entry for the Nokia 6131, which doesn't like large transfer sizes. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 762f007b05446f5c63268fb2c28646f28959ee4b Author: Jarek Poplawski Date: Fri Oct 6 07:23:11 2006 +0200 USB: fix cdc-acm problems with hard irq? (inconsistent lock state) Signed-off-by: Jarek Poplawski Signed-off-by: Greg Kroah-Hartman commit a7a0c9cd1f45c2cae38ebe0951246bf94399818a Author: matthieu castet Date: Tue Oct 3 21:44:11 2006 +0200 UEAGLE : comestic changes Hi, this patch does some cosmetic changes : - dump firwmare version as soon as possible and export it on sysfs - hint about wrong cmv/dsp - Display a message to warn user when the modem is ready : it can help people to detect problems on the line without debug trace - Fix wrong indent - display modem type (pots/isdn) - increase version number Signed-off-by: Matthieu Castet Signed-off-by: Greg Kroah-Hartman commit 531a39bbab213209a9914e68809bcf8b60a54f47 Author: matthieu castet Date: Tue Oct 3 21:49:29 2006 +0200 UEAGLE : use interruptible sleep this patch use wait_event_interruptible_timeout and msleep_interruptible beacause uninterruptible sleep (task state 'D') is counted as 1 towards load average, like running processes. Signed-off-by: Matthieu Castet Signed-off-by: Greg Kroah-Hartman commit 9ca5346483ea2c2e8932268246d1d8746fe3bcaa Author: matthieu castet Date: Tue Oct 3 21:46:33 2006 +0200 UEAGLE : be suspend friendly this patch avoid that the kernel thread block the suspend process. Some work is still need to recover after a resume. Signed-off-by: Matthieu Castet Signed-off-by: Greg Kroah-Hartman commit 8442ae00d47dad690ac1105b426274433dc672f8 Author: David Brownell Date: Mon Oct 2 07:20:10 2006 -0700 USB: ohci-pnx4008 build fixes The OHCI bus glue for the Philips PNX chips is missing a few calls. - Bus suspend/resume were wrongly omitted in the original submission. - Two new calls were added since that glue was submitted: * Root hub irq enable call * Shutdown hook for usbcore Plus usb_bus.hcpriv has now been removed from usbcore. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1a2ea1dfc4ee078841cd6406ebf6bf0c5a3d25e9 Author: Oliver Neukum Date: Tue Oct 3 10:30:52 2006 +0200 USB: suspend/resume support for kaweth this adds support for suspend and resume to the kaweth driver. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit fbe2bafcb00b25265c2c869ba4615d6a5324b7f1 Author: Oliver Neukum Date: Thu Sep 28 23:36:04 2006 +0200 USB: remove private debug macros from kaweth this kills the private debug macros from the kaweth driver. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 91a9c9214e34c364bf15406aadb922787ae7129b Author: Chris Malley Date: Tue Oct 3 10:08:28 2006 +0100 USB: Support for BT On-Air USB modem in cdc-acm.c The patch below is a necessary workaround to support the BT On-Air USB modem, which fails to initialise properly during normal probing thus: Sep 30 17:34:57 sled kernel: drivers/usb/class/cdc-acm.c: Zero length descriptor references Sep 30 17:34:57 sled kernel: cdc_acm: probe of 1-1.2:1.0 failed with error -22 Adding the patch below causes the probing section to be skipped, and the modem then initialises correctly. Signed-off-by: Chris Malley Signed-off-by: Greg Kroah-Hartman commit 931b0411ac296591643662b7a790d15d6e23d57e Author: Luiz Fernando N. Capitulino Date: Tue Oct 3 10:31:36 2006 -0300 airprime: New device ID. Adds support for the verizon wireless Broadband Access, National Access V640 ExpressCard34 Qualcomm 3G CDMA. Reported by Maciej A. __enczykowski Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit 2daa48729dfafd349c2a52520734de2edb9dc805 Author: Eric Sesterhenn Date: Wed Oct 4 09:56:44 2006 -0700 USB: fix use after free in wacom_sys.c the following commit added a use after free http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3D3bea733ab21247290bd552dd6a2cd3049af9adef Found by coverity (cid #1441) Signed-off-by: Eric Sesterhenn Signed-off-by: "Ping Cheng" Signed-off-by: Greg Kroah-Hartman commit 2920349d438ec08d2b1f6761c8b78b8d13fd1dee Author: Eric Sesterhenn <[mailto:snakebyte@gmx.de]> Date: Tue Oct 17 14:46:30 2006 -0700 USB: BUG_ON conversion for wacom.c this patch converts two if () BUG(); construct to BUG_ON(); which occupies less space, uses unlikely and is safer when BUG() is disabled. Signed-off-by: Eric Sesterhenn Acked-by: "Ping Cheng" Signed-off-by: Greg Kroah-Hartman commit 8d32e3ae5972641ee9eb813e7a5c44a2b85d3694 Author: Ping Cheng Date: Tue Sep 26 13:34:47 2006 -0700 USB: Wacom driver updates This fixes some issues with the current wacom driver due to the split of the driver into different pieces and adds support for the Intuos3 4x6 Signed-off-by: Ping Cheng Signed-off-by: Greg Kroah-Hartman commit 3bbe486b361b317ac7103378ed3d1aab4779715e Author: Tony Luck Date: Tue Oct 17 14:28:16 2006 -0700 [IA64] perfmon fix for global IRQ fix Missed one piece of ia64 fallout from the global IRQ patch 7d12e780e003f93433d49ce78cfedf4b4c52adc5 Perfmon interrupt handler needs to use get_irq_regs() too. Acked-by: stephane eranian Signed-off-by: Tony Luck commit 64f89798da35f43c6ef6afda0541e25034513458 Author: Greg Kroah-Hartman Date: Tue Oct 17 13:57:18 2006 -0700 USB: revert EHCI VIA workaround patch This reverts 26f953fd884ea4879585287917f855c63c6b2666 which caused resume problems on the mac mini. Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4e4bc305e16440ab38060d61fbcb7d774881d2f1 Author: Stephen Hemminger Date: Tue Oct 17 10:24:25 2006 -0700 sky2: GMAC pause frame This reverts earlier change that attempted to fix flow control. Device needs to discard pause frames, otherwise it hangs after a while. Signed-off-by: Stephen Hemminger commit a052b52f4b6b77503af2647dc0c7415939d8232a Author: Stephen Hemminger Date: Tue Oct 17 10:24:23 2006 -0700 sky2: accept multicast pause frames When using flow control, the PHY needs to accept multicast pause frames. Without this fix, these frames were getting discarded by the PHY before doing any flow control. Signed-off-by: Stephen Hemminger commit 52c89cac6781dea0ee2426821cd3effae1a925d3 Author: Stephen Hemminger Date: Tue Oct 17 10:24:18 2006 -0700 sky2: version 1.9 Mark version, this has been a lot of patches. Signed-off-by: Stephen Hemminger commit b6d7773462df13c105c19ab89706687ded839844 Author: Stephen Hemminger Date: Tue Oct 17 10:24:16 2006 -0700 sky2: no message on rx fifo overflow Under high load it is possible to make the receiver FIFO get overloaded. The driver/hardware recover properly, so there is no reason to fill the log with lots of extra messages, just update counter. Signed-off-by: Stephen Hemminger commit 16ad91e1c686734aaa5664cd08af0b5e9bf3af61 Author: Stephen Hemminger Date: Tue Oct 17 10:24:13 2006 -0700 sky2: flow control setting fixes The result of flow control negotiation should not limit the next negotiatition. If board is plugged into an old half duplex 10Mbit port, without pause, then replugged into a gigabit port, it should negotiate what is desired, not inherit that last negotiation. Signed-off-by: Stephen Hemminger commit 7800fddcd05a7dc89276389b96664af4f7890ea7 Author: Stephen Hemminger Date: Tue Oct 17 10:24:10 2006 -0700 sky2: don't reset PHY twice Don't need to reset PHY twice on startup. Signed-off-by: Stephen Hemminger commit 7c74ac1c236457e454804774e832046c1a7cc0bf Author: Stephen Hemminger Date: Tue Oct 17 10:24:08 2006 -0700 sky2: use duplex result bits The result of duplex negotiation is avaliable in the phy status register, so use that to simplify code and avoid rereading the PHY. Signed-off-by: Stephen Hemminger commit 0edea0f54e1e28bdc1ce6b02d5ca3c4c878cf959 Author: Stephen Hemminger Date: Tue Oct 17 10:24:07 2006 -0700 sky2: advertising register 16 bits The advertising bits (from ethtool.h) fit in 16 bits. commit 709c6e7bb07411176ef9ef660242b1e59fc87a6f Author: Stephen Hemminger Date: Tue Oct 17 10:24:04 2006 -0700 sky2: fiber pause bits The advertisement bits for flow control are located in different location on fiber (1000baseX) Signed-off-by: Stephen Hemminger commit ebc646f681a6ad5a81989a6906832e82155df283 Author: Stephen Hemminger Date: Tue Oct 17 10:23:56 2006 -0700 sky2: phy irq on shutdown When PHY is turned off on shutdown, it causes the IRQ to get stuck on. Make sure and disable the IRQ first, and if IRQ occurs when device is not running, don't access PHY because that will hang. Signed-off-by: Stephen Hemminger commit e561a83be5c9cada5fa3733efdff67a2098a0c8e Author: Stephen Hemminger Date: Tue Oct 17 10:20:51 2006 -0700 sky2: turn of workaround timer The workaround timer is not needed in most systems with proper IRQ routing and by perodically waking up it adds to laptop power consumption. Signed-off-by: Stephen Hemminger commit 2bffc23a01a489ad46ba7d61a1a657cecec87cc8 Author: Stephen Hemminger Date: Tue Oct 17 10:17:18 2006 -0700 sky2: MSI test is only a warning Some motherboards don't implement MSI correctly. The driver handles this but the warning is too verbose and overly cautious. Signed-off-by: Stephen Hemminger commit 7281c248f797723f66244b7ecef204620f664648 Author: Alan Cox Date: Mon Oct 16 16:49:50 2006 +0100 [ARM] switch to new pci_get_bus_and_slot API Signed-off-by: Alan Cox Signed-off-by: Russell King commit 43f82216f0bd114599f4a221ae6924f3658a0c9a Merge: 20f8595... b435fdc... Author: Linus Torvalds Date: Tue Oct 17 08:56:43 2006 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: fm801-gp - handle errors from pci_enable_device() Input: gameport core - handle errors returned by device_bind_driver() Input: serio core - handle errors returned by device_bind_driver() Lockdep: fix compile error in drivers/input/serio/serio.c Input: serio - add lockdep annotations Lockdep: add lockdep_set_class_and_subclass() and lockdep_set_subclass() Input: atkbd - supress "too many keys" error message Input: i8042 - supress ACK/NAKs when blinking during panic Input: add missing exports to fix modular build commit 20f85957667ccc53183b5ffac22213d75e317408 Merge: 7786ce1... 284a940... Author: Linus Torvalds Date: Tue Oct 17 08:20:57 2006 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Check for offline nodes in pci NUMA code [POWERPC] Better check in show_instructions [POWERPC] POWER6 has 6 PMCs [POWERPC] Never panic when taking altivec exceptions from userspace [POWERPC] Fix IO Window Updates on P2P bridges. [POWERPC] Add Makefile entry for MPC832x_mds support [POWERPC] Fix MPC8360EMDS PB board support [POWERPC] ppc: Add missing calls to set_irq_regs [POWERPC] Off-by-one in /arch/ppc/platforms/mpc8* [POWERPC] Add DOS partition table support to mpc834x_itx_defconfig [POWERPC] spufs: fix support for read/write on cntl [POWERPC] Don't crash on cell with 2 BEs when !CONFIG_NUMA commit 7786ce192fc4917fb9b789dd823476ff8fd6cf66 Author: Jeff Garzik Date: Tue Oct 17 00:10:40 2006 -0700 [PATCH] ISDN: check for userspace copy faults Most of the ISDN ->readstat() implementations needed to check copy_to_user() and put_user() return values. Signed-off-by: Jeff Garzik Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04518bfe8eac2e82b476fb2b0093527adc2bc791 Author: Jeff Garzik Date: Tue Oct 17 00:10:39 2006 -0700 [PATCH] ISDN: fix drivers, by handling errors thrown by ->readstat() This is a particularly ugly on-failure bug, possibly security, since the lack of error handling here is covering up another class of bug: failure to handle copy_to_user() return values. The I4L API function ->readstat() returns an integer, and by looking at several existing driver implementations, it is clear that a negative return value was meant to indicate an error. Given that several drivers already return a negative value indicating an errno-style error, the current code would blindly accept that [negative] value as a valid amount of bytes read. Obvious damage ensues. Correcting ->readstat() handling to properly notice errors fixes the existing code to work correctly on error, and enables future patches to more easily indicate errors during operation. Signed-off-by: Jeff Garzik Cc: Karsten Keil Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 078d396598401dbaa88d5f95ec45579f9d3dce0e Author: Amol Lad Date: Tue Oct 17 00:10:37 2006 -0700 [PATCH] drivers/isdn/isdnloop: save_flags()/cli(), restore_flags() replaced appropriately Signed-off-by: Amol Lad Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d9ba869e103d91d471146378ad85bf1fb8e74b4 Author: Amol Lad Date: Tue Oct 17 00:10:36 2006 -0700 [PATCH] drivers/isdn/hysdn: save_flags()/cli(), restore_flags() replaced appropriately With Karsten Keil save_flags()/cli() pair is replaced with spin_lock_irqsave() and restore_flags() replaced with spin_unlock_irqrestore() Tested compile only using allmodconfig Signed-off-by: Amol Lad Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd5349cfd2b9bbb10a3dbcd3fe5cbaabe0b2ab9e Author: Neil Brown Date: Tue Oct 17 00:10:35 2006 -0700 [PATCH] Convert cpu hotplug notifiers to use raw_notifier instead of blocking_notifier The use of blocking notifier by _cpu_up and _cpu_down in cpu.c has two problem. 1/ An interaction with the workqueue notifier causes lockdep to spit a warning. 2/ A notifier could conceivable be added or removed while _cpu_up or _cpu_down are in process. As each notifier is called twice (prepare then commit/abort) this could be unhealthy. To fix to we simply take cpu_add_remove_lock while adding or removing notifiers to/from the list. This makes the 'blocking' usage unnecessary as all accesses to cpu_chain are now protected by cpu_add_remove_lock. So change "blocking" to "raw" in all relevant places. This fixes 1. Credit: Andrew Morton Cc: Rusty Russell Cc: Michal Piotrowski (reporter) Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bea493a031fe3337f4fe5479e8e865513828ea76 Author: Peter Zijlstra Date: Tue Oct 17 00:10:33 2006 -0700 [PATCH] rt-mutex: fixup rt-mutex debug code BUG: warning at kernel/rtmutex-debug.c:125/rt_mutex_debug_task_free() (Not tainted) [] show_trace_log_lvl+0x58/0x16a [] show_trace+0xd/0x10 [] dump_stack+0x19/0x1b [] rt_mutex_debug_task_free+0x35/0x6a [] free_task+0x15/0x24 [] copy_process+0x12bd/0x1324 [] do_fork+0x42/0x113 [] sys_fork+0x19/0x1b [] syscall_call+0x7/0xb In copy_process(), dup_task_struct() also duplicates the ->pi_lock, ->pi_waiters and ->pi_blocked_on members. rt_mutex_debug_task_free() called from free_task() validates these members. However free_task() can be invoked before these members are reset for the new task. Move the initialization code before the first bail that can hit free_task(). Signed-off-by: Peter Zijlstra Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91b943ee4afa2037678dc1db30b89baef0e17090 Author: Aneesh Kumar K.V Date: Tue Oct 17 00:10:32 2006 -0700 [PATCH] Add entry.S labels to tag file Add functions defined using ENTRY macro to the tags file. Signed-off-by: Aneesh Kumar K.V Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f3fd3c055853d11295a1ec6cdc81e37e2182d16 Author: Greg Banks Date: Tue Oct 17 00:10:30 2006 -0700 [PATCH] kbuild: allow multi-word $M in Makefile.modpost Some people want to do crazy things like pass multiple directories as the value of $(SUBDIRS) or $M. Mostly this kinda works, except that Makefile.modpost constructs a modpost commandline which fails modpost's argument parsing. This patch fixes that little wrinkle. Signed-off-by: Greg Banks Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dabad0568a5935e9f4903f5fd1d8f22b1c7c88c7 Author: Akinobu Mita Date: Tue Oct 17 00:10:28 2006 -0700 [PATCH] epca: prevent panic on tty_register_driver() failure Make epca fail on initialization failure instead of panic. Cc: "Digi International, Inc" Signed-off-by: Akinobu Mita Acked-by: Alan Cox Acked-by: Scott Kilau Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea6f94dfe9db4d19a39e774cfafa5c9428a9fdbc Author: Akinobu Mita Date: Tue Oct 17 00:10:27 2006 -0700 [PATCH] rd: memory leak on rd_init() failure If RAM disk driver initialization fails due to blk_alloc_queue() faulure, the gendisk structs stored in rd_disks[] will not be freed completely. This patch resolves that memory leak case by doing alloc_disk() and blk_alloc_queue() at the same time. Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3864c4894a7f4c03d69a90082a5bb0ab10e437ab Author: Peter Zijlstra Date: Tue Oct 17 00:10:26 2006 -0700 [PATCH] lockdep: annotate i386 apm Lockdep doesn't like to enable interrupts when they are enabled already. BUG: warning at kernel/lockdep.c:1814/trace_hardirqs_on() (Not tainted) [] show_trace_log_lvl+0x58/0x16a [] show_trace+0xd/0x10 [] dump_stack+0x19/0x1b [] trace_hardirqs_on+0xa2/0x11e [] apm_bios_call_simple+0xcd/0xfd [] apm+0x92/0x5b1 [] kernel_thread_helper+0x5/0xb DWARF2 unwinder stuck at kernel_thread_helper+0x5/0xb Leftover inexact backtrace: [] show_trace+0xd/0x10 [] dump_stack+0x19/0x1b [] trace_hardirqs_on+0xa2/0x11e [] apm_bios_call_simple+0xcd/0xfd [] apm+0x92/0x5b1 [] kernel_thread_helper+0x5/0xb Signed-off-by: Peter Zijlstra Cc: Stephen Rothwell Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a15f46c1272afd3010259067451bf0df04f6511 Author: Jeff Garzik Date: Tue Oct 17 00:10:25 2006 -0700 [PATCH] rtc: fix printk of 64-bit res on 32-bit platform With 64-bit resources on 32-bit platforms, the resource address might be larger than a void*. Fix printk to work regardless of resource size. Signed-off-by: Jeff Garzik Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eee44cca665aa1a5663e6a00c2bdfc275739dac5 Author: Jeff Garzik Date: Tue Oct 17 00:10:23 2006 -0700 [PATCH] fs/partitions/check: add sysfs error handling Handle errors thrown in disk_sysfs_symlinks(), and propagate back to caller. The callers and associated functions don't do a real good job of handling kobject errors anyway (add_partition, register_disk, rescan_partitions), so this should do until something better comes along. Signed-off-by: Jeff Garzik Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b5f29675c6a1041aefc147271508bd56cf2b761 Author: Jeff Garzik Date: Tue Oct 17 00:10:22 2006 -0700 [PATCH] I2O: handle a few sysfs errors Signed-off-by: Jeff Garzik Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12fda16814bba05a84a49a1da25a069d6c249758 Author: Jeff Garzik Date: Tue Oct 17 00:10:20 2006 -0700 [PATCH] drivers/led: handle sysfs errors Signed-off-by: Jeff Garzik Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58ff407bee5a55f9c1188a3f9d70ffc79485183c Author: Jan Kara Date: Tue Oct 17 00:10:19 2006 -0700 [PATCH] Fix IO error reporting on fsync() When IO error happens on metadata buffer, buffer is freed from memory and later fsync() is called, filesystems like ext2 fail to report EIO. We solve the problem by introducing a pointer to associated address space into the buffer_head. When a buffer is removed from a list of metadata buffers associated with an address space, IO error is transferred from the buffer to the address space, so that fsync can later report it. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d343fce148a4eee24a907a05c4101d3268045aae Author: NeilBrown Date: Tue Oct 17 00:10:18 2006 -0700 [PATCH] knfsd: Allow lockd to drop replies as appropriate It is possible for the ->fopen callback from lockd into nfsd to find that an answer cannot be given straight away (an upcall is needed) and so the request has to be 'dropped', to be retried later. That error status is not currently propagated back. So: Change nlm_fopen to return nlm error codes (rather than a private protocol) and define a new nlm_drop_reply code. Cause nlm_drop_reply to cause the rpc request to get rpc_drop_reply when this error comes back. Cause svc_process to drop a request which returns a status of rpc_drop_reply. [akpm@osdl.org: fix warning storm] Cc: Marc Eshel Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4481d1038f4116f3f5c307d919e6dc815a3acbb9 Author: NeilBrown Date: Tue Oct 17 00:10:17 2006 -0700 [PATCH] knfsd: Fix bug in recent lockd patches that can cause reclaim to fail When an nfs server shuts down, lockd needs to release all the locks even though the client still holds them. It should therefore not 'unmonitor' the clients, so that the files in nfs/sm will still be there when the nfs server restarts, so that those clients will be told to reclaim their locks. However the hosts are fully unmonitored, so statd may well remove the files. lockd has a test for 'sm_sticky' and avoid the unmonitor call if it is set, but it is currently not set. So set it when tearing down lockd. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0942176f4353ffebcd6e3f95abce9fd8e24f2cb1 Author: J. Bruce Fields Date: Tue Oct 17 00:10:16 2006 -0700 [PATCH] knfsd: nfsd4: Fix error handling in nfsd's callback client Coverity noticed that the error handling code in the NFSv4 callback client sets cb->cb_client to NULL, then calls rpc_shutdown_client with the NULL pointer. Coverity: #cid 1397 Signed-off-by: Chuck Lever Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9801d8a39cfe6c34f39f9552a246a6bd002e735e Author: J. Bruce Fields Date: Tue Oct 17 00:10:14 2006 -0700 [PATCH] knfsd: nfsd4: fix open permission checking We weren't actually checking for SHARE_ACCESS_WRITE, with the result that the owner could open a non-writeable file for write! Continue to allow DENY_WRITE only with write access. Thanks to Jim Rees for reporting the bug. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc730e173785e29b297aa605786c94adaffe2544 Author: J. Bruce Fields Date: Tue Oct 17 00:10:13 2006 -0700 [PATCH] knfsd: nfsd4: fix owner-override on open If a client creates a file using an open which sets the mode to 000, or if a chmod changes permissions after a file is opened, then situations may arise where an NFS client knows that some IO is permitted (because a process holds the file open), but the NFS server does not (because it doesn't know about the open, and only sees that the IO conflicts with the current mode of the file). As a hack to solve this problem, NFS servers normally allow the owner to override permissions on IO. The client can still enforce correct permissions-checking on open by performing an explicit access check. In NFSv4 the client can rely on the explicit on-the-wire open instead of an access check. Therefore we should not be allowing the owner to override permissions on an over-the-wire open! However, we should still allow the owner to override permissions in the case where the client is claiming an open that it already made either before a reboot, or while it was holding a delegation. Thanks to Jim Rees for reporting the bug. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e956edd0523b6b48ed367c63b0c82d8f4c447a58 Author: Miklos Szeredi Date: Tue Oct 17 00:10:12 2006 -0700 [PATCH] fuse: fix dereferencing dentry parent There's no locking for ->d_revalidate, so fuse_dentry_revalidate() should use dget_parent() instead of simply dereferencing ->d_parent. Due to topology changes in the directory tree the parent could become negative or be destroyed while being used. There hasn't been any reports about this yet. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2a85164aaa8d514ef5efbf5d05746e85dd13ddd Author: Miklos Szeredi Date: Tue Oct 17 00:10:11 2006 -0700 [PATCH] fuse: fix handling of moved directory Fuse considered it an error (EIO) if lookup returned a directory inode, to which a dentry already refered. This is because directory aliases are not allowed. But in a network filesystem this could happen legitimately, if a directory is moved on a remote client. This patch attempts to relax the restriction by trying to first evict the offending alias from the cache. If this fails, it still returns an error (EBUSY). A rarer situation is if an mkdir races with an indenpendent lookup, which finds the newly created directory already moved. In this situation the mkdir should return success, but that would be incorrect, since the dentry cannot be instantiated, so return EBUSY. Previously checking for a directory alias and instantiation of the dentry weren't done atomically in lookup/mkdir, hence two such calls racing with each other could create aliased directories. To prevent this introduce a new per-connection mutex: fuse_conn->inst_mutex, which is taken for instantiations with a directory inode. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 265126ba9e1f8e217e61d1017c6609f76828aa7a Author: Miklos Szeredi Date: Tue Oct 17 00:10:09 2006 -0700 [PATCH] fuse: fix spurious BUG Fix a spurious BUG in an unlikely race, where at least three parallel lookups return the same inode, but with different file type. This has not yet been observed in real life. Allowing unlimited retries could delay fuse_iget() indefinitely, but this is really for the broken userspace filesystem to worry about. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8da5ff23ce0a84d9845b01e6fe5047e17836bf5a Author: Miklos Szeredi Date: Tue Oct 17 00:10:08 2006 -0700 [PATCH] fuse: locking fix for nlookup An inode could be returned by independent parallel lookups, in this case an update of the lookup counter could be lost resulting in a memory leak in userspace. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7762f5a0b709b415fda132258ad37b9f2a1db994 Author: Miklos Szeredi Date: Tue Oct 17 00:10:07 2006 -0700 [PATCH] document i_size_write locking rules Unless someone reads the documentation for write_seqcount_{begin,end} it is not obvious, that i_size_write() needs locking. Especially, that lack of such locking can result in a system hang. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ffbb9162312fd8113037cb3d94f787f06bbfa9a Author: Miklos Szeredi Date: Tue Oct 17 00:10:06 2006 -0700 [PATCH] fuse: fix hang on SMP Fuse didn't always call i_size_write() with i_mutex held which caused rare hangs on SMP/32bit. This bug has been present since fuse-2.2, well before being merged into mainline. The simplest solution is to protect i_size_write() with the per-connection spinlock. Using i_mutex for this purpose would require some restructuring of the code and I'm not even sure it's always safe to acquire i_mutex in all places i_size needs to be set. Since most of vmtruncate is already duplicated for other reasons, duplicate the remaining part as well, making all i_size_write() calls internal to fuse. Using i_size_write() was unnecessary in fuse_init_inode(), since this function is only called on a newly created locked inode. Reported by a few people over the years, but special thanks to Dana Henriksen who was persistent enough in helping me debug it. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48d1a7ea6373337985f27dc1c707649469df5827 Author: Alexey Dobriyan Date: Tue Oct 17 00:10:05 2006 -0700 [PATCH] sx: fix user-visible typo (devic) Signed-off-by: Alexey Dobriyan Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a460e745e8f9c75a0525ff94154a0629f9d3e05d Author: Ingo Molnar Date: Tue Oct 17 00:10:03 2006 -0700 [PATCH] genirq: clean up irq-flow-type naming Introduce desc->name and eliminate the handle_irq_name() hack. Add set_irq_chip_and_handler_name() to set the flow type and name at once. Signed-off-by: Ingo Molnar Acked-by: Thomas Gleixner Cc: "Eric W. Biederman" Cc: Matthew Wilcox Cc: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 308ba5fcf89b6e328f9290067181c1e4d772fdc9 Author: David Woodhouse Date: Tue Oct 17 00:10:02 2006 -0700 [PATCH] fix `make headers_install' Fix this: make[3]: *** No rule to make target `/mnt/md0/devel/linux-git/include/linux/version.h', needed by `/mnt/md0/devel/linux-git-obj/usr/include/linux/version.h'. Stop. make[2]: *** [linux] Error 2 make[1]: *** [headers_install] Error 2 Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4bb2cf1c3d30e7498e5561b22246b5bcbfe2e15 Author: Adrian Bunk Date: Tue Oct 17 00:10:00 2006 -0700 [PATCH] drivers/char/specialix.c: fix the baud conversion Correct the following bugs introduced by commit 67cc0161ecc9ebee6eba4af6cbfdba028090b1b9: - remove one remaining and now incorrect baud_table[] usage - "baud +=" is no longer correct The former bug was spotted by the Coverity checker. Rolf Eike Beer spotted a bug in the initial version of my patch. Signed-off-by: Adrian Bunk Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c60099bfe3a5e6fa22a930627689b3769c52153f Author: Andrew Morton Date: Tue Oct 17 00:09:59 2006 -0700 [PATCH] swsusp: fix memory leaks My fancy new swsusp IO code had a big memory leak. It's somewhat invisible because the whole mem_map[] gets overwritten after resume, but it can cause us to get low on memory during the actual suspend process. Cc: "Rafael J. Wysocki" Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1fec74a9cda95772887c82ede5c0ac60f5be857e Author: Andrew Morton Date: Tue Oct 17 00:09:58 2006 -0700 [PATCH] acpi_processor_latency_notifier(): UP warning fix drivers/acpi/processor_idle.c:1112: warning: 'smp_callback' defined but not used Cc: Len Brown Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 286e1ea3ac1ca4f503ebbb3020bdb0cbe6adffac Author: Andrew Morton Date: Tue Oct 17 00:09:57 2006 -0700 [PATCH] vmalloc(): don't pass __GFP_ZERO to slab A recent change to the vmalloc() code accidentally resulted in us passing __GFP_ZERO into the slab allocator. But we only wanted __GFP_ZERO for the actual pages whcih are being vmalloc()ed, and passing __GFP_ZERO into slab is not a rational thing to ask for. Cc: Jonathan Corbet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c430169e0c9f42f2cd27e0a6161e7ff4dc7e608d Author: Francisco Larramendi Date: Tue Oct 17 00:09:53 2006 -0700 [PATCH] rtc-max6902: month conversion fix Fix October-only BCD-to-binary conversion bug: 0x08 -> 7 0x09 -> 8 0x10 -> 15 (!) 0x11 -> 19 Fixes http://bugzilla.kernel.org/show_bug.cgi?id=7361 Cc: Raphael Assenat Cc: Alessandro Zummo Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9b2e97bea228739b74b541033b1119c5707200b Author: Evgeniy Polyakov Date: Tue Oct 17 00:09:47 2006 -0700 [PATCH] w1 kconfig fix Remove dependency of w1 subsytem from connector, only w1_con must depend on it. With attached patch applied to vanilla 2.6.19-git things works fine. Signed-off-by: Evgeniy Polyakov Cc: Cc: Greg KH Cc: Roman Zippel Cc: "Randy.Dunlap" Cc: Adrian Bunk Acked-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91828a405ae454a9503c41a7744f6ff877a80714 Author: David M. Grimes Date: Tue Oct 17 00:09:45 2006 -0700 [PATCH] knfsd: add nfs-export support to tmpfs We need to encode a decode the 'file' part of a handle. We simply use the inode number and generation number to construct the filehandle. The generation number is the time when the file was created. As inode numbers cycle through the full 32 bits before being reused, there is no real chance of the same inum being allocated to different files in the same second so this is suitably unique. Using time-of-day rather than e.g. jiffies makes it less likely that the same filehandle can be created after a reboot. In order to be able to decode a filehandle we need to be able to lookup by inum, which means that the inode needs to be added to the inode hash table (tmpfs doesn't currently hash inodes as there is never a need to lookup by inum). To avoid overhead when not exporting, we only hash an inode when it is first exported. This requires a lock to ensure it isn't hashed twice. This code is separate from the patch posted in June06 from Atal Shargorodsky which provided the same functionality, but does borrow slightly from it. Locking comment: Most filesystems that hash their inodes do so at the point where the 'struct inode' is initialised, and that has suitable locking (I_NEW). Here in shmem, we are hashing the inode later, the first time we need an NFS file handle for it. We no longer have I_NEW to ensure only one thread tries to add it to the hash table. Cc: Atal Shargorodsky Cc: Gilad Ben-Yossef Signed-off-by: David M. Grimes Signed-off-by: Neil Brown Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c496374a72320279ddb86291ef709e090a5d531 Author: Andrew Morton Date: Tue Oct 17 00:09:44 2006 -0700 [PATCH] remove carta_random32 This library function should be in obj-y and not in lib-y. But when we do that it clashes unpleasantly with the assembly-language implementation in the ia64 architecture. Instead of trying to fix it all up, just remove the generic carta_random32 in the expectation that the recently-made-generic random32() will suffice. If/when perfmon is migrated to random32, ia64's private carta_random32 implementation can also be removed. Cc: Stephane Eranian Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aaa248f6c9c81b2683db7dbb0689cd5ed1c86d88 Author: Stephen Hemminger Date: Tue Oct 17 00:09:42 2006 -0700 [PATCH] rename net_random to random32 Make net_random() more widely available by calling it random32 akpm: hopefully this will permit the removal of carta_random32. That needs confirmation from Stephane - this code looks somewhat more computationally expensive, and has a different (ie: callee-stateful) interface. [akpm@osdl.org: lots of build fixes, cleanups] Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller Cc: Stephane Eranian Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0187f879ee8d4b914e74ffa3cc5df268311fc2d2 Author: Andrew Morton Date: Tue Oct 17 00:09:41 2006 -0700 [PATCH] PROC_NUMBUF is wrong Actually, the decimal representation of a 32-bit signed number can take 12 bytes, including the \0. And then some code adds a \n as well, so let's give it 13 bytes. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac08c26492a0ad4d94a25bd47d5630cd38337069 Author: Thomas Gleixner Date: Tue Oct 17 00:09:39 2006 -0700 [PATCH] posix-cpu-timers: prevent signal delivery starvation The integer divisions in the timer accounting code can round the result down to 0. Adding 0 is without effect and the signal delivery stops. Clamp the division result to minimum 1 to avoid this. Problem was reported by Seongbae Park , who provided also an inital patch. Roland sayeth: I have had some more time to think about the problem, and to reproduce it using Toyo's test case. For the record, if my understanding of the problem is correct, this happens only in one very particular case. First, the expiry time has to be so soon that in cputime_t units (usually 1s/HZ ticks) it's < nthreads so the division yields zero. Second, it only affects each thread that is so new that its CPU time accumulation is zero so now+0 is still zero and ->it_*_expires winds up staying zero. For the VIRT and PROF clocks when cputime_t is tick granularity (or the SCHED clock on configurations where sched_clock's value only advances on clock ticks), this is not hard to arrange with new threads starting up and blocking before they accumulate a whole tick of CPU time. That's what happens in Toyo's test case. Note that in general it is fine for that division to round down to zero, and set each thread's expiry time to its "now" time. The problem only arises with thread's whose "now" value is still zero, so that now+0 winds up 0 and is interpreted as "not set" instead of ">= now". So it would be a sufficient and more precise fix to just use max(ticks, 1) inside the loop when setting each it_*_expires value. But, it does no harm to round the division up to one and always advance every thread's expiry time. If the thread didn't already fire timers for the expiry time of "now", there is no expectation that it will do so before the next tick anyway. So I followed Thomas's patch in lifting the max out of the loops. This patch also covers the reload cases, which are harder to write a test for (and I didn't try). I've tested it with Toyo's case and it fixes that. [toyoa@mvista.com: fix: min_t -> max_t] Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Roland McGrath Cc: Daniel Walker Cc: Toyo Abe Cc: john stultz Cc: Roman Zippel Cc: Seongbae Park Cc: Peter Mattis Cc: Rohit Seth Cc: Martin Bligh Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e24650c2e744f99541125a5b023f0d02cad19d14 Author: Akinobu Mita Date: Tue Oct 17 00:09:38 2006 -0700 [PATCH] md: fix /proc/mdstat refcounting I have seen mdadm oops after successfully unloading md module. This patch privents from unloading md module while mdadm is polling /proc/mdstat. Cc: Neil Brown Signed-off-by: Akinbou Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a649fd9271773dd0f78e2b9f347bcceecb8827f9 Author: Andrew Morton Date: Tue Oct 17 00:09:36 2006 -0700 [PATCH] invalidate: remove_mapping() fix If remove_mapping() failed to remove the page from its mapping, don't go and mark it not uptodate! Makes kernel go dead. (Actually, I don't think the ClearPageUptodate is needed there at all). Says Nick Piggin: "Right, it isn't needed because at this point the page is guaranteed by remove_mapping to have no references (except us) and cannot pick up any new ones because it is removed from pagecache. We can delete it." Signed-off-by: Andrew Morton Acked-by: Nick Piggin Signed-off-by: Linus Torvalds commit 5eb30790d4ccd3409240a80eaf9ab76b4fb75fd8 Author: Dave Kleikamp Date: Tue Oct 17 00:09:35 2006 -0700 [PATCH] null dereference in fs/jbd2/journal.c This is Eric Sesterhenn's jbd patch applied to jbd2. Commit: 41716c7c21b15e7ecf14f0caf1eef3980707fb74 His words: Since commit d1807793e1e7e502e3dc047115e9dbc3b50e4534 we dereference a NULL pointer. Coverity id #1432. We set journal to NULL, and use it directly afterwards. Signed-off-by: Dave Kleikamp Cc: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f4a0b917ce72ef47e438d354c433eb645218e87 Author: john stultz Date: Tue Oct 17 00:09:32 2006 -0700 [PATCH] i386 Time: Avoid PIT SMP lockups Avoid possible PIT livelock issues seen on SMP systems (and reported by Andi), by not allowing it as a clocksource on SMP boxes. However, since the PIT may no longer be present, we have to properly handle the cases where SMP systems have TSC skew and fall back from the TSC. Since the PIT isn't there, it would "fall back" to the TSC again. So this changes the jiffies rating to 1, and the TSC-bad rating value to 0. Thus you will get the following behavior priority on i386 systems: tsc [if present & stable] hpet [if present] cyclone [if present] acpi_pm [if present] pit [if UP] jiffies Rather then the current more complicated: tsc [if present & stable] hpet [if present] cyclone [if present] acpi_pm [if present] pit [if cpus < 4] tsc [if present & unstable] jiffies Signed-off-by: John Stultz Cc: Andi Kleen Cc: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9f5d8040b470e4f74e3266ece2969ef06d0f8aa Author: Pierre Ossman Date: Tue Oct 17 00:09:30 2006 -0700 [PATCH] New MMC maintainer I will be taking over after Russell King as the new maintainer of the MMC layer. Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca268c691de95612981b93e58899c1d73fdb6b47 Author: Ingo Molnar Date: Tue Oct 17 00:09:28 2006 -0700 [PATCH] lockdep: increase max allowed recursion depth In general, lockdep warnings are intended to be non-fatal, so I have put in various practical limits on internal data structure failure modes. We haven't had a /single/ lockdep-internal crash ever since lockdep went upstream [the unwinder crashes are outside of lockdep], and that's largely due to the good internal checks it does. Recursion within the dependency graph is currently limited to 20, that's probably not enough on some many-CPU boxes - this patch doubles it to 40. I have written the lockdep functions to have as small stackframes as possible, so 40 should be OK too. (The practical recursion limit should be somewhere between 100 and 200 entries. If we hit that then I'll change the algorithm to be iteration-based. Graph walking logic is so easy to program via recursion, so i'd like to keep recursion as long as possible.) Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 623a43952abfad2d48f287d1fab07b2089d07554 Author: Paul Fulghum Date: Tue Oct 17 00:09:27 2006 -0700 [PATCH] synclink: remove PAGE_SIZE reference Remove reference to PAGE_SIZE that causes errors if PAGE_SIZE != 4096 Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59f148005cfd3d41537a4b872c266213d5fe4dc6 Author: Brent Casavant Date: Tue Oct 17 00:09:25 2006 -0700 [PATCH] ioc4: Enable build on non-SN2 The SGI PCI-RT card, based on the SGI IOC4 chip, will be made available on Altix XE (x86_64) platforms in the near future. As such it is now a misnomer for the IOC4 base device driver to live under drivers/sn, and would complicate builds for non-SN2. This patch moves the IOC4 base driver code from drivers/sn to drivers/misc, and updates the associated Makefiles and Kconfig files to allow building on non-SN2 configs. Due to the resulting change in link order, it is now necessary to use late_initcall() for IOC4 subdriver initialization. [akpm@osdl.org: __udivdi3 fix] [akpm@osdl.org: fix default in Kconfig] Acked-by: Pat Gefre Acked-by: Jeremy Higdon Signed-off-by: Brent Casavant Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 107d5a72f2c6a6819b66eebcb0281c7a67b6baaa Author: Brent Casavant Date: Tue Oct 17 00:09:24 2006 -0700 [PATCH] ioc4: Remove SN2 feature and config dependencies The SGI PCI-RT card, based on the SGI IOC4 chip, will be made available on Altix XE (x86_64) platforms in the near future. As such dependencies on SN2-specific features and config dependencies need to be removed. This patch updates the Kconfig files to remove the config dependency, and updates the IOC4 bus speed detection routine to use universally available time interfaces instead of mmtimer. Signed-off-by: Brent Casavant Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f5c23e2c10d642a23aa3ebb449670a5184b6aab Author: Arthur Kepner Date: Mon Oct 16 20:22:35 2006 -0700 IB/mthca: Use mmiowb after doorbell ring We discovered a problem when running IPoIB applications on multiple CPUs on an Altix system. Many messages such as: ib_mthca 0002:01:00.0: SQ 000014 full (19941644 head, 19941707 tail, 64 max, 0 nreq) appear in syslog, and the driver wedges up. Apparently this is because writes to the doorbells from different CPUs reach the device out of order. The following patch adds mmiowb() calls after doorbell rings to ensure the doorbell writes are ordered. Signed-off-by: Arthur Kepner Signed-off-by: Roland Dreier commit 0f6f65f607b6d516fa001e8cdf5a2618c81372f5 Author: Russell King Date: Mon Oct 16 21:14:51 2006 +0100 [ARM] Update mach-types Signed-off-by: Russell King commit 4d99bfac9d5ce53b383d3c8279b917050be4e06c Author: Geert Uytterhoeven Date: Mon Oct 16 19:59:43 2006 +0200 [PATCH] CONFIG_TELCLOCK depends on X86 The telecom clock driver for MPBL0010 ATCA SBC depends on X86 Signed-off-by: Geert Uytterhoeven Acked-by: Mark Gross Signed-off-by: Linus Torvalds commit 6ef93dddfe11a72ab98a37ac4ef20ad681b008b0 Author: Robert Walsh Date: Tue Oct 10 14:55:45 2006 -0700 IB/ipath: Initialize diagpkt file on device init only Don't attempt to set up the diagpkt device in the module init code. Instead, wait until a piece of hardware is initialized. Fixes a problem when loading the ib_ipath module when no InfiniPath hardware is present: modprobe would go into the D state and stay there. Signed-off-by: Robert Walsh Signed-off-by: Roland Dreier commit fb7711e71ea7cd0d3e77e969df59162388c8a1f9 Author: Adrian Bunk Date: Tue Oct 10 14:26:02 2006 -0700 RDMA/amso1100: Fix a NULL dereference in error path This patch fixes a NULL dereference spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Acked-by: Steve Wise Acked-by: Tom Tucker Signed-off-by: Roland Dreier commit d986a27413aad10574f7211524de6a529870d134 Author: Henrik Kretzschmar Date: Tue Oct 10 14:26:01 2006 -0700 RDMA/amso1100: pci_module_init() conversion pci_module_init() convertion in amso1100 driver. Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: Roland Dreier commit 39af114377bf80d2a88e47be33d578d1fa9b0775 Author: Randy Dunlap Date: Mon Oct 16 09:01:46 2006 -0700 [PATCH] fix epoll_pwait when EPOLL=n Fixes http://bugzilla.kernel.org/show_bug.cgi?id=7371 sys_epoll_pwait needs to be listed as a conditional (weak) entry point for CONFIG_EPOLL=n. Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 5206a79d7b217c139116fc6faef55d1c0e65c800 Merge: 29da7eb... 3f53069... Author: Linus Torvalds Date: Mon Oct 16 08:33:06 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits) [Bluetooth] Use work queue to trigger URB submission [Bluetooth] Add locking for bt_proto array manipulation [Bluetooth] Check if DLC is still attached to the TTY [Bluetooth] Fix reference count when connection lookup fails [Bluetooth] Disconnect HID interrupt channel first [Bluetooth] Support concurrent connect requests [Bluetooth] Make use of virtual devices tree [Bluetooth] Handle return values from driver core functions [Bluetooth] Fix compat ioctl for BNEP, CMTP and HIDP [IPV6] sit: Add missing MODULE_LICENSE [IPV6]: Remove bogus WARN_ON in Proxy-NA handling. [IPv6] rules: Use RT6_LOOKUP_F_HAS_SADDR and fix source based selectors [XFRM]: Fix xfrm_state_num going negative. [NET]: reduce sizeof(struct inet_peer), cleanup, change in peer_check_expire() NetLabel: the CIPSOv4 passthrough mapping does not pass categories correctly NetLabel: better error handling involving mls_export_cat() NetLabel: only deref the CIPSOv4 standard map fields when using standard mapping [BRIDGE]: flush forwarding table when device carrier off [NETFILTER]: ctnetlink: Remove debugging messages [NETFILTER]: Update MAINTAINERS entry ... commit 29da7eb0ec69245c6e9b4eb5bdaa04af685f5c4f Author: David Howells Date: Mon Oct 16 14:10:49 2006 +0100 [PATCH] FRV: Use the correct preemption primitives in kmap_atomic() and co Use inc/dec_preempt_count() rather than preempt_enable/disable() and manually add in the compiler barriers that were provided by the latter. This makes FRV consistent with other archs. Furthermore, the compiler barrier effects are now there unconditionally - at least as far as preemption is concerned - because we don't want the compiler moving memory accesses out of the section of code in which the mapping is in force - in effect the kmap_atomic() must imply a LOCK-class barrier and the kunmap_atomic() must imply an UNLOCK-class barrier to the compiler. Signed-off-by: David Howells Acked-by: Peter Zijlstra Signed-off-by: Linus Torvalds commit 8741ca71a3f626a56595b88200ebf952ce77ceef Author: Andrey Mirkin Date: Mon Oct 16 12:08:43 2006 +0400 [PATCH] scsi: megaraid_{mm,mbox}: 64-bit DMA capability fix It is known that 2 LSI Logic MegaRAID SATA RAID Controllers (150-4 and 150-6) don't support 64-bit DMA. Unfortunately currently this check is wrong and driver sets 64-bit DMA mode for these devices. Signed-off-by: Andrey Mirkin Acked-by: Vasily Averin Signed-off-by: Linus Torvalds commit 3a42bb223f61fbd755d6e61b9b50b9681d68fcae Author: Alan Cox Date: Mon Oct 16 16:31:02 2006 +0100 [PATCH] ide: add sanity checking to ide taskfile ioctl Without this the user can feed in bogus values and get very bogus results. Security impact is minimal as this ioctl isn't available to unpriviledged processes anyway. Reported to the l/k list and found with an auditing tool. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9d90dafdb1f0e3c2b69fa8d3fbe99649127c8fa4 Author: Alan Cox Date: Mon Oct 16 16:28:44 2006 +0100 [PATCH] rio: fix array checking Found by an analysis tool and reported to the list. Fix is simple enough Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 3f5306927d800306ebba542438cfdf1a1c418376 Author: Marcel Holtmann Date: Sun Oct 15 17:31:19 2006 +0200 [Bluetooth] Use work queue to trigger URB submission The bcm203x firmware loading driver uses a timer to trigger the URB submission. It is better to use a work queue instead. Signed-off-by: Marcel Holtmann commit 74da626a1098640ddc40c0e3481c0cd41e8ec1e9 Author: Marcel Holtmann Date: Sun Oct 15 17:31:14 2006 +0200 [Bluetooth] Add locking for bt_proto array manipulation The bt_proto array needs to be protected by some kind of locking to prevent a race condition between bt_sock_create and bt_sock_register. And in addition all calls to sk_alloc need to be made GFP_ATOMIC now. Signed-off-by: Masatake YAMATO Signed-off-by: Frederik Deweerdt Signed-off-by: Marcel Holtmann commit cb19d9ea2ce2bcbe291d3d48e3501dc4f33ba627 Author: Marcel Holtmann Date: Sun Oct 15 17:31:10 2006 +0200 [Bluetooth] Check if DLC is still attached to the TTY If the DLC device is no longer attached to the TTY device, then it makes no sense to go through with changing the termios settings. Signed-off-by: Marcel Holtmann commit b2cfcd75df77b80d9cc3fa84190a350dfa79eb93 Author: Marcel Holtmann Date: Sun Oct 15 17:31:05 2006 +0200 [Bluetooth] Fix reference count when connection lookup fails When the connection lookup for the device structure fails, the reference count for the HCI device needs to be decremented. Signed-off-by: Marcel Holtmann commit e86070c83e9110e89800274385c013db602b1444 Author: Marcel Holtmann Date: Sun Oct 15 17:31:00 2006 +0200 [Bluetooth] Disconnect HID interrupt channel first The Bluetooth HID specification demands that the interrupt channel shall be disconnected first. This is needed to pass the qualification tests. Signed-off-by: Marcel Holtmann commit 4c67bc74f016b0d360b8573e18969c0ff7926974 Author: Marcel Holtmann Date: Sun Oct 15 17:30:56 2006 +0200 [Bluetooth] Support concurrent connect requests Most Bluetooth chips don't support concurrent connect requests, because this would involve a multiple baseband page with only one radio. In the case an upper layer like L2CAP requests a concurrent connect these chips return the error "Command Disallowed" for the second request. If this happens it the responsibility of the Bluetooth core to queue the request and try again after the previous connect attempt has been completed. Signed-off-by: Marcel Holtmann commit e9c4bec63eac001651d6d30239dd4175cc3698ef Author: Marcel Holtmann Date: Sun Oct 15 17:30:50 2006 +0200 [Bluetooth] Make use of virtual devices tree The Bluetooth subsystem currently uses a platform device for devices with no parent. It is a better idea to use the new virtual devices tree for these. Signed-off-by: Marcel Holtmann commit df5c37ea9a3820a9515d8204450aec00f48f8f88 Author: Marcel Holtmann Date: Sun Oct 15 17:30:45 2006 +0200 [Bluetooth] Handle return values from driver core functions Some return values of the driver core register and create functions are not handled and so might cause unexpected problems. Signed-off-by: Marcel Holtmann commit e9c5702e3c5558dade169949abd730173e87ef9c Author: Marcel Holtmann Date: Sun Oct 15 17:30:22 2006 +0200 [Bluetooth] Fix compat ioctl for BNEP, CMTP and HIDP There exists no attempt do deal with the fact that a structure with a uint32_t followed by a pointer is going to be different for 32-bit and 64-bit userspace. Any 32-bit process trying to use it will be failing with -EFAULT if it's lucky; suffering from having data dumped at a random address if it's not. Signed-off-by: David Woodhouse Signed-off-by: Marcel Holtmann commit 39c850863d5e36e72ecf9bc3537ec717bcce97fd Author: Jan Dittmer Date: Fri Oct 13 15:05:53 2006 -0700 [IPV6] sit: Add missing MODULE_LICENSE This is missing the MODULE_LICENSE statements and taints the kernel upon loading. License is obvious from the beginning of the file. Signed-off-by: Jan Dittmer Signed-off-by: Joerg Roedel Signed-off-by: David S. Miller commit f1a95859a86fcdfd94f8b6dc3255d70d037e1caf Author: YOSHIFUJI Hideaki Date: Fri Oct 13 15:03:34 2006 -0700 [IPV6]: Remove bogus WARN_ON in Proxy-NA handling. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit adaa70bbdfbc725e485179b06c8b23a20fbb7952 Author: Thomas Graf Date: Fri Oct 13 15:01:03 2006 -0700 [IPv6] rules: Use RT6_LOOKUP_F_HAS_SADDR and fix source based selectors Fixes rt6_lookup() to provide the source address in the flow and sets RT6_LOOKUP_F_HAS_SADDR whenever it is present in the flow. Avoids unnecessary prefix comparisons by checking for a prefix length first. Fixes the rule logic to not match packets if a source selector has been specified but no source address is available. Thanks to Kim Nordlund for working on this patch with me. Signed-off-by: Thomas Graf Acked-by: Ville Nuorvala Signed-off-by: David S. Miller commit 918049f0135854a1583f9b3b88f44dbf2b027329 Author: David S. Miller Date: Thu Oct 12 22:03:24 2006 -0700 [XFRM]: Fix xfrm_state_num going negative. Missing counter bump when hashing in a new ACQ xfrm_state. Now that we have two spots to do the hash grow check, break it out into a helper function. Signed-off-by: David S. Miller commit 4663afe2c848e2abc8791202beecf40684f13eb4 Author: Eric Dumazet Date: Thu Oct 12 21:21:06 2006 -0700 [NET]: reduce sizeof(struct inet_peer), cleanup, change in peer_check_expire() 1) shrink struct inet_peer on 64 bits platforms. commit ea614d7f4fb2d436b7a5ee490d1011615f6b38d5 Author: Paul Moore Date: Wed Oct 11 19:10:49 2006 -0400 NetLabel: the CIPSOv4 passthrough mapping does not pass categories correctly The CIPSO passthrough mapping had a problem when sending categories which would cause no or incorrect categories to be sent on the wire with a packet. This patch fixes the problem which was a simple off-by-one bug. Signed-off-by: Paul Moore Signed-off-by: James Morris commit bf0edf39296097f20c5fcc4919ed7d339194bd75 Author: Paul Moore Date: Wed Oct 11 19:10:48 2006 -0400 NetLabel: better error handling involving mls_export_cat() Upon inspection it looked like the error handling for mls_export_cat() was rather poor. This patch addresses this by NULL'ing out kfree()'d pointers before returning and checking the return value of the function everywhere it is called. Signed-off-by: Paul Moore Signed-off-by: James Morris commit 044a68ed8a692f643cf3c0a54c380a922584f34f Author: Paul Moore Date: Wed Oct 11 19:10:47 2006 -0400 NetLabel: only deref the CIPSOv4 standard map fields when using standard mapping Fix several places in the CIPSO code where it was dereferencing fields which did not have valid pointers by moving those pointer dereferences into code blocks where the pointers are valid. Signed-off-by: Paul Moore Signed-off-by: James Morris commit 1a620698c29b5e18150ec04ace0609fb07d08d3e Author: Stephen Hemminger Date: Thu Oct 12 14:45:38 2006 -0700 [BRIDGE]: flush forwarding table when device carrier off Flush the forwarding table when carrier is lost. This helps for availability because we don't want to forward to a downed device and new packets may come in on other links. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9ea8cfd6aa74e710f0cb0731ecb9dee53fbebfb9 Author: Pablo Neira Ayuso Date: Thu Oct 12 14:09:16 2006 -0700 [NETFILTER]: ctnetlink: Remove debugging messages Remove (compilation-breaking) debugging messages introduced at early development stage. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 82b985434c5e9ceee772ca206889a856a7a4a200 Author: Patrick McHardy Date: Thu Oct 12 14:08:55 2006 -0700 [NETFILTER]: Update MAINTAINERS entry Patches should go to myself CC netfilter-devel. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c08de5d5308ae0d20290344551ddd9cea8ded661 Author: Patrick McHardy Date: Thu Oct 12 14:08:41 2006 -0700 [NETFILTER]: xt_CONNSECMARK: fix Kconfig dependencies CONNSECMARK needs conntrack, add missing dependency to fix linking error with CONNSECMARK=y and CONNTRACK=m. Reported by Toralf Förster . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a9f54596fa20be3edefaa0b24c8714edb945eeaa Author: Patrick McHardy Date: Thu Oct 12 14:08:26 2006 -0700 [NETFILTER]: ipt_ECN/ipt_TOS: fix incorrect checksum update Even though the tos field is only a single byte large, the values need to be converted to net-endian for the checkum update so they are in the corrent byte position. Also fix incorrect endian annotations. Reported by Stephane Chazelas Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f603b6ec50faabbabde53ae2e2ce774968524c40 Author: Patrick McHardy Date: Thu Oct 12 14:08:11 2006 -0700 [NETFILTER]: arp_tables: missing unregistration on module unload Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f64ad5bb044326c6ebc6535d661c1abe78a0e5f2 Author: Patrick McHardy Date: Thu Oct 12 14:07:52 2006 -0700 [NETFILTER]: fix cut-and-paste error in exit functions Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit be60358e948484e472c88bf8a2d77e644ff5ed83 Author: Patrick McHardy Date: Thu Oct 12 13:53:32 2006 -0700 [DECNET]: Use correct config option for routing by fwmark in compare_keys() Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 284a940675a64df253e3dffc60b09bb4bbb149e4 Author: Anton Blanchard Date: Fri Oct 13 12:26:57 2006 +1000 [POWERPC] Check for offline nodes in pci NUMA code During boot we bring up all memory and cpu nodes. Normally a PCI device will be in one of these online nodes, however in some weird setups it may not. We have only seen this in the lab but we may as well check for the case and fallback to -1 (all nodes). Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 00ae36de49cc718d4122e1c8aac96fd1a5a2553c Author: Anton Blanchard Date: Fri Oct 13 12:17:16 2006 +1000 [POWERPC] Better check in show_instructions Instead of just checking that an address is in the right range, use the provided __kernel_text_address() helper which covers both the kernel and module text sections. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 99f48610252b736908fa5bdea505a480368308d6 Author: Anton Blanchard Date: Fri Oct 13 12:13:12 2006 +1000 [POWERPC] POWER6 has 6 PMCs Change ->num_pmcs to match the number of PMCs in POWER6. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 6c4841c2b6c32a134f9f36e5e08857138cc12b10 Author: Anton Blanchard Date: Fri Oct 13 11:41:00 2006 +1000 [POWERPC] Never panic when taking altivec exceptions from userspace At the moment we rely on a cpu feature bit or a firmware property to detect altivec. If we dont have either of these and the cpu does in fact support altivec we can cause a panic from userspace. It seems safer to always send a signal if we manage to get an 0xf20 exception from userspace. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 60b2a46cd60c54bd6551ddfa01f0aab08ca58a5d Author: Randy Vinson Date: Thu Oct 12 13:36:23 2006 -0700 [POWERPC] Fix IO Window Updates on P2P bridges. When update_bridge_base() updates the IO window on a PCI-to-PCI bridge, it fails to zero the upper 16 bits of the base and limit registers if the window size is less than 64K. This fixes it. Signed-off-by: Paul Mackerras commit 8ba738c2bb8fb83c0c99f680444d3ffd4c178ca2 Author: Li Yang Date: Wed Oct 11 19:27:57 2006 +0800 [POWERPC] Add Makefile entry for MPC832x_mds support Add missing entry in Makefile for MPC832x MDS support. It also change white space to tab in MPC8360 entry. Signed-off-by: Li Yang Signed-off-by: Paul Mackerras commit f5a37b066165f9938a93653f6940f3dc85ce751d Author: Li Yang Date: Wed Oct 11 19:04:22 2006 +0800 [POWERPC] Fix MPC8360EMDS PB board support MPC8360EMDS PB support is broken as some code was missing in last submission. This patch adds missing code and makes MPC8360EMDS PB support working. Signed-off-by: Li Yang Signed-off-by: Kim Phillips Signed-off-by: Paul Mackerras commit 7d2bd30f67e231920091d55d0fffc3a4bf43e68a Author: Kumar Gala Date: Wed Oct 11 02:06:59 2006 -0500 [POWERPC] ppc: Add missing calls to set_irq_regs In the timer_interrupt we were not calling set_irq_regs() and if we are profiling we will end up calling get_irq_regs(). This causes bad things to happen. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit bb579cf1d413b930be0241987b848e0f0c1b292f Author: Eric Sesterhenn Date: Tue Oct 10 14:37:29 2006 -0700 [POWERPC] Off-by-one in /arch/ppc/platforms/mpc8* A find -iname \*.[ch] | xargs grep "> ARRAY_SIZE(" revealed several incorrect usages of ARRAY_SIZE in the mpc drivers. The last element in the array is always ARRAY_SIZE()-1, this patch modifies the bounds checks accordingly. Signed-off-by: Eric Sesterhenn Cc: Vitaly Bordug Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit ee4ea82c07fa8aa46037962ec3e8b40c5144b5eb Author: Timur Tabi Date: Tue Oct 10 11:53:26 2006 -0500 [POWERPC] Add DOS partition table support to mpc834x_itx_defconfig The default configuration file for the MPC8349E-mITX reference board, mpc834x_itx_defconfig, did not include support for DOS partition table types. This support is necessary because the hard drive that comes with the ITX is formatted with this partition table type. Without this config option, no partitions on the drive can be mounted. Signed-off-by: Timur Tabi Signed-off-by: Paul Mackerras commit 654e4aee495bec1e4fc71ba1af25735da7cadc15 Author: Noguchi, Masato Date: Tue Oct 10 10:27:29 2006 +0200 [POWERPC] spufs: fix support for read/write on cntl This fixes a memory leak introduced by "spufs: add support for read/write oncntl", which was missing a call to simple_attr_close. Signed-off-by: Masato Noguchi Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit e5267b4b376cfbdc4518abcc68d5a7fffb505638 Author: Benjamin Herrenschmidt Date: Tue Oct 10 15:14:12 2006 +1000 [POWERPC] Don't crash on cell with 2 BEs when !CONFIG_NUMA The SPU code will crash if CONFIG_NUMA is not set and SPUs are found on a non-0 node. This workaround will ignore those SPEs and just print an message in the kernel log. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 51018b0a3160d253283173c2f54f16746cee5852 Author: Ulrich Drepper Date: Sun Oct 15 15:03:48 2006 -0400 [PATCH] make UML compile (FC6/x86-64) I need this patch to get a UML kernel to compile. This is with the kernel headers in FC6 which are automatically generated from the kernel tree. Some headers are missing but those files don't need them. At least it appears so since the resuling kernel works fine. Tested on x86-64. Signed-off-by: Ulrich Drepper Signed-off-by: Linus Torvalds commit 80c5606c3b45e0176c32d3108ade1e1cb0b954f3 Author: Linus Torvalds Date: Sun Oct 15 14:09:55 2006 -0700 Fix VM_MAYEXEC calculation .. and clean up the file mapping code while at it. No point in having a "if (file)" repeated twice, and generally doing similar checks in two different sections of the same code Signed-off-by: Linus Torvalds commit a7a0d86f5aa40a2215e36fe21d7911cf718ba428 Author: Petr Vandrovec Date: Fri Oct 13 18:42:07 2006 +0200 [PATCH] Fix core files so they make sense to gdb... It is silly to use non-static variable for writting zeroes to the file. And more seriously, foffset in core dump file dump function was incremented too much, so some parts of core dump were shifted by size of few phdrs and notes down, so although gdb was able to load that file, it did not make lot of sense - in my test case data pages were shifted down by about 900 bytes. Signed-off-by: Petr Vandrovec Signed-off-by: Linus Torvalds commit 0b269d8462a9f0058afb46eaee56e0732acf16c4 Merge: ed75ded... 9aaed2b... Author: Linus Torvalds Date: Sun Oct 15 11:02:52 2006 -0700 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: (28 commits) ACPI: check battery status on resume for un/plug events during sleep ACPICA: Fix incorrect handling of PCI Express Root Bridge _HID ACPI: asus_acpi: don't printk on writing garbage to proc files ACPI: asus_acpi: fix proc files parsing ACPI: SCI interrupt source override ACPI: fix printk format warnings ACPI: fix section for CPU init functions ACPI: update comments in motherboard.c ACPI: acpi_pci_link_set() can allocate with either GFP_ATOMIC or GFP_KERNEL ACPI: fix potential OOPS in power driver with CONFIG_ACPI_DEBUG ACPI: ibm_acpi: delete obsolete documentation ACPI: created a dedicated workqueue for notify() execution ACPI: Remove deferred execution from global lock acquire wakeup path MSI S270 Laptop support: backlight, wlan, bluetooth states ACPI: EC: export ec_transaction() for msi-laptop driver ACPI: EC: Simplify acpi_hw_low_level*() with inb()/outb(). ACPI: EC: Unify poll and interrupt gpe handlers ACPI: EC: Unify poll and interrupt mode transaction functions ACPI: EC: Remove unused variables and duplicated code ACPI: EC: Remove unnecessary delay added by previous transation patch. ... commit ed75ded7dd3fdb647df4efefc5d11158e3d182be Merge: e5a301e... 5570dd0... Author: Linus Torvalds Date: Sun Oct 15 11:01:53 2006 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (4750): AGC command1/2 is board specific V4L/DVB (4748): Fixed oops for Nova-T USB2 V4L/DVB (4746): HM12 is YUV 4:2:0, not YUV 4:1:1 V4L/DVB (4744): The Samsung TCPN2121P30A does not have a tda9887 V4L/DVB (4743): Fix oops in VIDIOC_G_PARM V4L/DVB (4742): Drivers/media/video: handle sysfs errors V4L/DVB (4741): {ov511,stv680}: handle sysfs errors V4L/DVB (4740): Fixed an if-block to avoid floating with debug-messages V4L/DVB (4739): SECAM support for saa7113 into saa7115 V4L/DVB (4738): Bt8xx/dvb-bt8xx.c: check kmalloc() return value. V4L/DVB (4734): Tda826x: fix frontend selection for dvb_attach V4L/DVB (4733): Tda10086: fix frontend selection for dvb_attach V4L/DVB (4732): Fix spelling error in Kconfig help text for DVB_CORE_ATTACH V4L/DVB (4731a): Kconfig: restore pvrusb2 menu items V4L/DVB (4729): Fix VIDIOC_G_FMT for NTSC in cx25840. V4L/DVB (4727): Support status readout for saa713x based FM radio V4L/DVB (4725): Fix vivi compile on parisc V4L/DVB (4692): Add WinTV-HVR3000 DVB-T support commit e5a301ee02e53acf000bb8331587129930bc2290 Author: Al Viro Date: Sat Oct 14 16:51:49 2006 +0100 [PATCH] serial167 __user annotations, NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cbff67668d597da48f8bc48549a9630cbf968f34 Author: Al Viro Date: Sat Oct 14 16:53:38 2006 +0100 [PATCH] sun3_ioremap() prototype Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6ce6b3aeeae75eee34670bcd42870ac839bfec4c Author: Al Viro Date: Sat Oct 14 16:52:36 2006 +0100 [PATCH] hp drivers/input stuff: C99 initializers, NULL noise removal, __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 733f99acc82543030ce0417e2f2201ddc63097af Author: Al Viro Date: Sat Oct 14 16:48:26 2006 +0100 [PATCH] new cifs endianness bugs * missing cpu_to_le64() for ChangeTime (introduced by [CIFS] Legacy time handling for Win9x and OS/2 part 1) * missing le16_to_cpu() for DialectIndex (introduced by [CIFS] Do not send newer QFSInfo to legacy servers which can not support it) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 645408d1ffe9f27b176a88302c22420f301607db Author: Al Viro Date: Sat Oct 14 16:50:38 2006 +0100 [PATCH] gfp_t in netlabel Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 36bd262b3f2ac723dadd20ce35539c8c738877f1 Author: Russell King Date: Sun Oct 15 13:50:02 2006 +0100 [ARM] Fix Zaurii keyboard/touchscreen drivers The Zaurii drivers were partially fixed up for the IRQ register changes, but unfortunately missed some bits, resulting in build errors. Fix these. Signed-off-by: Russell King commit 2326eb985b8844f44e150489c76f5cb56fa381b4 Author: Russell King Date: Sun Oct 15 13:48:37 2006 +0100 [ARM] Fix fallout from IRQ regs changes Some ARM platforms were still broken as a result of the IRQ register passing changes, mostly due to a missing linux/irq.h include. Signed-off-by: Russell King commit 8e25b84e76a0b2c117218405818cadd591512ff8 Author: Kristoffer Ericson Date: Sun Oct 8 20:00:53 2006 +0100 [ARM] 3890/1: [Jornada7xx] Addition of MCU commands into jornada720.h This adds relevant MCU commands for the j7xx chipset. Signed-off-by: Kristoffer Ericson Signed-off-by: Russell King commit 48e3becbee8906b44050c9300b668227b85f0c95 Author: Kristoffer Ericson Date: Sun Oct 8 19:52:30 2006 +0100 [ARM] 3889/1: [Jornada7xx] Addition of correct SDRAM params into cpu-sa1110.c This adds correct sdram params for K4S281632B-1H and sets the jornada to use them by default. Signed-off-by: Kristoffer Ericson Signed-off-by: Russell King commit 69f0304e174c765c624d75b79c35e49b7ba67ed4 Author: Liam Girdwood Date: Thu Oct 5 13:22:42 2006 +0100 [ARM] 3888/1: add pxa27x SSP FSRT register bit definition This patch adds a register bit definition for the pxa27x SSP port Frame Sync Relative Timing (FSRT) bit. Signed-off-by: Liam Girdwood Signed-off-by: Russell King commit 9aaed2b42d00d4abb2748d72d599a8033600e2bf Merge: 18d508b... a790b32... Author: Len Brown Date: Sat Oct 14 02:28:07 2006 -0400 Pull trivial into test branch commit 18d508bf5144e645443e80c606ed513f77369a50 Merge: 384bc8f... 281ea49... Author: Len Brown Date: Sat Oct 14 02:27:52 2006 -0400 Pull sci into test branch commit 384bc8f07075804b9ce8807ed54dd7a483bd749a Merge: e0749be... 37605a6... Author: Len Brown Date: Sat Oct 14 02:26:42 2006 -0400 Pull bugzilla-5534 into test branch commit e0749be933c3b0c4498d693524b0aa15cbdf0f8b Merge: ed3269a... 8c4c731... Author: Len Brown Date: Sat Oct 14 02:26:18 2006 -0400 Pull msi-laptop into test branch commit ed3269a31be516db7e5c415703e7c8eb09751083 Merge: d7321ad... ab9e43c... Author: Len Brown Date: Sat Oct 14 02:26:10 2006 -0400 Pull ec into test branch commit d7321ad2936c48a95af5187d4d676118cb59aa5f Merge: 1d5b30f... 991528d... Author: Len Brown Date: Sat Oct 14 02:25:59 2006 -0400 Pull mwait into test branch commit 1d5b30fc339fe2865599c70486abccc18200317d Merge: c92fd49... 34c4415... Author: Len Brown Date: Sat Oct 14 02:25:48 2006 -0400 Pull battery into test branch commit c92fd49c547c607e23b2687f0f65f762b7210035 Merge: 9443d7c... 2fe6dff... Author: Len Brown Date: Sat Oct 14 02:25:40 2006 -0400 Pull ibm into test branch commit 9443d7c93499e2b4bd37d30c09e8ac3aa4208466 Merge: aeb1104... 6df0570... Author: Len Brown Date: Sat Oct 14 02:25:33 2006 -0400 Pull asus into test branch commit 34c4415ab857dc6d51db08d62bcd45d4b8513bb6 Author: Jiri Kosina Date: Tue Oct 10 14:20:41 2006 -0700 ACPI: check battery status on resume for un/plug events during sleep Add ->resume method to the ACPI battery handler to check if the battery state has changed during sleep. If yes, update the ACPI internal data structures for benefit of /proc/acpi/battery/. Signed-off-by: Jiri Kosina Cc: Stefan Seyfried Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit aeb1104814e1177b865eec4f4b364602f5fcb6d1 Author: Eiichiro Oiwa Date: Mon Oct 2 19:18:03 2006 +0400 ACPICA: Fix incorrect handling of PCI Express Root Bridge _HID I could not get correct PCI Express bus number from the structure of acpi_object_extra. I always get zero as bus number regardless of bus location. I found that there is incorrect comparison with _HID (PNP0A08) in acpi/events/evrgnini.c and PCI Express _BBN method always fail. Therefore, we always get zero as PCI Express bus number. http://bugzilla.kernel.org/show_bug.cgi?id=7145 Signed-off-by: Bob Moore Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 6df05702f97f99e038ab817f4466386f6255f58d Author: Alexey Dobriyan Date: Tue Oct 10 14:20:36 2006 -0700 ACPI: asus_acpi: don't printk on writing garbage to proc files This reporting is useless (we errno anyway). Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 6311f0dac006032b82e3556874a1e18b31e80de2 Author: Darren Jenkins Date: Tue Oct 10 14:20:35 2006 -0700 ACPI: asus_acpi: fix proc files parsing ICC complains about a "Pointless comparsion of unsigned interger with zero" @ line 760 & 808 of asus_acpi.c parse_arg() mentioned below returns -E but it's copied into unsigned variable... Signed-off-by: Darren Jenkins Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 281ea49b0c294649a6de47a6f8fbe5611137726b Author: Kimball Murray Date: Tue Oct 10 14:20:33 2006 -0700 ACPI: SCI interrupt source override The Linux group at Stratus Technologies has come across an issue with SCI routing under ACPI. We were bitten by this when we made an x86_64 platform whose BIOS provides an Interrupt Source Override for the SCI itself. Apparently the override has no effect for the System Control Interrupt, and this appears to be because of the way the SCI is setup in the ACPI code. It does not handle the case where busirq != gsi. The code that sets up the SCI routing assumes that bus irq == global irq. So there is simply no provision for telling it otherwise. The attached patch provides this mechanism. This patch provided by David Bulkow, was tested on an i386 platform, which does not use the SCI override, and also on an x86_64 platform which does use an override. Signed-off-by: David Bulkow Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit a790b323fb1b73f9388426bf3b96f153d1c90d2c Author: Randy Dunlap Date: Tue Oct 10 14:20:32 2006 -0700 ACPI: fix printk format warnings Fix printk format warnings in drivers/acpi: drivers/acpi/tables/tbget.c:326: warning: format '%X' expects type 'unsigned int', but argument 5 has type 'long unsigned int' drivers/acpi/tables/tbrsdt.c:189: warning: format '%X' expects type 'unsigned int', but argument 5 has type 'long unsigned int' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 7af8b66004fa827958b4871112e59a07db5b3f6b Author: Pierre Ossman Date: Tue Oct 10 14:20:31 2006 -0700 ACPI: fix section for CPU init functions The ACPI processor init functions should be marked as __cpuinit as they use structures marked with __cpuinitdata. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit f4d2e2d87eac0338884b2c26f6bafed115dbac5e Author: Len Brown Date: Thu Sep 14 17:16:22 2006 -0400 ACPI: update comments in motherboard.c Signed-off-by: Len Brown commit 168a328f30e9d1a8bc6ff55c0501e0bdc08bee60 Author: Jiri Kosina Date: Thu Aug 24 00:36:19 2006 -0400 ACPI: acpi_pci_link_set() can allocate with either GFP_ATOMIC or GFP_KERNEL acpi_pci_link_set() allocates both with interrupts on and with interrupts off (resume-time), so check interrupts and decide on GFP_ATOMIC or GFP_KERNEL at run-time. Signed-off-by: Jiri Kosina Signed-off-by: Len Brown commit 786f18c666d7202a86a8aa42a98783b115fe8739 Author: Dmitry Torokhov Date: Wed Aug 23 23:18:06 2006 -0400 ACPI: fix potential OOPS in power driver with CONFIG_ACPI_DEBUG device was set to null and used before set in a debug printk Signed-off-by: Dmitry Torokhov Signed-off-by: Len Brown commit 2fe6dffabb06bfa0591c8c490b092b458fba1f06 Author: Pavel Machek Date: Thu Aug 31 14:15:54 2006 +0200 ACPI: ibm_acpi: delete obsolete documentation As this module is now part of the kernel tree, there is no need for instructions on how to download it and build an external module. Signed-off-by: Pavel Machek Signed-off-by: Len Brown commit 37605a6900f6b4d886d995751fcfeef88c4e462c Author: Alexey Y. Starikovskiy Date: Tue Sep 26 04:20:47 2006 -0400 ACPI: created a dedicated workqueue for notify() execution http://bugzilla.kernel.org/show_bug.cgi?id=5534#c160 Signed-off-by: Len Brown commit fcfc638c6b1345b6646523dbab0065b36a868ffc Author: Alexey Y. Starikovskiy Date: Tue Sep 26 04:18:16 2006 -0400 ACPI: Remove deferred execution from global lock acquire wakeup path On acquiring the ACPI global lock, if there were sleepers on the lock, we used to use acpi_os_execute() to defer a thread which would signal sleepers. Now just signal the semaphore directly. http://bugzilla.kernel.org/show_bug.cgi?id=5534#c159 Signed-off-by: Len Brown commit 8c4c731a89ea6458001f48033f8988447736fb38 Author: Lennart Poettering Date: Fri Oct 6 01:27:02 2006 -0400 MSI S270 Laptop support: backlight, wlan, bluetooth states Create a driver to support the platform-specific features of MSI S270 laptops (and maybe other MSI laptops). This driver implements a backlight device for controlling LCD brightness (/sys/class/backlight/msi-laptop-bl/). In addition it allows access to the WLAN and Bluetooth states through a platform driver (/sys/devices/platform/msi-laptop-pf/). Signed-off-by: Lennart Poettering Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit ab9e43c640b2b7d6e296fc39dd8cbcb96f9ae393 Author: Lennart Poettering Date: Tue Oct 3 22:49:00 2006 -0400 ACPI: EC: export ec_transaction() for msi-laptop driver Signed-off-by: Lennart Poettering Signed-off-by: Len Brown commit 6ffb221a82de962f31034b45d945e203a0f0500f Author: Denis M. Sadykov Date: Tue Sep 26 19:50:33 2006 +0400 ACPI: EC: Simplify acpi_hw_low_level*() with inb()/outb(). Simplify acpi_hw_low_level_xxx() functions to inb() and outb(). Signed-off-by: Alexey Y. Starikovskiy Signed-off-by: Len Brown commit 8e0341ba791cc72c643340b0d8119141ae5a80c5 Author: Denis M. Sadykov Date: Tue Sep 26 19:50:33 2006 +0400 ACPI: EC: Unify poll and interrupt gpe handlers Signed-off-by: Alexey Y. Starikovskiy Signed-off-by: Len Brown commit 3576cf619b73d850f5b21375609645f221e6270f Author: Denis M. Sadykov Date: Tue Sep 26 19:50:33 2006 +0400 ACPI: EC: Unify poll and interrupt mode transaction functions Signed-off-by: Alexey Y. Starikovskiy Signed-off-by: Len Brown commit 703959d47e887a29dc58123c05aa0ffcbbfa131d Author: Denis M. Sadykov Date: Tue Sep 26 19:50:33 2006 +0400 ACPI: EC: Remove unused variables and duplicated code Signed-off-by: Alexey Y. Starikovskiy Signed-off-by: Len Brown commit 7c6db5e51227761f42c6ac8260753f5c24dc1dde Author: Denis M. Sadykov Date: Tue Sep 26 19:50:33 2006 +0400 ACPI: EC: Remove unnecessary delay added by previous transation patch. Remove unnecessary delay (50 ms) while reading data from EC in interrupt mode. Signed-off-by: Alexey Y. Starikovskiy Signed-off-by: Len Brown commit d7a76e4cb3b4469b1eccb6204c053e3ebcd4c196 Author: Lennart Poettering Date: Tue Sep 5 12:12:24 2006 -0400 ACPI: consolidate functions in acpi ec driver Unify the following functions: acpi_ec_poll_read() acpi_ec_poll_write() acpi_ec_poll_query() acpi_ec_intr_read() acpi_ec_intr_write() acpi_ec_intr_query() into: acpi_ec_poll_transaction() acpi_ec_intr_transaction() These new functions take as arguments an ACPI EC command, a few bytes to write to the EC data register and a buffer for a few bytes to read from the EC data register. The old _read(), _write(), _query() are just special cases of these functions. Then unified the code in acpi_ec_poll_transaction() and acpi_ec_intr_transaction() a little more. Both functions are now just wrappers around the new acpi_ec_transaction_unlocked() function. The latter contains the EC access logic, the two original function now just do their special way of locking and call the the new function for the actual work. This saves a lot of very similar code. The primary reason for doing this, however, is that my driver for MSI 270 laptops needs to issue some non-standard EC commands in a safe way. Due to this I added a new exported function similar to ec_write()/ec_write() which is called ec_transaction() and is essentially just a wrapper around acpi_ec_{poll,intr}_transaction(). Signed-off-by: Lennart Poettering Acked-by: Luming Yu Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 991528d7348667924176f3e29addea0675298944 Author: Venkatesh Pallipadi Date: Mon Sep 25 16:28:13 2006 -0700 ACPI: Processor native C-states using MWAIT Intel processors starting with the Core Duo support support processor native C-state using the MWAIT instruction. Refer: Intel Architecture Software Developer's Manual http://www.intel.com/design/Pentium4/manuals/253668.htm Platform firmware exports the support for Native C-state to OS using ACPI _PDC and _CST methods. Refer: Intel Processor Vendor-Specific ACPI: Interface Specification http://www.intel.com/technology/iapc/acpi/downloads/302223.htm With Processor Native C-state, we use 'MWAIT' instruction on the processor to enter different C-states (C1, C2, C3). We won't use the special IO ports to enter C-state and no SMM mode etc required to enter C-state. Overall this will mean better C-state support. One major advantage of using MWAIT for all C-states is, with this and "treat interrupt as break event" feature of MWAIT, we can now get accurate timing for the time spent in C1, C2, .. states. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 3cd5b87d96db503f69a5892b8f5350d356d18969 Author: Lebedev, Vladimir P Date: Tue Sep 5 19:59:22 2006 +0400 ACPI: sbs: fix module_param() initializers Signed-off-by: Len Brown commit 963497c12acb4d43caa9751b9291b014eea51a1a Author: Lebedev, Vladimir P Date: Tue Sep 5 19:49:13 2006 +0400 ACPI: sbs: check for NULL device pointer Signed-off-by: Len Brown commit 28b779d127d3038ff83f42259d135a063b7cd848 Author: Stefan Schmidt Date: Fri Sep 22 12:19:16 2006 +0200 ACPI: ibm_acpi: Documentation the wan feature. Document the wan feature Jeremy Fitzhardinge added to ibm_acpi. Signed-off-by: Stefan Schmidt Acked-by: Borislav Deianov Signed-off-by: Len Brown commit 24f7ff0af855ece60064a2532d8b316df02983c6 Author: Stefan Schmidt Date: Fri Sep 22 12:19:15 2006 +0200 ACPI: ibm_acpi: Update documentation for brightness and volume. Document the change of the experimental flag for brightness and volume. Signed-off-by: Stefan Schmidt Acked-by: Borislav Deianov Signed-off-by: Len Brown commit 4d6bd5ea4ec4991901a8cf5a586babef68e1fa3f Author: Stefan Schmidt Date: Fri Sep 22 12:19:14 2006 +0200 ACPI: ibm_acpi: Remove experimental status for brightness and volume. The brightness and volume features from ibm-acpi are stable. The experimental flag is no longer needed. Signed-off-by: Stefan Schmidt Acked-by: Borislav Deianov Signed-off-by: Len Brown commit 288f3ad406460f03642a41bb945826891a7b866f Author: Marek W Date: Mon Aug 14 22:37:20 2006 -0700 ACPI: asus_acpi: W3000 support Add support for W3000 (W3V) and indirectly fixes an issue with kmilo under KDE (it was triggering excessive LCD read error messages by querying asus_acpi module) allowing people (I am probably the only one who tested this) with W3000 to run kmilo. Cc: Karol Kozimor Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 5570dd02ca7fb2e28d32516fae05031d48711aa5 Author: Patrick Boettcher Date: Fri Oct 13 11:35:12 2006 -0300 V4L/DVB (4750): AGC command1/2 is board specific Added config-struct-parameter to take board-specific AGC command 1 and 2 into account. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 6a74216c4590e4d322a45e1085f3553b1fb07f06 Author: Patrick Boettcher Date: Fri Oct 13 11:33:26 2006 -0300 V4L/DVB (4748): Fixed oops for Nova-T USB2 When using the remote control with the Nova-T USB there was an Oops because of the recent DVB-USB-Adapter change. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 5011915cbb139a331c083e65a61c82e9174f9813 Author: Hans Verkuil Date: Fri Oct 13 05:12:42 2006 -0300 V4L/DVB (4746): HM12 is YUV 4:2:0, not YUV 4:1:1 Fix comment in videodev2.h Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1d3e6bdaa8b4b068d378ab58679c334e433496cd Author: Hans Verkuil Date: Thu Oct 12 15:45:33 2006 -0300 V4L/DVB (4744): The Samsung TCPN2121P30A does not have a tda9887 Contrary to all expections the Samsung TCPN2121P30A tuner does NOT have a tda9887. Remove the tda9887 flag from the tuner definition. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 83427ac5d643308ccb36e05d525949952bdedc27 Author: Jonathan Corbet Date: Fri Oct 13 07:51:16 2006 -0300 V4L/DVB (4743): Fix oops in VIDIOC_G_PARM The call to v4l2_std_construct() in the VIDIOC_G_PARM handler treats vfd->current_norm as if it were an index - but it's not. The result is an oops if the driver has no vidioc_g_parm() method defined. Here's the fix. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit c12e3be0860652ed1e15c9442adcba44317211d1 Author: Jeff Garzik Date: Fri Oct 13 07:17:32 2006 -0300 V4L/DVB (4742): Drivers/media/video: handle sysfs errors Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 2444a2fca488fa8e362895a4ca9fdc51f497282a Author: Jeff Garzik Date: Tue Oct 10 15:09:43 2006 -0300 V4L/DVB (4741): {ov511,stv680}: handle sysfs errors Signed-off-by: Jeff Garzik Signed-off-by: Mauro Carvalho Chehab commit 474ce78130ba37cb50e620c538ab3ffe6c582ba6 Author: Enrico Scholz Date: Mon Oct 9 16:27:05 2006 -0300 V4L/DVB (4740): Fixed an if-block to avoid floating with debug-messages The dbgarg() macro in videodev.c contains some printk() statements where only the first one is influenced by an if-statement. This causes floating with debug-messages which is fixed by this patch by adding a '{ ... }' pair. Signed-off-by: Enrico Scholz Signed-off-by: Mauro Carvalho Chehab commit fc2fa31f4eaa53995593ced14c73f2cf63dcfa17 Author: Pádraig Brady Date: Mon Oct 9 08:02:17 2006 -0300 V4L/DVB (4739): SECAM support for saa7113 into saa7115 Without the attached trivial patch, the saa7113 is set up for PAL when SECAM is selected and hence will see only show black and white for SECAM signals. Tested the patch against the saa7115 module in linux-2.6.17 with a Pinnacle 50e USB tuner (em28xx). Signed-off-by: Pádraig Brady Signed-off-by: Mauro Carvalho Chehab commit 626ae83bb24927ca015503448f0199842ae2e8da Author: Amit Choudhary Date: Mon Oct 9 15:50:10 2006 -0300 V4L/DVB (4738): Bt8xx/dvb-bt8xx.c: check kmalloc() return value. Check the return value of kmalloc() in function frontend_init(), in file drivers/media/dvb/bt8xx/dvb-bt8xx.c. Signed-off-by: Amit Choudhary Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit c071fab453f7b181c49d92d06d936bb243ef1932 Author: Michael Krufky Date: Mon Oct 9 05:17:45 2006 -0300 V4L/DVB (4734): Tda826x: fix frontend selection for dvb_attach Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fc13d929cc7af3c0da09ea2b6d23465b933e279d Author: Michael Krufky Date: Mon Oct 9 05:17:09 2006 -0300 V4L/DVB (4733): Tda10086: fix frontend selection for dvb_attach Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 934765b8e2f211aec119dbdd9feea6d3f2ffaf7e Author: Uwe Bugla Date: Fri Oct 6 13:12:48 2006 -0300 V4L/DVB (4732): Fix spelling error in Kconfig help text for DVB_CORE_ATTACH Signed-off-by: Uwe Bugla Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 180958febfb8d32da1d4fee13868e03be0cb931a Author: Michael Krufky Date: Sat Oct 7 16:10:53 2006 -0300 V4L/DVB (4731a): Kconfig: restore pvrusb2 menu items Looks like the pvrusb2 menu items were accidentally removed in git commit 1450e6bedc58c731617d99b4670070ed3ccc91b4 This patch restores the menu items so that the pvrusb2 driver can be built. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit e0abc8cd54f5ac65465918f32f286218aa33e8c0 Author: Hans Verkuil Date: Sat Oct 7 16:22:10 2006 -0300 V4L/DVB (4729): Fix VIDIOC_G_FMT for NTSC in cx25840. VIDIOC_G_FMT returned the sliced VBI types in the wrong lines for NTSC (three lines too low). Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2e7cf3ea5acc7ed57b8883cc6d35ffc06a5c95fa Author: Hartmut Hackmann Date: Fri Oct 6 19:45:23 2006 -0300 V4L/DVB (4727): Support status readout for saa713x based FM radio This patch adds readout for stereo and signal level for saa713x cards which use the saa713x as FM demodulator. These are many cards based on saa7133, tda8290 and tda8275a. FM channel search should work now. Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 7844d7561307d6f8b0dd18b91f4dc6cff53848b4 Author: Matthew Wilcox Date: Fri Oct 6 17:12:00 2006 -0300 V4L/DVB (4725): Fix vivi compile on parisc parisc (and several other architectures) don't have a dma_address in their sg list. Use the macro instead. Signed-off-by: Matthew Wilcox Signed-off-by: Mauro Carvalho Chehab commit 76dc82ab57236105285fd8520895c1404b8b952f Author: Steven Toth Date: Sat Sep 30 00:43:58 2006 -0300 V4L/DVB (4692): Add WinTV-HVR3000 DVB-T support The WinTV-HVR3000 is currently defined for analog support only. This patch adds full DVB-T support. (DVB-S support will be added soon) Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit b435fdcda126db42343b8055d04a0a27c229717b Author: Jeff Garzik Date: Thu Oct 12 01:06:53 2006 -0400 Input: fm801-gp - handle errors from pci_enable_device() Signed-off-by: Jeff Garzik Signed-off-by: Dmitry Torokhov commit 23de1510e2468ea349354889097e018d4e8770c5 Author: Dmitry Torokhov Date: Thu Oct 12 01:06:34 2006 -0400 Input: gameport core - handle errors returned by device_bind_driver() Signed-off-by: Dmitry Torokhov commit 0a66045bcfd3a7ba5d1253f9f305b78bf636ac57 Author: Dmitry Torokhov Date: Thu Oct 12 01:06:23 2006 -0400 Input: serio core - handle errors returned by device_bind_driver() Signed-off-by: Dmitry Torokhov commit 07646e217f473a3e6213f8228336a9046833d6aa Author: Andrew Morton Date: Wed Oct 11 23:45:23 2006 -0400 Lockdep: fix compile error in drivers/input/serio/serio.c lockdep_set_subclass() was missing in !LOCKDEP case Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 88aa0103e408616e433c209e80169ab8d6eda99e Author: Jiri Kosina Date: Wed Oct 11 01:45:31 2006 -0400 Input: serio - add lockdep annotations Signed-off-by: Jiri Kosina Acked-by: Peter Zijlstra Signed-off-by: Dmitry Torokhov commit 4dfbb9d8c6cbfc32faa5c71145bd2a43e1f8237c Author: Peter Zijlstra Date: Wed Oct 11 01:45:14 2006 -0400 Lockdep: add lockdep_set_class_and_subclass() and lockdep_set_subclass() This annotation makes it possible to assign a subclass on lock init. This annotation is meant to reduce the _nested() annotations by assigning a default subclass. One could do without this annotation and rely on lockdep_set_class() exclusively, but that would require a manual stack of struct lock_class_key objects. Signed-off-by: Peter Zijlstra Signed-off-by: Dmitry Torokhov commit 86255d9d0bede79140f4912482447963f00818c0 Author: Dmitry Torokhov Date: Wed Oct 11 01:44:46 2006 -0400 Input: atkbd - supress "too many keys" error message Many users seems to be annoyed by this warning so kill the message and implement a counter exported as a sysfs attribute so we still know what is going on. Make atkbd use attribute groups while we are at it. Signed-off-by: Dmitry Torokhov commit 817e6ba3623de9cdc66c6aba90eae30b5588ff11 Author: Dmitry Torokhov Date: Wed Oct 11 01:44:28 2006 -0400 Input: i8042 - supress ACK/NAKs when blinking during panic This allows using SysRq and not fill logs with complaints from atkbd. Signed-off-by: Dmitry Torokhov commit 80fc9f532d8c05d4cb12d55660624ce53a378349 Author: Dmitry Torokhov Date: Wed Oct 11 01:43:58 2006 -0400 Input: add missing exports to fix modular build Signed-off-by: Dmitry Torokhov