commit 606135a3081e045b677cde164a296c51f66c4633 Author: Linus Torvalds Date: Tue Feb 27 20:59:12 2007 -0800 Linux 2.6.21-rc2 Too many changes for comfort since -rc1. Some missed merges, and some just annoyingly big fixes since. This is not how an -rc2 should look. Need to really calm things down! commit bb4c18cbba474ae20c84171819255598cf975158 Author: David S. Miller Date: Mon Feb 26 14:55:06 2007 -0800 [SPARC64]: Fix PCI interrupts on E450 et al. When the PCI controller OBP node lacks an interrupt-map and interrupt-map-mask property, we need to form the INO by hand. The PCI swizzle logic was not doing that properly. This was a regression added by the of_device code. Signed-off-by: David S. Miller commit f8dfdd5cab482a2ce4a8e2375e1512aa4829c653 Author: Stephen Hemminger Date: Mon Feb 26 14:51:56 2007 -0800 netxen: do_rom_fast_write error handling Compiler warning spots real error! The function do_rom_fast_read called in do_rom_fast_write can fail and leave data1 unset. This causes a compile warning. The correct thing is to propagate the error out. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 6eaf6fc81ab2fa8c264f819f57dc950b6ea9c651 Author: Adrian Bunk Date: Sun Feb 25 01:08:47 2007 +0100 remove the jffs MAINTAINERS entry This patch removes the MAINTAINERS entry for the removed jffs filesystem. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 36c843d5e347ec71ec579a477c941538a03b8cf3 Author: Mark Brown Date: Sun Feb 25 15:37:27 2007 +0000 natsemi: Fix detection of vanilla natsemi cards Bob Tracy reported that the addition of support for Aculab E1/T1 cPCI carrier cards broke detection of vanilla natsemi cards. This patch fixes that: the problem is that the driver-specific ta in the PCI device table is an index into a second table and this had not been updated for the vanilla cards. This patch fixes the problem minimally. Signed-Off-By: Mark Brown Signed-off-by: Jeff Garzik commit b882addd7aecbdae7b938fa189f0459d0713976b Author: Alan Date: Tue Feb 20 18:08:57 2007 +0000 net: remove a collection of unneeded #undef REALLY_SLOW_IO stuff Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 54d3e568209553d3dd0d824fbc0ef4a6cedaf465 Author: Roland Dreier Date: Mon Feb 26 14:58:49 2007 -0800 chelsio: Fix non-NAPI compile Chelsio without NAPI enabled has been broken (won't compile) since 3de00b89 ("chelsio: NAPI speed improvement"): drivers/net/chelsio/sge.c: In function `t1_interrupt`: drivers/net/chelsio/sge.c:1716: error: `Q` undeclared (first use in this function) The change below seems to add back in the declaration and initialization of `Q` that was removed by mistake, and at least makes the driver compile for me, although I have no hardware and hence no way to test whether this actually works. Signed-off-by: Roland Dreier Signed-off-by: Jeff Garzik commit e0994eb1d9ead09bb8f6483cf5cf6aa55ce0f3b9 Author: Divy Le Ray Date: Sat Feb 24 16:44:17 2007 -0800 cxgb3 - Feed Rx free list with pages Populate Rx free list with pages. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit bae73f44472921008f8d0982344c53ae231445a1 Author: Divy Le Ray Date: Sat Feb 24 16:44:12 2007 -0800 cxgb3 - Recovery from HW starvation of response queue entries. Improve the traffic recovery after the HW ran out of response queue entries. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit 99d7cf30b99a8b7863090d8a510d6a4d9ad082cf Author: Divy Le Ray Date: Sat Feb 24 16:44:06 2007 -0800 cxgb3 - Unmap offload packets when they are freed Offload packets may be DMAed long after their SGE Tx descriptors are done so they must remain mapped until they are freed rather than until their descriptors are freed. Unmap such packets through an skb destructor. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit 75d8626fdd172745ebb638c2bf5138071e67a818 Author: Divy Le Ray Date: Sun Feb 25 16:32:37 2007 -0800 cxgb3 - FW version update Update FW version to 3.2 Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit 1825494a7ec6c0fed0a7dfb1646e84402979743e Author: Divy Le Ray Date: Sat Feb 24 16:43:56 2007 -0800 cxgb3 - private ioctl cleanup Clean up some private ioctls. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit 896392ef94dd7b9e66d1e836f98b57380452a280 Author: Divy Le Ray Date: Sat Feb 24 16:43:50 2007 -0800 cxgb3 - manage sysfs attributes per port sysfs attributes are now managed per port, no longer per adapter. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit d8d70caf836e48c4c462435d38434f2901058884 Author: Sivakumar Subramani Date: Sat Feb 24 02:04:24 2007 -0500 S2IO: Restoring the mac address in s2io_reset - Restore in s2io_reset, the mac address assigned during s2io_open. Earlier, it was getting overwritten to the factory default (read from the eeprom) and subsequently dropping received frames. - Fixed the typo in calling rtnl_unlock in s2io_set_link function. Signed-off-by: Sivakumar Subramani Signed-off-by: Jeff Garzik commit fa1f0cb350989617281a98d30e6a3a4914c79b58 Author: Sivakumar Subramani Date: Sat Feb 24 02:03:22 2007 -0500 S2IO: Avoid printing the Enhanced statistics for Xframe I card. - Enhanced Statistics are supported only for Xframe II (Herculas) card. Add condition check such Enhanced statistics will included only in the case of Xframe II card. Signed-off-by: Sivakumar Subramani Signed-off-by: Jeff Garzik commit ac1f90d6f1267b916c47cc5a033ef5ec1baf4280 Author: Sivakumar Subramani Date: Sat Feb 24 02:01:31 2007 -0500 S2IO: Making LED off during LINK_DOWN notification. - Turning off LED for LINK_DOWN notification - Return from rxd_owner_bit_reset function if call to set_rxd_buffer_pointer fails with ENOMEM Signed-off-by: Sivakumar Subramani Signed-off-by: Jeff Garzik commit 926930b202d56c3dfb6aea0a0c6bfba2b87a8c03 Author: Sivakumar Subramani Date: Sat Feb 24 01:59:39 2007 -0500 S2IO: Added a loadable parameter to enable or disable vlan stripping in frame. - Added code to not to strip vlan tag when driver is in promiscuous mode - Added module loadable parameter 'vlan_tag_strip" through which user can enable or disable vlan stripping irrespective of mode ( promiscuous or non-promiscuous ). Signed-off-by: Sivakumar Subramani Signed-off-by: Jeff Garzik commit 9fc93a41a1ad11da128f37e60cac01b67990cfb4 Author: Sivakumar Subramani Date: Sat Feb 24 01:57:32 2007 -0500 S2IO: Optimized the delay to wait for command completion - Optimized delay to wait for command completion so as to reduce the initialization wait time. - Disable differentiated services steering. By default RMAC is configured to steer traffic with certain DS codes to other queues. Driver must initialize the DS memory to 0 to make sure that DS steering will not be used by default. Signed-off-by: Sivakumar Subramani Signed-off-by: Jeff Garzik commit fb6a825b09a2311624e9cac20e643d9d7ef602dc Author: Sivakumar Subramani Date: Sat Feb 24 01:51:50 2007 -0500 S2IO: Fixes for MSI and MSIX - Added debug statements to print a debug message if the MSI/MSI-X vector (or) data is zero. - This patch removes the code that will enable NAPI for the case of single ring and MSI-X / MSI case. There are some issue in the enabling NAPI with MSI/MSI-X. So we are turning off NAPI in the case of MSI/MSI-X. Signed-off-by: Sivakumar Subramani Signed-off-by: Jeff Garzik commit ed227dcc2d998c8e0616449db06f7ef892cb17fc Author: Benjamin Li Date: Mon Feb 26 11:06:43 2007 -0800 qla3xxx: Bumping driver version number Signed-off-by: Benjamin Li Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit e8f4df2491d07fc369e9d631e0638da03a9b3a38 Author: Benjamin Li Date: Mon Feb 26 11:06:42 2007 -0800 qla3xxx: Kernic Panic on pSeries under stress conditions To reproduce this panic consistently, we run an intensive network application like 'netperf'. After waiting for a couple of seconds, you will see a stack trace and a kernel panic where we are calling pci_unmap_single() in ql_poll(). Changes: 1) Check the flags on the Response MAC IO Control block to check for errors 2) Ensure that if we are on the 4022 we only use one segment 3) Before, we were reading the memory mapped producer index register everytime we iterated in the loop when clearing the queue. We should only be iterating to a known point, not as the producer index is being updated. Signed-off-by: Benjamin Li Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 63b66d12de57d8455615d9f619e18824137ed547 Author: Ron Mercer Date: Mon Feb 26 11:06:41 2007 -0800 qla3xxx: bugfix tx reset after stress conditions. To Reproduce the Problem: To reproduce this panic consistently, we run an intensive network application like 'netperf' and then switch to a different console. After waiting for a couple of seconds, you will see a tx reset has occured. Reason: We enable interrupts even if we were not running. Solution: Now we will enable interrupts only after we are ready to give up the poll routine. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 0f8ab89e825f8c9f1c84c558ad7e2e4006aee0d3 Author: Benjamin Li Date: Mon Feb 26 11:06:40 2007 -0800 qla3xxx: Check return code from pci_map_single() in ql_release_to_lrg_buf_free_list(), ql_populate_free_queue(), ql_alloc_large_buffers(), and ql3xxx_send() pci_map_single() could fail. We need to properly check the return code from pci_map_single(). If we can not properly map this address, then we should cleanup and return the proper return code. Signed-off-by: Benjamin Li Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 3e71f6dd47e7e64461328adcdc3fbad1465b4c2f Author: Ron Mercer Date: Mon Feb 26 11:06:39 2007 -0800 qla3xxx: bugfix: Fixed jumbo frame handling for 3032 chip. The scatter/gather lists were not being build correctly. When large frames spanned several buffers the chip would panic. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 97916330e12371b44df659abb25d4d5d528e3ff7 Author: Ron Mercer Date: Mon Feb 26 11:06:38 2007 -0800 qla3xxx: Clean up receive process. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 1357bfcf71063637d16a7014639d675b5cbf5189 Author: Ron Mercer Date: Mon Feb 26 11:06:37 2007 -0800 qla3xxx: Dynamically size the rx buffer queue based on the MTU. This change removes use of constants for rx buffer queue size and instead calculates the queue length based on what he MTU is set to. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit cb8bac12ec92ec469ecfe0967429bf9032f835c1 Author: Ron Mercer Date: Mon Feb 26 11:06:36 2007 -0800 qla3xxx: Remove API to change MTU. This network device driver shares the same hardware as the qla4xxx iSCSI driver. Changing the MTU via the device interface will cause qla4xxx to crash as there is no way to make notification. Users wishing to change the MTU must do so using an iSCSI utility such as Qlogic SanSurfer. This forces the user to unload/reload this network device driver after the MTU value has been changed in flash. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 04f10773535248466455ae80c1eedeb205c81e9a Author: Benjamin Li Date: Mon Feb 26 11:06:35 2007 -0800 qla3xxx: Fix deadlock issue on error paths 1) Fix deadlock issue when in QL_RESET_ACTIVE state and traversing through the Link State Machine 2) Fix deadlock issue when ethtool would call ql_get_settings() 3) Fix deadlock issue when adaptor is ifup'ed but adaptor fails to initialize Signed-off-by: Benjamin Li Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit cd238faa32c4ee0791125526e518f87f48493292 Author: Benjamin Li Date: Mon Feb 26 11:06:33 2007 -0800 qla3xxx: Changed to use netdev_alloc_skb() from dev_alloc_skb Signed-off-by: Benjamin Li Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit d2d76b8db4e681944801870f81b859c5bf9964cf Author: Benjamin Li Date: Mon Feb 26 11:06:32 2007 -0800 qla3xxx: Remove unnecessary memset() in qla3xxx_send() We do not need to zero out the 64 byte MAC request I/O control block. By zeroing out the control block and setting it to proper fields is redundant work. This is because in the qla3xxx_send() function we will already set the proper fields in this structure. The unused fields are not looked at by the hardware and do not need to be zeroed out. Signed-off-by: Benjamin Li Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 546faf077e14930df2ebddad9190db42f1c42f0f Author: Benjamin Li Date: Mon Feb 26 11:06:31 2007 -0800 qla3xxx: Return proper error codes when the 4022/4032 is being probed The return code was not properly set when when allocating memory or mapping memory failed. Depending on the stack, the return code would sometimes return 0, which indicates everything was ok, when in fact there was an error. This would cause trouble when the module was removed. Now, we will pass back the proper return code when an error occurs during the PCI probe. Signed-off-by: Benjamin Li Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 908b637fe793165b6aecdc875cdca67c4959a1ad Author: Ralf Baechle Date: Mon Feb 26 19:52:06 2007 +0000 Alignment in mv643xx_eth The driver contains this little piece of candy: #if defined(CONFIG_DMA_NONCOHERENT) || defined(CONFIG_NOT_COHERENT_CACHE) #define ETH_DMA_ALIGN L1_CACHE_BYTES #else #define ETH_DMA_ALIGN 8 #endif Any reason why we're not using dma_get_cache_alignment() instead? Ralf Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 92b0c4e240d0768f875bd08d01ec26d87b9546d1 Author: Ralf Baechle Date: Mon Feb 26 01:50:34 2007 +0000 sgiseeq: Don't include unnecessary headerfiles. Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit e9eb70c92143c8f03e456aa60d89204b3311e554 Author: Timur Tabi Date: Wed Feb 21 14:40:12 2007 -0600 ucc_geth: use of_get_mac_address() Update ucc_geth_probe() to use function of_get_mac_address() to obtain the MAC address. Signed-off-by: Timur Tabi Signed-off-by: Jeff Garzik commit f19841f517f4db628366fa2f080dfa7ac24f0f51 Author: Stephen Hemminger Date: Fri Feb 23 14:04:54 2007 -0800 skge: comma consistency Use comma's consistently. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit c4cd29d2058808b7a68e3f2e6cbbcfe19ca7233d Author: Stephen Hemminger Date: Fri Feb 23 14:03:00 2007 -0800 skge: fix transmitter flow control It looks like the skge driver inherited another bug from the sk98lin code. If I send from 1000mbit port to a machine on 100mbit port, the switch should be doing hardware flow control, but no pause frames show up in the statistics. This is the analog of the recent sky2 fixes. The device needs to listen for multicast pause frames and then not discard them. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 9dc6f0e789ac8cdd4a7912a9c27027d937a6e784 Author: Brice Goglin Date: Wed Feb 21 18:05:17 2007 +0100 myri10ge: workaround buggy adopted firmwares Work around a bug which occurs when adopting firmware versions 1.4.4 though 1.4.11 where broadcasts are filtered as if they were multicasts. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit b1adf031a1325bd85eef0313e42d0189d89cece0 Author: Amit S. Kale Date: Wed Feb 21 06:54:06 2007 -0800 NetXen: Driver ifconfig fix Signed-off-by: Amit S. Kale Signed-off-by: Jeff Garzik commit 9de06610669b2f7b9c2ba6f0a849b70aa91b2edb Author: Amit S. Kale Date: Wed Feb 21 06:37:06 2007 -0800 NetXen: Driver unload fixes Signed-off-by: Amit S. Kale Signed-off-by: Jeff Garzik commit fa302484218e4043f4502de2f64a69f87101c78e Author: Linas Vepstas Date: Tue Feb 20 16:45:27 2007 -0600 spidernet: maintainership Update driver support contact info. Signed-off-by: Linas Vepstas Cc: Jens Osterkamp Cc: Kou Ishizaki Signed-off-by: Jeff Garzik commit 7376e732561f3bd4e2bc7edb26e06874f4ce737c Author: Linas Vepstas Date: Tue Feb 20 16:42:59 2007 -0600 spidernet: janitorial, typos Janitorial patch. Undo long lines, fix typo in err msg. Signed-off-by: Linas Vepstas Cc: Jens Osterkamp Cc: Kou Ishizaki Signed-off-by: Jeff Garzik commit 5c8e98fe4742734c1c6b81699a86d1f5b03841e0 Author: Linas Vepstas Date: Tue Feb 20 16:41:59 2007 -0600 spidernet: transmit race Multiple threads performing a transmit can race into the spidernet tx ring cleanup code. This puts the relevant check under a lock. Signed-off-by: Linas Vepstas Cc: Jens Osterkamp Cc: Kou Ishizaki Signed-off-by: Jeff Garzik commit d9c199ee781fa874e6feb4c56ae3d0e19f7f82a6 Author: Linas Vepstas Date: Tue Feb 20 16:41:03 2007 -0600 spidernet: fix racy double-free of skb It appears that under certain circumstances, a race will result in a double-free of an skb. This patch null's out the skb pointer upon the skb free, avoiding the inadvertent deref of bogus data. The next patch fixes the actual race. Signed-off-by: Linas Vepstas Cc: Jens Osterkamp Cc: Kou Ishizaki Signed-off-by: Jeff Garzik commit 4cb6f9e57d5d7c26d08809c1ce6310c8a7dc96d2 Author: Linas Vepstas Date: Tue Feb 20 16:40:06 2007 -0600 spidernet: separate hardware state from driver state. This patch separates the hardware descriptor state from the driver descriptor state, per (old) suggestion from Ben Herrenschmidt. This compiles and boots and seems to work. Signed-off-by: Linas Vepstas Cc: Jens Osterkamp Cc: Kou Ishizaki Signed-off-by: Jeff Garzik commit 4b23a554db1571306d9e9cfb2321c3a44770371e Author: Jens Osterkamp Date: Tue Feb 20 16:39:13 2007 -0600 spidernet: move medium variable into card struct This moves the medium variable into the spidernet card structure. It renames the GMII_ variables to BCM54XX specific ones. Signed-off-by: Jens Osterkamp Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit fc8e13da9118b2d45642c2a8bdbdd0448d9f6d04 Author: Ishizaki Kou Date: Tue Feb 20 16:37:42 2007 -0600 spidernet: remove txram full logging This patches removes logging for SPIDER_NET_GTMFLLINT interrupts. Since the interrupts are not irregular, and they happen frequently when using 100Mbps network switches. Signed-off-by: Kou Ishizaki Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 3342cf0e59b6e360ae770f8082b062f4db09f3b5 Author: Kou Ishizaki Date: Tue Feb 20 16:36:14 2007 -0600 spidernet: spidernet: add support for Celleb This patch adds or changes some HW specific settings for spider_net on Celleb. Signed-off-by: Kou Ishizaki Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 3cf761ddccb9332218973e17f9b987bb5cae7b69 Author: Kou Ishizaki Date: Tue Feb 20 16:34:50 2007 -0600 spidernet: load firmware when open This patch moves calling init_firmware() from spider_net_probe() to spider_net_open() so as to use the driver by built-in. Signed-off-by: Kou Ishizaki Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit abdb66b566fce5641c90100e0a113a94bab43fda Author: Kou Ishizaki Date: Tue Feb 20 16:33:41 2007 -0600 spidernet: autoneg support for Celleb Add auto negotiation support for Celleb. Signed-off-by: Kou Ishizaki Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit d406eafee814c0e20af00a9a74f68f6993d8cb9c Author: Linas Vepstas Date: Tue Feb 20 16:32:00 2007 -0600 spidernet: compile break. As of 2.6.20-git4, the spider_net driver does not compile. This appears to be due to some archaic usage involving kobjects. It also fixes a nasty double-free during ifdown of the interface. Signed-off-by: Linas Vepstas Cc: Jens Osterkamp Cc: Kou Ishizaki Signed-off-by: Jeff Garzik commit eb5b5b2ff96e8f3a42a46378968a166bb56bd900 Author: Jens Osterkamp Date: Tue Feb 20 16:30:50 2007 -0600 sungem_phy: support bcm5461 phy, autoneg. This version moves the medium variable to the card specific structure and changes the GMII_* to BCM54XX_* #defines. This patch adds improved version of enable_fiber for both the 5421 and the 5461 phy. It is now possible to specify with these wether you want autonegotiation or not. This is needed for bladecenter switches where some expect autonegotiation and some dont seem to like this at all. Depending on this flag it sets phy->autoneg accordingly for the fiber mode. More importantly it implements proper read_link and poll_link functions for both phys which can handle both copper and fiber mode by determining the medium first and then branching to the required functions. For fiber they all work fine, for copper they are not tested but return the result of the genmii_* function anyway which is supposed to work. The patch moves the genmii_* functions around to avoid foreward declarations. Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 6fedae1f6e66ab5f169bf58064e23e015fc1307d Author: Ayaz Abdulla Date: Tue Feb 20 03:34:44 2007 -0500 forcedeth: fix checksum feature in mcp65 This patch removes checksum offload feature in mcp65 chipsets as they are not supported in hw. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit caf96469e8ab57170cc8ca9c59809132d38e529e Author: Ayaz Abdulla Date: Tue Feb 20 03:34:40 2007 -0500 forcedeth: disable msix There seems to be an issue when both MSI-X is enabled and NAPI is configured. This patch disables MSI-X until the issue is root caused. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit e0379a14fc80cb98978fa86989dab77b522a8106 Author: Ayaz Abdulla Date: Tue Feb 20 03:34:30 2007 -0500 forcedeth: fixed missing call in napi poll The napi poll routine was missing the call to the optimized rx process routine. This patch adds the missing call for the optimized path. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 420e85241e41fc84b8f5b26c811beb03c472b679 Author: Jeff Garzik Date: Sat Feb 24 17:02:16 2007 -0500 [netdrvr] tc35815: fix obvious bugs * clear_page() use is wrong. We might have multiple pages. Use memset() instead. * Call pci_unregister_driver() in module exit. Signed-off-by: Jeff Garzik commit e047d1cfc3cd79f75e7dda9ffb28b456f6936864 Author: Ryusuke Konishi Date: Tue Feb 27 14:13:02 2007 +0900 [AGPGART] fix compile errors This fixes the following compile failures of agpgart drivers. These errors were inserted by the recent AGPGART constification patch. drivers/char/agp/uninorth-agp.c:492: error: expected '{' before 'const' drivers/char/agp/uninorth-agp.c:517: error: expected '{' before 'const' drivers/char/agp/uninorth-agp.c: In function 'agp_uninorth_probe': drivers/char/agp/uninorth-agp.c:634: error: 'u3_agp_driver' undeclared (first use in this function) drivers/char/agp/uninorth-agp.c:634: error: (Each undeclared identifier is reported only once drivers/char/agp/uninorth-agp.c:634: error: for each function it appears in.) drivers/char/agp/uninorth-agp.c:636: error: 'uninorth_agp_driver' undeclared (first use in this function) Signed-off-by: Ryusuke Konishi Signed-off-by: Dave Jones commit 01363220f5d23ef68276db8974e46a502e43d01d Author: Kyle McMartin Date: Mon Feb 26 22:21:22 2007 -0500 [PARISC] clocksource: Move update_cr16_clocksource later in boot smp_cpus_done is too early for us... before we even do a device inventory! Move update_cr16_clocksource into the tail end of processor_probe() and stub it out on CONFIG_SMP=n builds. Verified that clocksource0 is properly updated to use jiffies on an SMP build. Signed-off-by: Kyle McMartin commit fb55a0debee81280684b68713024d0c5e62e8aa5 Author: Kyle McMartin Date: Mon Feb 26 21:29:26 2007 -0500 [PARISC] parisc-agp: Fix thinko const-ifying Can't really blame davej for mucking this up... static-ify it while we're at it, which would have prevented this... Signed-off-by: Kyle McMartin commit b2a8289a611af409e5621df27227dc3f55ba358b Author: Kyle McMartin Date: Mon Feb 26 21:24:56 2007 -0500 [PARISC] time: clocksource lost update_callback So move the code to be called by smp_cpus_done, which is after we've figured out if there's more than one cpu actually present. Signed-off-by: Kyle McMartin commit 87c8174727c95ab43f5bd2164e78c665c6945e67 Author: Kyle McMartin Date: Mon Feb 26 20:15:18 2007 -0500 [PARISC] time: Convert clocksource is_continuous to flag Signed-off-by: Kyle McMartin commit 00d1f3c31a415bb3701abbd3a2c2aa44cb97116c Author: Kyle McMartin Date: Mon Feb 26 20:10:42 2007 -0500 [PARISC] clocksource_cr16: Use clocksource_change_rating() Signed-off-by: Kyle McMartin commit 0ff851e1903cd46823520a0d95d00f5347a88bd8 Author: Kyle McMartin Date: Mon Feb 26 20:08:46 2007 -0500 [PARISC] Remove __read_mostly annotation from command_line Who cares if it's in the read mostly section when it's going to be discarded anyway? Signed-off-by: Kyle McMartin commit c68644d3304d217d50b8f0a179d4aa7e5a85a5bc Author: Ralf Baechle Date: Mon Feb 26 20:46:34 2007 +0000 [MIPS] Make SMTC_IDLE_HOOK_DEBUG a proper option in Kconfig.debug. Signed-off-by: Ralf Baechle commit e016c38d1813c4ad180a4cd44942bca2a9e7a8c9 Author: Ralf Baechle Date: Sat Feb 24 21:15:11 2007 +0000 [MIPS] Fix foobar in wiring up compat_sys_epoll_pwait syscall. Signed-off-by: Ralf Baechle commit b772e6d272152808cede1c8f5387626b6329538c Author: Ralf Baechle Date: Sat Feb 24 21:04:04 2007 +0000 [MIPS] Always fixup unaligned accesses in kernel mode. Signed-off-by: Ralf Baechle commit 9b43fb6bc118226206c17be5f46297fd76b4abbb Author: Thomas Bogendoerfer Date: Fri Feb 23 19:58:48 2007 +0100 [MIPS] Fix dma_sync_*_for_device() functions Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 40139bd459d3fe90ee560f46a2cb00f16b873170 Author: Robert P. J. Day Date: Sat Feb 24 06:17:09 2007 -0500 [MIPS] Remove unreferenced _IOC_SLMASK macro in ioctl.h. Delete the definition of the apparently unreferenced macro _IOC_SLMASK. Signed-off-by: Robert P. J. Day Signed-off-by: Ralf Baechle commit f13cc01d8d3630ba42680ac56b3bedfce812e531 Author: Thomas Bogendoerfer Date: Fri Feb 23 21:39:38 2007 +0100 [MIPS] SNI: MIPS_CPU_IRQ_BASE cleanup Use MIPS_CPU_IRQ_BASE instead of own define. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 3dac2561e2ed8d75a8bb682c25a32b271298ff49 Author: Ralf Baechle Date: Fri Feb 23 14:12:32 2007 +0000 [MIPS] RTLX: Delete multiple definition of ret shaddowing each other. Signed-off-by: Ralf Baechle commit c4c4018b04f9b7993e3800dc1f391ac8947764a5 Author: Ralf Baechle Date: Fri Feb 23 13:40:45 2007 +0000 [MIPS] RTLX, VPE: Make open actually atomic. Signed-off-by: Ralf Baechle commit cbc841356702ccf4f16e760c84006ed3ddd4b1fd Author: Thomas Koeller Date: Fri Feb 23 01:39:41 2007 +0100 [MIPS] excite: Set serial driver iotype to UPIO_RM9000 Signed-off-by: Thomas Koeller Signed-off-by: Ralf Baechle commit be91589ee8b8691209d5dd876360e67d2f79f16a Author: Thomas Koeller Date: Fri Feb 23 01:40:34 2007 +0100 [MIPS] excite: Rename CONFIG option This change is purely cosmetical. Signed-off-by: Thomas Koeller Signed-off-by: Ralf Baechle commit 4419708807308fc93ec9a135db7ffe50b182fdda Author: Atsushi Nemoto Date: Fri Feb 23 01:13:17 2007 +0900 [MIPS] Mark pcibios_fixup_device_resources() as __devinit pcibios_fixup_device_resources() is called by pcibios_fixup_bus() which is marked as __devinit. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit d2af363cfb94f1bacb3e60327bc44a97881a38c2 Author: Atsushi Nemoto Date: Fri Feb 23 00:39:48 2007 +0900 [MIPS] Kill redundant EXTRA_AFLAGS Many Makefiles in arch/mips have EXTRA_AFLAGS := $(CFLAGS) line. This is redundant while AFLAGS contains $(cflags-y) and any options only listed in CFLAGS (not in cflags-y) should be unnecessary for asm sources. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 67e2cccec6d230165345fdf6c0fe4c8761f9d1ba Author: Ralf Baechle Date: Thu Feb 22 14:19:48 2007 +0000 [MIPS] RTLX: Handle signals when sleeping. Signed-off-by: Ralf Baechle commit cc39cb15a62c7e515557edcc3aea20cc62ffb13b Author: Yoichi Yuasa Date: Thu Feb 22 22:31:00 2007 +0900 [MIPS] TB0287: Enable SM501 driver support in defconfig Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 221dee285ee38099b82437531bcae9fa9cb64cc4 Author: Linus Torvalds Date: Mon Feb 26 14:55:48 2007 -0800 Revert "[CPUFREQ] constify cpufreq_driver where possible." This reverts commit aeeddc1435c37fa3fc844f31d39c185b08de4158, which was half-baked and broken. It just resulted in compile errors, since cpufreq_register_driver() still changes the 'driver_data' by setting bits in the flags field. So claiming it is 'const' _really_ doesn't work. Signed-off-by: Linus Torvalds commit e41698894d3fe64f17fe411e3e5ef3c2537bf2e6 Author: Russell King Date: Mon Feb 26 21:07:30 2007 +0000 [ARM] CLPS7500 doesn't have IO ports Signed-off-by: Russell King commit 61fde514c2368a93e97f926a289d556c93a18fc6 Author: Russell King Date: Mon Feb 26 21:04:29 2007 +0000 [ARM] Fix more apm-emulation.h Signed-off-by: Russell King commit eafb4f184cd89e8af5676ec49ae35184172553fe Author: Alan Date: Wed Feb 21 16:41:23 2007 +0000 [PATCH] Fix oops in pata_pcmcia The change to the devres layer re-orders the execution of cleanup functions and in turn causes the pcmcia layer to oops as it zaps a pointer now needed later on. We simply leave the pointer alone. Signed-off-by: Alan Cox Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 8cd0ae056a8d3528e4deb7ecc046304bb2d5a680 Author: Rusty Russell Date: Fri Feb 23 14:12:02 2007 +1100 [PATCH] Make hvc_console.c compile on non-powerpc: Remove NO_IRQ Paulus preferred this over #defining NO_IRQ in the file, since that's 0 for powerpc anyway. Signed-off-by: Rusty Russell Acked-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 843613b04744d5b65c2f37975c5310f366a0d070 Author: Roland Dreier Date: Mon Feb 26 12:57:08 2007 -0800 IPoIB: Correct debugging output when path record lookup fails If path_rec_completion() is passed a non-NULL path record pointer along with an unsuccessful status value, the tracing code incorrectly prints the (invalid) DLID from the path record rather than the more interesting status code. The actual logic of the function correctly uses the path record only if the status indicates a successful lookup. Signed-off-by: Roland Dreier commit 62fa4dc7f782911b7b3867b6360892dcd46d8e69 Author: Ondrej Zajicek Date: Thu Feb 22 17:00:41 2007 +0100 [PATCH] Fix build-failure in drivers/video/s3fb.c Toralf Förster pointed out that drivers/video/s3fb.c would fail to compile: > ... > CC drivers/video/s3fb.o > drivers/video/s3fb.c: In function `s3_pci_remove': > drivers/video/s3fb.c:1003: warning: unused variable `par' > drivers/video/s3fb.c: In function `s3fb_setup': > drivers/video/s3fb.c:1141: error: `mtrr' undeclared (first use in this function) > drivers/video/s3fb.c:1141: error: (Each undeclared identifier is reported only once > drivers/video/s3fb.c:1141: error: for each function it appears in.) > make[2]: *** [drivers/video/s3fb.o] Error 1 > make[1]: *** [drivers/video] Error 2 > make: *** [drivers] Error 2 Here is fix, it also fixes broken boot options. Signed-off-by: Linus Torvalds commit 25165120f2432ffa36518d53bd3ec66f6e434f63 Author: Ingo Molnar Date: Thu Feb 22 09:38:22 2007 +0100 [PATCH] x86: add -freg-struct-return to CFLAGS Jeremy Fitzhardinge suggested the use of -freg-struct-return, which does structure-returns (such as when using pte_t) in registers instead of on the stack. that is indeed so, and this option reduced the kernel size a bit: text data bss dec hex filename 4799506 543456 3760128 9103090 8ae6f2 vmlinux.before 4798117 543456 3760128 9101701 8ae185 vmlinux.after the resulting kernel booted fine on my testbox. Lets go for it. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 38bed5429987c939d86cd3da915d6706fd1e6e53 Author: Ingo Molnar Date: Thu Feb 22 09:09:34 2007 +0100 [PATCH] add MAINTAINERS entry for high-res timers, clockevents, dynticks Thomas is the maintainer and primary author of the high-res timers, clockevents and dynticks code. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 6572d6d7d0f965dda19d02af804ed3ae4b3bf1fc Author: Mikael Pettersson Date: Sun Feb 25 12:49:01 2007 +0100 [PATCH] CREDITS: update my email address Update my email address in CREDITS to one that works. Signed-off-by: Mikael Pettersson Signed-off-by: Linus Torvalds commit f15e66b9328c8e2fef4f59f121221c902d7a9920 Author: Richard Knutsson Date: Sat Feb 24 11:46:06 2007 +0100 [PATCH] drivers/mfd/sm501.c: Replace pci_module_init with pci_register_driver Replace pci_module_init with pci_register_driver Signed-off-by: Richard Knutson Acked-by: Ben Dooks Signed-off-by: Linus Torvalds commit aef8811abbc9249a2bd59bd2331bbe523df05d17 Author: Bernhard Walle Date: Mon Feb 26 12:10:32 2007 -0800 [XFRM]: Fix oops in xfrm4_dst_destroy() With 2.6.21-rc1, I get an oops when running 'ifdown eth0' and an IPsec connection is active. If I shut down the connection before running 'ifdown eth0', then there's no problem. The critical operation of this script is to kill dhcpd. The problem is probably caused by commit with git identifier 4337226228e1cfc1d70ee975789c6bd070fb597c (Linus tree) "[IPSEC]: IPv4 over IPv6 IPsec tunnel". This patch fixes that oops. I don't know the network code of the Linux kernel in deep, so if that fix is wrong, please change it. But please fix the oops. :) Signed-off-by: Bernhard Walle Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 4f4acf3a478d5cada688f336f2229ab580f56113 Author: Stephen Smalley Date: Mon Feb 26 12:02:34 2007 -0500 Always initialize scontext and scontext_len Always initialize *scontext and *scontext_len in security_sid_to_context. (via http://lkml.org/lkml/2007/2/23/135) Signed-off-by: Stephen Smalley Signed-off-by: James Morris commit fadcdb451632d32d7c0d4c71df9ac2d3b7ae2348 Author: Eric Paris Date: Thu Feb 22 18:11:31 2007 -0500 Reassign printk levels in selinux kernel code Below is a patch which demotes many printk lines to KERN_DEBUG from KERN_INFO. It should help stop the spamming of logs with messages in which users are not interested nor is there any action that users should take. It also promotes some KERN_INFO to KERN_ERR such as when there are improper attempts to register/unregister security modules. A similar patch was discussed a while back on list: http://marc.theaimsgroup.com/?t=116656343500003&r=1&w=2 This patch addresses almost all of the issues raised. I believe the only advice not taken was in the demoting of messages related to undefined permissions and classes. Signed-off-by: Eric Paris Acked-by: Stephen Smalley security/selinux/hooks.c | 20 ++++++++++---------- security/selinux/ss/avtab.c | 2 +- security/selinux/ss/policydb.c | 6 +++--- security/selinux/ss/sidtab.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) Signed-off-by: James Morris commit e4396b544fa5c85e3c263e0bc92b0743a24ba818 Author: Arnaldo Carvalho de Melo Date: Sat Feb 24 18:12:42 2007 -0800 [XFRM_TUNNEL]: Reload header pointer after pskb_may_pull/pskb_expand_head Please consider applying, this was found on your latest net-2.6 tree while playing around with that ip_hdr() + turn skb->nh/h/mac pointers as offsets on 64 bits idea :-) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 4c3ae4d7e727eac6f6eb23587cef0413734d4ae1 Author: Joe Perches Date: Thu Feb 22 01:26:32 2007 -0800 [IPV4]: Use random32() in net/ipv4/multipath Removed local random number generator function Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 269def7c505b4d229f9ad49bf88543d1e605533e Author: Stephen Hemminger Date: Thu Feb 22 01:10:18 2007 -0800 [BRIDGE]: eliminate workqueue for carrier check Having a work queue for checking carrier leads to lots of race issues. Simpler to just get the cost when data structure is created and update on change. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit ac062e84d0c177c43549e7fb608152fec218e7fc Author: Stephen Hemminger Date: Thu Feb 22 01:07:53 2007 -0800 [BRIDGE]: get rid of miscdevice include The bridge hasn't used miscdevice for a long long time. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7401055b58e557362dfcaa65a581db1d1e972439 Author: David S. Miller Date: Wed Feb 21 23:26:56 2007 -0800 [IPV6]: Fix __ipv6_addr_type() export in correct place. It needs to be in net/ipv6/addrconf_core.c Signed-off-by: David S. Miller commit 8030f54499925d073a88c09f30d5d844fb1b3190 Author: Herbert Xu Date: Thu Feb 22 01:53:47 2007 +0900 [IPV4] devinet: Register inetdev earlier. This patch allocates inetdev at registration for all devices in line with IPv6. This allows sysctl configuration on the devices to occur before they're brought up or addresses are added. Signed-off-by: Herbert Xu Signed-off-by: YOSHIFUJI Hideaki commit 45ba9dd2007da23da5ac21179451c3c9fee30a96 Author: YOSHIFUJI Hideaki Date: Thu Feb 15 02:07:27 2007 +0900 [IPV6] ADDRCONF: Register inet6_dev earlier. Allocate inet6_dev earlier to allow users to set up per-interface variables. Signed-off-by: YOSHIFUJI Hideaki commit 46d480468fd9d165513d96f5e545538425d6472d Author: YOSHIFUJI Hideaki Date: Wed Feb 7 20:36:26 2007 +0900 [IPV6] ADDRCONF: Manage prefix route corresponding to address manually added. It is more natural to manage prefix routes corresponding to address which is being added manually. With help from Masafumi Aramoto . Signed-off-by: YOSHIFUJI Hideaki commit 268920584b57d534a40503a8a3a47eff9e57fbf8 Author: Yasuyuki Kozakai Date: Sun Sep 10 03:59:17 2006 +0900 [IPV6] IP6TUNNEL: Use update_pmtu() of dst on xmit. Signed-off-by: Yasuyuki Kozakai Signed-off-by: YOSHIFUJI Hideaki commit 8c14b7ce22a7ddd9fe1b1c852c4015633ec3efec Author: YOSHIFUJI Hideaki Date: Thu Feb 22 02:25:42 2007 +0900 [IPV6] ADDRCONF: Statically link __ipv6_addr_type() for sunrpc subsystem. Link __ipv6_addr_type() statically for sunrpc code even if IPv6 is built as module. Signed-off-by: YOSHIFUJI Hidaki commit f4b9479dc5a1b0e1ca8666053f0d932baddc619d Author: Baruch Even Date: Wed Feb 21 19:32:37 2007 -0800 [IPV4]: Correct links in net/ipv4/Kconfig Correct dead/indirect links in net/ipv4/Kconfig Signed-off-by: Baruch Even Signed-off-by: David S. Miller commit 1845a579e0c3084a822fbe610f7cfd1b0e0396ac Author: Vlad Yasevich Date: Wed Feb 21 02:06:19 2007 -0800 [SCTP]: Strike the transport before updating rto. Once we reach a point where we exceed the max.path.retrans, strike the transport before updating the rto. This will force transport switch at the right time, instead of 1 retransmit too late. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 8c4a2d41a7eb5a8f214f537acca533dcd6430782 Author: Vlad Yasevich Date: Wed Feb 21 02:06:04 2007 -0800 [SCTP]: Fix connection hang/slowdown with PR-SCTP The problem that this patch corrects happens when all of the following conditions are satisfisfied: 1. PR-SCTP is used and the timeout on the chunks is set below RTO.Max. 2. One of the paths on a multihomed associations is brought down. In this scenario, data will expire within the rto of the initial transmission and will never be retransmitted. However this data still fills the send buffer and is counted against the association as outstanding data. This causes any new data not to be sent and retransmission to not happen. The fix is to discount the abandoned data from the outstanding count and peers rwnd estimation. This allows new data to be sent and a retransmission timer restarted. Even though this new data will most likely expire within the rto, the timer still counts as a strike against the transport and forces the FORWARD-TSN chunk to be retransmitted as well. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 2c4f6219aca5939b57596278ea8b014275d4917b Author: David S. Miller Date: Tue Feb 20 23:51:47 2007 -0800 [TCP]: Fix MD5 signature pool locking. The locking calls assumed that these code paths were only invoked in software interrupt context, but that isn't true. Therefore we need to use spin_{lock,unlock}_bh() throughout. Signed-off-by: David S. Miller commit 7f62ad5d37f4e43c841e92c6f159c93dcf2d2cdd Author: Michael Chan Date: Tue Feb 20 23:25:40 2007 -0800 [TG3]: TSO workaround fixes. 1. Add race condition check after netif_stop_queue(). tg3_tx() runs without netif_tx_lock and can race with tg3_start_xmit_dma_bug() -> tg3_tso_bug(). 2. Firmware TSO in 5703/5704/5705 also have the same TSO limitation, i.e. they cannot handle TSO headers bigger than 80 bytes. Rename TG3_FL2_HW_TSO_1_BUG to TG3_FL2_TSO_BUG and set this flag on these chips as well. 3. Update version to 3.74. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit ad930650c0e694233971c56e8de8e78b896e2613 Author: Jason Lunz Date: Tue Feb 20 23:19:54 2007 -0800 [AF_PACKET]: Remove unnecessary casts. packet_lookup_frame() always returns tpacket_hdr*, so there's no reason to return char* and require casting by callers. Also, remove a cast of void*. Signed-off-by: Jason Lunz Signed-off-by: David S. Miller commit ca17c23345308a8692a65a0cca363d9108a665ca Author: Joe Jin Date: Tue Feb 20 01:30:15 2007 -0800 [IPV6]: Adjust inet6_exit() cleanup sequence against inet6_init() This patch for adjust inet6_exit() to inverse sequence to inet6_init(). At ipv6_init, it first create proc_root/net/dev_snmp6 entry by call ipv6_misc_proc_init(), then call addrconf_init() to create the corresponding device entry at this directory, but at inet6_exit, ipv6_misc_proc_exit() called first, then call addrconf_init(). Signed-off-by: Joe Jin Signed-off-by: David S. Miller commit d3f23dfe8bbb6bf352a208755e4ff2806315067b Author: Noriaki TAKAMIYA Date: Tue Feb 20 01:08:41 2007 -0800 [IPSEC]: More fix is needed for __xfrm6_bundle_create(). Fixed to set fl_tunnel.fl6_src correctly in xfrm6_bundle_create(). Signed-off-by: Noriaki TAKAMIYA Acked-by: Masahide NAKAMURA Signed-off-by: David S. Miller commit a39a21982c53846acb3bee1a23764a387160a4c8 Author: Adrian Bunk Date: Tue Feb 20 01:06:40 2007 -0800 [IRDA] net/irda/: proper prototypes This patch adds proper prototypes for some functions in include/net/irda/irda.h Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 2312119afbce0108a72a1e09015a37308f7c7212 Author: Marcel Holtmann Date: Sat Feb 17 23:59:02 2007 +0100 [Bluetooth] Make use of MODULE_FIRMWARE Some Bluetooth drivers need one or more binary firmware images. Export these image names via the MODULE_FIRMWARE tag. Signed-off-by: Marcel Holtmann commit c1a3313698895d8ad4760f98642007bf236af2e8 Author: Marcel Holtmann Date: Sat Feb 17 23:58:57 2007 +0100 [Bluetooth] Make use of device_move() for RFCOMM TTY devices In the case of bound RFCOMM TTY devices the parent is not available before its usage. So when opening a RFCOMM TTY device, move it to the corresponding ACL device as a child. When closing the device, move it back to the virtual device tree. Signed-off-by: Marcel Holtmann commit f5ffd4620aba9e55656483ae1ef5c79ba81f5403 Author: Marcel Holtmann Date: Sat Feb 17 23:58:53 2007 +0100 [Bluetooth] Add open and close callbacks for HID device The open and close callbacks for the HID device are not optional, but for the Bluetooth HID report mode support it is enough to add empty dummy callbacks. Signed-off-by: Marcel Holtmann commit e1aaadd4d8162a2c33e41dd5a72234ea4d3b014f Author: Marcel Holtmann Date: Sat Feb 17 23:58:49 2007 +0100 [Bluetooth] Add support for using the HID subsystem This patch extends the current Bluetooth HID support to use the new HID subsystem and adds full report mode support. Signed-off-by: Marcel Holtmann commit a83d6c0de8811d7bcc4eb67ed199d1120ca6cad8 Author: Marcel Holtmann Date: Sat Feb 17 23:58:44 2007 +0100 [Bluetooth] Fix wrong put_user() from HIDP compat ioctl patch The compat ioctl patch copied the parser version field into the report descriptor size field by mistake. Signed-off-by: Marcel Holtmann commit 19ba1b19962aeb87a029b37234f54b02e8f7b507 Author: David S. Miller Date: Mon Feb 26 09:46:54 2007 -0800 [SPARC] uctrl: Check request_irq() return value. Based upon a patch by Monakhov Dmitriy. Signed-off-by: David S. Miller commit c5b002c1bf31d1145271b28ed63db5e4f893dfd3 Author: David S. Miller Date: Mon Feb 26 10:45:43 2007 -0800 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 3b36fb8471f8639d565b69c9a456a3ef9413df59 Author: David S. Miller Date: Mon Feb 26 10:11:35 2007 -0800 [SPARC64] bbc_i2c: Fix kenvctrld eating %100 cpu. Based almost entirely upon a patch by Joerg Friedrich Signed-off-by: David S. Miller commit abfd336cd79ea154dc71f09272f578a731b81d8c Author: David S. Miller Date: Mon Feb 26 09:40:34 2007 -0800 [SPARC64]: Fix arch_teardown_msi_irq(). Need to use get_irq_msi() not get_irq_data(). Signed-off-by: David S. Miller commit 5746c99dfa09231fa24cac1986de4661ea79a80f Author: David S. Miller Date: Tue Feb 20 01:26:48 2007 -0800 [SPARC64]: virt_irq_free only needed when CONFIG_PCI_MSI Noticed by Meelis Roos. Signed-off-by: David S. Miller commit cacfd56756c087873f22dc9e2ace5f634775836a Author: Adrian Bunk Date: Tue Feb 20 01:03:48 2007 -0800 [SPARC]: Remove the broken SUN_AURORA driver. The SUN_AURORA driver: - has been marked as BROKEN for more than two years and - is still marked as BROKEN. Drivers that had been marked as BROKEN for such a long time seem to be unlikely to be revived in the forseeable future. But if anyone wants to ever revive this driver, the code is still present in the older kernel releases. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 3494c16676a21e7e53e21b08a0a469a38df6dcfb Author: David S. Miller Date: Sat Feb 24 22:11:42 2007 -0800 [TICK] tick-common: Fix one-shot handling in tick_handle_periodic(). When clockevents_program_event() is given an expire time in the past, it does not update dev->next_event, so this looping code would loop forever once the first in-the-past expiration time was used. Keep advancing "next" locally to fix this bug. Acked-by: Thomas Gleixner Signed-off-by: David S. Miller commit 9e203bcc1051cac2a8b15c3ee9db4c0d05794abe Author: David S. Miller Date: Sat Feb 24 22:10:13 2007 -0800 [TIME] tick-sched: Add missing asm/irq_regs.h include. Acked-by: Thomas Gleixner Signed-off-by: David S. Miller commit 2a786b452eba900324c29a8fcf5c96d5b1c01000 Author: Eric W. Biederman Date: Fri Feb 23 04:46:20 2007 -0700 [PATCH] genirq: Mask irqs when migrating them. move_native_irqs tries to do the right thing when migrating irqs by disabling them. However disabling them is a software logical thing, not a hardware thing. This has always been a little flaky and after Ingo's latest round of changes it is guaranteed to not mask the apic. So this patch fixes move_native_irq to directly call the mask and unmask chip methods to guarantee that we mask the irq when we are migrating it. We must do this as it is required by all code that call into the path. Since we don't know the masked status when IRQ_DISABLED is set so we will not be able to restore it. The patch makes the code just give up and trying again the next time this routing is called. Signed-off-by: Eric W. Biederman Acked-by: Suresh Siddha Signed-off-by: Linus Torvalds commit 610142927b5bc149da92b03c7ab08b8b5f205b74 Author: Eric W. Biederman Date: Fri Feb 23 04:40:58 2007 -0700 [PATCH] x86_64 irq: Safely cleanup an irq after moving it. The problem: After moving an interrupt when is it safe to teardown the data structures for receiving the interrupt at the old location? With a normal pci device it is possible to issue a read to a device to flush all posted writes. This does not work for the oldest ioapics because they are on a 3-wire apic bus which is a completely different data path. For some more modern ioapics when everything is using front side bus delivery you can flush interrupts by simply issuing a read to the ioapic. For other modern ioapics emperical testing has shown that this does not work. So it appears the only reliable way to know the last of the irqs from an ioapic have been received from before the ioapic was reprogrammed is to received the first irq from the ioapic from after it was reprogrammed. Once we know the last irq message has been received from an ioapic into a local apic we then need to know that irq message has been processed through the local apics. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit bc5e81a1519abc69472bb67deace7bb1ac09d65a Author: Eric W. Biederman Date: Fri Feb 23 04:38:26 2007 -0700 [PATCH] x86_64 irq: Add constants for the reserved IRQ vectors. For the ISA irqs we reserve 16 vectors. This patch adds constants for those vectors and modifies the code to use them. Making the code a little clearer and making it possible to move these vectors in the future. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit b93179bdfcbb0154e63e57194e2648bd0ff648a7 Author: Eric W. Biederman Date: Fri Feb 23 04:36:25 2007 -0700 [PATCH] x86_64 irq: Remove unnecessary irq 0 setup. The code in io_apic.c and in i8259.c currently hardcode the same vector for the timer interrupt so there is no reason for a special assignment for the timer as the setup for the i8259 already takes care of this. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit dfbffdd81c5d029ca8f8a754ce0eb8199c418eba Author: Eric W. Biederman Date: Fri Feb 23 04:35:05 2007 -0700 [PATCH] x86_64 irq: Simplify assign_irq_vector's arguments. Currently assign_irq_vector works mostly by side effect and returns the results of it's changes to the caller. Which makes for a lot of arguments to pass/return and confusion as to what to do if you need the status but you aren't calling assign_irq_vector. This patch stops returning values from assign_irq_vector that can be retrieved just as easily by examining irq_cfg, and modifies the callers to retrive those values from irq_cfg when they need them. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 13a79503ab4a0f602c6806b2572b3338994b55d2 Author: Eric W. Biederman Date: Fri Feb 23 04:32:47 2007 -0700 [PATCH] x86_64 irq: Begin consolidating per_irq data in structures. Currently the io_apic.c has several parallel arrays for different kinds of data that can be know about an irq. The parallel arrays make the code harder to maintain and make it difficult to remove the static limits on the number of the number of irqs. This patch pushes irq_data and irq_vector into a irq_cfg array and updates the code to use it. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit e273d140d9d0c2c7941d97a6ace455113bb4ec63 Author: Eric W. Biederman Date: Fri Feb 23 04:26:53 2007 -0700 [PATCH] x86_64 irq: Use NR_IRQS not NR_IRQ_VECTORS NR_IRQ_VECTORS is currently a compatiblity define set to NR_IRQs. This patch updates the users of NR_IRQ_VECTORS to use NR_IRQs instead so that NR_IRQ_VECTORS can be removed. There is still shared code with arch/i386 that uses NR_IRQ_VECTORS so we can't remove the #define just yet :( Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit f45bcd7022a46de48cc414e3ea3a5b9b4de318ec Author: Eric W. Biederman Date: Fri Feb 23 04:23:52 2007 -0700 [PATCH] x86_64 irq: In __DO_ACTION perform the FINAL action for every entry. If we have an irq that comes from multiple io_apic pins the FINAL action (which is io_apic_sync or nothing) needs to be called for every entry or else if the two pins come from different io_apics we may not wait until after the action happens on the io_apic. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 5ff5115efafb08b49cbc8abdea9726884fba0b5a Author: Eric W. Biederman Date: Fri Feb 23 04:20:59 2007 -0700 [PATCH] x86_64 irq: Simplfiy the set_affinity logic. For some reason the code has been picking TARGET_CPUS when asked to set the affinity to an empty set of cpus. That is just silly it's extra work. Instead if there are no cpus to set the affinity to we should just give up immediately. That is simpler and a little more intuitive. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit a8c8a36736c00b261fd5dd01400c41726f2f19eb Author: Eric W. Biederman Date: Fri Feb 23 04:19:08 2007 -0700 [PATCH] x86_64 irq: Refactor setup_IO_APIC_irq Currently we have two routines that do practically the same thing setup_IO_APIC_irq and io_apic_set_pci_routing. This patch makes setup_IO_APIC_irq the common factor of these two previous routines. For setup_IO_APIC_irq all that was needed was to pass the trigger and polarity to make the code a proper subset of io_apic_set_pci_routing. Hopefully consolidating these two routines will improve maintenance there were several differences that simply appear to be one routine or the other getting it wrong. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit a27bc06dd8ee6ad6394e8a76345660b93621b51b Author: Eric W. Biederman Date: Fri Feb 23 04:16:31 2007 -0700 [PATCH] x86_64 irq: Remove the unused vector parameter from ioapic_register_intr Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit e560c8bd866bfa284b2c5978efcaf1bd16ee9fc3 Author: Eric W. Biederman Date: Fri Feb 23 04:15:15 2007 -0700 [PATCH] x86_64 irq: Kill declaration of removed array, interrupt It's dead Jim. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 9f0a5ba5508143731dc63235de19659be20d26dc Author: Eric W. Biederman Date: Fri Feb 23 04:13:55 2007 -0700 [PATCH] irq: Remove set_native_irq_info This patch replaces all instances of "set_native_irq_info(irq, mask)" with "irq_desc[irq].affinity = mask". The latter form is clearer uses fewer abstractions, and makes access to this field uniform accross different architectures. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit fc5d56f987170cda1d344095c4df65a60a3e9820 Author: Eric W. Biederman Date: Fri Feb 23 04:11:56 2007 -0700 [PATCH] x86_64 irq: Simplfy __assign_irq_vector By precomputing old_mask I remove an extra if statement, remove an indentation level and make the code slightly easier to read. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit ea3d5226f52ef30f52aa0a04f47f5919c7facacf Author: Linus Torvalds Date: Mon Feb 26 09:21:46 2007 -0800 Revert "[PATCH] i386: add idle notifier" This reverts commit 2ff2d3d74705d34ab71b21f54634fcf50d57bdd5. Uwe Bugla reports that he cannot mount a floppy drive any more, and Jiri Slaby bisected it down to this commit. Benjamin LaHaise also points out that this is a big hot-path, and that interrupt delivery while idle is very common and should not go through all these expensive gyrations. Fix up conflicts in arch/i386/kernel/apic.c and arch/i386/kernel/irq.c due to other unrelated irq changes. Cc: Stephane Eranian Cc: Andi Kleen Cc: Andrew Morton Cc: Uwe Bugla Cc: Jiri Slaby Signed-off-by: Linus Torvalds commit cb48cab7f363014e0a5dc21f7b4892c15d626d41 Author: Jeff Garzik Date: Mon Feb 26 06:04:24 2007 -0500 [libata] bump versions Bump versions based on changes submitted during 2.6.21 merge window. Signed-off-by: Jeff Garzik commit a84471fe269c38ea3725345c43ad64e5f489bea2 Author: Jeff Garzik Date: Mon Feb 26 05:51:33 2007 -0500 [libata] Trim trailing whitespace. No code changes. Signed-off-by: Jeff Garzik commit fb621e2fde735abab854586d52c96c5624bcb5b8 Author: Jeff Garzik Date: Sun Feb 25 04:19:45 2007 -0500 [libata] sata_mv: Fix 50xx irq mask IRQ mask bits assumed a 60xx or newer generation chip, which is very wrong for the 50xx series. Luckily both generations shared the per-port interrupt mask bits, leaving only the "misc chip features" bits to be completely mismatched. Fix 50xx by ensuring we only program bits that exist. Signed-off-by: Jeff Garzik commit e728eabea110da90e69c05855e3a11174edb77ef Author: Jeff Garzik Date: Sun Feb 25 02:53:41 2007 -0500 [libata] sata_mv: don't touch reserved bits in EDMA config register The code in mv_edma_cfg() reflected its 60xx origins, by doing things [slightly] incorrectly on the older 50xx and newer 6042/7042 chips. Clean up the EDMA configuration setup such that, each chip family carefully initializes its own EDMA setup. Signed-off-by: Jeff Garzik commit 616ece2e7e5363574d172d64b19ffe9535606a1b Author: Alan Date: Tue Feb 20 18:15:03 2007 +0000 libata: Use new id_to_dma_mode function to tidy reporting in more drivers (minimally tested) Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit cc70991d64e767729c37278cd4f80f709556079a Author: Alan Date: Wed Feb 21 16:41:23 2007 +0000 pata_pcmcia: Fix oops in 2.6.21-rc1 Manuel Lass reports: > This bug is also present in 2.6.21-rc1, and this patch > indeed fixes it. The change to the devres layer re-orders the execution of cleanup functions and in turn causes the pcmcia layer to oops as it zaps a pointer now needed later on. We simply leave the pointer alone. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 10305f0f8e642590c69674d08bd22accef610aed Author: Alan Date: Tue Feb 20 18:01:59 2007 +0000 Add id_to_dma_mode function for printing DMA modes Also export dev_disable as this is needed by drivers doing slave decode filtering, which will follow shortly Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 098cdff3d40286f87062c17cd07e98ca7ad94184 Author: Mikael Pettersson Date: Sun Feb 25 17:51:15 2007 +0100 sata_promise: simplify port setup Each place in pdc_ata_init_one() that initialises a SATA port first calls pdc_ata_setup_port(), and then manually assigns the port's ->scr_addr. Simplify the code by extending pdc_ata_setup_port() to also handle scr_addr initialisation; for PATA ports we pass NULL as scr_addr. The initialisation of the PATA-only 20619 redundantly set up scr_addr for the ports. Remove this. Tested on 20619, 20575, and 20775 chips. Signed-off-by: Mikael Pettersson Signed-off-by: Jeff Garzik commit 540477b4d93f5b49f9e9ce3ae2437071103a0f8e Author: Mikael Pettersson Date: Sun Feb 25 12:44:39 2007 +0100 sata_promise: fix 20619 new EH merge error When I merged my 20619 new EH conversion with #libata-upstream I had to manually resolve a conflict, and inadvertently lost pdc_pata_ops' ->post_internal_cmd binding. Corrected by this patch. Signed-off-by: Mikael Pettersson Signed-off-by: Jeff Garzik commit 8748415d0df9e16c419a749b5de3a0ccd90bca3f Author: Uwe Kleine-König Date: Fri Feb 23 20:20:47 2007 +0100 [ARM] 4234/1: Introduce get_irqnr_preamble and arch_ret_to_user for ns9xxx. This is a follow up for f80dff9da07d81da16e3b842118d47b9febf9c01 which didn't include adaption for the new ns9xxx machine support. Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King commit dff5e44c36ed7ef6ce2a5280e5204c452668960f Author: Arnaud Patard Date: Fri Feb 23 01:00:09 2007 +0100 [ARM] 4233/1: nand/s3c2410.c: warning fix Noticed while building a s3c2410 kernel : drivers/mtd/nand/s3c2410.c: In function 's3c2440_nand_calculate_ecc': drivers/mtd/nand/s3c2410.c:476: warning: format '%06x' expects type 'unsigned int', but argument 3 has type 'long unsigned int' This patch fixes it. Signed-off-by: Arnaud Patard Signed-off-by: Russell King commit ec3622d963522432a873cc1b6f66fed6fceddc18 Author: Nicolas Pitre Date: Wed Feb 21 15:32:28 2007 +0100 [ARM] 4226/1: initial .data and .bss mappings of XIP kernel should be TEXT_OFFSET aware Since TEXT_OFFSET is meant to determine RAM location for kernel use, itshould affect .data and .bss initial mapping in the XIP case. Otherwise a XIP kernel would crash if TEXT_OFFSET gets somewhat larger than 2MB. Corresponding code is also moved up a bit to be near the similar .text mapping code making the whole a bit more straight forward to understand. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit e98ff7f6d8164c5636538998fb7d1e08b1fbbddd Author: Nicolas Pitre Date: Thu Feb 22 16:18:09 2007 +0100 [ARM] 4224/2: allow XIP kernel to boot again Since commit 2552fc27ff79b10b9678d92bcaef21df38bb7bb6 XIP kernels failed to boot because (_end - PAGE_OFFSET - 1) is much smaller than the size of the kernel text and data in the XIP case, causing the kernel not to be entirely mapped. Even in the non-XIP case, the use of (_end - PAGE_OFFSET - 1) is wrong because it produces a too large value if TEXT_OFFSET is larger than 1MB. Finally the original code was performing one loop too many. Let's break the loop when the section pointer has passed the last byte of the kernel instead. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit fc16c25ff431d0c5b12693108f0ec3809ef1e804 Author: Jeff Garzik Date: Sat Feb 24 21:05:01 2007 -0500 [libata] ACPI: remove needless ->qc_issue hook existence test All drivers must implement this hook, otherwise ATA commands would go nowhere (and a lot of other oopsen would appear as well). Signed-off-by: Jeff Garzik commit ea34e45a4670c4fa0da3442fc74789fd66c1201b Author: Dan Williams Date: Fri Feb 23 16:36:43 2007 -0700 sata_vsc: refactor vsc_sata_interrupt and hook up error handling Separate sata_vsc interrupt handling into a normal (per-port) path and an error path with the addition of vsc_port_intr and vsc_error_intr respectively. The error path handles interrupt based hotplug events which requires the definition of vsc_freeze and vsc_thaw. Note: vsc_port_intr has a workaround for unexpected interrupts that occur during polled commands. This fixes a regression between 2.6.19 and 2.6.20. Changes in take2: * removed definition of invalid fis bit * let standard ata-error-handling handle the serror register * clear all unhandled interrupts * revert changes to vsc_intr_mask_update (vsc_thaw enables all interrupts) * use unlikely() for the pci-abort and not-our-interrupt cases in vsc_sata_interrupt Changes in take3: * Unify the "add" + "hook-up" patches into this single patch [htejun@gmail.com: clean up comments and suggestions] Cc: Jeremy Higdon Signed-off-by: Dan Williams Signed-off-by: Jeff Garzik commit e2f8fb72144a9f38d44ccf3f939e939392eda659 Author: Tejun Heo Date: Sat Feb 24 22:30:36 2007 +0900 sata_sil: ignore and clear spurious IRQs while executing commands by polling sata_sil used to trigger HSM error if IRQ occurs during polling command. This didn't matter because polling wasn't used in sata_sil. However, as of 2.6.20, all IDENTIFYs are performed by polling and device detection sometimes fails due to spurious IRQ. This patch makes sata_sil ignore and clear spurious IRQ while executing commands by polling. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 6a59dcf8678cbc4106a8a6e158d7408a87691358 Author: Tejun Heo Date: Sat Feb 24 15:12:31 2007 +0900 sata_mv: fix pci_enable_msi() error handling intx should be turned on when pci_enable_msi() fails not when it succeeds. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f1da66e7592c978d9122cb05d8eada1bd900de1a Author: Tejun Heo Date: Mon Feb 5 17:01:28 2007 +0900 pata_amd: fix an obvious bug in cable detection 80c test mask is at bits 18 and 19 of EIDE Controller Configuration not 22 and 23. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 19c262391c4741b012a5031fc438fb694e77c385 Author: Alan Stern Date: Tue Feb 20 15:03:32 2007 -0500 USB: export autosuspend delay in sysfs This patch (as861) adds sysfs attributes to expose the autosuspend delay value for each USB device. If the user changes the delay from 0 (no autosuspend) to a positive value, an autosuspend is attempted. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit dfa87c824a9a5430008acd1ed2e8111ed164fcbe Author: Alan Stern Date: Tue Feb 20 15:02:44 2007 -0500 sysfs: allow attributes to be added to groups This patch (as860) adds two new sysfs routines: sysfs_add_file_to_group() and sysfs_remove_file_from_group(). A later patch adds code that uses the new routines. Signed-off-by: Alan Stern Cc: Maneesh Soni Signed-off-by: Greg Kroah-Hartman commit b5e795f8df42936590ba9c606edc715fe3593284 Author: Alan Stern Date: Tue Feb 20 15:00:53 2007 -0500 USB: make autosuspend delay a module parameter This patch (as859) makes the default USB autosuspend delay a module parameter of usbcore. By setting the delay value at boot time, users will be able to prevent the system from autosuspending devices which for some reason can't handle it. The patch also stores the autosuspend delay as a per-device value. A later patch will allow the user to change the value, tailoring the delay for each individual device. A delay value of 0 will prevent autosuspend. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit aa084f3efe5fb7e9c0d5b54ce704f0de69bbf27c Author: Alan Stern Date: Tue Feb 20 14:59:59 2007 -0500 USB: minor cleanups for sysfs.c This patch (as858) makes some minor cleanups to sysfs.c in usbcore. Unnecessary tests are removed and a few temp variables are added. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 7ceec1f1d26f966c0816b86a1aab1e0b3b208757 Author: Oliver Neukum Date: Fri Jan 26 14:26:21 2007 +0100 USB: add a blacklist for devices that can't handle some things we throw at them. This adds a blacklist to the USB core to handle some autosuspend and string issues that devices have. Originally written by Oliver, but hacked up a lot by Greg. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit bb417020ba8c559eb52f57379ba17f669f8f72cd Author: Greg Kroah-Hartman Date: Fri Jan 26 14:26:21 2007 +0100 USB: refactor usb device matching and create usb_device_match This is needed for the quirk match code. Cc: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 80d4e8e9862fa71ce896195c60b691a623c38d49 Author: Ping Cheng Date: Fri Feb 23 12:22:48 2007 -0800 USB: Wacom driver updates Updated Intuos and Graphire irq calls Report pad device ID Signed-off-by: Ping Cheng Signed-off-by: Greg Kroah-Hartman commit 50f97a1f829d26e01ae8bb33cd1384cf0a5e046f Author: Sarah Bailey Date: Thu Feb 22 22:36:21 2007 -0800 gadgetfs: Fixed bug in ep_aio_read_retry. I don't think the current code works with multiple iovecs. The original would just copy the first part of priv->buf over and over into multiple iovecs. Signed-off-by: Sarah Bailey Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4ef2e23f03c597e2073b649e7287b840f8fb9274 Author: Michael Opdenacker Date: Wed Feb 21 22:51:25 2007 +0100 USB: Use USB defines in usbmouse.c and usbkbd.c The below patch proposes to use USB defines (defined in linux/hid.h) instead of just plain numbers in the USB_INTERFACE_INFO statements. Signed-off-by: Michael Opdenacker Signed-off-by: Greg Kroah-Hartman commit 672027a35795ec95f516fdc702ba8900d55a9eef Author: Inaky Perez-Gonzalez Date: Thu Feb 22 16:37:53 2007 -0800 USB: add rationale on why usb descriptor structures have to be packed Add argumentation in defense of using __attribute__((packed)) in USB descriptors authored by Dave Brownell. Necessary as in some cases it seems superfluous. Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: Greg Kroah-Hartman commit 822c7ef48b06332168530284781640856621d9f4 Author: Micke Prag Date: Sun Feb 4 23:39:11 2007 +0100 USB: ftdi_sio: Adding VID and PID for Tellstick I would like to add the VID and PID for Telldus Technologies Homeautomation usb-dongle to the ftdi_sio driver. From: Micke Prag Signed-off-by: Greg Kroah-Hartman commit 17230acdc71137622ca7dfd789b3944c75d39404 Author: Alan Stern Date: Mon Feb 19 15:52:45 2007 -0500 UHCI: Eliminate asynchronous skeleton Queue Headers This patch (as856) attempts to improve the performance of uhci-hcd by removing the asynchronous skeleton Queue Headers. They don't contain any useful information but the controller has to read through them at least once every millisecond, incurring a non-zero DMA overhead. Now all the asynchronous queues are combined, along with the period-1 interrupt queue, into a single list with a single skeleton QH. The start of the low-speed control, full-speed control, and bulk sublists is determined by linear search. Since there should rarely be more than a couple of QHs in the list, the searches should incur a much smaller total load than keeping the skeleton QHs. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 28b9325e6ae45ffb5e99fedcafe00f25fcaacf06 Author: Alan Stern Date: Mon Feb 19 15:51:51 2007 -0500 UHCI: Add macros for computing DMA values This patch (as855) adds some convenience macros to uhci-hcd, to help simplify the code for computing hardware DMA pointers. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit d0374f4f9c35cdfbee0ade72d06732613b4e6628 Author: Peter Korsgaard Date: Fri Feb 16 17:03:54 2007 +0100 USB: Davicom DM9601 usbnet driver This patch adds a driver for the Davicom DM9601 USB 1.1 10/100Mbps ethernet adaptor using the usbnet framework. See http://www.davicom.com.tw/eng/products/dm9601.htm for details. Signed-off-by: Peter Korsgaard Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 39c4b38cad00287cfd92cb66fec7c9a3edf50f2a Author: David Hollis Date: Tue Feb 20 08:02:24 2007 -0500 USB: asix.c - Add JVC-PRX1 ids Add device IDs for the JVC-PRX1 port replicator. Additionally cleans up the tabs on a few of other IDs in the list. Reported by: Reuben Thomas Signed-off-by: David Hollis Signed-off-by: Greg Kroah-Hartman commit 21641e3fb1c2e53b3a0acf68e6f62f1f82f61445 Author: Pete Zaitcev Date: Tue Feb 20 10:37:52 2007 -0800 usbmon: Remove erroneous __exit mon_bin_exit() and mon_text_exit() are called from __init code, so don't mark them as __exit. Signed-off-by: Alexey Dobriyan Signed-off-by: Russell King Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 946b960d13c15f050a3b848987aaca79f6a459b7 Author: Greg Kroah-Hartman Date: Wed Feb 14 13:40:14 2007 -0800 USB: add driver for iowarrior devices. The ioctl is commented out for now, until we verify some userspace application issues. Cc: Christian Lucht Cc: Robert Marquardt Signed-off-by: Greg Kroah-Hartman commit fd978bfa127a0b8c0bdbbbc9d64f3c73bf080f61 Author: Greg Kroah-Hartman Date: Wed Feb 21 12:53:17 2007 -0800 USB: option: add a bunch of new device ids This adds all of the known Option device ids to the driver. Many thanks to some Option engineers for getting me this list. Cc: Matthias Urlichs Signed-off-by: Greg Kroah-Hartman commit b656b2cbd74fb591d46e07c7c291791b280ad5b4 Author: Greg Kroah-Hartman Date: Wed Feb 21 12:53:17 2007 -0800 USB: option: remove duplicate device id table There is no need to have two tables with the same device ids in it. Cc: Matthias Urlichs Signed-off-by: Greg Kroah-Hartman commit dfff0a0671baf4e69fc676bf8150635407548288 Author: Greg Kroah-Hartman Date: Fri Feb 23 14:54:57 2007 -0800 Revert "Driver core: let request_module() send a /sys/modules/kmod/-uevent" This reverts commit c353c3fb0700a3c17ea2b0237710a184232ccd7f. It turns out that we end up with a loop trying to load the unix module and calling netfilter to do that. Will redo the patch later to not have this loop. Acked-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 82f0cf9b7c42684c29189ddb6d0bc86eb1137fc4 Author: James Simmons Date: Wed Feb 21 17:44:51 2007 +0000 Driver core: fix error by cleanup up symlinks properly When a device fails to register the class symlinks where not cleaned up. This left a symlink in the /sys/class/"device"/ directory that pointed to no where. This caused the sysfs_follow_link Oops I reported earlier. This patch cleanups up the symlink. Please apply. Thank you. Signed-Off: James Simmons Signed-off-by: Greg Kroah-Hartman commit 4541ac94d0ea0b00776edd5904ac91dd6d6330f7 Author: Adrian Bunk Date: Tue Feb 20 01:07:49 2007 +0100 make kernel/kmod.c:kmod_mk static This patch makes the needlessly global struct kmod_mk static. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 2a9df4945106d62ed9249a44d666fab93c685f7a Author: Johannes Berg Date: Fri Feb 16 01:38:30 2007 -0800 power management: fix struct layout and docs Because the pm ops in powermac are obviously not using them as intended, I added documentation for it in kernel-doc format. Reordering the fields in struct pm_ops not only makes the output of kernel-doc make more sense but also removes a hole from the structure on 64-bit platforms. Signed-off-by: Johannes Berg Cc: "Randy.Dunlap" Cc: Rafael J. Wysocki Cc: Pavel Macheck Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9c372d06ce9ddf65e1393f9ea22a6d6bd5f96b42 Author: Johannes Berg Date: Fri Feb 16 01:38:29 2007 -0800 power management: no valid states w/o pm_ops Change /sys/power/state to not advertise any valid states (except for disk if SOFTWARE_SUSPEND is enabled) when no pm_ops have been set so userspace can easily discover what states should be available. Signed-off-by: Johannes Berg Cc: "Randy.Dunlap" Cc: Rafael J. Wysocki Cc: Pavel Macheck Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit dfe461aef0d621d8472d0af343ae8a60866a7a8a Author: Manuel Lauss Date: Wed Feb 21 14:47:20 2007 +0100 Driver core: more fallout from class_device changes for pcmcia More fallout from the PCMCIA class_device changes. The first hunk is run-tested on SH-4, the others are converted in the spirit of the original conversion. Signed-off-by: Manuel Lauss Signed-off-by: Greg Kroah-Hartman commit d56c3eae6753f53d3313b926dcdda38c6c9bbe9b Author: Adam J. Richter Date: Fri Feb 16 21:35:25 2007 +0800 sysfs: move struct sysfs_dirent to private header struct sysfs_dirent is private to the fs/sysfs/ subtree. It is not even referenced as an opaque structure outside of that subtree. The following patch moves the declaration from include/linux/sysfs.h to fs/sysfs/sysfs.h, making it clearer that nothing else in the kernel dereferences it. I have been running this patch for years. Please integrate and forward upstream if there are no objections. From: "Adam J. Richter" Signed-off-by: Greg Kroah-Hartman commit 63ce18cfe685115ff8d341bae4c9204a79043cf0 Author: Mike Galbraith Date: Wed Feb 21 12:45:35 2007 -0800 driver core: refcounting fix Fix a reference counting bug exposed by commit 725522b5453dd680412f2b6463a988e4fd148757. If driver.mod_name exists, we take a reference in module_add_driver(), and never release it. Undo that reference in module_remove_driver(). Signed-off-by: Mike Galbraith Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 40cf67c5fcc513406558c01b91129280208e57bf Author: Greg Kroah-Hartman Date: Mon Jul 3 14:31:12 2006 -0700 Driver core: remove class_device_rename No one uses it, and it wasn't exported to modules, so remove it. The only other user of it was the network code, which is now converted to use struct device instead. Signed-off-by: Greg Kroah-Hartman commit 2f236735fd05259a07a28233dcd07a8a6dddee9b Author: Steve Wise Date: Wed Feb 21 14:45:39 2007 -0600 RDMA/cxgb3: Stop the EP Timer on BAD CLOSE Stop the ep timer in ec_status() if the status indicates a bad close. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 2b540355cd2f46c5445030995e72c4b4fb2b775e Author: Adrian Bunk Date: Wed Feb 21 11:52:49 2007 +0100 RDMA/cxgb3: cleanups - don't mark static functions in C files as inline - gcc should know best whether inlining makes sense - never compile the unused cxio_dbg.c - make the following needlessly global functions static: - cxio_hal.c: cxio_hal_clear_qp_ctx() - iwch_provider.c: iwch_get_qp() - remove the following unused global functions: - cxio_hal.c: cxio_allocate_stag() - cxio_resource.: cxio_hal_get_rhdl() - cxio_resource.: cxio_hal_put_rhdl() Signed-off-by: Adrian Bunk Acked-by: Steve Wise Signed-off-by: Roland Dreier commit ec09150303479aff2bbe5ca5fcb714336b973074 Author: Jeff Garzik Date: Fri Feb 23 05:49:14 2007 -0500 [libata] ata_piix: remove duplicate PCI IDs Duplicate ids noticed by Kay Sievers Although 100% different, this is based on a patch by Greg Kroah-Hartman Signed-off-by: Jeff Garzik commit 2a54cf76d1066d5aadfac65c8455426df80322f4 Author: Robert Hancock Date: Wed Feb 21 23:53:03 2007 -0600 sata_nv: complain on spurious completion notifiers Recently Tejun wrote a patch to ahci.c to make it raise a HSM violation if the drive attempted to complete a tag that wasn't outstanding. We could run into the same problem with sata_nv ADMA. This adds code to raise a HSM violation error if the controller gives us a notifier tag that isn't outstanding, since the drive may be issuing spurious completions. Signed-off-by: Robert Hancock Signed-off-by: Jeff Garzik commit 32d90911568f67fad3f73623e106667a37c6e7ed Author: Tejun Heo Date: Wed Feb 21 20:25:08 2007 +0900 libata: test major version in ata_id_is_sata() Test major version in ata_id_is_sata() not separately. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f5ecac2d8e0beb0e4d3eb09833cfd19d8f9f004d Author: Robert Hancock Date: Tue Feb 20 21:49:10 2007 -0600 sata_nv: kill old private BMDMA helper functions sata_nv implemented its own copies of the BMDMA helper functions for ADMA, since the ADMA BMDMA status registers are PIO while the other registers are MMIO, and this was the only way to handle this previously. Now that we have iomap support, the standard routines should just work, so use them. The only thing we need to override as far as ADMA and BMDMA is the post_internal_cmd callback, where we should only call ata_post_internal_cmd if we are in port-register mode. Signed-off-by: Robert Hancock Signed-off-by: Jeff Garzik commit 878d4fedab4e5eba59877b771622856495a92df4 Author: Tejun Heo Date: Wed Feb 21 16:36:33 2007 +0900 libata: fix remaining ap->id Merge order left libata-acpi and pata_scc with remainling usage of ap->id. Kill superflous id printing and substitute the remaining ones with ap->print_id. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit a2bbd0c923708a23c6fcc6bbc492f2eecadc676f Author: Tejun Heo Date: Wed Feb 21 16:34:25 2007 +0900 ahci: consider SDB FIS containing spurious NCQ completions HSM violation (regenerated) SDB FIS containing spurious NCQ completions is a clear protocol violation. Currently, only some Maxtors with early firmware revisions are showing this problem. Those firmwares have other NCQ related problems including buggy NCQ error reporting and occasional lock up after NCQ errors. Consider spurious NCQ completions HSM violation and freeze the port after it. EH will turn off NCQ after this happens several times. Eventually drives which show this behavior should be blacklisted for NCQ. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1836854f25b1bc63766bff06aeeb83d2a602b050 Author: Sean Hefty Date: Thu Feb 22 11:37:44 2007 -0800 RDMA/cma: Remove unused node_guid from cma_device structure Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit e971b8cd19d39366b9fdc9eadafec988d785264d Author: Sean Hefty Date: Thu Feb 22 11:37:38 2007 -0800 IB/cm: Remove ca_guid from cm_device structure The cm_device references an ib_device, which already contains the node_guid. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 962063e64b0c55d270979fa0e4ae26daedac6282 Author: Sean Hefty Date: Wed Feb 21 16:40:44 2007 -0800 RDMA/cma: Request reversible paths only The rdma_cm requires that path records be reversible. Set the reversible bit when issuing an path record query. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 47645d8d25387c08bb3ccd84e1405c3776f21d24 Author: Sean Hefty Date: Wed Feb 21 16:37:31 2007 -0800 IB/core: Set hop limit in ib_init_ah_from_wc correctly The hop_limit value in the ah_attr should be 0xFF, not the value read from the received GRH (which should be 0). See 13.5.4.4 in the 1.2 IB spec. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit bd5ab26a7d0cc834d846fe5dd7291f0aed3be72b Author: Dave Jones Date: Thu Feb 22 19:11:16 2007 -0500 [CPUFREQ] constify some data tables. Signed-off-by: Dave Jones commit aeeddc1435c37fa3fc844f31d39c185b08de4158 Author: Dave Jones Date: Thu Feb 22 19:08:27 2007 -0500 [CPUFREQ] constify cpufreq_driver where possible. Not all cases are possible due to ->flags being set at runtime on some drivers. Signed-off-by: Dave Jones commit e5524f355a0d272ba5233537a896a668db1f3008 Author: Dave Jones Date: Thu Feb 22 18:41:28 2007 -0500 [AGPGART] Further constification. Make agp_bridge_driver->aperture_sizes and ->masks const. Also agp_bridge_data->driver Signed-off-by: Dave Jones commit aaf1aef55f50f53812871693692c7cbefcd57f39 Author: Roland Dreier Date: Thu Feb 22 13:16:51 2007 -0800 IB/uverbs: Return correct error for invalid PD in register MR If no matching PD is found in ib_uverbs_reg_mr(), then the function jumps to err_release without setting the return value ret. This means that ret will hold the return value of the call to ib_umem_get() a few lines earlier; if the function reaches the point where it looks for the PD, we know that ib_umem_get() must have returned 0, so ib_uverbs_reg_mr() ends up return 0 for a bad PD ID. Fix this by setting ret to -EINVAL before jumping to the exit path when no PD is found. Signed-off-by: Roland Dreier commit 0ebffe39f8ec8b5b126d9505852a396371014555 Author: Andrew Victor Date: Thu Feb 22 09:38:52 2007 +0100 [ARM] 4232/1: AT91: Generic GPIO bug The new gpio_direction_input() and gpio_direction_output() functions were both enabling output mode. When configuring a GPIO for input mode, you need to program the ODR (Output Disable Register). Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 7f6e2d992d4cb2f537ece62d221e466df1fead1c Author: Andrew Victor Date: Thu Feb 22 07:34:56 2007 +0100 [ARM] 4231/1: AT91: Merge and typo fixes. The duplicate file "include/asm-arm/arch-at91rm9200/entry-macro.S" can be removed - it was already moved to include/asm-arm/arch-at91/. Fix 3 small typo's - two in comments, and the incorrect clock was specified for the LCD device. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit f8dbf45fabaec0371c3bdd1bc94abc569af4badf Author: Ben Dooks Date: Wed Feb 21 17:50:04 2007 +0100 [ARM] 4229/1: S3C2410: Add MACH_QT2410 to s3c2410_defconfig Add the Armzone QT2410 to the list of built machines in the s3c2410_defconfig Signed-off-by: Ben Dooks Signed-off-by: Russell King commit b9c28081a71316dcce7a59122c2a3994ae6091ed Author: Ben Dooks Date: Wed Feb 21 17:45:54 2007 +0100 [ARM] 4228/2: S3C24XX: update s3c2410_defconfig for 2.6.21-rc1 Udpate s3c2410_defconfig for 2.6.21-rc1 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 658bcef619f50d9eb6028452ff9e1ad4a96c2af9 Author: Roland Dreier Date: Wed Feb 21 20:28:05 2007 -0800 IPoIB: Remove unused local_rate tracking Now that low-level drivers handle the conversion from an absolute rate to a relative rate, there's no need for the IPoIB driver to keep track of the local port's data rate. Signed-off-by: Roland Dreier commit 2e8e2d49b14cce7bae910d22d59d2f282761e0d3 Author: Dale Farnsworth Date: Tue Feb 20 15:46:49 2007 -0700 [MIPS] Fix port 0 mac address for mips mv6434x platforms Signed-off-by: Dale Farnsworth Signed-off-by: Ralf Baechle commit 0970769aceb9bccf038f5dba72379f68431f94db Author: Atsushi Nemoto Date: Thu Feb 22 02:17:28 2007 +0900 [SERIAL] serial_txx9 driver update * Use platform_device. * Fix and cleanup suspend/resume/initialization codes. Signed-off-by: Atsushi Nemoto Acked-by: Alan Cox Signed-off-by: Ralf Baechle commit 5ce704f877057e257ecb9f5cdec6c4aa5c0d064c Author: Ralf Baechle Date: Wed Feb 21 09:37:44 2007 +0000 Revert "[PATCH] Generic ioremap_page_range: mips conversion" The generic version truncates addresses. This reverts commit 8e087929df884dbb13e383d49d192bdd6928ecbf. commit 0eb9d788f24167acce48f99688e9eeb13bfe8a32 Author: Ralf Baechle Date: Wed Feb 21 02:17:58 2007 +0000 [MIPS] Cobalt: Rename "Colo" MTD partition to "firmware". Signed-off-by: Ralf Baechle commit de7fa296b60c9086fa038350404975b7ee4e60c2 Author: Ralf Baechle Date: Wed Feb 21 00:10:19 2007 +0000 [MIPS] SMP: Get smp_tune_scheduling to do something useful. Signed-off-by: Ralf Baechle commit 9693a85378b590cc7a4aa2db2174422585c7c8c4 Author: Franck Bui-Huu Date: Fri Feb 2 17:41:47 2007 +0100 [MIPS] Add basic SMARTMIPS ASE support This patch adds trivial support for SMARTMIPS extension. This extension is currently implemented by 4KS[CD] CPUs. Basically it saves/restores ACX register, which is part of the SMARTMIPS ASE, when needed. This patch does *not* add any support for Smartmips MMU features. Futhermore this patch does not add explicit support for 4KS[CD] CPUs since they are respectively mips32 and mips32r2 compliant. So with the current processor configuration, a platform that has such CPUs needs to select both configs: CPU_HAS_SMARTMIPS SYS_HAS_CPU_MIPS32_R[12] This is due to the processor configuration which is mixing up all the architecture variants and the processor types. The drawback of this, is that we currently pass '-march=mips32' option to gcc when building a kernel instead of '-march=4ksc' for 4KSC case. This can lead to a kernel image a little bit bigger than required. Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit b5bf28cde894b3bb3bd25c13a7647020562f9ea0 Author: Linus Torvalds Date: Wed Feb 21 11:21:44 2007 -0800 Revert "e1000: fix shared interrupt warning message" This reverts commit d2ed16356ff4fb9de23fbc5e5d582ce580390106. As Thomas Gleixner reports: "e1000 is not working anymore. ifup fails permanentely. ADDRCONF(NETDEV_UP): eth0: link is not ready nothing else" The broken commit was identified with "git bisect". Auke Kok says: "I think we need to drop this now. The report that says that this *fixes* something might have been on regular interrupts only. I currently suspect that it breaks all MSI interrupts, which would make sense if I look a the code. Very bad indeed." Cc: Jesse Brandeburg Acked-by: Auke Kok Cc: Andrew Morton Cc: Jeff Garzik Signed-off-by: Linus Torvalds commit 5fc7e655a50b0a19229a6b4a8a5e23bfedf700a4 Author: Linus Torvalds Date: Wed Feb 21 11:18:26 2007 -0800 Fix bogus 'inline' in drivers/char/ip2/i2lib.c Not only was the function way too big to be inlined in the first place, it was used before it was even defined. Noted-by: Faik Uygur Cc: Jiri Slaby Signed-off-by: Linus Torvalds commit 1055a8af093fea7490445bd15cd671020e542035 Author: Kyle McMartin Date: Wed Feb 21 15:36:05 2007 +0000 [PARISC] Use symbolic last syscall in __NR_Linux_syscalls Hopefully will prevent people from forgetting to update this... Signed-off-by: Kyle McMartin commit f6982d59480953a8f5a84c237a9dabff39f788ce Author: Michael Krufky Date: Tue Feb 13 18:26:26 2007 -0300 V4L/DVB (5253): Qt1010: whitespace / 80 column cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 47e76c5c7904b8bc2d4c08fbe531017b704a877d Author: Michael Krufky Date: Tue Feb 13 17:53:46 2007 -0300 V4L/DVB (5252): Qt1010: use ARRAY_SIZE macro when appropriate Use ARRAY_SIZE macro already defined in kernel.h Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit b79ea694a919ebc107c90af61b5d22becb1b1324 Author: Marco Schluessler Date: Tue Feb 13 16:46:13 2007 -0300 V4L/DVB (5251): Qt1010: fix compiler warning In function 'qt1010_init': Signed-off-by: Marco Schluessler Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 4acf26703e6cabceb6838ee9c4f75f765ad96915 Author: Marcel Siegert Date: Tue Feb 13 18:44:49 2007 -0300 V4L/DVB (5249): Fix compiler warning in vivi.c The result of copy_to_user was not used, so the compiler complained now a warning will be issued if copy_to_user fails. Signed-off-by: Marcel Siegert Signed-off-by: Mauro Carvalho Chehab commit 90e3bd4ba5563f2a6efbb46ce7e10845329dfffd Author: Hartmut Birr Date: Tue Feb 13 18:01:56 2007 -0300 V4L/DVB (5247): Stv0297: Enable BER/UNC counting Enable BER/UNC counting for the stv0297 frontend. The idea for this patch comes from stv0297_cs.c. Signed-off-by: Hartmut Birr Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 59327a4897a0395d6f0358574dbb113102b63769 Author: David Härdeman Date: Tue Feb 13 09:39:58 2007 -0300 V4L/DVB (5246): Budget-ci: IR handling fixups Commit 00c4cc67512ada1d195b8bf3ef1db1d6b3951605 Oliver Endriss changed the budget-ci driver to use interrupt mode for i2c transfers. This also meant that a new bunch of IR bytes that were previously lost are now received, which allowed me to better understand how the MSP430 chip works. Unfortunately it also means that the current driver gets some assumptions wrong and might generate double keypresses for one IR command. The attached patch fixes this by throwing away the repeat bytes and by associating the correct command and device bytes. Signed-off-by: David Härdeman Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 89e4d59f2c082be9472c4de4dafb832e01bfbe01 Author: Marco Schluessler Date: Tue Feb 13 09:31:07 2007 -0300 V4L/DVB (5245): Dvb-ttpci: use i2c gate ctrl from stv0297 frontend driver Use i2c gate ctrl from stv0297 frontend driver. Signed-off-by: Marco Schluessler Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit b61901024776b25ce7b8edc31bb1757c7382a88e Author: Marcel Siegert Date: Tue Feb 13 09:46:55 2007 -0300 V4L/DVB (5244): Dvbdev: fix illegal re-usage of fileoperations struct Arjan van de Ven reported an illegal re-usage of the fileoperations struct if more than one dvb device (e.g. frontend) is present. This patch fixes this issue. It allocates a new fileoperations struct each time a device is registered and copies the default template fileops. Signed-off-by: Marcel Siegert Signed-off-by: Mauro Carvalho Chehab commit e1af498063007cee5d7ec5af1e0cf25c088d05c7 Author: Chris Rankin Date: Tue Feb 6 20:29:07 2007 -0300 V4L/DVB (5178): Avoid race when deregistering the IR control for dvb-usb The work item function is dvb_usb_read_remote_control(): INIT_WORK(&d->rc_query_work, dvb_usb_read_remote_control, d); and the last piece of work it does is: schedule_delayed_work(&d->rc_query_work,msecs_to_jiffies(d->props.rc_interval)); Hence you need to call "cancel_rearming_delayed_work()" and not "cancel_delayed_work()", correct? I certainly haven't seen this oops reoccur since I applied this patch. Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 705d41e5da674b449f900df97ad13ebe53e82b82 Author: Antti Palosaari Date: Sat Jan 27 16:41:35 2007 -0300 V4L/DVB (5240): Qt1010: use i2c_gate_ctrl where appropriate This patch adds calls to i2c_gate_ctrl in the qt1010 dvb tuner module, while removing the temporary hack in au6610 and gl861. Tested successfully against fi-Oulu frequencies with MSI Megasky 580 GL861 and Sigmatek DVB-110 AU6610. Signed-off-by: Antti Palosaari Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 38d0629fd80464247290450d8641890d6f94b6fa Author: Michael Krufky Date: Sun Jan 21 15:57:48 2007 -0300 V4L/DVB (5239): Whitespace / 80-column cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d4130b18f7ae5adfe2fd5761e31803554d090aa9 Author: Michael Krufky Date: Sun Jan 21 15:56:46 2007 -0300 V4L/DVB (5238): Kconfig: qt1010 should be selected by gl861 and au6610 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 4c7e3ea92da379c4f31500a65680862d8c898dee Author: Antti Palosaari Date: Sun Jan 21 15:56:10 2007 -0300 V4L/DVB (5237): Dvb: add new qt1010 tuner module gl861: (MSI Megasky) - hack for enable ZL10353 / QT1010 I2C gate - use new QT1010 module instead of old code au6610: (Sigmatek DVB-110) - hack for enable ZL10353 / QT1010 I2C gate - use new QT1010 module instead of old code Tested successfully with au6610 and gl861 devices against fi-Yllas frequencies. Now it locks perfectly with both devices. There is a "hack" to enable probable i2c gate in zl10535 demodulator. QT1010 doesn't respond to any i2c messages before we write 0x1a to demodulator register 0x62. In my understanding this should be fixed to demodulator code. Signed-off-by: Antti Palosaari Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 5decdd2729066c5c155d0f6e7fdf89b844fbfc27 Author: Antti Palosaari Date: Sun Nov 5 16:05:38 2006 -0300 V4L/DVB (5236): Initial support for Sigmatek DVB-110 DVB-T This patch adds driver for Sigmatek DVB-110 USB DVB-T stick. Stick has based on hardware of Qtuantek QT1010 tuner, Zarlink ZL10353 (Intel CE 6353) demodulator and Alcor Micro AU6610 DVB-T USB controller. HW is rather similar as used in MSI Megasky GL861. Currently, the driver works only in USB 2.0. In my understanding USB 1.1 is also supported by hw but I cannot test it due to lack of USB 1.1 port. Device supports only isochronous mode transfers. There is also eeprom in usb controller(at least in address range 0x80 - 0xbf) for storing data, eg. firmware. Anyway, firmware loading is not used / required by the device. There seems to be at least one unknown I2C device in address 0xa0, probably remote control or GPIO. Windows drivers reads registers from 0x00 to 0x07 from this unknown address. Driver is based on gl861 module. Tuner has a lot of problems to lock with megasky qt1010 module with this hardware with some broadcasting standards. Signed-off-by: Antti Palosaari Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 4131fd4fd40aa22cfe61b4e7c78e640b9fcfcd8c Author: Carl Lundqvist Date: Mon Oct 9 12:49:17 2006 -0300 V4L/DVB (5235): Gl861: use parallel_ts - use parallel_ts - Now this driver works. - correct typo in MODULE_VERSION Signed-off-by: Carl Lundqvist Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 05eb2a8058ecd964f0560807a0ce582909a8c30e Author: Michael Krufky Date: Mon Oct 9 01:11:07 2006 -0300 V4L/DVB (5234): Gl861: remove unneeded declaration remove unneeded declaration of .generic_bulk_ctrl_endpoint generic_bulk_ctrl_endpoint isn't being used in this device, so this is not needed here. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8c0b24c2d2f779040a8ec21de0422eeaf56395cc Author: Jan Nijs Date: Sat Oct 7 16:29:54 2006 -0300 V4L/DVB (5233): Gl861: correct address of the bulk endpoint The megasky 580 based on gl861 has three endpoints: - 0x81 BULK/ISOC IN MPEG2 TS - 0x83 INT IN remote control receiver - 0x02 BULK OUT bulk control endpoint It doesn't look like the bulk endpoint is used, but better to have the correct one in the config. Signed-off-by: Jan Nijs Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit b3b2b8b5746cfe5af181dc2ce7a0912b5b2c598a Author: Jan Nijs Date: Sat Oct 7 01:25:53 2006 -0300 V4L/DVB (5232): Gl861: correct oops when loading module This patch moves the DVB_USB_IS_AN_I2C_ADAPTER flag from the adapter properties to the device properties. Without this patch I get an OOPS when the gl861 driver tries to access any registers. Signed-off-by: Jan Nijs Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 1f78867bc8a05b6c0bc3f2cb1c5915c10e92369e Author: Michael Krufky Date: Tue Oct 3 17:21:13 2006 -0300 V4L/DVB (5231): Gl861: whitespace cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit e465ea7ed16124e926ca4988317b1d2d31f41d6f Author: Michael Krufky Date: Tue Oct 3 17:20:37 2006 -0300 V4L/DVB (5230): Gl861: remove NULL entry from gl861_properties Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 6ae7232084ffea750968320241a0276d2211d736 Author: Michael Krufky Date: Tue Oct 3 17:19:30 2006 -0300 V4L/DVB (5229): Gl861: use qt1010_tuner_attach function from qt1010.h The gl861_tuner_attach function is not specific to this device. This patch removes gl861_tuner_attach, and replaces it with qt1010_tuner_attach from the qt1010 header file. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8bb36dc7b5c9f528541b8674f9417901129dae64 Author: Michael Krufky Date: Tue Oct 3 17:17:24 2006 -0300 V4L/DVB (5228): Gl861: remove unneeded "extern int" declaration Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 73b96c09f679dfaaf8f72b7789a277fc10618328 Author: Michael Krufky Date: Tue Oct 3 17:16:44 2006 -0300 V4L/DVB (5227): Gl861: hide disabled code from upstream patch system enclose disabled code inside an #if 0 block, instead of /* comments */ Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 05ec6cc88c901fa8755fc11e847c1d6a0e31f9c5 Author: Michael Krufky Date: Tue Oct 3 17:15:26 2006 -0300 V4L/DVB (5226): Gl861: fix driver_name Rename driver_name from "gl861" to "dvb_usb_gl861" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 947af8fdcd034e567421bdc55ec446e24b519b7f Author: Michael Krufky Date: Tue Oct 3 17:14:07 2006 -0300 V4L/DVB (5225): Gl861: fix MODULE_AUTHOR The author's email address is already in the MODULE_AUTHOR field. This patch adds his name as well. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a9bde1d88c49cd7ab4faae5110261046555dd7a3 Author: Michael Krufky Date: Tue Oct 3 17:12:55 2006 -0300 V4L/DVB (5224): Gl861: select DVB_ZL10353 if !DVB_FE_CUSTOMISE Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 6f7880f0264457e80e456b512722c7a627883fda Author: Michael Krufky Date: Tue Oct 3 17:12:14 2006 -0300 V4L/DVB (5223): Rename USB_PID_MSI_MEGASKY55801 to USB_PID_MSI_MEGASKY580_55801 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f0c3a2ca56c5c56ecfaf46c1b47851319e9655ac Author: Carl Lundqvist Date: Tue Oct 3 17:09:30 2006 -0300 V4L/DVB (5221): Dvb-usb: initial support for MSI Mega Sky 580 DVB-T based on GL861 This patch adds support for MSI Mega Sky 580 / GL861 DVB-T USB2.0 Except for the 2 lines added to zl10353.c, zl10353_reset_attach needs to be changed. If I read the code correctly setting parallel_ts will take care of the 3rd byte, but the 2nd byte needs to be 0x0b instead of 0x03 too. I guess these changes needs to be done only for this device, not sure how to do that. The zl10353 changes have been split apart from this patch, into the next patch, soon to follow. Signed-off-by: Carl Lundqvist Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 6345f0f6428cc7a3f73b83624c6f97629a9fddd1 Author: Chris Pascoe Date: Sat Feb 10 10:19:16 2007 -0300 V4L/DVB (5218): Zl10353: register definitions update Update the descriptions of "discovered" registers on the zl10353, using the equivalaent mt352 register names. Signed-off-by: Chris Pascoe Signed-off-by: Mauro Carvalho Chehab commit f7f57770dc610eddd678aec483263e7980327ee9 Author: Antti Palosaari Date: Sat Feb 10 10:19:11 2007 -0300 V4L/DVB (5217): Zl10353: Implement TRL nominal rate calculation Implement trl nominal rate calculation to Zarlink ZL10353 demod, based on calculation used in Zarlink MT352. This adds support for 6 and 8MHz bandwidth transponders. Signed-off-by: Antti Palosaari Signed-off-by: Chris Pascoe Signed-off-by: Mauro Carvalho Chehab commit 0a11bb865a88a7459855ab46f74091e6ca4a1a20 Author: Antti Palosaari Date: Sat Feb 10 10:19:08 2007 -0300 V4L/DVB (5216): Zl10353: add i2c_gate_ctrl support Implement I2C gate control for Megasky GL861 and SigmaTek AU6610 support. Signed-off-by: Chris Pascoe Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 67b60aad168cfdd40ffec12f14b93e2e68f7d486 Author: Chris Pascoe Date: Sat Feb 10 10:17:57 2007 -0300 V4L/DVB (5215): Experimental support for signal strength/BER/uncorrectable count After studying many hours worth of register dumps of MT352 and ZL10353 fed with identically damaged RF signals I have made an educated guess at which registers contain the AGC level, bit error rate and uncorrectable error count values. Implement the IOCTLs that return these values to userspace. Signed-off-by: Chris Pascoe Signed-off-by: Mauro Carvalho Chehab commit 90060d32ca0a941b158994f78e60d0381871c84b Author: Mike Isely Date: Thu Feb 8 02:02:53 2007 -0300 V4L/DVB (5212): Pvrusb2: Be more forgiving about encoder firmware size The pvrusb2 driver previously rejected encoder firmware whose size was not a multiple of 8192. But this is a false check because it's possible to find cx23416 firmware whose size doesn't conform to this limit. So change the firmware loader implementation to be more forgiving of the image size. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 201779f5c4a4bd8503a38749dd371ecddb7928a5 Author: Mike Isely Date: Thu Feb 8 01:48:57 2007 -0300 V4L/DVB (5210): Pvrusb2: Fix printk format typo Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 6591691b259f9487f374f35c0c310aa220f829c6 Author: akpm@linux-foundation.org Date: Thu Feb 8 14:36:57 2007 -0300 V4L/DVB (5209): Kthread api conversion for dvb_frontend and av7110 fix avoid double-up(), pointed out by Oliver. Signed-off-by: Andrew Morton Acked-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 8eec14295e03f9dfe2be7bb75c8004a5fa867cdb Author: Herbert Poetzl Date: Thu Feb 8 14:32:43 2007 -0300 V4L/DVB (5208): Kthread API conversion for dvb_frontend and av7110 dvb kernel_thread to kthread API port. It is running fine here, including module load/unload and software suspend (which doesn't work as expected with or without this patch :). I didn't convert the dvb_ca_en50221 as I do not have such an interface, but if the conversion process is fine with the v4l-dvb maintainers, it should not be a problem to send a patch for that too ... Acked-by: Oliver Endriss Signed-off-by: Herbert Poetzl Signed-off-by: Andrew Morton Acked-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 2a9f8b5d25beacd034369fca416b548cbf931561 Author: Thierry MERLE Date: Wed Feb 7 10:14:38 2007 -0300 V4L/DVB (5206): Usbvision: set alternate interface modification - usb alternate selection modified to get the biggest endpoint packet size. - fix sysfs get values for brightness/contrast/hue/saturation Signed-off-by: Thierry MERLE Signed-off-by: Mauro Carvalho Chehab commit 6f78e186fe5d29dbff5e34f950adb573c4808de4 Author: Thierry MERLE Date: Wed Feb 7 10:13:11 2007 -0300 V4L/DVB (5205): Usbvision: dynamic allocation for frames - fix decoder route output - dynamic frame buffer allocation Signed-off-by: Thierry MERLE Signed-off-by: Mauro Carvalho Chehab commit c65eeaab1f04d1113b5c4fb21f7f61ded795d2bb Author: Adrian Bunk Date: Tue Feb 6 21:53:31 2007 -0300 V4L/DVB (5200): V4l_printk_ioctl_arg() is no longer used. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit b1e7df1d3543906654b9e6443aee177c8009acac Author: Michael Schimek Date: Wed Feb 7 09:15:01 2007 -0300 V4L/DVB (5204): Change videodev2.h licence to dual GPL/BSD videodev2.h contains just the V4L2 API structs and defines. By allowing this header file to be dual GPL/BSD will enable sharing userspace apps between Linux and *BSD systems. It will also allow developing newer BSD licens