commit c420bc9f09a0926b708c3edb27eacba434a4f4ba Author: Linus Torvalds Date: Fri May 25 19:55:14 2007 -0700 Linux 2.6.22-rc3 It's that time of the year again. Summer starts in the US, and people want to sit at the beach with a new -rc candidate. Signed-off-by: Linus Torvalds commit f4d43bd579f13219ffd3cae48432eab5bbac2d6f Author: Hugh Dickins Date: Sat May 26 00:39:17 2007 +0100 fix compat console unimap regression Why is it that since the 2f1a2ccb9c0de632ab07193becf5f7121794f6ae console UTF-8 fixes went into 2.6.22-rc1, the PowerMac G5 shows only inverse video question marks for the text on tty2-6? whereas tty1 is fine, and so is x86. No fault of that patch: by removing the old fallback behaviour, it reveals that 32-bit setfont running on 64-bit kernels has only really worked on the current console, the rest getting faked by that inadequate fallback. Bring the compat do_unimap_ioctl into line with the main one: PIO_UNIMAP and GIO_UNIMAP apply to the specified tty, not redirected to fg_console. Use the same checks, and most particularly, remember to check access_ok: con_set_unimap and con_get_unimap are using __get_user and __put_user. And the compat vt_check should ask for the same capability as the main one, CAP_SYS_TTY_CONFIG rather than CAP_SYS_ADMIN. Added in vt_ioctl's vc_cons_allocated check for safety, though failure may well be impossible. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 960c8a10cbd47d1535996f40749b36f3d2c45f88 Author: Alan Cox Date: Fri May 25 20:48:55 2007 +0100 pata_hpt37x: Further improvements based on the IDE updates and vendor drivers Better DPLL use and calibration Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit c343a8391496de83c66e771ead986aab0d6f777f Author: Alan Cox Date: Fri May 25 20:39:30 2007 +0100 pata: Trivia Typo/comment fixes Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit d9b08b9efece1f397143378938e626d0de29e911 Author: Christoph Hellwig Date: Fri May 18 13:12:40 2007 +0200 [PATCH] ocfs2: use generic_segment_checks Signed-off-by: Christoph Hellwig Signed-off-by: Mark Fasheh commit 8fccfc829a66b8b879c6672940523a402a786ce1 Author: Mark Fasheh Date: Wed May 9 17:34:26 2007 -0700 ocfs2: fix inode leak We weren't cleaning up our inode reference on error in ocfs2_reserve_local_alloc_bits(). Add a check for error return and iput() if need be. Move the code to set the alloc context inode info to the end of the function so we don't have any possibility of passing back a bad pointer. Signed-off-by: Mark Fasheh commit 5c3c6bb7709bf2bf4132750124879b3d89183e46 Author: Nate Diller Date: Thu May 10 22:56:01 2007 -0700 [PATCH] ocfs2: use zero_user_page Use zero_user_page() instead of open-coding it. Signed-off-by: Nate Diller Signed-off-by: Andrew Morton Signed-off-by: Mark Fasheh commit 1024c902abdcbd2425aa850d7ef04e013ffb35f0 Author: Mark Fasheh Date: Mon May 14 11:39:40 2007 -0700 ocfs2: unmap_mapping_range() in ocfs2_truncate() We weren't calling this before, but since ocfs2 handles the entire truncate operation, we should. Signed-off-by: Mark Fasheh commit e9dfc0b2bc42761410e8db6c252c6c5889e178b8 Author: Mark Fasheh Date: Mon May 14 11:38:51 2007 -0700 ocfs2: trylock in ocfs2_readpage() Similarly to the page lock / cluster lock inversion in ocfs2_readpage, we can deadlock on ip_alloc_sem. We can down_read_trylock() instead and just return AOP_TRUNCATED_PAGE if the operation fails. Signed-off-by: Mark Fasheh commit 52df0ee07ca23676785e6c7e569b6d93c6dbc026 Author: Jeff Garzik Date: Fri May 25 05:02:06 2007 -0400 [libata] sata_via, pata_via: Add PCI IDs. Supplied by VIA. Also, convert named constants to hex values in the pata_via PCI ID table. (standard libata policy for PCI device IDs, which are considered simply arbitrary hex numbers, without a need to create a single-use constant in linux/pci_ids.h) Signed-off-by: Jeff Garzik commit 6c7b7d2b7615110edbc4ea7816831c13b0250ebb Author: Jeff Garzik Date: Fri May 25 04:39:39 2007 -0400 [libata] Fix decoding of 6-byte commands The code for parsing 6-byte SCSI command LBAs missed the top 5 bits (the MSB). Signed-off-by: Jeff Garzik commit ddfc87a098a0172ad13ce50edf55d5fe266f1352 Author: Uwe Koziolek Date: Fri May 25 09:48:52 2007 +0200 libata: sata_sis fixes The sata_sis driver supports SATA and PATA ports. The broken support of both types in one controller is fixed. Signed-off-by: Uwe Koziolek Signed-off-by: Jeff Garzik commit 7e068376c5128db2a342fa659a6dfa1488adc135 Author: Tony Breeds Date: Wed May 23 14:26:43 2007 -0700 Fix build failure for drivers/ata/pata_scc.c The commit d4b2bab4f26345ea1803feb23ea92fbe3f6b77bc added deadline support to prereset and reset methods to libbata the pata_scc driver wasn't converted. This patch is a naive attempt to bring this driver up to scratch. Build failures are: drivers/ata/pata_scc.c: In function 'scc_pata_prereset': drivers/ata/pata_scc.c:870: error: too few arguments to function 'ata_std_prereset' drivers/ata/pata_scc.c: In function 'scc_error_handler': drivers/ata/pata_scc.c:916: warning: passing argument 2 of 'ata_bmdma_drive_eh' from incompatible pointer type drivers/ata/pata_scc.c:916: warning: passing argument 3 of 'ata_bmdma_drive_eh' from incompatible pointer type drivers/ata/pata_scc.c: In function 'scc_pata_prereset': drivers/ata/pata_scc.c:871: warning: control reaches end of non-void function On a releated note scc_bus_post_reset() is (AFACT) identical to ata_bus_post_reset(), would a patch to make ata_bus_post_reset() assesable to drivers be accepted? Signed-off-by: Tony Breeds Acked-by: Tejun Heo Cc: Akira Iguchi Cc: Jeff Garzik Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 4a05e2091709dbb22b86a1b3343cd3fa3c0d7a6b Author: Jeff Garzik Date: Thu May 24 23:40:15 2007 -0400 [libata] sata_mv: add TODO list Signed-off-by: Jeff Garzik commit bb312235933689fb0f973ae61d19d7416de1e085 Author: Jeff Garzik Date: Thu May 24 23:35:59 2007 -0400 [libata] sata_promise: fix flags typo A stray comma makes all the difference. Change to '|' as these flags should be or'd together. Signed-off-by: Jeff Garzik commit 14e50e57aedb2a89cf79b77782879769794cab7b Author: David S. Miller Date: Thu May 24 18:17:54 2007 -0700 [XFRM]: Allow packet drops during larval state resolution. The current IPSEC rule resolution behavior we have does not work for a lot of people, even though technically it's an improvement from the -EAGAIN buisness we had before. Right now we'll block until the key manager resolves the route. That works for simple cases, but many folks would rather packets get silently dropped until the key manager resolves the IPSEC rules. We can't tell these folks to "set the socket non-blocking" because they don't have control over the non-block setting of things like the sockets used to resolve DNS deep inside of the resolver libraries in libc. With that in mind I coded up the patch below with some help from Herbert Xu which provides packet-drop behavior during larval state resolution, controllable via sysctl and off by default. This lays the framework to either: 1) Make this default at some point or... 2) Move this logic into xfrm{4,6}_policy.c and implement the ARP-like resolution queue we've all been dreaming of. The idea would be to queue packets to the policy, then once the larval state is resolved by the key manager we re-resolve the route and push the packets out. The packets would timeout if the rule didn't get resolved in a certain amount of time. Signed-off-by: David S. Miller commit 04efb8787e4d8a7b21a61aeb723de33154311256 Author: David S. Miller Date: Thu May 24 17:54:15 2007 -0700 [CASSINI]: Check pci_set_mwi() return value. Signed-off-by: David S. Miller commit cf5792d20cdc9a88abf9984a2224f57de1952926 Author: Alan Cox Date: Wed May 23 22:39:01 2007 +0100 pata_via: Handle laptops via DMI Oh the joy of saving a fraction of a cent using short 40 wire cables and not faking 80wire Teach the VIA driver that there are some systems we need to know are magically wired for high speeds. Signed-off-by: Alan Cox Tested-by: Francis Russell Signed-off-by: Jeff Garzik commit 6dffaf61e22d21e539ae7e30c2e33e41230c3d52 Author: Tejun Heo Date: Wed May 23 11:58:52 2007 +0200 libata: -ENODEV during prereset isn't an error During prereset, -ENODEV return from ata_wait_ready() is not an error. This causes unnecessary bug message on controllers which uses 0xff to indicate empty port. Fix it. Signed-off-by: Tejun Heo Cc: Paul Mundt Signed-off-by: Jeff Garzik commit fd7fe701612e42fb8780d7bf61fbb0467a488c9b Author: Tejun Heo Date: Wed May 23 11:22:15 2007 +0200 libata: don't consider 0xff as port empty if SStatus is available Some SATA controllers (sata_sil) use 0xff to indicate port not ready status, not port empty. As libata interprets 0xff as port empty, this causes unnecessary reset failure and retry. Don't consider 0xff as port empty if SStatus is available and indicates that port is online. Signed-off-by: tejun Heo Cc: Paul Mundt Cc: Indan Zupancic Signed-off-by: Jeff Garzik commit b33620f9fa6a8deabaac7a7cd827cc7fafbf0064 Author: Tejun Heo Date: Tue May 22 11:34:22 2007 +0200 ata_piix: add short 40c quirk for Acer Aspire 2030, take #2 Acer Aspire 2023WLMi uses short 40c cable. Add quirk for it. Signed-off-by: Tejun Heo Cc: Steve H. Signed-off-by: Jeff Garzik commit dd668d150cad39d3af676519c81c2757fb7787da Author: Alan Cox Date: Mon May 21 15:00:53 2007 +0100 pata_sis: Fix and clean up some timing setups - Rename sis_port_base to sis_old_port_base() so nobody uses it for new generation controllers in error. - Use byte size operations where it is cleaner for mode setup - Fix a couple of masking errors on certai chip revs when setting speeds Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 824cf333db97954d6144230b5e28f4e65e67d312 Author: Alan Cox Date: Mon May 21 14:57:01 2007 +0100 hpt3x2n: Correct revision boundary We have a revision that isn't correctly claimed as two drivers both go for it: Fix the test accordingly. Noticed originally by Bill Nottingham. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit ba78073e6f70cd9c64a478a9bd901d7c8736cfbc Author: Vasily Averin Date: Thu May 24 16:58:54 2007 -0700 [NET]: "wrong timeout value" in sk_wait_data() v2 sys_setsockopt() do not check properly timeout values for SO_RCVTIMEO/SO_SNDTIMEO, for example it's possible to set negative timeout values. POSIX do not defines behaviour for sys_setsockopt in case negative timeouts, but requires that setsockopt() shall fail with -EDOM if the send and receive timeout values are too big to fit into the timeout fields in the socket structure. In current implementation negative timeout can lead to error messages like "schedule_timeout: wrong timeout value". Proposed patch: - checks tv_usec and returns -EDOM if it is wrong - do not allows to set negative timeout values (sets 0 instead) and outputs ratelimited information message about such attempts. Signed-off-By: Vasily Averin Signed-off-by: David S. Miller commit 1ff75ed254bdbb47bb0c1d71a3cc65f6831a8e3a Author: Jing Min Zhao Date: Thu May 24 16:44:40 2007 -0700 [NETFILTER]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook They're the same. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f8f1c08eaef838e22bf427665da87cfa73e5074d Author: Jing Min Zhao Date: Thu May 24 16:44:11 2007 -0700 [NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA Add missing process of T.120 address in OpenLogicalChannelAck signal. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 596830f1a1e5d26a83fe83b99ced1456d9d7f39b Author: Jing Min Zhao Date: Thu May 24 16:43:42 2007 -0700 [NETFILTER]: nf_conntrack_h323: remove unnecessary process of Information signal According to the implementation of H.323, it's not necessary to check the addresses in Information signals. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit bb807245ef981cac7e8550aea365e6f2157d5c4d Author: Jing Min Zhao Date: Thu May 24 16:43:07 2007 -0700 [NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access Update get_h225_addr() to meet the changes in ASN.1 types. It was using field ip6 to access IPv6 TransportAddress, it should be ip according the ASN.1 definition. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d052918688bdd7a1218aa5ae182013bf45a4881a Author: Jing Min Zhao Date: Thu May 24 16:42:26 2007 -0700 [NETFILTER]: nf_conntrack_h323: fix ASN.1 types 1. Add support for decoding IPv6 address. I know it was manually added in the header file, but not in the template file. That wouldn't work. 2. Add missing support for decoding T.120 address in OLCA. 3. Remove unnecessary decoding of Information signal. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 25b86e05467a2bf936b78695ef49039e3bbd1e0c Author: Patrick McHardy Date: Thu May 24 16:41:50 2007 -0700 [NETFILTER]: nf_conntrack_ftp: fix newline sequence number calculation When the packet size is changed by the FTP NAT helper, the connection tracking helper adjusts the sequence number of the newline character by the size difference. This is wrong because NAT sequence number adjustment happens after helpers are called, so the unadjusted number is compared to the already adjusted one. Based on report by YU, Haitao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 5fe26f53fe9e2ba5dca2835a4ca69d0ba7b5f707 Author: Patrick McHardy Date: Thu May 24 16:40:51 2007 -0700 [NETFILTER]: nf_conntrack_ftp: fix newline sequence number update When trying to locate the oldest entry in the history of newline character sequence numbers, the sequence number of the current entry is incorrectly compared with the index of the oldest sequence number instead of the number itself. Additionally it is not made sure that the current sequence number really is after the oldest known one. Based on report by YU, Haitao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2e4b3b0e8734d1173c96c6f5d8a8dd6728950b56 Author: Patrick McHardy Date: Wed May 23 23:39:54 2007 -0700 [NET_SCHED]: sch_htb: fix event cache time calculation The event cache time must be an absolute value, when no event exists it is incorrectly set to 1s instead of 1s in the future. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 1b07a95a5be77dc1291de12b216f930aee04eb4f Author: David S. Miller Date: Wed May 23 17:43:11 2007 -0700 [DCCP]: Fix build warning when debugging is disabled. Signed-off-by: David S. Miller commit cb283ead710c342d9856af8507e2a42bf5c6576c Author: Jon Paul Maloy Date: Wed May 23 15:11:15 2007 -0700 [TIPC]: Fixed erroneous introduction of for_each_netdev Signed-off-by: Jon Paul Maloy Signed-off-by: David S. Miller commit b8f558313506b5bc435f2e031f3bec4b1725098e Author: Milan Kocian Date: Wed May 23 14:55:06 2007 -0700 [RTNETLINK]: Fix sending netlink message when replace route. When you replace route via ip r r command the netlink multicast message is not send. This patch corrects it. NL message is sent with NLM_F_REPLACE flag. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=8320 Signed-off-by: Milan Kocian Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8a903be129a741fd1e1d44223f0e3a01c357bde5 Author: Jan Engelhardt Date: Wed May 23 14:51:07 2007 -0700 [TR]: Use menuconfig objects. Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 42859007f458f305624009862d6ca818e3c5be57 Author: Jan Engelhardt Date: Wed May 23 14:50:18 2007 -0700 [ARCNET]: Use menuconfig objects. Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit a31b19c514664b8161b956f8da45d8a9166da0c6 Author: Jan Engelhardt Date: Wed May 23 14:49:38 2007 -0700 [TIPC]: Use menuconfig objects. Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 29e32ccdec8574aa5b6e0b6b555815dbb62591e1 Author: Jan Engelhardt Date: Wed May 23 14:48:57 2007 -0700 [SCTP]: Use menuconfig objects. Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit a6938a1e0e0ebdf42f34b37116576d9eaaa9bba4 Author: Jan Engelhardt Date: Wed May 23 14:48:10 2007 -0700 [IPVS]: Use menuconfig objects. Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Acked-by: Simon Horman Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 3df25df354d0e9bae9b83be5a828b6756db9bcf4 Author: Jan Engelhardt Date: Wed May 23 14:46:35 2007 -0700 [DCCP]: Use menuconfig objects. Use menuconfigs instead of menus, so the whole menu can be disabled at once instead of going through all options. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 7e7a2d07b0faf13b2f7ad982c77ca30c9e9ee0e4 Author: Matthias Kaehlcke Date: Wed May 23 14:45:45 2007 -0700 [ATM]: Use mutex instead of binary semaphore in idt77252 driver. Use mutex instead of binary semaphore in idt77252 driver. Signed-off-by: Matthias Kaehlcke Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit bbb711e63332d7b43b535381c78b26a66cd60f48 Author: Oliver Hartkopp Date: Wed May 23 14:35:31 2007 -0700 [IPV6]: Ignore ipv6 events on non-IPV6 capable devices. Signed-off-by: Oliver Hartkopp Signed-off-by: Urs Thuermann Signed-off-by: David S. Miller commit 36247f5421015eab0bdd96789b24790598934db9 Author: Herbert Xu Date: Wed May 23 14:30:44 2007 -0700 [NET_SCHED]: Fix qdisc_restart return value when dequeue is empty My previous patch that changed the return value of qdisc_restart incorrectly made the case where dequeue returns empty continue processing packets. This patch is based on diagnosis and fix by Patrick McHardy. Reported-and-debugged-by: Anant Nitya Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 096a458c3a9c717563e98b0a2ce69821459a6660 Author: Ayaz Abdulla Date: Mon May 21 20:23:11 2007 -0400 forcedeth: fix cpu irq mask This patch fixes the cpu irq mask define to include the timer irq. Another flag check was setting up the timer bit in all cases so we didn't notice the issue. Signed-off-by: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 294cf1b880fad9221e911fb2ce07b1fff3ae1a3d Author: Mariusz Kozlowski Date: Thu May 24 19:46:14 2007 +0200 chelsio parenthesis fix Hello, Balanance parenthesis in chelsio header file. Signed-off-by: Mariusz Kozlowski drivers/net/chelsio/suni1x10gexp_regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik commit 93c1d3b790673bb2a7489d6f165c5c99a7f44baf Author: Florin Malita Date: Tue May 22 18:09:42 2007 -0500 spidernet: skb used after netif_receive_skb The stats update code in spider_net_pass_skb_up() is touching the skb after it's been passed up to the stack. To avoid that, just update the stats first. Signed-off-by: Florin Malita Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit e971290133d8151c468cd70206fedc92648feb58 Author: Ralf Baechle Date: Thu May 24 12:54:04 2007 +0100 meth driver renovation The meth ethernet driver for the SGI IP32 aka O2 is so far still an old style driver which does not use the device driver model. This is now causing issues with some udev based gadgetry in debian-stable. Fixed by converting the meth driver to a platform device. Signed-off-by: Ralf Baechle -- Fixes since previous patch: o Fixed typo in meth_exit_module() Signed-off-by: Jeff Garzik commit 73815538e642de66a5607cc16d13004ecb1a3062 Author: Yoichi Yuasa Date: Thu May 24 16:12:27 2007 +0900 remove unnecessary dependency on VIA velocity config Hi, This patch has removed unnecessary dependency on VIA velocity config. Yoichi Signed-off-by: Yoichi Yuasa Signed-off-by: Jeff Garzik commit 239dc572b8e6ecde91afe96d2426ddc2afd4695d Author: Denver Gingerich Date: Wed May 23 14:34:43 2007 -0700 fix compiler warning in fixed.c Correct the following compiler warning (and warnings resulting from the correction): warning: 'fixed_mdio_register_device' defined but not used Signed-off-by: Denver Gingerich Cc: Vitaly Bordug Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 2ed22bc294315d19aa1f0423b83d21a2d94c641b Author: David Hollis Date: Wed May 23 07:33:17 2007 -0400 asix.c - Add Belkin F5D5055 ids (Originally sent to linux-usb-devel) The attached patch adds the device IDs for the Belkin F5D5055 device. Reported by Andy Juniper Signed-off-by: David Hollis -- David Hollis Signed-off-by: Jeff Garzik commit 66bd23fad81fb0b84c16edd48ec160f8fdbe3f57 Author: Li Yang Date: Tue May 22 20:34:14 2007 +0800 ucc_geth:trivial fix Remove redundant includes. Signed-off-by: Li Yang Signed-off-by: Jeff Garzik commit 5bc8d39a4759e956fa25880d57ef579f96f1a334 Author: Li Yang Date: Tue May 22 20:24:37 2007 +0800 ucc_geth: Fix MODULE_DEVICE_TABLE() duplication Fix MODULE_DEVICE_TABLE() duplication in ucc_geth.c and ucc_geth_mii.c for ucc_geth to be compiled as module. Signed-off-by: Li Yang Signed-off-by: Jeff Garzik commit 2dfbfc37121d307e1f1d24c2979382cb17b19347 Author: Michael S. Tsirkin Date: Thu May 24 18:32:46 2007 +0300 IPoIB/cm: Drain cq in ipoib_cm_dev_stop() Since NAPI polling is disabled while ipoib_cm_dev_stop() is running, ipoib_cm_dev_stop() must poll the CQ itself in order to see the packets draining. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 8fd357a6e3375083f7d321413eb8f6739491f342 Author: Michael S. Tsirkin Date: Thu May 24 14:02:39 2007 -0700 IPoIB/cm: Fix timeout check in ipoib_cm_dev_stop() time_after() was used backwards, so the timeout occurred immediately. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 65a2c841d68ae3402ea4cad8d00fe4b9b0a5bc80 Author: Stefan Roscher Date: Thu May 24 16:51:08 2007 +0200 IB/ehca: Fix number of send WRs reported for new QP Due to a typo, the driver was reporting the wrong number of "actual send WRs" after ehca_create_qp(). Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit c0be5fb5f835110652911ea8b88ad78f841e5b45 Author: Eli Cohen Date: Thu May 24 16:05:01 2007 +0300 IB/mlx4: Initialize send queue entry ownership bits We need to initialize the owner bit of send queue WQEs to hardware ownership whenever the QP is modified from reset to init, not just when the QP is first allocated. This avoids having the hardware process stale WQEs when the QP is moved to reset but not destroyed and then modified to init again. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit d57c4a38928ab2f71542046a9bae2932006b2523 Author: Tony Luck Date: Thu May 24 10:59:44 2007 -0700 [IA64] acpi_get_sysname() should be __init Section mismatch: reference to .init.text:acpi_find_rsdp (between 'acpi_get_sysname' and 'acpi_request_vector') acpi_get_sysname() needs to call the __init function acpi_find_rsdp, but it doesn't have the __init attribute itself, hence the warning. Luckily it is only called from machvec_init() which has __init attribute, so the fix is to define acpi_get_sysname() as __init too. Signed-off-by: Tony Luck commit c2b38989cf2b0c003a9cf57efc833ab16d33901e Author: Josef 'Jeff' Sipek Date: Thu May 24 12:21:43 2007 -0400 Documentation: Fix up docs still talking about i_sem .. it got changed to 'i_mutex' some time ago. Signed-off-by: Josef 'Jeff' Sipek Signed-off-by: Linus Torvalds commit 35729449655abcceeb3c72181e9920cf98f81c1e Author: Venki Pallipadi Date: Tue May 22 15:36:57 2007 -0700 [IA64] Cleanup acpi header to reuse the generic _PDC defines ia64 _PDC setup is defined similar to i386. So, cleanup the header to use generic _PDC defines than using specific defines in ia64. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Tony Luck commit ce45b51ac4c3c575c71ab5c91c29bf34c2af6f7d Author: Venki Pallipadi Date: Tue May 22 15:35:24 2007 -0700 [IA64] Fix using uninitialized data in _PDC setup Silly bug in _PDC data setup. Haven't seen any real side-effects of this one yet. But, needs fixing regardless. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Tony Luck commit 8f53b6fcc49745c19bb2dd2972185ff398160162 Author: Linus Torvalds Date: Thu May 24 10:13:43 2007 -0700 Don't call a warnign a bug. It's a warning. Change the default printout message for WARN_ON() to say what it is, not something else. I'm tired of having people get all aflutter about a warning. Signed-off-by: Linus Torvalds commit 1a93fa86bf6eb0d8bed84ef18c8b35be389edee5 Author: Linus Torvalds Date: Thu May 24 08:50:39 2007 -0700 Revert "HOWTO: bug report addition" (or "HOWTO: mention bughunting") This reverts commit 722385f75efd82d9f480f0765a1e97a4d83cac0d (or commit 3f27100872b21e4cc70d07b96eeb3611b30bce63, it's your choice ;), since the same patch to Documentation/HOWTO got added twice because it just kept applying cleanly. Noted by Qi Yong. Cc: Qi Yong Acked-by: Diego Calleja Signed-off-by: Linus Torvalds commit 92ea77275b5345c1300433f28689493dc4163f24 Author: Linus Torvalds Date: Thu May 24 08:37:14 2007 -0700 Fix crash with irqpoll due to the IRQF_IRQPOLL flag testing With irqpoll enabled, trying to test the IRQF_IRQPOLL flag in the actions would cause a NULL pointer dereference if no action was installed (for example, the driver might have been unloaded with interrupts still pending). So be a bit more careful about testing the flag by making sure to test for that case. (The actual _change_ is trivial, the patch is more than a one-liner because I rewrote the testing to also be much more readable. Original (discarded) bugfix by Bernhard Walle. Cc: Bernhard Walle Tested-by: Vivek Goyal Signed-off-by: Linus Torvalds commit d4a8f3677fe2c2fc86443254fe42825e244c194d Author: Trond Myklebust Date: Tue May 22 10:22:27 2007 -0400 NFS: Fix nfs_direct_dirty_pages() We only need to dirty the pages that were actually read in. Also convert nfs_direct_dirty_pages() to call set_page_dirty() instead of set_page_dirty_lock(). A call to lock_page() is unacceptable in an rpciod callback function. Signed-off-by: Trond Myklebust commit 749e146e01cf87ce3c1d6f6077b877471b04df5b Author: Chuck Lever Date: Sat May 19 17:22:46 2007 -0400 NFS: Fix handful of compiler warnings in direct.c This patch fixes a couple of signage issues that were causing an Oops when running the LTP diotest4 test. get_user_pages() returns a signed error, hence we need to be careful when comparing with the unsigned number of pages from data->npages. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 7fe7f8487ae742239dd8c66596e2311c30d057d1 Author: Trond Myklebust Date: Sun May 20 10:18:27 2007 -0400 NFS: Avoid a deadlock situation on write When processes are allowed to attempt to lock a non-contiguous range of nfs write requests, it is possible for generic_writepages to 'wrap round' the address space, and call writepage() on a request that is already locked by the same process. We avoid the deadlock by checking if the page index is contiguous with the list of nfs write requests that is already held in our nfs_pageio_descriptor prior to attempting to lock a new request. Signed-off-by: Trond Myklebust commit 5dee9e7c4c869fcffccc3d432b755793dfa71376 Author: Marcel Holtmann Date: Thu May 24 14:27:19 2007 +0200 [Bluetooth] Fix L2CAP configuration parameter handling The L2CAP configuration parameter handling was missing the support for rejecting unknown options. The capability to reject unknown options is mandatory since the Bluetooth 1.2 specification. This patch implements its and also simplifies the parameter parsing. Signed-off-by: Marcel Holtmann commit fd184ab4283a6a6105e8312a497d2a2a193eaf67 Author: Marcel Holtmann Date: Thu May 24 14:26:15 2007 +0200 [Bluetooth] Always send HCI_Reset for Broadcom devices In case of Broadcom based Bluetooth devices, it is safe to always send HCI_Reset as first command. This gives the advantage that all HID Proxy versions will automatically work and don't need any additional quirks anymore. Signed-off-by: Marcel Holtmann commit 761e784673d79c8ea9befdad31e30c65e0d20b82 Author: Jordan Crouse Date: Thu May 24 21:23:24 2007 +1000 [CRYPTO] geode: Fix in-place operations and set key Allow in-place crypto operations. Also remove the coherent user flag (we use it automagically now), and by default use the user written key rather then the HW hidden key - this makes crypto just work without any special considerations, and thats OK, since its our only usage model. Signed-off-by: Jordan Crouse Signed-off-by: Herbert Xu commit 2761f5c2ea80bcaa77ec1827064f3aa919474ac8 Author: Russell King Date: Thu May 24 06:56:08 2007 +0200 mmc: add maintainer for ARM Primecell controller Russell King handles this driver. Signed-off-by: Russell King Signed-off-by: Pierre Ossman commit c58ff04ad10f3bf290e9457c46412b1623afad19 Author: Pavel Pisa Date: Wed May 16 01:10:41 2007 +0200 mmc: add maintainer for iMX MMC interface Pavel Pisa takes on the role of administrating this driver. Signed-off-by: Pavel Pisa Signed-off-by: Pierre Ossman commit 9f9c24f4fe1a3acff40acba9f83136bf520ac6ae Author: Syed Khasim Date: Wed May 16 01:07:22 2007 +0200 mmc: Add maintainers for TI OMAP MMC interface Carlos Aguiar and Anderson Briglia are interested in making sure the driver works for existing boards as they have access to them, and Syed Khasim can make it work for new omaps (2430, 3430). Signed-off-by: Syed Khasim Signed-off-by: Pierre Ossman commit 272f133afb20badf413228f112f2e03c84ba8a52 Author: Pierre Ossman Date: Mon May 14 21:25:26 2007 +0200 mmc: mark unmaintained drivers Most of the host controller drivers in the MMC layer lacks an official maintainer. Make sure this is mentioned in MAINTAINERS in case someone wants to pick up the ball. Signed-off-by: Pierre Ossman commit 9c9f2d63a77325bc050e4ed9255ee8270c067d1a Author: Pierre Ossman Date: Wed May 16 17:29:21 2007 +0200 mmc: clean up unused parts of block driver Remove dead code and unused structs from the block driver. Signed-off-by: Pierre Ossman commit db2668fdbeb2e3c95ebadf95856c9e31a8a8d569 Author: H. Peter Anvin Date: Wed May 23 16:59:27 2007 -0700 boot documentation: clarifications Textual clarifications (and fix an off-by-one error) based on feedback mostly from Jeremy Fitzhardinge. Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit af669c97291c458c97a869bf3c36eb870e7430c1 Author: William Lee Irwin III Date: Wed May 23 13:58:23 2007 -0700 i386 bigsmp: section mismatch fixes WARNING: arch/i386/mach-generic/built-in.o(.data+0xc4): Section mismatch: reference to .init.text: (between 'apic_bigsmp' and 'cpu.4905') This appears to be resolvable by removing all the __init and __initdata qualifiers from arch/i386/mach-generic/bigsmp.c Signed-off-by: William Irwin Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3c8bdfb931171d6cfd1ec23b2218b0a1f052b95 Author: Andrew Morton Date: Wed May 23 13:58:22 2007 -0700 drivers/isdn/hardware/eicon/message.c warning fixes Squash these: drivers/isdn/hardware/eicon/message.c: In function 'api_put': drivers/isdn/hardware/eicon/message.c:536: warning: cast from pointer to integer of different size drivers/isdn/hardware/eicon/message.c: In function 'plci_free_msg_in_queue': drivers/isdn/hardware/eicon/message.c:1035: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/message.c: In function 'data_b3_req': drivers/isdn/hardware/eicon/message.c:3121: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/message.c:3154: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/message.c: In function 'callback': drivers/isdn/hardware/eicon/message.c:4060: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/message.c: In function 'nl_ind': drivers/isdn/hardware/eicon/message.c:7137: warning: cast from pointer to integer of different size Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 241be8d9c4c475c66b2f60a6dddb5e416b1b2811 Author: Andrew Morton Date: Wed May 23 13:58:22 2007 -0700 capifunc warning fixes squish these: drivers/isdn/hardware/eicon/capifunc.c: In function 'TransmitBufferSet': drivers/isdn/hardware/eicon/capifunc.c:192: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/capifunc.c: In function 'TransmitBufferGet': drivers/isdn/hardware/eicon/capifunc.c:197: warning: cast from pointer to integer of different size drivers/isdn/hardware/eicon/capifunc.c:198: warning: cast from pointer to integer of different size drivers/isdn/hardware/eicon/capifunc.c:200: warning: cast from pointer to integer of different size drivers/isdn/hardware/eicon/capifunc.c: In function 'TransmitBufferFree': drivers/isdn/hardware/eicon/capifunc.c:205: warning: cast from pointer to integer of different size drivers/isdn/hardware/eicon/capifunc.c:206: warning: cast from pointer to integer of different size drivers/isdn/hardware/eicon/capifunc.c: In function 'sendf': drivers/isdn/hardware/eicon/capifunc.c:304: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/capifunc.c:304: warning: cast to pointer from integer of different size drivers/isdn/hardware/eicon/capifunc.c:321: warning: cast to pointer from integer of different size Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5f1b194a9afa3e686986839eb67620e6549e9ad Author: Imre Deak Date: Wed May 23 13:58:20 2007 -0700 omap_uwire: SPI_CPHA mode bugfix The omap_uwire controller driver handles SPI_CPHA incorrectly; It should mean: CPHA=0 ... sample at leading edge of clock CPHA=1 ... sample at trailing edge of clock This bug has been masked by inverse bugs in layered drivers; and was uncovered by running some of them on non-OMAP hardware. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81fc632355834b7133ec4f3341cfb171bd9edc31 Author: Jarek Poplawski Date: Wed May 23 13:58:20 2007 -0700 Documentation/memory-barriers.txt: various fixes Fix various grammatical issues in Documentation/memory-barriers.txt. Cc: "Robert P. J. Day" Signed-off-by: Jarek Poplawski Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03491c92932b8d2dab1bb298e0122ff6d39680af Author: Thomas Gleixner Date: Wed May 23 13:58:19 2007 -0700 i386: fix early usage of atomic_add_return and local_add_return on real i386 The check (boot_cpu_data.x86 == 3) in atomic_add_return() and local_add_return() fails, when those operations are used before boot_cpu_data is filled in. Change the check to (boot_cpu_data.x86 <= 3) to fix this. Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98d8256739f2c6c636fa2da359f5949c739ae839 Author: Thomas Gleixner Date: Wed May 23 13:58:18 2007 -0700 Prevent going idle with softirq pending The NOHZ patch contains a check for softirqs pending when a CPU goes idle. The BUG is unrelated to NOHZ, it just was made visible by the NOHZ patch. The BUG showed up mainly on P4 / hyperthreading enabled machines which lead the investigations into the wrong direction in the first place. The real cause is in cond_resched_softirq(): cond_resched_softirq() is enabling softirqs without invoking the softirq daemon when softirqs are pending. This leads to the warning message in the NOHZ idle code: t1 runs softirq disabled code on CPU#0 interrupt happens, softirq is raised, but deferred (softirqs disabled) t1 calls cond_resched_softirq() enables softirqs via _local_bh_enable() calls schedule() t2 runs t1 is migrated to CPU#1 t2 is done and invokes idle() NOHZ detects the pending softirq Fix: change _local_bh_enable() to local_bh_enable() so the softirq daemon is invoked. Thanks to Anant Nitya for debugging this with great patience ! Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40acc095302aee380491df5f58d98945243468ec Author: Li Yang Date: Wed May 23 13:58:17 2007 -0700 ehci-fsl: fix cache coherency problem on system with large memory The patch fixes bug http://bugzilla.kernel.org/show_bug.cgi?id=7482. It sets USB snooping on 4G space for PowerPC platforms without CONFIG_NOT_COHERENT_CACHE defined. Reported-by: Stefan Meyer Signed-off-by: Li Yang Cc: Greg KH Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d6ac9843175c1d29c075794519cb045b52e46c2 Author: Randy Dunlap Date: Wed May 23 13:58:16 2007 -0700 document clocksources Document the available clocksources per platform and move clocksource= into the correct (alpha) location in the file. Signed-off-by: Randy Dunlap Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53a2731f9310a66beaf55677229ab067c85ce4fa Author: Michael Halcrow Date: Wed May 23 13:58:15 2007 -0700 eCryptfs: delay writing 0's after llseek until write Delay writing 0's out in eCryptfs after a seek past the end of the file until data is actually written. http://www.opengroup.org/onlinepubs/009695399/functions/lseek.html ``The lseek() function shall not, by itself, extend the size of a file.'' Without this fix, applications that lseek() past the end of the file without writing will experience unexpected behavior. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4acb3e2f97f41cf9b53182b494384467d3ceb304 Author: Eric Sesterhenn / Snakebyte Date: Wed May 23 13:58:15 2007 -0700 Off by one in floppy.c Another coverity patch i forgot to resend, original thread here http://marc.info/?l=linux-kernel&m=115144559823592&w=2 In case drive == N_DRIVE, we get one past the drive_params array. Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa74419bb7b51af4bbb66116d14cc92f0b5aff25 Author: Nicolas Boichat Date: Wed May 23 13:58:13 2007 -0700 applesmc - sensors patch missing from 2.6.22-rc2 Add name file needed by lm_sensors user-space applications in applesmc sysfs tree. Cc: Soeren Sonnenburg Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae2d990eede0ef5938c210d48a177c044258ecd8 Author: Alan Stern Date: Wed May 23 13:58:12 2007 -0700 HiSax: fix error checking for hisax_register()] This patch (as875) adds error-checking to the callers of hisax_register(). It also changes an error pathway in that routine, making it return an error code rather than 0. This fixes Bugzilla #7960. Signed-off-by: Alan Stern Acked-by: Karsten Keil Cc: Martin Bachem Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d9a2000e683ecd497b65d5f3e73b048c68976e1 Author: Domenico Andreoli Date: Wed May 23 13:58:11 2007 -0700 documentation: Documentation/initrd.txt Final clearification of the pivot_root mechanism, which brings this document really up-to-date. Signed-off-by: Domenico Andreoli Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a778b73ff793d34c0082f76110f73a7754915067 Author: NeilBrown Date: Wed May 23 13:58:10 2007 -0700 md: fix bug with linear hot-add and elsewhere Adding a drive to a linear array seems to have stopped working, due to changes elsewhere in md, and insufficient ongoing testing... So the patch to make linear hot-add work in the first place introduced a subtle bug elsewhere that interracts poorly with older version of mdadm. This fixes it all up. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab6085c795a71b6a21afe7469d30a365338add7a Author: NeilBrown Date: Wed May 23 13:58:10 2007 -0700 md: don't write more than is required of the last page of a bitmap It is possible that real data or metadata follows the bitmap without full page alignment. So limit the last write to be only the required number of bytes, rounded up to the hard sector size of the device. Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 787f17feb204ed1c6331892fb8124b80dc9fe288 Author: NeilBrown Date: Wed May 23 13:58:09 2007 -0700 md: avoid overflow in raid0 calculation with large components If a raid0 has a component device larger than 4TB, and is accessed on a 32bit machines, then as 'chunk' is unsigned long, chunk << chunksize_bits can overflow (this can be as high as the size of the device in KB). chunk itself will not overflow (without triggering a BUG). So change 'chunk' to be 'sector_t, and get rid of the 'BUG' as it becomes impossible to hit. Cc: "Jeff Zheng" Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1dbf37e8adf1ab6b82a510d5e69fa676ed9717c4 Author: Stefan Richter Date: Wed May 23 13:58:08 2007 -0700 i386, x86-64: show that CONFIG_HOTPLUG_CPU is required for suspend on SMP It's not sufficiently documented that CONFIG_HOTPLUG_CPU is required for suspend/hibernation on SMP. Point out the non-obvious. Signed-off-by: Stefan Richter Signed-off-by: Rafael J. Wysocki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82cd0e8410ae74d3fd39d168049381eafc489e5b Author: Akinobu Mita Date: Wed May 23 13:58:07 2007 -0700 i2o: eliminate a peculiar constraint on i2o_max_drivers There is no reason i2o_max_drivers must be a power of two. This patch eliminates such a constraint. Cc: Markus Lidel Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be324797d9b2a10f767e89dfbd880c735249bef9 Author: Akinobu Mita Date: Wed May 23 13:58:06 2007 -0700 i2o: fix notifiers when max_drivers is configured Maximum number of I2O drivers which could be registered is configurable by max_drivers module parameter. But the module parameter is ignored and default value (I2O_MAX_DRIVERS = 8) is used in the loops to notify all registered drivers. Cc: Markus Lidel Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e578e9a1cc8a5983d87126d5877e305d3189f1b9 Author: Akinobu Mita Date: Wed May 23 13:58:05 2007 -0700 i2o: destroy event queue only when drv->event is set i2o_driver_register() initalizes event queue for driver only when drv->event is set. So similarly the event queue should be destroyed only when drv->event is set in the error path. Otherwise destroy_workqueue() will called with NULL. Cc: Markus Lidel Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3762bfc8d046342db664d855f8f875e8a4c2ca1 Author: Davi Arnaut Date: Wed May 23 13:58:04 2007 -0700 signalfd: retrieve multiple signals with one read() call Gathering signals in bulk enables server applications to drain a signal queue (almost full of realtime signals) more efficiently by reducing the syscall and file look-up overhead. Very similar to the sigtimedwait4() call described by Niels Provos, Chuck Lever, and Stephen Tweedie in a paper entitled "Analyzing the Overload Behavior of a Simple Web Server". The paper lists more details and advantages. Signed-off-by: Davi E. M. Arnaut Acked-by: Davide Libenzi Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0532cb427ed2a5957d39e98cb5a4741b68fc6102 Author: Randy Dunlap Date: Wed May 23 13:58:03 2007 -0700 update dontdiff file Update dontdiff file by adding entries from many .gitignore files. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6373da1fb719f167c775c96015b0553507c34a18 Author: OGAWA Hirofumi Date: Wed May 23 13:58:00 2007 -0700 power: Fix sizeof(PAGE_SIZE) typo Fix sizeof(PAGE_SIZE) typo. It should be just PAGE_SIZE for zeroing the swsusp_header. Signed-off-by: OGAWA Hirofumi Signed-off-by: OGAWA Hirofumi Cc: Pavel Machek Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8511f94908a92337b80f0c12342b9051232054f Author: Jiri Slaby Date: Wed May 23 13:57:59 2007 -0700 Misc: phantom, take care of pci posting phantom, take care of pci posting thanks to akpm for pointing this out Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c15395c0dbdd646ca80945a7578c8c6cd44ce942 Author: Jiri Slaby Date: Wed May 23 13:57:58 2007 -0700 phantom: move to unlocked_ioctl phantom's ioctl is often (4000 times a sec or so) invoked, don't acquire BKL and block other processes. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14441960e8c27a64487e0b455b323e784f33583f Author: Oleg Nesterov Date: Wed May 23 13:57:57 2007 -0700 simplify cleanup_workqueue_thread() cleanup_workqueue_thread() and cwq_should_stop() are overcomplicated. Convert the code to use kthread_should_stop/kthread_stop as was suggested by Gautham and Srivatsa. In particular this patch removes the (unlikely) busy-wait loop from the exit path, it was a temporary and ugly kludge (if not a bug). Note: the current code was designed to solve another old problem: work->func can't share locks with hotplug callbacks. I think this could be done, see http://marc.info/?l=linux-kernel&m=116905366428633 but this needs some more complications to preserve CPU affinity of cwq->thread during cpu_up(). A freezer-based hotplug looks more appealing. [akpm@linux-foundation.org: make it more tolerant of gcc borkenness] Signed-off-by: Oleg Nesterov Cc: Zilvinas Valinskas Cc: Gautham R Shenoy Cc: Srivatsa Vaddagiri Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fcbc72965f767bb5c4518aef754c28f45fc6147 Author: Jiri Slaby Date: Wed May 23 13:57:56 2007 -0700 Char: cyclades, fix deadlock An omitted unlock. Signed-off-by: Jiri Slaby Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33e9e24101abac2bf3535d0d013d6d27d19197cb Author: Christoph Lameter Date: Wed May 23 13:57:56 2007 -0700 SLUB Debug: fix check for super sized slabs (>512k 64bit, >256k 32bit) The check for super sized slabs where we can no longer move the free pointer behind the object for debugging purposes etc is accessing a field that is not setup yet. We must use objsize here since the size of the slab has not been determined yet. The effect of this is that a global slab shrink via "slabinfo -s" will show errors about offsets being wrong if booted with slub_debug. Potentially there are other troubles with huge slabs under slub_debug because the calculated free pointer offset is truncated. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 418508c13222ddba475873ea95c8aeadd26104f2 Author: Miklos Szeredi Date: Wed May 23 13:57:55 2007 -0700 fix unused setup_nr_node_ids mm/page_alloc.c:931: warning: 'setup_nr_node_ids' defined but not used This is now the only (!) compiler warning I get in my UML build :) Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ead5f0b5fa41dd3649a44bfc922d06641ff3dbcf Author: Miklos Szeredi Date: Wed May 23 13:57:54 2007 -0700 fuse: delete inode on drop When inode is dropped (no more references) delete it from cache. There's not much point in keeping it cached, when a new lookup will refresh the attributes anyway. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 889f784831d6cc9125a74eb55a5641f95635a204 Author: Miklos Szeredi Date: Wed May 23 13:57:54 2007 -0700 fuse: generic_write_checks() for direct_io This fixes O_APPEND in direct IO mode. Also checks writes against file size limits, notably rlimits. Reported by Greg Bruno. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 492c8b332e3af279ffadf49b85967d5e43810923 Author: Christoph Hellwig Date: Wed May 23 13:57:53 2007 -0700 uselib: add missing MNT_NOEXEC check We don't allow loading ELF shared library from noexec points so the same should apply to sys_uselib aswell. Signed-off-by: Christoph Hellwig Cc: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a1b63914815e4223ceb3d079286e18f9ee92b4b Author: David Woodhouse Date: Wed May 23 13:57:52 2007 -0700 Missing 'const' from reiserfs MIN_KEY declaration. In stree.c, MIN_KEY is declared const. The extern declaration in dir.c doesn't match... Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 772dce71f5468d97143aef74be04e34faa712d48 Author: Sascha Hauer Date: Wed May 23 13:57:52 2007 -0700 imxfb: fix memory hole info->pseudo_palette was previously kmalloced. Do not overwrite it afterwards Signed-off-by: Sascha Hauer Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90e16dddecc6bd804920b639f61825d2a1769f89 Author: Sascha Hauer Date: Wed May 23 13:57:51 2007 -0700 imxfb: remove ifdefs Here are some small fixes for the imxfb framebuffer driver: - remove ifndef for MX1FS2 platform which is not present in the kernel. - REV, CLS, PS and SPL_SPR are only needed with some sharp displays. Only setup the corresponding io pins when such a display is connected. Signed-off-by: Sascha Hauer Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92c4579dbb3bc70bd397e272258c69f88de189b8 Author: Geert Uytterhoeven Date: Wed May 23 13:57:50 2007 -0700 ps3fb: use FB_SYS_* instead of FB_CFB_* ps3fb: Use the FB_SYS_* operations instead of the FB_CFB_* operations as the actual frame buffer memory is part of system RAM Signed-off-by: Geert Uytterhoeven Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a01fbbd52e4faf5971856c011e87ec6571b62840 Author: Richard Purdie Date: Wed May 23 13:57:49 2007 -0700 w100fb: fix compile warnings Fix compile warnings from w100fb.c. Attribute registration failure doesn't stop the driver working so just warn about it. Signed-off-by: Richard Purdie Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2686ba894bfedcacbe1b5197c574f3f1e66f2fda Author: Krzysztof Helt Date: Wed May 23 13:57:48 2007 -0700 pm3fb: various fixes - fix 16-bit RGBA 4444 and 5551 modes (use fbset -rgba to set them) - kill wmb() after each register write by PM3_SLOW_WRITE_REG - kill inaccurate comments (leftovers from skeletonfb.c) - kill PCI class restriction, now it is more general and shorter - white spaces and other minor fixes and source reducing Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11d1a62c596023991e860f1814aacb12a5169aa9 Author: Krzysztof Helt Date: Wed May 23 13:57:47 2007 -0700 pm2fb: RDAC_WR barriers clean up This patch fixes a possible barriers problem in RDAC_WR functions, then remove redudant ones. It also removes one unneeded register load from blitter function(). Signed-off-by: Krzysztof.Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d74c1fdaaea34b56c1dffe2c79f64d2c53c11b1 Author: Krzysztof Helt Date: Wed May 23 13:57:46 2007 -0700 fbdev: cleanup of sparc FB options This patch puts all SBUS/UPA selection under one option "SBUS/UPA framebuffers" and moves all sparc specific drivers next to them in one group. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9bea3f29fc626e190f012c4ad5f8a9e9a2f26cf6 Author: Florin Malita Date: Wed May 23 13:57:45 2007 -0700 spi: potential memleak in spidev_ioctl 'ioc' should be deallocated if __copy_from_user fails (found by Coverity - CID 1644). Signed-off-by: Florin Malita Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6087b2dab2c914268b1a50882edbbad82bfefd29 Author: Badari Pulavarty Date: Wed May 23 13:57:45 2007 -0700 optimize compat_core_sys_select() by a using stack space for small fd sets Optimize select by a using stack space for small fd sets. core_sys_select() already has this optimization. This is for compat version. Signed-off-by: Badari Pulavarty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bb44adef39ad3bda2be40bb34686bc56bd563a5 Author: Roland McGrath Date: Wed May 23 13:57:44 2007 -0700 recalc_sigpending_tsk fixes Steve Hawkes discovered a problem where recalc_sigpending_tsk was called in do_sigaction but no signal_wake_up call was made, preventing later signals from waking up blocked threads with TIF_SIGPENDING already set. In fact, the few other calls to recalc_sigpending_tsk outside the signals code are also subject to this problem in other race conditions. This change makes recalc_sigpending_tsk private to the signals code. It changes the outside calls, as well as do_sigaction, to use the new recalc_sigpending_and_wake instead. Signed-off-by: Roland McGrath Cc: Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c6df2a9177c010bf811c361149069e4bfd9bb11 Author: Ben Collins Date: Wed May 23 13:57:43 2007 -0700 Avoid zero size allocation in cache_k8_northbridges() kmalloc for flush_words resulted in zero size allocation when no k8_northbridges existed. Short circuit the code path for this case. Also remove uneeded zeroing of num_k8_northbridges just after checking if it is zero. Signed-off-by: Ben Collins Cc: Andi Kleen Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6754bb4de94098a0aaa23a600f0edb9a9454c252 Author: Robert P. J. Day Date: Wed May 23 13:57:42 2007 -0700 Documentation: fix the explanation of Kconfig files Fix the obvious errors in the explanation of Kconfig files. Signed-off-by: Robert P. J. Day Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9aaffc898ff4a3df18c5fc4b9e0fa47e779ad726 Author: Paul E. McKenney Date: Wed May 23 13:57:41 2007 -0700 prohibit rcutorture from being compiled into the kernel There have been a number of instances where people have accidentally compiled rcutorture into the kernel (CONFIG_RCU_TORTURE_TEST=y), which has never been useful, and has often resulted in great frustration. The attached patch prohibits rcutorture from being compiled into the kernel. It may be excluded altogether or compiled as a module. People wishing to have rcutorture hammer their machine immediately upon boot are free to hand-edit lib/Kconfig.debug to remove the "depends on m" line. Thanks to Randy Dunlap for the trick that makes this work. Signed-off-by: Paul E. McKenney Acked-by: Josh Triplett Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf6acedbeac17dea1c1eed85048a72e188f3f768 Author: Jeff Dike Date: Wed May 23 13:57:40 2007 -0700 uml: improve PTRACE_SYSEMU checking Make the PTRACE_SYSEMU checking more robust. It will make sure that system call numbers are reported correctly. If there is a problem, it will disable PTRACE_SYSEMU use and use PTRACE_SYSCALL instead. Thanks to Balaji G for helping reproduce this problem. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da90fa8ff671a0139772ec3b3e82c06077e82122 Author: Domen Puncer Date: Wed May 23 13:57:39 2007 -0700 spi/spidev: check message size before copying Message size needs to be checked before copying, or bad things could happen. Signed-off-by: Domen Puncer Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7add02d6247bff34005e040347d81777c80931c Author: Andrew Morton Date: Wed May 23 13:57:39 2007 -0700 capability.h warning fix include/linux/capability.h:397: warning: "struct task_struct" declared inside parameter list include/linux/capability.h:397: warning: its scope is only this definition or declaration, which is probably not what you want Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ce7ad7b2d11fae2c3d285a6a0caea9322c0b8fc Author: Kristen Carlson Accardi Date: Wed May 23 13:57:38 2007 -0700 genhd: send async notification on media change Send an uevent to user space to indicate that a media change event has occurred. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86ce18d7b7925bfd6b64c061828ca2a857ee83b8 Author: Kristen Carlson Accardi Date: Wed May 23 13:57:38 2007 -0700 genhd: expose AN to user space Allow user space to determine if a disk supports Asynchronous Notification of media changes. This is done by adding a new sysfs file "capability_flags", which is documented in (insert file name). This sysfs file will export all disk capabilities flags to user space. We also define a new flag to define the media change notification capability. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 352823160613b65fdaa558be486720a71f75ed86 Author: Thomas Gleixner Date: Wed May 23 13:57:37 2007 -0700 NOHZ: Rate limit the local softirq pending warning output The warning in the NOHZ code, which triggers when a CPU goes idle with softirqs pending can fill up the logs quite quickly. Rate limit the output until we found the root cause of that problem. Signed-off-by: Thomas Gleixner Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43d4f961a87509b4ea5c1d6f02751aef360a632f Author: David Brownell Date: Wed May 23 13:57:36 2007 -0700 spi doc update: describe clock mode bits Update the SPI documentation to cover a few points that have proven to be confusing or unclear; most notably the two clock mode bits. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8888735fcaac7681dbcca67fbcc88cf627c47b3a Author: Domen Puncer Date: Wed May 23 13:57:32 2007 -0700 mpc52xx_psc_spi: fix it for CONFIG_PPC_MERGE Fix mpc5200 PSC SPI driver to actually work for CONFIG_PPC_MERGE - s/mpc52xx/mpc5200/, as this was changed in device tree some time ago - fix spi id detection The move from 'ppc' to 'powerpc' didn't quite match the latest kernel.org code. Signed-off-by: Domen Puncer Acked-by: Dragos Carp Acked-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9ba347f27f2508e3da023688d047e111cbbe2da Author: Miklos Szeredi Date: Wed May 23 13:57:32 2007 -0700 fuse: fix mknod of regular file The wrong lookup flag was tested in ->create() causing havoc (error or Oops) when a regular file was created with mknod() in a fuse filesystem. Thanks to J. Cameijo Cerdeira for the report. Kernels 2.6.18 onward are affected. Please apply to -stable as well. Signed-off-by: Miklos Szeredi Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c12b3c62513ecf95c979d5c1785f99562b9dd10d Author: Christoph Lameter Date: Wed May 23 13:57:31 2007 -0700 SLUB Debug: Fix object size calculation The object size calculation is wrong if !CONFIG_SLUB_DEBUG because the #ifdef CONFIG_SLUB_DEBUG is now switching off the size adjustments for DESTROY_BY_RCU and ctor. Signed-off-by: Christoph Lameter Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72fcde966252abd17d70e4e216a0411a34523a8f Author: Thomas Gleixner Date: Wed May 23 13:57:30 2007 -0700 Ignore bogus ACPI info for offline CPUs Booting a SMP kernel with maxcpus=1 on a SMP system leads to a hard hang, because ACPI ignores the maxcpus setting and sends timer broadcast info for the offline CPUs. This results in a stuck for ever call to smp_call_function_single() on an offline CPU. Ignore the bogus information and print a kernel error to remind ACPI folks to fix it. Signed-off-by: Thomas Gleixner Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88f18ba028b5939bb6f77bd690e5ad8d01bb24cc Author: Gautham R Shenoy Date: Wed May 23 13:57:29 2007 -0700 freezer: move frozen_process() to kernel/power/process.c Other than refrigerator, no one else calls frozen_process(). So move it from include/linux/freezer.h to kernel/power/process.c. Also, since a task can be marked as frozen by itself, we don't need to pass the (struct task_struct *p) parameter to frozen_process(). Signed-off-by: Gautham R Shenoy Signed-off-by: Rafael J. Wysocki Cc: Oleg Nesterov Cc: Pavel Machek Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fcc57f2d5d558056668159f9153bf21d2c53d16 Author: Gautham R Shenoy Date: Wed May 23 13:57:28 2007 -0700 freezer: fix PF_NOFREEZE vs freezeable race This patch fixes the race pointed out by Oleg Nesterov. * Freezer marks a thread as freezeable. * The thread now marks itself PF_NOFREEZE, but it will be frozen on on calling try_to_freeze(). Thus the task is frozen, even though it doesn't want to. * Subsequent thaw_processes() will also fail to thaw the task since it is marked PF_NOFREEZE. Avoid this problem by checking the task's PF_NOFREEZE status in frozen_processes() before marking the task as frozen. Signed-off-by: Gautham R Shenoy Signed-off-by: Rafael J. Wysocki Cc: Oleg Nesterov Cc: Pavel Machek Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a076e4bca2fdabb9e45d86722cc72c0944da5f94 Author: Oleg Nesterov Date: Wed May 23 13:57:27 2007 -0700 freezer: fix kthread_create vs freezer theoretical race kthread() sleeps in TASK_INTERRUPTIBLE state waiting for the first wakeup. In theory, this wakeup may come from freeze_process()->signal_wake_up(), so the task can disappear even before kthread_create() sets its ->comm. Change kthread() to use TASK_UNINTERRUPTIBLE. [akpm@linux-foundation.org: s/BUG_ON/WARN_ON+recover] Signed-off-by: Oleg Nesterov Acked-by: "Eric W. Biederman" Signed-off-by: Rafael J. Wysocki Cc: Gautham R Shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49b12d4f5e274517b8bc032d507abf31cc2f4150 Author: Rafael J. Wysocki Date: Wed May 23 13:57:26 2007 -0700 freezer: take kernel_execve into consideration Kernel threads can become userland processes by calling kernel_execve(). In particular, this may happen right after the try_to_freeze_tasks() called with FREEZER_USER_SPACE has returned, so try_to_freeze_tasks() needs to take userspace processes into consideration even if it is called with FREEZER_KERNEL_THREADS. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Cc: Gautham R Shenoy Cc: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba96a0c88098697a63e80157718b7440414ed24d Author: Rafael J. Wysocki Date: Wed May 23 13:57:25 2007 -0700 freezer: fix vfork problem Currently try_to_freeze_tasks() has to wait until all of the vforked processes exit and for this reason every user can make it fail. To fix this problem we can introduce the additional process flag PF_FREEZER_SKIP to be used by tasks that do not want to be counted as freezable by the freezer and want to have TIF_FREEZE set nevertheless. Then, this flag can be set by tasks using sys_vfork() before they call wait_for_completion(&vfork) and cleared after they have woken up. After clearing it, the tasks should call try_to_freeze() as soon as possible. Signed-off-by: Rafael J. Wysocki Cc: Gautham R Shenoy Cc: Oleg Nesterov Cc: Pavel Machek Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33e1c288da62a6a5aa9077a6b7bfa690b1b02cf4 Author: Rafael J. Wysocki Date: Wed May 23 13:57:24 2007 -0700 freezer: close potential race between refrigerator and thaw_tasks If the freezing of tasks fails and a task is preempted in refrigerator() before calling frozen_process(), then thaw_tasks() may run before this task is frozen. In that case the task will freeze and no one will thaw it. To fix this race we can call freezing(current) in refrigerator() along with frozen_process(current) under the task_lock() which also should be taken in the error path of try_to_freeze_tasks() as well as in thaw_process(). Moreover, if thaw_process() additionally clears TIF_FREEZE for tasks that are not frozen, we can be sure that all tasks are thawed and there are no pending "freeze" requests after thaw_tasks() has run. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Cc: Gautham R Shenoy Cc: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 585a2858b970cb6e2e5ca4877eefd18b4dba8ed4 Author: Andrew Morton Date: Thu May 24 02:42:39 2007 +0200 ide serverworks warning fixes gcc-4.3: drivers/ide/pci/serverworks.c: In function 'svwks_tune_chipset': drivers/ide/pci/serverworks.c:176: warning: overflow in implicit constant conversion drivers/ide/pci/serverworks.c:190: warning: overflow in implicit constant conversion drivers/ide/pci/serverworks.c:211: warning: overflow in implicit constant conversion drivers/ide/pci/serverworks.c:212: warning: overflow in implicit constant conversion Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 5a6248cac22a77588f81c7473cfd03d250cc5b56 Author: Junio C Hamano Date: Thu May 24 02:42:38 2007 +0200 Match DMA blacklist entries between ide-dma.c and libata-core.c There are a few entries in ata_device_blacklist[] in libata-core.c marked with HORKAGE_NODMA but are missing from drive_blacklist[] in ide-dma.c. This patch makes the lists in sync. Also remove a duplicated entry for "SanDisk SDP3B-64". Signed-off-by: Junio C Hamano Cc: Alan Cox Cc: Dave Jones Signed-off-by: Bartlomiej Zolnierkiewicz commit 39c98c421200e7bb16bed7aab2b640b43ca6621b Author: Mika Kukkonen Date: Thu May 24 02:42:38 2007 +0200 Add two missing chipsets to drivers/ide/ide-proc.c Compiling with '-Wswitch-enum' I noticed following: CC drivers/ide/ide-proc.o drivers/ide/ide-proc.c: In function ‘proc_ide_read_imodel’: drivers/ide/ide-proc.c:54: warning: enumeration value ‘ide_etrax100’ not handled in switch drivers/ide/ide-proc.c:54: warning: enumeration value ‘ide_acorn’ not handled in switch How about the following patch? Signed-off-by: Mika Kukkonen Signed-off-by: Bartlomiej Zolnierkiewicz commit 2074a106f52b6371885afbd714e929d60d0e3f64 Author: Alan Cox Date: Thu May 24 02:42:38 2007 +0200 ide/pci/serverworks.c: Fix corruption/timeouts with MegaIDE It turns out from customer reports to Red Hat and some PCI dumps that the MegaIDE in RAID mode doesn't provide the drive tuning data that the serverworks driver expects but sometimes does provide something that fools the code. For the RAID class case skip the oem setup and don't trust the BIOS data. We then tune from scratch and this sorts it out. (This has been confirmed on an afflicted IBM blade) [libata serverworks.c never trusts the BIOS in the first place so is accidentally immune] Signed-off-by: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit 6c6a2a8d201b4f8fd54167802da5ddbe08abd744 Author: Henry Su Date: Thu May 24 02:42:37 2007 +0200 add the IDE device ID for ATI SB700 Add the IDE device ID to atiixp_pci_tbl struct in atiixp.c for ATI SB700. From: Henry Su Signed-off-by: Luugi Marsan Signed-off-by: Bartlomiej Zolnierkiewicz commit d86ebd140963e50238ac397074b1ab7fc7ec1126 Author: Tony Luck Date: Wed May 23 16:46:40 2007 -0700 [IA64] start_secondary() and smp_callin() should be __cpuinit Continuing the seemingly neverending quest to stomp out "Section mismatch" warnings. Signed-off-by: Tony Luck commit 02d89b87081f516ad3993637f9b75db0d9786554 Author: Roland Dreier Date: Wed May 23 15:16:08 2007 -0700 IB/mlx4: Don't allocate RQ doorbell if using SRQ If a QP is attached to a shared receive queue (SRQ), then it doesn't have a receive queue (RQ). So don't allocate an RQ doorbell (or map a doorbell from userspace for userspace QPs) for that QP. Signed-off-by: Roland Dreier commit fa91d43b914b77637653d984416e17e182f7b807 Author: Tony Lindgren Date: Fri May 4 18:23:24 2007 -0700 USB: Add support for Olimex arm-usb-ocd JTAG interface serial port This patch adds support for the serial port on Olimex arm-usb-ocd JTAG interface. The device appears as two serial ports, but the first one is reserved for the JTAG interface. The JTAG interface can be used with OpenOCD from userspace. For more information, please see: http://openocd.berlios.de/web/ http://www.olimex.com/dev/arm-usb-ocd.html Signed-off-by: Tony Lindgren Signed-off-by: Greg Kroah-Hartman commit 5b7da8f6ff1aaf5a500dc798f4d1c2d6e98420a5 Author: Danny Budik Date: Fri May 4 16:09:37 2007 -0400 USB: Add support for Sierra Wireless Aircard 595U This patch adds support for the newly released Aircard 595U EVDO modem to the Sierra Wireless driver (sierra.c) in kernel 2.6.21. I suspect that my mailer may be mangling patches so let me know and I'll try to resend it. From: Danny Budik Signed-off-by: Greg Kroah-Hartman commit 9d33efd9a791041bbe3a9e879925ef8fbb94d812 Author: Oliver Neukum Date: Fri May 4 09:23:40 2007 +0200 USB: ldusb bugfix This patch fixes a problem reported with consecutive reads in the ldusb driver. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 2adb80e9c52f35a4d63783b98d48386c38c90484 Author: Guido Scholz Date: Tue May 8 19:52:41 2007 +0200 USB: ftdi_sio: Add USB Product Id for OpenDCC USB product id registration for the OpenDCC (www.opendcc.de) model railway central unit. Applies to 2.6.21.1. Signed-off-by: Guido Scholz Signed-off-by: Greg Kroah-Hartman commit d4b7d8e8024a33d9d1f916379eaee7aa945a7c48 Author: Alan Stern Date: Tue May 22 11:48:17 2007 -0400 USB: fix ratelimit call semantics This patch (as910) fixes a ratelimit modification so that the original error-handling path will be followed even when the log-rate limitation kicks in. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit dd865571d7af06ba1285c2db85083649193cceab Author: Alan Stern Date: Tue May 22 11:38:19 2007 -0400 USB: handle errors in power/level attribute This patch (as906) improves the error handling for the USB power/level attribute file. If an error occurs, the original power-level settings will be restored. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 7ed92f1a149dddc3cb537ccd7441e98adac12c3e Author: Alan Stern Date: Tue May 22 09:38:39 2007 -0400 USB: make the autosuspend workqueue thread freezable This patch (as881b) makes the ksuspend_usb_wq workqueue freezable. We don't want a rogue workqueue thread running around, unexpectedly suspending or resuming USB devices in the middle of a system sleep transition. This fixes Bugzilla #8498. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 8ab5e8c0ca55c4b40d254f7043a9052345fcd343 Author: Andrey Borzenkov Date: Sat May 19 14:23:28 2007 -0700 USB: Fix USB OHCI Subvendor for Toshiba Portege 4000 This fixes a bug in an OHCI quirk handler for Portege 4000; the Subvendor is 0x1179 (PCI_VENDOR_ID_TOSHIBA) not 0x102f (PCI_VENDOR_ID_TOSHIBA_2) bugid 8510 00:02.0 USB Controller [0c03]: ALi Corporation USB 1.1 Controller [10b9:5237] (rev 03) (prog-if 10 [OHCI]) Subsystem: Toshiba America Info Systems Unknown device [1179:0004] Flags: bus master, medium devsel, latency 64, IRQ 11 Memory at f7eff000 (32-bit, non-prefetchable) [size=4K] Capabilities: Signed-off-by: Andrey Borzenkov Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit bdc4abdd0960e7ca946f4ec93b4cf7a2b826b24f Author: Pete Zaitcev Date: Mon May 21 20:52:44 2007 -0700 USB: usblp: Use correct DMA address in case of probe error Looks like the error path had a copy-paste error. The normal exit path uses correct URB already. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit b268f484f9d7ce91301091e0fb2c80e9e8caa3df Author: Jan Engelhardt Date: Thu May 17 17:16:44 2007 +0200 USB: Fix debug output of ark3116 Fix debug output. Previously, it would output "0xFFFFFFB0" on 32-bit archs (and probably "0xFFFFFFFFFFFFFFB0" on 64-bits), because buf is taken as signed char, which is promoted to signed int, while %x always expects an unsigned int. Signed-off-by: Jan Engelhardt Signed-off-by: Greg Kroah-Hartman commit 09b7002d68cfa1c45cc413a0c7cca399c25a57c6 Author: Dmitry Torokhov Date: Tue May 8 00:31:30 2007 -0400 USB: Onetouch - switch to using input_dev->dev.parent In preparation for struct class_device -> struct device input core conversion, switch to using input_dev->dev.parent when specifying device position in sysfs tree. Also, do not access input_dev->private directly, use helpers. Signed-off-by: Dmitry Torokhov Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 57a21c1b929450b1e020c0a03cca6fa7448f4222 Author: Alan Stern Date: Tue May 15 17:40:37 2007 -0400 USB: don't try to kzalloc 0 bytes This patch (as907) prevents us from trying to allocate 0 bytes when an interface has no endpoint descriptors. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b89ee19ae6c0b5a0d9facca780b53959fbadd123 Author: Alan Stern Date: Fri May 11 10:19:04 2007 -0400 USB: remove short initial timeout for device descriptor fetch This patch (as905) removes a micro-optimization from the hub port initialization code. Previously we had been using a short timeout on the first attempt the read the device descriptor; now we will use the standard timeout length. It's not clear that the short timeout ever provided any benefit. And now we know of one case where it actually hurts: The device can't meet the short timeout and then it gets terminally confused. This fixes Bugzilla #8444. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit d984abc97e400d68a09729b80060fe0ec591eb16 Author: Pete Zaitcev Date: Fri May 11 22:00:29 2007 -0700 USB: Deref URB after usbmon is done with it I haven't personally run across an oops because of this, but I feel safer with this fix in place. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 9a03095831e839959175379bfdd88e6e1a93b9ea Author: Ben Collins Date: Wed May 16 16:49:54 2007 -0400 USB: Remove duplicate IDs from option card driver Cc: Matthias Urlichs Signed-off-by: Ben Collins Signed-off-by: Greg Kroah-Hartman commit be23edf848b14d1b426c12f2f58e4949c4fbd695 Author: Andrew Morton Date: Thu May 10 23:04:14 2007 -0700 USB: auerswald: fix file release handler If this down_interruptible() does fail due to signal_pending() then the state of the driver will get trashed in interesting ways, because userspace cannot and will not retry the close(). Cc: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit fcbd963912acc0c5d51bb27f8654f2a91fcff322 Author: Li Yang Date: Sat Apr 28 14:07:32 2007 +0800 USB: fsl_usb2_udc: Fix UMTI_WIDE support and a compile warning Change PORT_WIDTH bit for UMTI_WIDE mode and fix a compile warning introduced in last revision. Signed-off-by: Li Yang Signed-off-by: Greg Kroah-Hartman commit 8d062b9a3516c6fbcf749bcc864fdb8b3def1caa Author: Alan Stern Date: Mon Apr 23 17:30:32 2007 -0400 USB: set the correct Interrupt interval in usb_bulk_msg This patch (as902) fixes a mistake I introduced into usb_bulk_msg(). usb_fill_int_urb() already does the bit-shifting calculation for high-speed Interrupt intervals; it shouldn't be done twice. Signed-off-by: Alan Stern commit 762e92fa1742007dedd90ff6b1ea74842f0cd34b Author: Neil \"Superna\" ARMSTRONG Date: Wed Apr 25 20:34:28 2007 +0200 USB: New device PID for ftdi_sio driver Hello, I need to use MaxStream's PKG-U modules which includes a ftdi sio chipset for usb2serial communication, here are the patches for handling Maxstream's modules. The VID & PID to use with the open-source driver are provided on the CD-ROM bundled with the modules. From: Neil Superna ARMSTRONG Signed-off-by: Greg Kroah-Hartman commit bf87ce5a06ed2cb13ad04f065706cf36ab021549 Author: Alan Stern Date: Thu Apr 5 16:07:44 2007 -0400 USB: remove unneeded WARN_ON This patch (as883) removes an out-of-date WARN_ON from the main HCD endpoint-disable routine. The warning is triggered whenever an endpoint is disabled while the root hub is suspended. In the past that may not have been legal, but it definitely is legal now. Merely unbinding a USB driver will do it. Furthermore, I've never seen any occurrences of this warning that really did signal an actual bug or error condition. At this point it has outlived its purpose. Signed-off-by: Alan Stern Signed-off-by: David Brownell commit ef7f6c7084b333c7524dcd297e0578d43733a2a2 Author: Alan Stern Date: Thu Apr 5 16:03:49 2007 -0400 USB: more autosuspend timer stuff This patch (as879) ties up some loose ends from an earlier patch. These are things I didn't think to include at the time but which clearly belonged there. If an autosuspend fails because driver activity races with the autosuspend call, restart the autosuspend timer. When a device is resumed by an external request, it counts as device activity and should update the last_busy time so that the next autoresume won't occur immediately. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 4fe5354f61cad4c0550285283c83c66c070c198e Author: Alan Stern Date: Thu Apr 5 16:06:53 2007 -0400 EHCI: fix problem with BIOS handoff This patch (as882) fixes a problem with the EHCI BIOS handoff. On my machine, the BIOS configures the controller and the handoff fails, leaving the controller configured. During resume-from-disk, this confuses ehci-hcd into thinking that the controller has not been tampered with. The problem is fixed by turning off the Configured Flag whenever a BIOS handoff is attempted, whether it succeeds or not. Signed-off-by: Alan Stern Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 36433127ae7a842482ba857f5ad3c431817a9542 Author: Oliver Neukum Date: Mon Apr 30 01:37:44 2007 -0700 USB: address FIXME in usbnet w.r.t drivers claiming multiple interfaces This fixes the issue of drivers claiming multiple interfaces. Operations are stopped as soon as an interface is suspend and resumed only as all interfaces have been resumed. Signed-off-by: Oliver Neukum Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 741ec4e6d0b7780d29a63f908d6d21df425be365 Author: David Brownell Date: Sun Apr 29 19:51:05 2007 -0700 USB: remove usb DocBook warnings This just removes some warnings generated by the Docbook tools when turning USB (host and peripheral side) kerneldoc into HTML; they're all about missing ID attributes. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4149b72eaa74583c361e3aaf5804eb74b72c51f1 Author: David Brownell Date: Sun Apr 29 10:09:47 2007 -0700 USB: handle more rndis_host oddities Workaround another device firmware bug, wherein CDC descriptors get placed in a wrong place never previously observed in the wild. Fix a bug where a seeming RNDIS device returns a bogus response during device initialization. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 47f8468e6008a1d62f7dacbcff4ec3e115a500c8 Author: David Brownell Date: Sun Apr 29 10:21:14 2007 -0700 USB: fix more ftdi-elan/u132-hcd #include lossage Partial fix for bogosity in the ftdi-elan and u132-hcd drivers ... these have no business including with the internals of other drivers, much less doing so in a broken way!! A previous patch resolved one build fix, this resolves another... Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 64902cbaf17a5c81a2ed0cca51bf57227086df65 Author: Matthew Davidson Date: Tue May 1 01:15:01 2007 +0100 usb-storage: ignore Sitecom WL-117 USB-WLAN The Sitecom WL-117 is another "driverless" ZD1211 device where the virtual windows driver CD must be ejected before the WLAN device appears. zd1211rw takes care of the ejecting, but usb-storage must be told not to claim the device. From: Matthew Davidson Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit deb3d7fff0b7c21c5a80b2fdfb93d7fb1abcf21f Author: Oliver Neukum Date: Wed May 2 10:17:50 2007 +0200 USB: remove useless check in mos7840 found by coverity this useless check should be removed. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 5ac43d1fbbfd1b89f83c1a907c58d558d262e441 Author: Oliver Neukum Date: Wed May 2 10:33:10 2007 +0200 USB: fix omninet memory leak found by coverity the transfer of allocating the descriptor in attach and no longer in open was incomplete resulting in a memory leak coverity spotted. This fix is against the patch set you posted. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 230ffc8e348e7841b79fd7c659d16aa5d7ec8a69 Author: Semih Hazar Date: Tue May 22 23:35:12 2007 -0400 Input: ads7846 - SPI_CPHA mode bugfix In commit [1] the SPI mode is set to 1, but it should be 0. As stated in the commit, ads784x samples the data on the rising edge. SPI mode 1 samples on the falling edge [2] though. The root cause of this is a bug in the omap_uwire code, which treats CPHA=1 incorrectly; so these two bugs cancel each other out on one of the main regression test platforms for this driver. [1] kernel.org GIT 7937e86a70235e1584486654687dc9908a11e00a [2] http://en.wikipedia.org/wiki/Serial_Peripheral_Interface_Bus Signed-off-by: David Brownell Signed-off-by: Dmitry Torokhov commit bff0de5f59ff935138eb41c397a7e50468028b83 Author: David Brownell Date: Tue May 22 23:28:40 2007 -0400 Input: ads7846 - document that it handles tsc2046 too The TSC2046 is an updated version of the ADS7846 ... mention that in the Kconfig helptext and driver source. Signed-off-by: David Brownell Acked-by: Kevin Hilman Signed-off-by: Dmitry Torokhov commit 36bd52a49b790a71f3d353cdddf2f22e1e6f84ff Author: Eric Piel Date: Tue May 22 23:28:03 2007 -0400 Input: input-polldev - add module info This is required to load it as a module, as GPL-compatible license is necessary to use workqueues. Signed-off-by: Eric Piel Signed-off-by: Dmitry Torokhov commit 1124d5ca7b7296035c1cc5fc00fdbfa44603b2ac Author: Dmitry Torokhov Date: Mon May 14 23:52:22 2007 -0400 Input: ucb1x00-ts - remove commented out code Signed-off-by: Dmitry Torokhov commit c130bdba585cff185919cc5c82c126fc58aab7a6 Author: Satoru Takeuchi Date: Mon May 14 23:52:07 2007 -0400 Input: ucb1400_ts - use sched_setscheduler() Fix Philips UCB1400 driver to use sched_setscheduler() instead of setting the fields of task_struct directly. Signed-off-by: Satoru Takeuchi Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 1e0c5b1275a0e59747349745da8778523a9dcd18 Author: Dmitry Torokhov Date: Mon May 14 23:51:54 2007 -0400 Input: ALPS - force stream mode ALPS appears to need SETSTREAM command after reset, otherwise it does not produce any data. Now that we do not request stream mode by default individual drivers need to take care of it. [Jason Riedy - fix oops] Signed-off-by: Dmitry Torokhov commit c0338c15973c1b6de2b42808a071bf3af948d595 Author: Johann Deneux Date: Mon May 14 00:09:33 2007 -0400 Input: iforce - minor clean-ups Signed-off-by: Johann Deneux Signed-off-by: Dmitry Torokhov commit b8691fd2258d2ae5941c5e5f8bf3dfdaa8951b81 Author: Johann Deneux Date: Mon May 14 00:09:28 2007 -0400 Input: iforce - fix force feedback not working Use an interrupt URB to send force-feedback data to the device instead of a bulk URB. This was broken since 2.6.18. Signed-off-by: Johann Deneux Signed-off-by: Dmitry Torokhov commit 575c3e2a041c08ad39b5d4535539a9a7d4c63aa6 Author: Patrick McHardy Date: Tue May 22 17:00:49 2007 -0700 [RTNETLINK]: Remove remains of wireless extensions over rtnetlink Remove some unused variables and function arguments related to the recently removed wireless extensions over rtnetlink. Signed-off-by: Patrick McHardy Acked-by: Johannes Berg Signed-off-by: David S. Miller commit 83b496e928dbd38104bfb107230cc88751b09d89 Author: Patrick McHardy Date: Tue May 22 17:00:01 2007 -0700 [RTNETLINK]: Allow changing of subsets of netdevice flags in rtnl_setlink rtnl_setlink doesn't allow to change subsets of the flags, just to override the set entirely by a new one. This means that for simply setting a device up or down userspace first needs to query the current flags, change it and send the changed flags back, which is racy and needlessly complicated. Mask the flags using ifi_change since this is what it is intended for. For backwards compatibility treat ifi_change == 0 as ~0 (even though it seems quite unlikely that anyone has been using this so far). Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 1f8481d19af005c469ee50cf972486240905585e Author: David Howells Date: Tue May 22 16:14:24 2007 -0700 [AF_RXRPC]: Make call state names available if CONFIG_PROC_FS=n Make the call state names array available even if CONFIG_PROC_FS is disabled as it's used in other places (such as debugging statements) too. Signed-off-by: David Howells Signed-off-by: David S. Miller commit 71a904bf49582f1866e2d6f9ce0a186af9a50b39 Author: David Howells Date: Tue May 22 16:13:49 2007 -0700 [AF_RXRPC]: AF_RXRPC depends on IPv4 Add a dependency for CONFIG_AF_RXRPC on CONFIG_INET. This fixes this error: net/built-in.o: In function `rxrpc_get_peer': (.text+0x42824): undefined reference to `ip_route_output_key' Signed-off-by: David Howells Signed-off-by: David S. Miller commit 26b8e51e98ae09cfc770b918577c004a376de4b8 Author: Herbert Xu Date: Tue May 22 16:12:26 2007 -0700 [IPSEC]: Fix warnings with casting int to pointer This patch adds some casts to shut up the warnings introduced by my last patch that added a common interator function for xfrm algorightms. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit edd75ede2d40eadb98e07d87e88fa970f86ffe9e Author: Jonathan Corbet Date: Tue May 22 00:39:00 2007 -0300 V4L/DVB (5691): Ov7670: reset clkrc in rgb565 mode A bug in the ov7670 sensor causes it to introduce noise unless the CLKRC register is rewritten *after* setting the image mode. Naturally, resetting CLKRC in this way will cause other modes to fail. So carefully poke the register only when indicated. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 7acf90c70c6ee063f7465b2f10e2083bc49f355b Author: Jonathan Corbet Date: Tue May 22 00:37:58 2007 -0300 V4L/DVB (5690): Cafe_ccic: Properly power down the sensor The proper method for powering down the sensor on OLPC systems has changed somewhat; in particular, the sensor must be powered down completely (rather than simply told to power down) or the associated "camera active" LED will stay on. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 82c01d3d5a26f82aea1fb2e9a357dfb6404f44db Author: matthieu castet Date: Mon May 21 11:15:09 2007 -0300 V4L/DVB (5680): Tuner-simple.c fix suport for SECAM with FI1216MF Allow to use SECAM-BG with the FI1216MF tuner. The selection is done with the secam=B module argument. The default behaviour should be the same as before. Signed-off-by: Matthieu CASTET Signed-off-by: Andrew Morton Acked-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 4abdcf933f647763592db6bef001d1fae61a5527 Author: Simon Arlott Date: Sun May 6 20:56:14 2007 -0300 V4L/DVB (5630): Dvb-core: Handle failures to create devices dvb-core is not started early enough when device drivers that use dvb are compiled in so dvb_register_device fails (silently) since dvb_class is NULL, this runs dvb_init using subsys_initcall instead of module_init. dvb_register_device will now check the return value of class_device_create. Signed-off-by: Simon Arlott Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit a6d7613226c4e159b12fbaad707ddadf47b38ccf Author: Manu Abraham Date: Sun May 13 12:23:43 2007 -0300 V4L/DVB (5639a): Fix dst usage count Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit c74e83a8632fd88560a533980a0d4c3922325326 Author: Hans Verkuil Date: Thu May 17 06:41:44 2007 -0300 V4L/DVB (5670): Adding new fields to v4l2_pix_format broke the ABI, reverted that change Reverted the change to struct v4l2_pix_format. I completely missed that this struct was used by existing ioctls so that changing it broke the ABI. I will have to think of another way of setting the top/left coordinates but for now this change is reverted to preserve compatibility. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit bf57ab7ae74591973265ebd8e18bd0e785dbfb33 Author: Mauro Carvalho Chehab Date: Mon May 21 07:10:27 2007 -0300 V4L/DVB (5640): Fix: em28xx shouldn't be selecting VIDEO_BUF Signed-off-by: Mauro Carvalho Chehab commit d460f857a5332fe892d88ddfb5efa827dc3b25e6 Author: Mauro Carvalho Chehab Date: Mon May 21 07:10:09 2007 -0300 V4L/DVB (5639): Fix Kconfig dependencies for ivtv ivtv were wrongly marked as dependent of USB. Signed-off-by: Mauro Carvalho Chehab commit a1ba15832c8f6ac2d5d193a6dbb91bcf7705b732 Author: Arnaud Patard Date: Tue May 22 19:49:16 2007 +0200 i2c-s3c2410: Fix build warning Fix for the following build warning: CC drivers/i2c/busses/i2c-s3c2410.o drivers/i2c/busses/i2c-s3c2410.c: In function 's3c24xx_i2c_probe': drivers/i2c/busses/i2c-s3c2410.c:839: warning: format '%ld' expects type 'long int', but argument 4 has type 'resource_size_t' Signed-off-by: Arnaud Patard Signed-off-by: Jean Delvare commit 6a7ce82f02e8ce7391e40018749d93762abf6ee0 Author: Jean Delvare Date: Tue May 22 19:49:16 2007 +0200 i2c-tiny-usb: Fix truncated adapter name Signed-off-by: Jean Delvare Cc: Till Harbaum commit de81d2aaebc8e5e5167cb93f674c57705898e45e Author: David Brownell Date: Tue May 22 19:49:16 2007 +0200 i2c: Legacy i2c drivers shouldn't issue uevents Prevent legacy drivers from issuing uevents for device creation/removal, so that userspace can't cause modprobing loops for them. This became a problem for some legacy PC drivers. I can't easily see it becoming an issue with I2C legacy drivers, but consistency-in-paranoia seems likely to be a good thing here. For usable i2c-level driver model uevents, just switch to a new-style driver. Signed-off-by: David Brownell Signed-off-by: Jean Delvare commit a66aa704d6f332b001dfb0e787c92b2c61c75081 Author: Kenji Kaneshige Date: Tue May 22 10:20:36 2007 -0700 [IA64] fix kmalloc(0) in arch/ia64/pci/pci.c Hiroyuki Kamezawa reported the problem that pci_acpi_scan_root() of ia64 might call kmalloc_node() with zero size. Currently ia64's pci_acpi_scan_root() assumes that _CRS method of root bridge has at least one resource window. But, the root bridges that has no resource window must be taken into account. Signed-off-by: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 6ae384884d936cb39ab20238af34689933e44525 Author: Robin Holt Date: Fri May 18 13:46:52 2007 -0500 [IA64] Only unwind non-running tasks. Unwinding a running task has proven problematic. In one instance, the running task was attempting to unwind itself and received an interrupt between when get_wchan allocated local variables on the stack and when unw_init_from_blocked_task was called which resulted in unw_init_frame_info to place this tasks task_struct pointer over the switch stack's ar_bspstore entry. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit e2e6fe7bb6e30621ad4e8a3acb1e711815c239bd Author: Robin Holt Date: Fri May 18 13:46:23 2007 -0500 [IA64] Improve unwind checking. This patch adds some sanity checks to keep register and memory stack pointers in the unw_frame_info structure within the tasks stack address range. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit 412e8a0ebf1a58c060cc76438e5b6d33789c5e20 Author: Eugene Teo Date: Mon May 21 22:30:22 2007 +0800 [PATCH] drivers/net/wireless/libertas/rx.c: fix use-after-free skb could have been freed by then. Also, in libertas_upload_rx_packet(), skb->protocol is initialized by eth_type_trans(). Signed-off-by: Eugene Teo Signed-off-by: John W. Linville commit 596f2d0554352f1089f7478b309b27d8cdf5cd4f Author: Eugene Teo Date: Sat May 19 11:09:20 2007 +0800 [PATCH] drivers/net/wireless/libertas/fw.c: fix use-before-check NULL checks should be performed before the dereference. Spotted by the Coverity checker. Signed-off-by: Eugene Teo Signed-off-by: John W. Linville commit 3d4bd24b019981394fabb465b0c7932924b83d65 Author: Florin Malita Date: Fri May 18 16:04:33 2007 -0400 [PATCH] libertas: skb dereferenced after netif_rx In libertas_process_rxed_packet() and process_rxed_802_11_packet() the skb is dereferenced after being passed to netif_rx (called from libertas_upload_rx_packet). Spotted by Coverity (1658, 1659). Also, libertas_upload_rx_packet() unconditionally returns 0 so the error check is dead code - might as well take it out and change the signature. Signed-off-by: Florin Malita Signed-off-by: John W. Linville commit 5453e7723b95958f4591b2e0063573d8d53e7699 Author: Benjamin Herrenschmidt Date: Tue May 22 16:25:51 2007 +1000 [POWERPC] Fix warning in 32-bit builds with CONFIG_HIGHMEM Some missing fixup for the removal of 4 level fixup header. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 832a791c580a86cbeea5bb12a984d95b1f458539 Author: Benjamin Herrenschmidt Date: Tue May 22 14:33:05 2007 +1000 [POWERPC] Fix powerpc vmlinux.lds.S Sam's recent change in 7664709b44a13e2e0b545e2dd8e7b8797a1748dc broke things for us because we ended up with *(.text.*) before *(.text), whereas previously *(.text) was first. This was important because the start of the text section contains the kernel entry point. In fact, we don't need that *(.text.*) thing anymore and it incorrectly matched .text.init.refok, thus putting it before .text. .. ouch ! Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 177e9ea49deea238f59bb0b1708cfc60b75828fb Author: Anton Blanchard Date: Sun May 20 03:13:43 2007 +1000 [POWERPC] Fix typo: MMCR0_PMA0 != MMCR0_PMAO pmc.c has: #ifndef MMCR0_PMA0 #define MMCR0_PMA0 0 This one took a while to find. Unfortunately its the wrong define (number 0 vs letter O). Its probably worth removing this override, since if our includes get screwed up we will have the same (hard to debug) failure. Fix it simply for now, so that we can backport to stable. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 2fae4985a135ca5d7d9bba17d45d674c099621b4 Author: Anton Blanchard Date: Sat May 19 15:22:41 2007 +1000 [POWERPC] Add missing pmc_type fields in cpu_table A number of cpu_table entries were missing the pmc_type field, which means that the sysfs entries for the performance monitor counters don't get created. This adds them. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit d3fdaed9e973687f088c9c156a6e20870386e0b7 Author: Hugh Dickins Date: Sat May 19 02:47:01 2007 +1000 [POWERPC] Fix smp_call_function to be preempt-safe smp_call_function_map() was not safe against preemption to another cpu: its test for removing self from map was outside the spinlock. Rearrange it a little to fix that. smp_call_function_single() was also wrong: now get_cpu() before excluding self, as other architectures do. Signed-off-by: Hugh Dickins Signed-off-by: Paul Mackerras commit d25790532370e7448e3d3bd25a17e1e9f1299816 Author: Stephen Rothwell Date: Tue May 22 11:10:19 2007 +1000 Fix headers check fallout commit e8edc6e03a5c8562dc70a6d969f732bdb355a7e7 added an include of linux/jiffies.h in linux/smb_fs.h outside the ifdef __KERNEL__. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit df5f6311f171cc249e39ccd06321b68823ac68f0 Author: David Woodhouse Date: Mon May 21 19:53:35 2007 -0400 Make 'headerscheck' stop immediately on an error This should make it stop immediately after printing the _helpful_ error message, rather than continuing to spit out many pages more of 'CHECK include/linux/foo.h' before eventually coming to a halt with something less obvious. Now I get this... CHECK include/linux/smb_fs.h /shiny/git/linux-2.6/usr/include/linux/smb_fs.h requires linux/jiffies.h, which does not exist in exported headers make[2]: *** [/shiny/git/linux-2.6/usr/include/linux/.check.smb_fs.h] Error 1 make[1]: *** [linux] Error 2 make: *** [headers_check] Error 2 Signed-off-by-if-Sam-says-so: David Woodhouse [ Sam had better say so! This made me waste way too much time. - Linus] Signed-off-by: Linus Torvalds commit 72dd9ca59944f117c719a1cc3fc9010bce0486f2 Author: Jeff Garzik Date: Tue May 22 00:28:11 2007 -0400 partitions/LDM: build fix This from a "tested" patch... Signed-off-by: Jeff Garzik Cc: Anton Altaparmakov Signed-off-by: Linus Torvalds commit efa5bf1dd2cf3cdee0bfe97cfd76ff2296179ae4 Author: Linus Torvalds Date: Mon May 21 18:41:17 2007 -0700 Revert "kbuild: make better section mismatch reports on i386, arm and mips" This reverts commit f892b7d480eec809a5dfbd6e65742b3f3155e50e, which totally broke the build on x86 with CONFIG_RELOCATABLE (which, as far as I can tell, is the only case where it should even matter!) due to a SIGSEGV in modpost. Cc: Sam Ravnborg Cc: Atsushi Nemoto Signed-off-by: Linus Torvalds commit 8bc3fc470eb25af4d70c72485cbcb130cc657691 Author: Jeff Garzik Date: Mon May 21 20:26:38 2007 -0400 libata: bump versions Signed-off-by: Jeff Garzik commit a617c09f6d646b60f31efc8afd9f81b752bf21b7 Author: Jeff Garzik Date: Mon May 21 20:14:23 2007 -0400 libata: Trim trailing whitespace Signed-off-by: Jeff Garzik commit bc9a8a7eaa58d802a2b26c75edcc95cb92835db3 Author: Alan Cox Date: Mon May 21 15:20:33 2007 +0100 libata: Kiss post_set_mode goodbye As of the -mm tree we don't have post_set_mode users any more. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 2f91d81db3060f6d218e32d935b9a18ffca4dde2 Author: Alan Cox Date: Mon May 21 15:15:51 2007 +0100 ata_piix: clean up With cable methods in place we don't need a custom error handler for SATA so get rid of it Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 4349eebf67b2b06eab36f3dad651ac36619ae986 Author: Alan Cox Date: Mon May 21 14:52:49 2007 +0100 pata_hpt366: Enable bits are unreliable so don't use them Various people had problems with both old and new IDE when hpt366 enable bits started getting honoured. It turns out they are not reliable so don't rely on them Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 39f198868dfd4216ff221d741c72a009d995a7ba Author: Dave Jones Date: Mon May 21 14:31:03 2007 -0400 libata: Add Seagate STT20000A to DMA blacklist. http://bugzilla.kernel.org/show_bug.cgi?id=1044 points out an additional hard disk that doesn't handle DMA transfers correctly. This patch is the libata variant of the earlier patch to drivers/ide/ Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit c7a42156d99bcea7f8173ba7a6034bbaa2ecb77c Author: Tejun Heo Date: Fri May 18 16:23:19 2007 +0200 ahci: disable 64bit dma on sb600 SB600 claims it can do 64bit DMA but it can't. Disable it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2053ed02a62f2c66d9cb9b51aea0836a7d8dbabf Author: Auke Kok Date: Tue May 15 15:29:16 2007 -0700 Add constant for FCS/CRC length (frame check sequence) About a dozen drivers that have some form of crc checksumming or offloading use this constant, warranting a global define for it. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit f1e9a4eaea5c22cfb557e58a8cd0ca3bde5160a5 Author: Maciej W. Rozycki Date: Mon May 21 14:33:21 2007 +0100 declance: Remove a dangling spin_unlock_irq() thingy The spin_unlock_irq() invocation in lance_start_xmit() has no matching locking request. The call is already protected by netif_tx_lock, so remove the statement. Signed-off-by: Maciej W. Rozycki Signed-off-by: Jeff Garzik commit 3e1657c8ef53e1cd541cc1e420f3230dc075949b Author: Auke Kok Date: Mon May 21 14:51:35 2007 -0700 e1000: Don't enable polling in open() (was: e1000: assertion hit in e1000_clean(), kernel 2.6.21.1) Herbert Xu wrote: "netif_poll_enable can only be called if you've previously called netif_poll_disable. Otherwise a poll might already be in action and you may get a crash like this." Removing the call to netif_poll_enable in e1000_open should fix this issue, the only other call to netif_poll_enable is in e1000_up() which is only reached after a device reset or resume. Bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=8455 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240339 Tested by Doug Chapman Signed-off-by: Auke Kok Acke