commit da8bacf6d59288ef3e41389db24886c928dcbd33 tree 35d2739fb57a760dca1c9413a6814d6d2be8e295 parent 67e3812426efbe62dd765eed9895cd3098def948 parent 09b74de9fff056a0a4058a0f14508acba89ea6fc author Linus Torvalds Wed, 24 May 2006 08:55:12 -0700 committer Linus Torvalds Wed, 24 May 2006 08:55:12 -0700 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IB/ipath: deref correct pointer when using kernel SMA IB/ipath: fix null deref during rdma ops IB/ipath: register as IB device owner IB/ipath: enable PE800 receive interrupts on user ports IB/ipath: enable GPIO interrupt on HT-460 IB/ipath: fix NULL dereference during cleanup IB/ipath: replace uses of LIST_POISON IB/ipath: fix reporting of driver version to userspace IB/ipath: don't modify QP if changes fail IB/ipath: fix spinlock recursion bug commit 67e3812426efbe62dd765eed9895cd3098def948 tree b38073c956ed46cc1d5953abd34beb669e3f8b8a parent 278654541017bc93befe3570edeabd5d9e95e4ea parent b964638ffd59b61c13f02b81e5118a6e573d91cd author Linus Torvalds Wed, 24 May 2006 08:37:03 -0700 committer Linus Torvalds Wed, 24 May 2006 08:37:03 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: JFS: Fix multiple errors in metapage_releasepage commit 278654541017bc93befe3570edeabd5d9e95e4ea tree 80a6809294155a450ce8105f02847414179e07be parent b8bba261e05bce1712231060f296001ddf8250ab parent bb31a8faa270beafcc51a65880c5564c6b718bd6 author Linus Torvalds Wed, 24 May 2006 08:36:31 -0700 committer Linus Torvalds Wed, 24 May 2006 08:36:31 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] libata: add pio flush for via atapi (was: Re: TR: ASUS A8V Deluxe, x86_64) commit b8bba261e05bce1712231060f296001ddf8250ab tree e7d6ae6e4f3c7fe48d3cbc5dfb83abb5826dfb9a parent 51c403274093767d6dc30703d67e9f0b255c7439 parent a1433ac4ab46fb23ae77804c207a1f710a7b12f1 author Linus Torvalds Wed, 24 May 2006 08:36:03 -0700 committer Linus Torvalds Wed, 24 May 2006 08:36:03 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] sky2: fix jumbo packet support commit 51c403274093767d6dc30703d67e9f0b255c7439 tree 2fcf20613a2366f59635df0c00f7dc6c0d551ede parent 387e2b0439026aa738a9edca15a57e5c0bcb4dfc author Pierre Ossman Wed, 24 May 2006 10:20:45 +0200 committer Linus Torvalds Wed, 24 May 2006 08:35:31 -0700 [MMC] Fix premature use of md->disk md->disk was being used in a debug message before it was allocated. Signed-off-by: Pierre Ossman Signed-off-by: Linus Torvalds commit b964638ffd59b61c13f02b81e5118a6e573d91cd tree 118ab6ba3bceab3ab39d7d22070d03af2ace6f18 parent 387e2b0439026aa738a9edca15a57e5c0bcb4dfc author Dave Kleikamp Wed, 24 May 2006 07:43:38 -0500 committer Dave Kleikamp Wed, 24 May 2006 07:43:38 -0500 JFS: Fix multiple errors in metapage_releasepage It looks like metapage_releasepage was making in invalid assumption that the releasepage method would not be called on a dirty page. Instead of issuing a warning and releasing the metapage, it should return 0, indicating that the private data for the page cannot be released. I also realized that metapage_releasepage had the return code all wrong. If it is successful in releasing the private data, it should return 1, otherwise it needs to return 0. Lastly, there is no need to call wait_on_page_writeback, since try_to_release_page will not call us with a page in writback state. Signed-off-by: Dave Kleikamp commit bb31a8faa270beafcc51a65880c5564c6b718bd6 tree 6ca5371bbaa53f0ada68f5adda9e3321319ae68b parent 387e2b0439026aa738a9edca15a57e5c0bcb4dfc author Albert Lee Mon, 22 May 2006 11:43:46 +0800 committer Jeff Garzik Wed, 24 May 2006 01:43:53 -0400 [PATCH] libata: add pio flush for via atapi (was: Re: TR: ASUS A8V Deluxe, x86_64) Backport the "pio flush" from the libata major update to 2.6.17 for via atapi. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit a1433ac4ab46fb23ae77804c207a1f710a7b12f1 tree 8823b8402768b6ad17c4cbeb4b0512245e5b1825 parent 387e2b0439026aa738a9edca15a57e5c0bcb4dfc author Stephen Hemminger Mon, 22 May 2006 12:03:42 -0700 committer Jeff Garzik Wed, 24 May 2006 00:36:09 -0400 [PATCH] sky2: fix jumbo packet support The truncate threshold calculation to prevent receiver from getting stuck was incorrect, and it didn't take into account the upper limit on bits in the register so the jumbo packet support was broken. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 387e2b0439026aa738a9edca15a57e5c0bcb4dfc tree 5d4e0349a0119fcff5278c1077b2b2888933d441 parent 4a063739138e2c4e933188d641f1593e01ce8285 author Stephen Hemminger Tue, 23 May 2006 15:20:25 -0700 committer David S. Miller Tue, 23 May 2006 15:20:25 -0700 [BRIDGE]: need to ref count the LLC sap Bridge will OOPS on removal if other application has the SAP open. The bridge SAP might be shared with other usages, so need to do reference counting on module removal rather than explicit close/delete. Since packet might arrive after or during removal, need to clear the receive function handle, so LLC only hands it to user (if any). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4a063739138e2c4e933188d641f1593e01ce8285 tree 73b7a622babb84307abdd3e08fd57e59bf50a0b8 parent 4d942d8b39bf7d43ce93d85964aeb63aeace0593 author Chris Wright Tue, 23 May 2006 15:08:13 -0700 committer David S. Miller Tue, 23 May 2006 15:15:13 -0700 [NETFILTER]: SNMP NAT: fix memleak in snmp_object_decode If kmalloc fails, error path leaks data allocated from asn1_oid_decode(). Signed-off-by: Chris Wright Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 4d942d8b39bf7d43ce93d85964aeb63aeace0593 tree 5c8122762945a8bb9be58bf9bdcbc4dc023ad5db parent 7185989db4d926dbef1a2f638c464f35599c83e0 author Patrick McHardy Tue, 23 May 2006 15:07:46 -0700 committer David S. Miller Tue, 23 May 2006 15:15:10 -0700 [NETFILTER]: H.323 helper: fix sequence extension parsing When parsing unknown sequence extensions the "son"-pointer points behind the last known extension for this type, don't try to interpret it. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7185989db4d926dbef1a2f638c464f35599c83e0 tree bea35167acbd7cc38dfc8b543833cf22f0e8b460 parent 14ba3e7b3103a12b6f6a1057a1ecbfb15e1b48c0 author Patrick McHardy Tue, 23 May 2006 15:07:07 -0700 committer David S. Miller Tue, 23 May 2006 15:15:08 -0700 [NETFILTER]: H.323 helper: fix parser error propagation The condition "> H323_ERROR_STOP" can never be true since H323_ERROR_STOP is positive and is the highest possible return code, while real errors are negative, fix the checks. Also only abort on real errors in some spots that were just interpreting any return value != 0 as error. Fixes crashes caused by use of stale data after a parsing error occured: BUG: unable to handle kernel paging request at virtual address bfffffff printing eip: c01aa0f8 *pde = 1a801067 *pte = 00000000 Oops: 0000 [#1] PREEMPT Modules linked in: ip_nat_h323 ip_conntrack_h323 nfsd exportfs sch_sfq sch_red cls_fw sch_hfsc xt_length ipt_owner xt_MARK iptable_mangle nfs lockd sunrpc pppoe pppoxx CPU: 0 EIP: 0060:[] Not tainted VLI EFLAGS: 00210646 (2.6.17-rc4 #8) EIP is at memmove+0x19/0x22 eax: d77264e9 ebx: d77264e9 ecx: e88d9b17 edx: d77264e9 esi: bfffffff edi: bfffffff ebp: de6a7680 esp: c0349db8 ds: 007b es: 007b ss: 0068 Process asterisk (pid: 3765, threadinfo=c0349000 task=da068540) Stack: <0>00000006 c0349e5e d77264e3 e09a2b4e e09a38a0 d7726052 d7726124 00000491 00000006 00000006 00000006 00000491 de6a7680 d772601e d7726032 c0349f74 e09a2dc2 00000006 c0349e5e 00000006 00000000 d76dda28 00000491 c0349f74 Call Trace: [] mangle_contents+0x62/0xfe [ip_nat] [] ip_nat_mangle_tcp_packet+0xa1/0x191 [ip_nat] [] set_addr+0x74/0x14c [ip_nat_h323] [] process_setup+0x11b/0x29e [ip_conntrack_h323] [] process_setup+0x14c/0x29e [ip_conntrack_h323] [] process_q931+0x3c/0x142 [ip_conntrack_h323] [] q931_help+0xe0/0x144 [ip_conntrack_h323] ... Found by the PROTOS c07-h2250v4 testsuite. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 09b74de9fff056a0a4058a0f14508acba89ea6fc tree 1a935fea2400450afe8984975eea6e22ddf57833 parent 3977026462314dfbb237adf6a964d0f683b8e45d author Bryan O'Sullivan Tue, 23 May 2006 11:32:38 -0700 committer Roland Dreier Tue, 23 May 2006 13:29:35 -0700 IB/ipath: deref correct pointer when using kernel SMA At this point, the core QP structure hasn't been initialized, so what's in there isn't valid. Get the same information elsewhere. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 3977026462314dfbb237adf6a964d0f683b8e45d tree d9fbd218ac4a742371468a67db1a738f52af5a83 parent 41c75a19bf4a0102f49763a686fb7e39780349f3 author Bryan O'Sullivan Tue, 23 May 2006 11:32:37 -0700 committer Roland Dreier Tue, 23 May 2006 13:29:35 -0700 IB/ipath: fix null deref during rdma ops The problem was that node A's sending thread, which handles sending RDMA read response data, would write the trigger word, the last packet would be sent, node B would send a new RDMA read request, node A's interrupt handler would initialize s_rdma_sge, then node A's sending thread would update s_rdma_sge. This didn't happen very often naturally but was more frequent with 1 byte RDMA reads. Rather than adding more locking or increasing the QP structure size and copying sge data, I modified the copy routine to update the pointers before writing the trigger word to avoid the update race. Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 41c75a19bf4a0102f49763a686fb7e39780349f3 tree 5f9e8db9047ea613ef41ece49be72cd845239b20 parent 9dcc0e58e2913f7e6ffba64c27fe5c2f2c7b845c author Bryan O'Sullivan Tue, 23 May 2006 11:32:36 -0700 committer Roland Dreier Tue, 23 May 2006 13:29:35 -0700 IB/ipath: register as IB device owner This fixes an oops. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 9dcc0e58e2913f7e6ffba64c27fe5c2f2c7b845c tree 67280213382759829dfbbc423b55ed898c841b9f parent f2080fa3c6098dedfb9b599bdaedd07be2ea4646 author Bryan O'Sullivan Tue, 23 May 2006 11:32:35 -0700 committer Roland Dreier Tue, 23 May 2006 13:29:35 -0700 IB/ipath: enable PE800 receive interrupts on user ports Fixed so it works on the PE-800. It had not previously been updated to match PE-800 receive interrupt differences from HT-400. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit f2080fa3c6098dedfb9b599bdaedd07be2ea4646 tree e6d144327abb892f7598905bb823770283d1b669 parent b0ff7c2005f7ec8dec10fb15e62b8e1acc172bbf author Bryan O'Sullivan Tue, 23 May 2006 11:32:34 -0700 committer Roland Dreier Tue, 23 May 2006 13:29:34 -0700 IB/ipath: enable GPIO interrupt on HT-460 This is required for even semi-decent performance on OpenIB. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit b0ff7c2005f7ec8dec10fb15e62b8e1acc172bbf tree d62bf6616d98ef73a941d7bbfbe1ebd5d1621d40 parent 94b8d9f98d7f535037eb9845b81396f667b4f727 author Bryan O'Sullivan Tue, 23 May 2006 11:32:33 -0700 committer Roland Dreier Tue, 23 May 2006 13:27:06 -0700 IB/ipath: fix NULL dereference during cleanup Fix NULL deref due to pcidev being clobbered before dd->ipath_f_cleanup() was called. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 94b8d9f98d7f535037eb9845b81396f667b4f727 tree 20eeb94120a7da859e27876aa997619ce73bc2a8 parent eaf6733bc176742fb08def2269441684e963c275 author Bryan O'Sullivan Tue, 23 May 2006 11:32:32 -0700 committer Roland Dreier Tue, 23 May 2006 13:27:06 -0700 IB/ipath: replace uses of LIST_POISON Per Andrew's request. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit eaf6733bc176742fb08def2269441684e963c275 tree cc365d39b9d0e1121fdead2c324250d51a3699c4 parent b228b43c491c53d1838e06f47a7470db9f84d899 author Bryan O'Sullivan Tue, 23 May 2006 11:32:31 -0700 committer Roland Dreier Tue, 23 May 2006 13:27:06 -0700 IB/ipath: fix reporting of driver version to userspace Fix the interface version that gets exported to userspace. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit b228b43c491c53d1838e06f47a7470db9f84d899 tree 3dc567452c12e13ed89d6c12563558cd9407d48c parent ebac3800e5652063aa9491ef7fb4d57e089eb385 author Bryan O'Sullivan Tue, 23 May 2006 11:32:30 -0700 committer Roland Dreier Tue, 23 May 2006 13:27:06 -0700 IB/ipath: don't modify QP if changes fail Make sure modify_qp won't modify the QP if any of the changes failed. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit ebac3800e5652063aa9491ef7fb4d57e089eb385 tree c925e75212ff309bdfaf6dfef7cbe9defb00c7fc parent 1faadface9c5d000bb16e42c89f24859337cf2db author Bryan O'Sullivan Tue, 23 May 2006 11:32:29 -0700 committer Roland Dreier Tue, 23 May 2006 13:27:06 -0700 IB/ipath: fix spinlock recursion bug The local loopback path for RC can lock the rkey table lock without blocking interrupts. The receive interrupt path can then call ipath_rkey_ok() and deadlock. Remove the redundant lock. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 14ba3e7b3103a12b6f6a1057a1ecbfb15e1b48c0 tree 0b449771042ba69d8716d8497e3dea6f70456b63 parent 8b6c879c81e8f00077607f83e024eedf388839b4 author Mauro Carvalho Chehab Tue, 23 May 2006 16:02:03 -0300 committer Mauro Carvalho Chehab Tue, 23 May 2006 16:08:29 -0300 V4L/DVB (4041): Fix compilation on PPC 64 Those functions don't exist on PPC64 architecture. Signed-off-by: Mauro Carvalho Chehab commit 8b6c879c81e8f00077607f83e024eedf388839b4 tree 8ba4b4088e305bed23820ae3583efe47571ca1a8 parent 3c2c54910f277f3abd3763dbc64b9dbf8b4479e9 author Jean Delvare Tue, 23 May 2006 15:56:50 -0300 committer Mauro Carvalho Chehab Tue, 23 May 2006 15:56:50 -0300 V4L/DVB (4040a): Fix the following section warnings: reference to .init.text: from .text between 'dvb_bt8xx_probe' (at offset 0x122c) and 'dvb_bt8xx_remove' reference to .init.text: from .text between 'dvb_bt8xx_probe' (at offset 0x1267) and 'dvb_bt8xx_remove' Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 3c2c54910f277f3abd3763dbc64b9dbf8b4479e9 tree 95fa9d12ef4c7c72e5f26835130a0d33ba9e57a8 parent 9d8a51f80117a9d672b455d60901842ad50aa69f author Manu Abraham Sat, 20 May 2006 13:17:00 -0300 committer Mauro Carvalho Chehab Tue, 23 May 2006 15:56:38 -0300 V4L/DVB (4037): Make the bridge devices that depend on I2C dependant on I2C Ref: Bugzilla 6179, 6589 Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 9d8a51f80117a9d672b455d60901842ad50aa69f tree 6f5ab1b191a056cf36d45028ae6664983735a17b parent 1faadface9c5d000bb16e42c89f24859337cf2db author Adrian Bunk Tue, 23 May 2006 15:56:20 -0300 committer Mauro Carvalho Chehab Tue, 23 May 2006 15:56:20 -0300 V4L/DVB (3927): Fix VIDEO_DEV=m, VIDEO_V4L1_COMPAT=y If CONFIG_VIDEO_DEV=m and CONFIG_VIDEO_V4L1_COMPAT=y, v4l1-compat should be built as a module (currently, it isn't built at all leading to problems with modules using it). Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 1faadface9c5d000bb16e42c89f24859337cf2db tree 081a296ff0387a516937f96ddadccf6976137497 parent 9cfe864842c755ea6dd683e2449016c7c4ca9867 parent 42f142371e48fbc44956d57b4e506bb6ce673cd7 author Linus Torvalds Tue, 23 May 2006 10:40:43 -0700 committer Linus Torvalds Tue, 23 May 2006 10:40:43 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Respect gfp_t argument to dma_alloc_coherent(). commit 9cfe864842c755ea6dd683e2449016c7c4ca9867 tree ae5e77ed14f6bd1d04f4e632a62c48e90a17ee40 parent fd0ff8aa1d95a896b3627bc62d42d6d002ac0bc3 parent f41d5bb1d9f49b03af7126d07a511facbe283a92 author Linus Torvalds Tue, 23 May 2006 10:40:19 -0700 committer Linus Torvalds Tue, 23 May 2006 10:40:19 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NETFILTER]: SNMP NAT: fix memory corruption [IRDA]: fixup type of ->lsap_state [IRDA]: fix 16/32 bit confusion [NET]: Fix "ntohl(ntohs" bugs [BNX2]: Use kmalloc instead of array [BNX2]: Fix bug in bnx2_nvram_write() [TG3]: Add some missing rx error counters commit fd0ff8aa1d95a896b3627bc62d42d6d002ac0bc3 tree e4ba36d57ca288eeaebdc882b988833e86607b22 parent 0f0410823792ae0ecb45f2578598b115835ffdbb author Jens Axboe Tue, 23 May 2006 11:23:49 +0200 committer Linus Torvalds Tue, 23 May 2006 10:39:43 -0700 [PATCH] blk: fix gendisk->in_flight accounting during barrier sequence While executing barrrier sequence, the bar_rq which carries actual write was accounted as normal IO on completion, while it wasn't on queueing. This caused gendisk->in_flight to be decremented by 1 after each barrier thus messed up statistics. This patch makes bar_rq not accounted as normal IO. As the containing barrier request as a whole is accounted, part of it shouldn't be. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 0f0410823792ae0ecb45f2578598b115835ffdbb tree b20f362f34757b8d612d8f1c2740fca5f329d93e parent b471f55427ee94d6de2b33b88a7409f8cbc6b5dc author David Woodhouse Tue, 23 May 2006 07:46:40 -0700 committer Linus Torvalds Tue, 23 May 2006 10:35:32 -0700 [PATCH] powerpc: wire up sys_[gs]et_robust_list Signed-off-by: David Woodhouse Cc: Benjamin Herrenschmidt Acked-by: Paul Mackerras Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b471f55427ee94d6de2b33b88a7409f8cbc6b5dc tree 24458ffccb4f9df1cef2fa65794997fc01ba37b1 parent 5a4fa1639622b85d7e4422242308fc6cef7e503e author David Woodhouse Tue, 23 May 2006 07:46:39 -0700 committer Linus Torvalds Tue, 23 May 2006 10:35:32 -0700 [PATCH] powerpc: check Cell SPU syscall number range _before_ using it Signed-off-by: David Woodhouse Cc: Benjamin Herrenschmidt Acked-by: Paul Mackerras Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a4fa1639622b85d7e4422242308fc6cef7e503e tree bb4d142efe1accb88bfdcf5075a842095c540c83 parent bb6e093da23ace2724fdadd27738027468eb82b3 author David Woodhouse Tue, 23 May 2006 07:46:38 -0700 committer Linus Torvalds Tue, 23 May 2006 10:35:32 -0700 [PATCH] powerpc: fill hole in Cell SPU syscall table Syscall number 224 was absent from the table, which I believe means that the SPU can cause an oops by attempting to use it. Signed-off-by: David Woodhouse Cc: Benjamin Herrenschmidt Acked-by: Paul Mackerras Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb6e093da23ace2724fdadd27738027468eb82b3 tree 6cbe07bc4a9ceeed0c35f5f15b5b5cd9f5dba319 parent 30d6b2f3749e41ce37170ebc445948222b2db4ee author Florin Malita Mon, 22 May 2006 22:35:30 -0700 committer Linus Torvalds Tue, 23 May 2006 10:35:32 -0700 [PATCH] orinoco: possible null pointer dereference in orinoco_rx_monitor() If the skb allocation fails, the current error path calls dev_kfree_skb_irq() with a NULL argument. Also, 'err' is not being used. Coverity CID: 275. Signed-off-by: Florin Malita Cc: "John W. Linville" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30d6b2f3749e41ce37170ebc445948222b2db4ee tree f4a1d2723ca8c8f0d3e3d310f2f99203a52e9bad parent ff4547f4aa9823908e9866495598fc65772c2a09 author Pavel Machek Mon, 22 May 2006 22:35:29 -0700 committer Linus Torvalds Tue, 23 May 2006 10:35:32 -0700 [PATCH] swsusp: fix typo in cr0 handling Writing cr0 to cr2 register can't be right. This fixes the typo. I wonder how it could survive so long. Signed-off-by: Pavel Machek Cc: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff4547f4aa9823908e9866495598fc65772c2a09 tree fcf9554da66fb06d5e466363f6e96cada2aafab2 parent a2eb0c101d24aca9d3d16c30c4f79f3a70c89208 author Tobias Powalowski Mon, 22 May 2006 22:35:28 -0700 committer Linus Torvalds Tue, 23 May 2006 10:35:31 -0700 [PATCH] tty_insert_flip_string_flags() license fix We still don't have the tty layer licensing compatibility quite right. tty_insert_flip_char() used to be inlined in include/linux/tty_flip.h. It is now out-of-lined and hence needs EXPORT_SYMBOL() to be back-compatible. One known offender is the Intel Modem driver. Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2eb0c101d24aca9d3d16c30c4f79f3a70c89208 tree c74aaec429deb174440e76d9b73985abb9604c50 parent 5c4c33318d26620fa552f15bbb6d0f9775a1b4df author NeilBrown Mon, 22 May 2006 22:35:27 -0700 committer Linus Torvalds Tue, 23 May 2006 10:35:31 -0700 [PATCH] md: Make sure bi_max_vecs is set properly in bio_split Else a subsequent bio_clone might make a mess. Signed-off-by: Neil Brown Cc: "Don Dupuis" Acked-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c4c33318d26620fa552f15bbb6d0f9775a1b4df tree d1d39bca5beb51dfcbb47d4b0c47a56214d4448b parent f2d395865faa2a7cd4620b07178e58cbb160ba08 author NeilBrown Mon, 22 May 2006 22:35:26 -0700 committer Linus Torvalds Tue, 23 May 2006 10:35:31 -0700 [PATCH] md: fix possible oops when starting a raid0 array This loop that sets up the hash_table has problems. Careful examination will show that the last time through, everything but the first line is pointless. This is because all it does is change 'cur' and 'size' and neither of these are used after the loop. This should ring warning bells... That last time through the loop, size += conf->strip_zone[cur].size can index off the end of the strip_zone array. Depending on what it finds there, it might exit the loop cleanly, or it might spin going further and further beyond the array until it hits an unmapped address. This patch rearranges the code so that the last, pointless, iteration of the loop never happens. i.e. the one statement of the last loop that is needed is moved the the end of the previous loop - or to before the loop starts - and the loop counter starts from 1 instead of 0. Cc: "Don Dupuis" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2d395865faa2a7cd4620b07178e58cbb160ba08 tree 01d3b090a4ce73eb346a2c55d99fe12d07d52906 parent e46e490368f87032a6e54969194413339b35a385 author NeilBrown Mon, 22 May 2006 22:35:25 -0700 committer Linus Torvalds Tue, 23 May 2006 10:35:31 -0700 [PATCH] knfsd: Fix two problems that can cause rmmod nfsd to die Both cause the 'entries' count in the export cache to be non-zero at module removal time, so unregistering that cache fails and results in an oops. 1/ exp_pseudoroot (used for NFSv4 only) leaks a reference to an export entry. 2/ sunrpc_cache_update doesn't increment the entries count when it adds an entry. Thanks to "david m. richter" for triggering the problem and finding one of the bugs. Cc: "david m. richter" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e46e490368f87032a6e54969194413339b35a385 tree eeb2daa75b5a900bd9920da6ffc2969d05e12b4a parent 353b28bafd1b962359a866ff263a7fad833d29a1 author Andrew Morton Mon, 22 May 2006 22:35:24 -0700 committer Linus Torvalds Tue, 23 May 2006 10:35:31 -0700 [PATCH] sys_sync_file_range(): move exported flags outside __KERNEL__ These flags are needed by userspace - move them outside __KERNEL__ (Pointed out by dwmw2) Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42f142371e48fbc44956d57b4e506bb6ce673cd7 tree cbcf77d8bf8adc923c50e1fd53a8becd81952beb parent 353b28bafd1b962359a866ff263a7fad833d29a1 author David S. Miller Tue, 23 May 2006 02:07:22 -0700 committer David S. Miller Tue, 23 May 2006 02:07:22 -0700 [SPARC64]: Respect gfp_t argument to dma_alloc_coherent(). Using asm-generic/dma-mapping.h does not work because pushing the call down to pci_alloc_coherent() causes the gfp_t argument of dma_alloc_coherent() to be ignored. Fix this by implementing things directly, and adding a gfp_t argument we can use in the internal call down to the PCI DMA implementation of pci_alloc_coherent(). This fixes massive memory corruption when using the sound driver layer, which passes things like __GFP_COMP down into these routines and (correctly) expects that to work. Signed-off-by: David S. Miller commit f41d5bb1d9f49b03af7126d07a511facbe283a92 tree 3551fffccb0cafd2851bc441cf8ea1a81716a9f7 parent f5565f4a90bdfea99e4bcd8411ff5272ebdbdbf8 author Patrick McHardy Mon, 22 May 2006 16:55:14 -0700 committer David S. Miller Mon, 22 May 2006 16:55:14 -0700 [NETFILTER]: SNMP NAT: fix memory corruption Fix memory corruption caused by snmp_trap_decode: - When snmp_trap_decode fails before the id and address are allocated, the pointers contain random memory, but are freed by the caller (snmp_parse_mangle). - When snmp_trap_decode fails after allocating just the ID, it tries to free both address and ID, but the address pointer still contains random memory. The caller frees both ID and random memory again. - When snmp_trap_decode fails after allocating both, it frees both, and the callers frees both again. The corruption can be triggered remotely when the ip_nat_snmp_basic module is loaded and traffic on port 161 or 162 is NATed. Found by multiple testcases of the trap-app and trap-enc groups of the PROTOS c06-snmpv1 testsuite. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f5565f4a90bdfea99e4bcd8411ff5272ebdbdbf8 tree 3f9ccfe14a101ad5dba50eb26531ee3f49fd5930 parent 405a42c5c8bd5731087c0ff01310731a3c1c9c24 author Alexey Dobriyan Mon, 22 May 2006 16:54:30 -0700 committer David S. Miller Mon, 22 May 2006 16:54:30 -0700 [IRDA]: fixup type of ->lsap_state Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 405a42c5c8bd5731087c0ff01310731a3c1c9c24 tree 8d4b14486660706febc4d5ae2ba7f3fe32bbf4fe parent 4195f81453b9727f82bb8ceae03411b7fe52a994 author Alexey Dobriyan Mon, 22 May 2006 16:54:08 -0700 committer David S. Miller Mon, 22 May 2006 16:54:08 -0700 [IRDA]: fix 16/32 bit confusion Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 4195f81453b9727f82bb8ceae03411b7fe52a994 tree 061d410408c883058afbbbbc39b4276ac359dc03 parent ae181bc44c65fdc93d0d2d908534b22e43f60f56 author Alexey Dobriyan Mon, 22 May 2006 16:53:22 -0700 committer David S. Miller Mon, 22 May 2006 16:53:22 -0700 [NET]: Fix "ntohl(ntohs" bugs Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit ae181bc44c65fdc93d0d2d908534b22e43f60f56 tree 1b3e93698455063d88c130cb7407a7b2c4dc3100 parent bae25761c92c5eec781b6ea72bbe7e98fc8382a0 author Michael Chan Mon, 22 May 2006 16:39:20 -0700 committer David S. Miller Mon, 22 May 2006 16:39:20 -0700 [BNX2]: Use kmalloc instead of array Use kmalloc() instead of a local array in bnx2_nvram_write(). Update version to 1.4.40. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit bae25761c92c5eec781b6ea72bbe7e98fc8382a0 tree b4a12d158a425a695272761f02d2c0eb87838ee8 parent 463d305bc51b8f5d0750a17ec0c9caf5181ec6d4 author Michael Chan Mon, 22 May 2006 16:38:38 -0700 committer David S. Miller Mon, 22 May 2006 16:38:38 -0700 [BNX2]: Fix bug in bnx2_nvram_write() Fix a bug in bnx2_nvram_write() caused by a counter variable not correctly incremented by 4. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 463d305bc51b8f5d0750a17ec0c9caf5181ec6d4 tree 0e37735dd181ba40364cabd4cf82e0e0fae0ff86 parent 353b28bafd1b962359a866ff263a7fad833d29a1 author Michael Chan Mon, 22 May 2006 16:36:27 -0700 committer David S. Miller Mon, 22 May 2006 16:36:27 -0700 [TG3]: Add some missing rx error counters Add some missing rx error counters for 5705 and newer chips. Update version to 3.58. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 353b28bafd1b962359a866ff263a7fad833d29a1 tree 151c3c1fb4296ef12151b5fb06d5e7bad87d254b parent 9a2a9bb2010ed7e56547e2bb2041dab14ab0510a author David S. Miller Sun, 21 May 2006 21:22:53 -0700 committer David S. Miller Sun, 21 May 2006 21:22:53 -0700 [SPARC]: Add robust futex syscall entries. Signed-off-by: David S. Miller commit 9a2a9bb2010ed7e56547e2bb2041dab14ab0510a tree 60bcf3d4c1aa63c847ee2a2571e122c2f7dc1d99 parent f1adad78dd2fc8edaa513e0bde92b4c64340245c author Andrew Morton Mon, 15 May 2006 14:10:11 -0700 committer David S. Miller Sun, 21 May 2006 20:08:56 -0700 [SUNSU]: Fix license. FATAL: modpost: GPL-incompatible module sunsu uses the GPL-only symbol tty_insert_flip_string_flags Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit f1adad78dd2fc8edaa513e0bde92b4c64340245c tree a2cd5c53b08fa80c953147ee22b62e7bbff7ddcd parent c9d20af62c59e49684f3882503351153964ff14b author Linus Torvalds Sun, 21 May 2006 18:54:09 -0700 committer Linus Torvalds Sun, 21 May 2006 18:54:09 -0700 Revert "[PATCH] sched: fix interactive task starvation" This reverts commit 5ce74abe788a26698876e66b9c9ce7e7acc25413 (and its dependent commit 8a5bc075b8d8cf7a87b3f08fad2fba0f5d13295e), because of audio underruns. Reported by Rene Herman , who also pinpointed the exact cause of the underruns: "Audio underruns galore, with only ogg123 and firefox (browsing the GIT tree online is also a nice trigger by the way). If I back it out, everything is fine for me again." Cc: Rene Herman Cc: Mike Galbraith Acked-by: Con Kolivas Signed-off-by: Linus Torvalds commit c9d20af62c59e49684f3882503351153964ff14b tree a8dfdcf801cd27ab2cb0b0c31b6727d77b6e184e parent b307e8548921c686d2eb948ca418ab2941876daa parent 8a2ae70a9b4dc88c83b4644c58d06d74f2cb70c9 author Linus Torvalds Sun, 21 May 2006 18:31:53 -0700 committer Linus Torvalds Sun, 21 May 2006 18:31:53 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (33 commits) V4L/DVB (3965): Fix CONFIG_VIDEO_VIVI=y build bug V4L/DVB (3964): Bt8xx/bttv-cards.c: fix off-by-one errors V4L/DVB (3914): Vivi build fix V4L/DVB (3912): Sparc32 vivi fix V4L/DVB (3832): Get_dvb_firmware: download nxt2002 firmware from new driver location V4L/DVB (3829): Fix frequency values in the ranges structures of the LG TDVS H06xF tuners V4L/DVB (3826): Saa7134: Missing 'break' in Terratec Cinergy 400 TV initialization V4L/DVB (3825): Remove broken 'fast firmware load' from cx25840. V4L/DVB (3819): Cxusb-bluebird: bug-fix: power down corrupts frontend V4L/DVB (3813): Add support for TCL M2523_5N_E tuner. V4L/DVB (3804): Tweak bandselect setup fox cx24123 V4L/DVB (3803): Various correctness fixes to tuning. V4L/DVB (3797): Always wait for diseqc queue to become ready before transmitting a diseqc message V4L/DVB (3796): Add several debug messages to cx24123 code V4L/DVB (3795): Fix for CX24123 & low symbol rates V4L/DVB (3792): Kbuild: DVB_BT8XX must select DVB_ZL10353 V4L/DVB (3790): Use after free in drivers/media/video/em28xx/em28xx-video.c V4L/DVB (3788): Fix compilation with V4L1_COMPAT V4L/DVB (3782): Removed uneeded stuff from pwc Makefile V4L/DVB (3775): Add VIVI Kconfig stuff ... commit b307e8548921c686d2eb948ca418ab2941876daa tree 6da5286f9e92a9edc7a7520fba70c8f8e0b09c9a parent db31419404e5ccc7e8e07000a5f1ac440a0eafa0 author Andrew Morton Sat, 20 May 2006 15:00:36 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:22 -0700 [PATCH] ad1848 section fix WARNING: sound/oss/ad1848.o - Section mismatch: reference to .init.data:ad1848_isapnp_list from .text between 'ad1848_init_generic' (at offset 0x46f0) and 'kmalloc' WARNING: sound/oss/ad1848.o - Section mismatch: reference to .init.data:ad1848_isapnp_list from .text between 'ad1848_init_generic' (at offset 0x46f8) and 'kmalloc' WARNING: sound/oss/ad1848.o - Section mismatch: reference to .init.data:ad1848_isapnp_list from .text between 'ad1848_init_generic' (at offset 0x4818) and 'kmalloc' Also, sound/oss/ad1848.c: In function `ad1848_init': sound/oss/ad1848.c:2029: warning: cast to pointer from integer of different size sound/oss/ad1848.c: In function `ad1848_unload': sound/oss/ad1848.c:2178: warning: cast to pointer from integer of different size sound/oss/ad1848.c: In function `adintr': sound/oss/ad1848.c:2207: warning: cast from pointer to integer of different size Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db31419404e5ccc7e8e07000a5f1ac440a0eafa0 tree a41a4dba722321fdef953b3ad12380f80d842be1 parent 1caef6aa97a3a43a82f238d8b31bf177de34a4bf author Andrew Morton Sat, 20 May 2006 15:00:35 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:22 -0700 [PATCH] nm256_audio section fix WARNING: sound/oss/nm256_audio.o - Section mismatch: reference to .init.text:nm256_peek_for_sig from .text between 'nm256_install' (at offset 0x3ba4) and 'nm256_probe' WARNING: sound/oss/nm256_audio.o - Section mismatch: reference to .init.text:nm256_peek_for_sig from .text between 'nm256_install' (at offset 0x3bac) and 'nm256_probe' WARNING: sound/oss/nm256_audio.o - Section mismatch: reference to .init.text: from .text between 'nm256_install' (at offset 0x3dcc) and 'nm256_probe' WARNING: sound/oss/nm256_audio.o - Section mismatch: reference to .init.text: from .text between 'nm256_install' (at offset 0x3dd0) and 'nm256_probe' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1caef6aa97a3a43a82f238d8b31bf177de34a4bf tree 168195b4a61f2676850eb7468f45d9396124af8d parent fad43488b8c9b3914fcdc48ee3b8d30aeb49fa30 author Andrew Morton Sat, 20 May 2006 15:00:35 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:22 -0700 [PATCH] es18xx build fix sound/isa/es18xx.c: In function `snd_es18xx_identify': sound/isa/es18xx.c:1606: warning: implicit declaration of function `udelay' Cc: Jaroslav Kysela Cc: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fad43488b8c9b3914fcdc48ee3b8d30aeb49fa30 tree 4f51b7120a6e32aa3d91e5b6213279675e25d4df parent 9e8a3d229b23c34adb9c20cc2875fc67dce12585 author Andrew Morton Sat, 20 May 2006 15:00:34 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:22 -0700 [PATCH] mpu401 section fix WARNING: sound/drivers/mpu401/snd-mpu401.o - Section mismatch: reference to .init.text: from .text between 'snd_mpu401_pnp_probe' (at offset 0x1f7) and 'snd_mpu401_pnp_remove' Cc: Jaroslav Kysela Cc: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e8a3d229b23c34adb9c20cc2875fc67dce12585 tree 057657db21b66f7f82663272a8b5a0566bd79292 parent 9781b8b055bd0a02a043ed80fb8d59d703a49daf author Andrew Morton Sat, 20 May 2006 15:00:33 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:22 -0700 [PATCH] i810 section fix WARNING: drivers/video/i810/i810fb.o - Section mismatch: reference to .init.data: from .text between 'i810_fix_offsets' (at offset 0x1b88) and 'i810_alloc_agp_mem' WARNING: drivers/video/i810/i810fb.o - Section mismatch: reference to .init.data: from .text between 'i810_fix_offsets' (at offset 0x1b8f) and 'i810_alloc_agp_mem' WARNING: drivers/video/i810/i810fb.o - Section mismatch: reference to .init.data: from .text between 'i810_fix_offsets' (at offset 0x1ba3) and 'i810_alloc_agp_mem' WARNING: drivers/video/i810/i810fb.o - Section mismatch: reference to .init.data: from .text between 'i810_fix_offsets' (at offset 0x1bb5) and 'i810_alloc_agp_mem' WARNING: drivers/video/i810/i810fb.o - Section mismatch: reference to .init.data: from .text between 'i810_fix_offsets' (at offset 0x1bc6) and 'i810_alloc_agp_mem' WARNING: drivers/video/i810/i810fb.o - Section mismatch: reference to .init.data: from .text between 'i810_init_defaults' (at offset 0x1dd8) and 'i810_init_device' WARNING: drivers/video/i810/i810fb.o - Section mismatch: reference to .init.data: from .text between 'i810_init_defaults' (at offset 0x1dfb) and 'i810_init_device' Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9781b8b055bd0a02a043ed80fb8d59d703a49daf tree e4a138b31c5ac3ac86d1b34e73047410b423f43f parent e984bb43f7450312ba66fe0e67a99efa6be3b246 author Andrew Morton Sat, 20 May 2006 15:00:32 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:22 -0700 [PATCH] pd6729 section fix WARNING: drivers/pcmcia/pd6729.o - Section mismatch: reference to .init.text: from .text between 'pd6729_pci_probe' (at offset 0x9a8) and 'pd6729_pci_remove' Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e984bb43f7450312ba66fe0e67a99efa6be3b246 tree 54c86240172136fc81c773f71cd70eda54fed6f2 parent ae57a856429dd932c547530df1b234eb7e642297 author Bob Picco Sat, 20 May 2006 15:00:31 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:22 -0700 [PATCH] Align the node_mem_map endpoints to a MAX_ORDER boundary Andy added code to buddy allocator which does not require the zone's endpoints to be aligned to MAX_ORDER. An issue is that the buddy allocator requires the node_mem_map's endpoints to be MAX_ORDER aligned. Otherwise __page_find_buddy could compute a buddy not in node_mem_map for partial MAX_ORDER regions at zone's endpoints. page_is_buddy will detect that these pages at endpoints are not PG_buddy (they were zeroed out by bootmem allocator and not part of zone). Of course the negative here is we could waste a little memory but the positive is eliminating all the old checks for zone boundary conditions. SPARSEMEM won't encounter this issue because of MAX_ORDER size constraint when SPARSEMEM is configured. ia64 VIRTUAL_MEM_MAP doesn't need the logic either because the holes and endpoints are handled differently. This leaves checking alloc_remap and other arches which privately allocate for node_mem_map. Signed-off-by: Bob Picco Acked-by: Mel Gorman Cc: Dave Hansen Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae57a856429dd932c547530df1b234eb7e642297 tree 32745a24ad396bacc044793e984601dafc971776 parent b3969e5831adac133b286600e74214e1ae42ec05 author Greg Kroah-Hartman Sat, 20 May 2006 15:00:30 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:21 -0700 [PATCH] kobject: quiet errors in kobject_add People don't like released kernels yelling at them, no matter how real the error might be. So only report it if CONFIG_KOBJECT_DEBUG is enabled. Sent on request of Andrew Morton. (akpm: should bring this back post-2.6.17) Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3969e5831adac133b286600e74214e1ae42ec05 tree d708f1be2b626f0f73ab09a7e6a241640a5dd9fc parent eae07ac607f317ee6781983d3f9d8f77ef144b45 author Alessandro Zummo Sat, 20 May 2006 15:00:29 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:21 -0700 [PATCH] rtc subsystem: use ENOIOCTLCMD and ENOTTY where appropriate Appropriately use -ENOIOCTLCMD and -ENOTTY when the ioctl is not implemented by a driver. (akpm: we're not allowed to return -ENOIOCTLCMD to userspace. This patch does the right thing). Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eae07ac607f317ee6781983d3f9d8f77ef144b45 tree 4eb308235b077a69794d52d72b9241e2dd48f990 parent 2c1a51f39d9551a514d7a089d01c23c0c3a54ab8 author Atsushi Nemoto Sat, 20 May 2006 15:00:28 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:21 -0700 [PATCH] kbuild: fix modpost segfault for 64bit mipsel kernel Here is an updated r_info layout fix. Please apply "check SHT_REL sections" patch before this. 64bit mips has different r_info layout. This patch fixes modpost segfault for 64bit little endian mips kernel. Signed-off-by: Atsushi Nemoto Cc: Sam Ravnborg Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c1a51f39d9551a514d7a089d01c23c0c3a54ab8 tree e938e986a1a6f41ac701ad231601d90d4c824ffb parent 92f63cd000059366af18712367216d96180e0ec0 author Atsushi Nemoto Sat, 20 May 2006 15:00:26 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:21 -0700 [PATCH] kbuild: check SHT_REL sections I found that modpost can not detect section mismatch on mips and i386. On mips64, the modpost (with r_info layout fix) can detect it. The current modpst only checks SHT_RELA section but I suppose SHT_REL section should be checked also. This patch does not contain r_info layout fix. I'll post an updated r_info layout fix on next mail. Check SHT_REL sections as like as SHT_RELA sections to detect section mismatch. Signed-off-by: Atsushi Nemoto Cc: Sam Ravnborg Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92f63cd000059366af18712367216d96180e0ec0 tree 4f88c3875afaa8183d6cfcff685e03ac7684d82d parent 0662b71322e211dba9a4bc0e6fbca7861a2b5a7d author Martin Schwidefsky Sat, 20 May 2006 15:00:25 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:21 -0700 [PATCH] s390: next_timer_interrupt overflow in stop_hz_timer The 32 bit unsigned substraction (next - jiffies) in stop_hz_timer can overflow if jiffies gets advanced between next_timer_interrupt and the read under the xtime lock. The cast to a u64 then results in a large value which causes the cpu to wait too long. Fix this by casting next and jiffies independently to u64 before subtracting them. (Spotted by Zachary Amsden ) Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0662b71322e211dba9a4bc0e6fbca7861a2b5a7d tree bffce074929b6a36b7b1e00a485df7a5fe95cc22 parent 8b1ea24c6cc529f6860c458b1c0872f22e74c950 author Zachary Amsden Sat, 20 May 2006 15:00:24 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:21 -0700 [PATCH] Fix a NO_IDLE_HZ timer bug Under certain timing conditions, a race during boot occurs where timer ticks are being processed on remote CPUs. The remote timer ticks can increment jiffies, and if this happens during a window when a timeout is very close to expiring but a local tick has not yet been delivered, you can end up with 1) No softirq pending 2) A local timer wheel which is not synced to jiffies 3) No high resolution timer active 4) A local timer which is supposed to fire before the current jiffies value. In this circumstance, the comparison in next_timer_interrupt overflows, because the base of the comparison for high resolution timers is jiffies, but for the softirq timer wheel, it is relative the the current base of the wheel (jiffies_base). Signed-off-by: Zachary Amsden Cc: Martin Schwidefsky Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b1ea24c6cc529f6860c458b1c0872f22e74c950 tree 82f5d144279ee12ae9ec89910feeaf3d4575d573 parent dc49e3445aa703eb7fd33c7ddb7e4a7bbcf06d30 author Rene Herman Sat, 20 May 2006 15:00:22 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:21 -0700 [PATCH] missing newline in scsi/st.c st: Version 20050830, fixed bufsize 32768, s/g segs 256 st 0:0:6:0: Attached scsi tape st0<4>st0: try direct i/o: yes (alignment 512 B) Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc49e3445aa703eb7fd33c7ddb7e4a7bbcf06d30 tree eb164ad61b92f2df2ffab9628adffe06e635c8e2 parent be0d03f1c3d3612fe2b6aa451ae87a89382c9231 author Satoshi Oshima Sat, 20 May 2006 15:00:21 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:21 -0700 [PATCH] kprobes: bad manipulation of 2 byte opcode on x86_64 Problem: If we put a probe onto a callq instruction and the probe is executed, kernel panic of Bad RIP value occurs. Root cause: If resume_execution() found 0xff at first byte of p->ainsn.insn, it must check the _second_ byte. But current resume_execution check _first_ byte again. I changed it checks second byte of p->ainsn.insn. Kprobes on i386 don't have this problem, because the implementation is a little bit different from x86_64. Cc: Andi Kleen Signed-off-by: Satoshi Oshima Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be0d03f1c3d3612fe2b6aa451ae87a89382c9231 tree 6449e2071969fda7441437856da6a4739d719851 parent 5daa3ba0c6a41a8bb4ba17ad8d5514172e103504 author Vivek Goyal Sat, 20 May 2006 15:00:21 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:20 -0700 [PATCH] i386 kdump boot cpu physical apicid fix o Kdump second kernel boot fails after a system crash if second kernel is UP and acpi=off and if crash occurred on a non-boot cpu. o Issue here is that MP tables report boot cpu lapic id as 0 but second kernel is booting on a different processor and MP table data is stale in this context. Hence apic_id_registered() check fails in setup_local_APIC() when called from APIC_init_uniprocessor(). o Problem is not seen if ACPI is enabled as in that case boot_cpu_physical_apicid is read from the LAPIC. o Problem is not seen with SMP kernels as well because in this case also boot_cpu_physical_apicid is read from LAPIC. (smp_boot_cpus()). o The problem is fixed by reading boot_cpu_physical_apicid from LAPIC if it is a UP kernel and CRASH_DUMP is enabled. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5daa3ba0c6a41a8bb4ba17ad8d5514172e103504 tree b1b55ad5fb5feca7455112d6a95547c4e9913585 parent 7fba53402eb0fb4209c74469814c583b6455e096 author Stephen Street Sat, 20 May 2006 15:00:19 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:20 -0700 [PATCH] pxa2xx-spi update Fix some outstanding issues with the pxa2xx_spi driver when running on a PXA270: - Wrong timeout calculation in the setup function due to different peripheral clock rates in the PXAxxx family. - Bad handling of SSSR_TFS interrupts in interrupt_transfer function. - Added locking to interface between the pump_messages workqueue and the pump_transfers tasklet. Much thanks to Juergen Beisert for the extensive testing on the PXA270. Signed-off-by: Stephen Street Signed-off-by: David Brownell Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fba53402eb0fb4209c74469814c583b6455e096 tree 3f59b82b3bde5ffcf275e8f09e9c5785c21ee43c parent 1fc7547d4bfe5c8c8c79e196b955b6fbaa21bfd2 author Ben Dooks Sat, 20 May 2006 15:00:18 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:19 -0700 [PATCH] S3C24XX: hardware SPI driver Hardware based SPI driver for Samsung S3C24XX SoC systems Signed-off-by: Ben Dooks Cc: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1fc7547d4bfe5c8c8c79e196b955b6fbaa21bfd2 tree 1a08d571dbbd64a4585f2e486aa87ad1005a37f7 parent 1b81d6637d27a0e6a0506ecef65493b50d859cfc author Ben Dooks Sat, 20 May 2006 15:00:17 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:19 -0700 [PATCH] S3C24XX: GPIO based SPI driver SPI driver for SPI by GPIO on the Samsung S3C24XX series of SoC processors. Signed-off-by: Ben Dooks Cc: Greg KH Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b81d6637d27a0e6a0506ecef65493b50d859cfc tree 4eedb47409ac804710d9910c6485e391e87daf1a parent ccf06998fe179ae2cc9517ed1d75433dc0b5032d author Adrian Bunk Sat, 20 May 2006 15:00:16 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:19 -0700 [PATCH] drivers/base/firmware_class.c: cleanups - remove the following global function that is both unused and unimplemented: - register_firmware() - make the following needlessly global function static: - firmware_class_uevent() Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ccf06998fe179ae2cc9517ed1d75433dc0b5032d tree 88696d35b5bb168c3f7f2a3b56a683c919e33bed parent ba1a051319dc2bec9f43b7cef11c6e5270107fd6 author Kumar Gala Sat, 20 May 2006 15:00:15 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:19 -0700 [PATCH] spi: add spi master driver for Freescale MPC83xx SPI controller This driver supports the SPI controller on the MPC83xx SoC devices from Freescale. Note, this driver supports only the simple shift register SPI controller and not the descriptor based CPM or QUICCEngine SPI controller. Signed-off-by: Kumar Gala Signed-off-by: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba1a051319dc2bec9f43b7cef11c6e5270107fd6 tree f50d5141dceccda33cd5bb0f01f8c25a0108d51d parent ae0718f8e3fcfa3e4863f63db90d24bbec6b14a2 author dmitry pervushin Sat, 20 May 2006 15:00:14 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:19 -0700 [PATCH] minor SPI doc fix Because several developers asked me about referenced but missing spi_add_master(), I think that this patch should be applied ... it corrects comments so they refer to spi_register_master() instead. Signed-off-by: dmitry pervushin Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae0718f8e3fcfa3e4863f63db90d24bbec6b14a2 tree 06566bda57b1c704ee3b6902ad56fce586d6de8e parent c9ee133b914879e02796bccd840f75f185cf1bb7 author Theodore Tso Sat, 20 May 2006 15:00:13 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:19 -0700 [PATCH] Update ext2/ext3/jbd MAINTAINERS entries Signed-off-by: "Theodore Ts'o" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9ee133b914879e02796bccd840f75f185cf1bb7 tree 7f6a48dc8a51ffa233405ee32834edf0caa8244c parent a6a61c5494145c904bead0cceadd94080bd3a784 author Alan Cox Sat, 20 May 2006 15:00:12 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:18 -0700 [PATCH] Clarify maintainers and include linux-security info Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6a61c5494145c904bead0cceadd94080bd3a784 tree 7b0af71fd46a86da830c1ae3c0391fa9e55dee53 parent 92d1dbd27417c54c23aac6a84c285e256f6118b6 author Eric Sesterhenn Sat, 20 May 2006 15:00:12 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:18 -0700 [PATCH] Overrun in isdn_tty.c This fixes coverity bug id #1237. After the while loop, it is possible for i == ISDN_LMSNLEN. If this happens the terminating '\0' is written after the end of the array. Signed-off-by: Eric Sesterhenn Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92d1dbd27417c54c23aac6a84c285e256f6118b6 tree bab665935a47bb6889ddc3c92a9bee68f1f6f532 parent 36be57ffe39e03aab9fbe857f70c7a6a15bd9e08 author Paul Jackson Sat, 20 May 2006 15:00:11 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:18 -0700 [PATCH] cpuset: might_sleep_if check in cpuset_zones_allowed It's too easy to incorrectly call cpuset_zone_allowed() in an atomic context without __GFP_HARDWALL set, and when done, it is not noticed until a tight memory situation forces allocations to be tried outside the current cpuset. Add a 'might_sleep_if()' check, to catch this earlier on, instead of waiting for a similar check in the mutex_lock() code, which is only rarely invoked. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36be57ffe39e03aab9fbe857f70c7a6a15bd9e08 tree 8062e9a9e49fd942fab35e17a2b5afe571a74f63 parent bdd804f478a0cc74bf7db8e9f9d5fd379d1b31ca author Paul Jackson Sat, 20 May 2006 15:00:10 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:18 -0700 [PATCH] cpuset: update cpuset_zones_allowed comment Update the kernel/cpuset.c:cpuset_zone_allowed() comment. The rule for when mm/page_alloc.c should call cpuset_zone_allowed() was intended to be: Don't call cpuset_zone_allowed() if you can't sleep, unless you pass in the __GFP_HARDWALL flag set in gfp_flag, which disables the code that might scan up ancestor cpusets and sleep. The explanation of this rule in the comment above cpuset_zone_allowed() was stale, as a result of a restructuring of some __alloc_pages() code in November 2005. Rewrite that comment ... Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bdd804f478a0cc74bf7db8e9f9d5fd379d1b31ca tree 2b8f083b1ca698c0f9321b3714dab036d2531f29 parent 593ee20766921fec643194dff829e17f30552220 author Paul Jackson Sat, 20 May 2006 15:00:09 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:18 -0700 [PATCH] Cpuset: might sleep checking zones allowed fix Fix a couple of infrequently encountered 'sleeping function called from invalid context' in the cpuset hooks in __alloc_pages. Could sleep while interrupts disabled. The routine cpuset_zone_allowed() is called by code in mm/page_alloc.c __alloc_pages() to determine if a zone is allowed in the current tasks cpuset. This routine can sleep, for certain GFP_KERNEL allocations, if the zone is on a memory node not allowed in the current cpuset, but might be allowed in a parent cpuset. But we can't sleep in __alloc_pages() if in interrupt, nor if called for a GFP_ATOMIC request (__GFP_WAIT not set in gfp_flags). The rule was intended to be: Don't call cpuset_zone_allowed() if you can't sleep, unless you pass in the __GFP_HARDWALL flag set in gfp_flag, which disables the code that might scan up ancestor cpusets and sleep. This rule was being violated in a couple of places, due to a bogus change made (by myself, pj) to __alloc_pages() as part of the November 2005 effort to cleanup its logic, and also due to a later fix to constrain which swap daemons were awoken. The bogus change can be seen at: http://linux.derkeiler.com/Mailing-Lists/Kernel/2005-11/4691.html [PATCH 01/05] mm fix __alloc_pages cpuset ALLOC_* flags This was first noticed on a tight memory system, in code that was disabling interrupts and doing allocation requests with __GFP_WAIT not set, which resulted in __might_sleep() writing complaints to the log "Debug: sleeping function called ...", when the code in cpuset_zone_allowed() tried to take the callback_sem cpuset semaphore. We haven't seen a system hang on this 'might_sleep' yet, but we are at decent risk of seeing it fairly soon, especially since the additional cpuset_zone_allowed() check was added, conditioning wakeup_kswapd(), in March 2006. Special thanks to Dave Chinner, for figuring this out, and a tip of the hat to Nick Piggin who warned me of this back in Nov 2005, before I was ready to listen. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 593ee20766921fec643194dff829e17f30552220 tree 78fe75485a921e80252184d52613280cef5e9dbd parent d66fd908acc8ba88541ecc570d89b0243f947c5e author Kristen Accardi Sat, 20 May 2006 15:00:08 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:18 -0700 [PATCH] pci: correctly allocate return buffers for osc calls The OSC set and query functions do not allocate enough space for return values, and set the output buffer length to a false, too large value. This causes the acpi-ca code to assume that the output buffer is larger than it actually is, and overwrite memory when copying acpi return buffers into this caller provided buffer. In some cases this can cause kernel oops if the memory that is overwritten is a pointer. This patch will change these calls to use a dynamically allocated output buffer, thus allowing the acpi-ca code to decide how much space is needed. Signed-off-by: Kristen Carlson Accardi Cc: "Brown, Len" Cc: "Yu, Luming" Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d66fd908acc8ba88541ecc570d89b0243f947c5e tree 4367428c092231981230975b37cd1fbff3ec3155 parent 66055a4e7334b05354c835123ff621c5f700e56a author Amy Griffis Sat, 20 May 2006 15:00:07 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:18 -0700 [PATCH] fix NULL dereference in inotify_ignore Don't reassign to watch. If idr_find() returns NULL, then put_inotify_watch() will choke. Signed-off-by: Amy Griffis Cc: John McCutchan Cc: Robert Love Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66055a4e7334b05354c835123ff621c5f700e56a tree de9d4b432e48d4c919b70a627d9ba0b50e840de0 parent 12783b002db1f02c29353c8f698a85514420b9f4 author Amy Griffis Sat, 20 May 2006 15:00:06 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:18 -0700 [PATCH] fix race in inotify_release While doing some inotify stress testing, I hit the following race. In inotify_release(), it's possible for a watch to be removed from the lists in between dropping dev->mutex and taking inode->inotify_mutex. The reference we hold prevents the watch from being freed, but not from being removed. Checking the dev's idr mapping will prevent a double list_del of the same watch. Signed-off-by: Amy Griffis Acked-by: John McCutchan Cc: Robert Love Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12783b002db1f02c29353c8f698a85514420b9f4 tree d0cec6913308fb34d539192dd0928cd0d7aae714 parent ad8f5797302ed389476debcc51b4630f387618b9 author Mike Kravetz Sat, 20 May 2006 15:00:05 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:17 -0700 [PATCH] SPARSEMEM incorrectly calculates section number A bad calculation/loop in __section_nr() could result in incorrect section information being put into sysfs memory entries. This primarily impacts memory add operations as the sysfs information is used while onlining new memory. Fix suggested by Dave Hansen. Note that the bug may not be obvious from the patch. It actually occurs in the function's return statement: return (root_nr * SECTIONS_PER_ROOT) + (ms - root); In the existing code, root_nr has already been multiplied by SECTIONS_PER_ROOT. Signed-off-by: Mike Kravetz Cc: Dave Hansen Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad8f5797302ed389476debcc51b4630f387618b9 tree 496981468883ff6f06410c205ca0007b1d1ae3dc parent d4e9dc63dca91cd89086b5a686d7f7635c8319e5 author KAMEZAWA Hiroyuki Sat, 20 May 2006 15:00:03 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:17 -0700 [PATCH] build fix: CONFIG_MEMORY_HOTPLUG=y on i386 typo in #ifdefs. Fixes http://bugme.osdl.org/show_bug.cgi?id=6538 Signed-off-by: KAMEZAWA Hiroyuki Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4e9dc63dca91cd89086b5a686d7f7635c8319e5 tree c6ec1b8801d8e526e0d7373b7cd91e46f20a4299 parent df88912a2165f56a7402db80126cf8ea075221fe author Alexey Dobriyan Sat, 20 May 2006 15:00:02 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:17 -0700 [PATCH] selinux: endian fix Signed-off-by: Alexey Dobriyan Cc: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df88912a2165f56a7402db80126cf8ea075221fe tree 3d2246a0507cbaa56a501485d69ee936f367bc37 parent 48d705522da4fa04bb0169a7ca3c9ab92e28b613 author Andrew Morton Sat, 20 May 2006 15:00:01 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:17 -0700 [PATCH] binfmt_flat: don't check for EMFILE Bernd Schmidt points out that binfmt_flat is now leaving the exec file open while the application runs. This offsets all the application's fd numbers. We should have closed the file within exec(), not at exit()-time. But there doesn't seem to be a lot of point in doing all this just to avoid going over RLIMIT_NOFILE by one fd for a few microseconds. So take the EMFILE checking out again. This will cause binfmt_flat to again fail LTP's exec-should-return-EMFILE-when-fdtable-is-full test. That test appears to be wrong anyway - Open Group specs say nothing about exec() returning EMFILE. Cc: Bernd Schmidt Cc: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48d705522da4fa04bb0169a7ca3c9ab92e28b613 tree 4863bac913553850e33a0cfc8f8dabd598214bf7 parent 9ccfc29c671c9d0a83c2a114d4bc5f85f3cd749d author Micon, David Sat, 20 May 2006 14:59:59 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:17 -0700 [PATCH] HID read busywait fix Make a read of a HID device block until data is available. Without it, the read goes into a busy-wait loop until data is available. Cc: Greg KH Acked-by: Vojtech Pavlik Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ccfc29c671c9d0a83c2a114d4bc5f85f3cd749d tree a02d2712a788abb4c5891e9c469c99b770fa0dbb parent 2adc7d47c4dbf684e69ee3980c158ff684dc170e author Florin Malita Sat, 20 May 2006 14:59:58 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:17 -0700 [PATCH] nfsd: sign conversion obscuring errors in nfsd_set_posix_acl() Assigning the result of posix_acl_to_xattr() to an unsigned data type (size/size_t) obscures possible errors. Coverity CID: 1206. Signed-off-by: Florin Malita Acked-by: NeilBrown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2adc7d47c4dbf684e69ee3980c158ff684dc170e tree ec4d2891f17b67c91f29d8b748ae49b9ef39a3e7 parent 8c7b389e532e964f07057dac8a56c43465544759 author NeilBrown Sat, 20 May 2006 14:59:57 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:17 -0700 [PATCH] md: Fix inverted test for 'repair' directive. We should be able to write 'repair' to /sys/block/mdX/md/sync_action, however due to and inverted test, that always given EINVAL. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c7b389e532e964f07057dac8a56c43465544759 tree 23d81d654dfead5f12503e77818dd45940fbc5fd parent ea6c20891eb25e4884b852c040136f44cb173f3e author Peter Staubach Sat, 20 May 2006 14:59:56 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:16 -0700 [PATCH] NFS server subtree_check returns dubious value Address a problem found when a Linux NFS server uses the "subtree_check" export option. The "subtree_check" NFS export option was designed to prohibit a client from using a file handle for which it should not have permission. The algorithm used is to ensure that the entire path to the file being referenced is accessible to the user attempting to use the file handle. If some part of the path is not accessible, then the operation is aborted and the appropriate version of ESTALE is returned to the NFS client. The error, ESTALE, is unfortunate in that it causes NFS clients to make certain assumptions about the continued existence of the file. They assume that the file no longer exists and refuse to attempt to access it again. In this case, the file really does exist, but access was denied by the server for a particular user. A better error to return would be an EACCES sort of error. This would inform the client that the particular operation that it was attempting was not allowed, without the nasty side effects of the ESTALE error. Signed-off-by: Peter Staubach Acked-By: NeilBrown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea6c20891eb25e4884b852c040136f44cb173f3e tree 0e27879e6775bed150a0d0801874ef73dd841c32 parent 22192ccd6d1dfea2a41e40442997ccad5b7b160e author Vivek Goyal Sat, 20 May 2006 14:59:55 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:16 -0700 [PATCH] Kdump maintainer info update Update MAINTAINERS file for info regarding kdump maintainership. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22192ccd6d1dfea2a41e40442997ccad5b7b160e tree b5e0662ffee5e8776cb5165e9d4aafdd6cafaec2 parent c44b20d51142acdc9c66108b758c0454a7e2ce11 author Benjamin Herrenschmidt Sat, 20 May 2006 14:59:53 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:16 -0700 [PATCH] powerpc: Fix ide-pmac sysfs entry It looks like the generic ide code now wants ide_init_hwif_ports() to set the parent struct device into the ide_hw structure (new field ?). Without this, the mac ide code can cause the ide probing code to explode in flames in sysfs registration due to what looks like a stale pointer in there (happens when removing/re-inserting one of the hotswap media bays on some laptops). Signed-off-by: Benjamin Herrenschmidt Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c44b20d51142acdc9c66108b758c0454a7e2ce11 tree f1079752527d3c9ee637e06781ae150834e33fab parent 6d39bedc47fbf18a940f5843981767c221d22cfe author Chuck Ebbert <76306.1226@compuserve.com> Sat, 20 May 2006 14:59:52 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:16 -0700 [PATCH] i386: remove junk from stack dump i386 stack dump has a "<0>" in the middle of the line and an extra space between columns in multicolumn mode. Remove those and also remove an extra blank line of source code. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d39bedc47fbf18a940f5843981767c221d22cfe tree 900a15248ace2b0b7946b19acb49e3c696ce953e parent d64b1c878fc1e384ae53d1d40034239bc33848f4 author Paul A. Clarke Sat, 20 May 2006 14:59:51 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:16 -0700 [PATCH] matroxfb: fix DVI setup to be more compatible There has been a longstanding problem with the Matrox G450 and perhaps other similar cards, with modes "above" 1280x1024-60 on ppc/ppc64 boxes running Linux. Higher resolutions and/or higher refresh rates resulted in a very noticably "jittery" display, and sometimes no display, depending on the physical monitor. This patch fixes that problem on the systems I have easy access to... I've tested with SLES9SP3 (2.6.5+ kernel) and 2.6.16-rc6 custom kernels on an IBM eServer p5 520 w/G450 (a.k.a GXT135P on IBM's ppc64 systems), and a colleague of mine (Ian Romanick) tested it successfully on an Apple ppc32 box (w/GXT135P). I also tested it on IA32 box I have with a GXT135P to verify that it didn't obviously break anything. In my testing, I covered single-card, single and dual-head setups using both HD15 and DVI-D signals, on both the IA32 and ppc64 boxes. While everything appeared fine on both boxes, I did encounter one problem: I can't get any signal on the DVI-D output on the ppc64 box. However, this is also the case without my patch. I just noticed that screen-blanking only occurs on the primary display as well. Signed-off-by: Paul A. Clarke Signed-off-by: Ian Romanick Signed-off-by: Petr Vandrovec Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d64b1c878fc1e384ae53d1d40034239bc33848f4 tree fe31b26f2db18d021cf04181bd39e08b2beb17f1 parent 84b3932bf0fd8cdc8c75a5be77e1dded1e6479c6 author Lin Feng Shen Sat, 20 May 2006 14:59:49 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:16 -0700 [PATCH] NFS: fix error handling on access_ok in compat_sys_nfsservctl Functions compat_nfs_svc_trans, compat_nfs_clnt_trans, compat_nfs_exp_trans, compat_nfs_getfd_trans and compat_nfs_getfs_trans, which are called by compat_sys_nfsservctl(fs/compat.c), don't handle the return value of access_ok properly. access_ok return 1 when the addr is valid, and 0 when it's not, but these functions have the reversed understanding. When the address is valid, they always return -EFAULT to compat_sys_nfsservctl. An example is to run /usr/sbin/rpc.nfsd(32bit program on Power5). It doesn't function as expected. strace showes that nfsservctl returns -EFAULT. The patch fixes this by correcting the error handling on the return value of access_ok in the five functions. Signed-off-by: Lin Feng Shen Cc: Trond Myklebust Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84b3932bf0fd8cdc8c75a5be77e1dded1e6479c6 tree 731b287b0635ef97c1621c49d0be555d6f351bbe parent 6566a3f8f3281497a81815dfe2b64eb54dafe05d author Ayaz Abdulla Sat, 20 May 2006 14:59:48 -0700 committer Linus Torvalds Sun, 21 May 2006 12:59:16 -0700 [PATCH] forcedeth: fix multi irq issues With Manfred Spraul and Andrew Morton Bring back this recently-reverted patch, only fixed. Original changelog: From: Ayaz Abdulla This patch fixes the issues with multiple irqs. I am resending based on feedback. I decoupled the dma mask for consistent memory and fixed leak with multiple irq in error path. Thanks to Manfred for catching the spin lock problem. Fix it: From: Manfred Spraul Fix bug introduced by ebf34c9b6fcd22338ef764b039b3ac55ed0e297b, covered in http://bugzilla.kernel.org/show_bug.cgi?id=6568. Remove second instance of the request_irq() calls: they were moved from nv_open into nv_request_irq. Thanks to Alistair Strachan for reporting and persisting. Signed-off-by: Ayaz Abdulla Signed-off-by: Manfred Spraul Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6566a3f8f3281497a81815dfe2b64eb54dafe05d tree ff0073a0b85edef12d6248608d08c4962fec58d6 parent bb02aacc02c6002143a1cfc313d144a413eec8d0 parent e2a7f77a7b4ab298a38c8d1f624628456069bdb0 author Linus Torvalds Sat, 20 May 2006 10:35:41 -0700 committer Linus Torvalds Sat, 20 May 2006 10:35:41 -0700 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] libata-core: fix current kernel-doc warnings [PATCH] sata_mv: version bump [PATCH] sata_mv: endian fix [PATCH] sata_mv: remove local copy of queue indexes [PATCH] sata_mv: spurious interrupt workaround [PATCH] sata_mv: chip initialization fixes [PATCH] sata_mv: deal with interrupt coalescing interrupts [PATCH] sata_mv: prevent unnecessary double-resets commit e2a7f77a7b4ab298a38c8d1f624628456069bdb0 tree e54ad6f4414ce23972a42492d6265bd598000984 parent 63a25355cd5cd9a2d19a7c50eed4f0a8aa622f72 author Randy Dunlap Thu, 18 May 2006 10:50:18 -0700 committer Jeff Garzik Sat, 20 May 2006 00:33:51 -0400 [PATCH] libata-core: fix current kernel-doc warnings Fix all current kernel-doc warnings. Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 63a25355cd5cd9a2d19a7c50eed4f0a8aa622f72 tree 92e2faafa3b1f180d0bd7494ec662c6677bc4d08 parent 559eedad7f7764dacca33980127b4615011230e4 author Mark Lord Fri, 19 May 2006 16:41:27 -0400 committer Jeff Garzik Sat, 20 May 2006 00:31:46 -0400 [PATCH] sata_mv: version bump Increment the version number inside sata_mv.c. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 559eedad7f7764dacca33980127b4615011230e4 tree 0ea842b15f7fe360b5786e866160dedbb95cc38b parent a6432436c5e14b416f27c8f87c5bf0bc36771f49 author Mark Lord Fri, 19 May 2006 16:40:15 -0400 committer Jeff Garzik Sat, 20 May 2006 00:31:45 -0400 [PATCH] sata_mv: endian fix This fixes a byte-swap issue on PPC, found by Zang Roy-r61911 on the powerpc platform. His original patch also had some other platform-specific changes in #ifdef's, but I'm not sure yet how to incorporate them. Look for another patch for those (soon). Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit a6432436c5e14b416f27c8f87c5bf0bc36771f49 tree c87e8148240a4efefeba72a239ee049e6d88bb0c parent e857f141945f29c16f72ffcfdbce097f8be6c4e9 author Mark Lord Fri, 19 May 2006 16:36:36 -0400 committer Jeff Garzik Sat, 20 May 2006 00:31:45 -0400 [PATCH] sata_mv: remove local copy of queue indexes The driver currently keeps local copies of the hardware request/response queue indexes. But it expends significant effort ensuring consistency between the two views, and still gets it wrong after an error or reset occurs. This patch removes the local copies, in favour of just accessing the hardware whenever we need them. Eventually this may need to be tweaked again for NCQ, but for now this works and solves problems some users were seeing. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit e857f141945f29c16f72ffcfdbce097f8be6c4e9 tree cd6bcdeaed84701fddc693eedfddae0fcba68e27 parent eb46d684600ac145501805a294c94675e82eab2e author Mark Lord Fri, 19 May 2006 16:33:03 -0400 committer Jeff Garzik Sat, 20 May 2006 00:31:45 -0400 [PATCH] sata_mv: spurious interrupt workaround The 60xx chips, and possibly others, incorrectly assert DEV_IRQ interrupts on a regular basis. The cause of this is under investigation (by me and in theory by Marvell also), but regardless we do need to deal with these events. This patch tidies up some interrupt handler code, and ensures that we ignore DEV_IRQ interrupts when the drive still has ATA_BUSY asserted. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit eb46d684600ac145501805a294c94675e82eab2e tree e99ef2ae9cdc1b21229e42eb075e6c5b8c60db3b parent 615ab95342f6245026d8974b9724f7ea57d9a184 author Mark Lord Fri, 19 May 2006 16:29:21 -0400 committer Jeff Garzik Sat, 20 May 2006 00:31:45 -0400 [PATCH] sata_mv: chip initialization fixes The interface control register of the 60xx (and later) Marvell chip requires certain bits to always be set when writing to it. These bits incorrectly read-back as zeros, so the pattern must be ORed in with each write of the register. Also, bit 12 should NOT be set (note that Marvell's own driver also had bit-12 wrong here). While we're at it, we also now do pci_set_master() in the init code. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 615ab95342f6245026d8974b9724f7ea57d9a184 tree f86414f7024494c0049a0f37610fc25c4f708b1f parent 9b358e305c1d783c8a4ebf00344e95deb9e38f3d author Mark Lord Fri, 19 May 2006 16:24:56 -0400 committer Jeff Garzik Sat, 20 May 2006 00:31:45 -0400 [PATCH] sata_mv: deal with interrupt coalescing interrupts In some systems, it is possible that the BIOS may have enabled interrupt coalescing for the Marvell controllers which support it. This patch adds code to detect/ack interrupts from the chip's coalescing (combing) logic. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 9b358e305c1d783c8a4ebf00344e95deb9e38f3d tree b1cfece40d968befb1df17661282471ddf59a9dc parent 2f880b65fdbc2d4915bddc59d75a176329570fdd author Mark Lord Fri, 19 May 2006 16:21:03 -0400 committer Jeff Garzik Sat, 20 May 2006 00:31:45 -0400 [PATCH] sata_mv: prevent unnecessary double-resets The mv_err_intr() function is invoked from the driver's interrupt handler, as well as from the timeout function. This patch prevents it from triggering a one-after-the-other double reset of the controller when invoked from the timeout function. This also adds a check for a timeout race condition that has been observed to occur with this driver in earlier kernels. This should not be needed, in theory, but in practice it has caught bugs. Maybe nuke it at a later date. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit bb02aacc02c6002143a1cfc313d144a413eec8d0 tree 7577b35c7756a693bfb16fea5ea6d68f0c3197db parent f905703a93b7014a0fd95d0edac2b734bf0d1522 author Erling A. Jacobsen Sun, 30 Apr 2006 21:46:56 +0200 committer Jeff Garzik Sat, 20 May 2006 00:20:29 -0400 [PATCH] winbond-840-remove-badness-in-pci_map_single Call pci_map_single() with the actual size of the receive buffers, not 0 (which skb->len is initialized to by dev_alloc_skb()). Signed-off-by: Erling A. Jacobsen Signed-off-by: Jeff Garzik commit f905703a93b7014a0fd95d0edac2b734bf0d1522 tree e7642260c3b8a4b759e0b1b3be5e3587cf372c67 parent a06631cbdc09fe33892f08238be498eaa84892ee author Komuro Sun, 30 Apr 2006 09:54:13 +0900 committer Jeff Garzik Sat, 20 May 2006 00:20:29 -0400 [PATCH] network: axnet_cs: bug fix multicast code (support older ax88190 chipset) Dear Jeff axnet_cs: bug fix multicast code (support older ax88190 chipset) Signed-off-by: komurojun-mbn@nifty.com Best Regards Komuro Signed-off-by: Jeff Garzik commit a06631cbdc09fe33892f08238be498eaa84892ee tree 52d7d6d7677815f8be197bde05bb4f2df1a76bf4 parent 20e777a2a7dc9fad3d0b016c662c2fb60e6b20e7 author Stephen Hemminger Mon, 15 May 2006 16:32:39 -0700 committer Jeff Garzik Sat, 20 May 2006 00:17:07 -0400 [PATCH] skge: don't allow transmit ring to be too small The driver will get stuck (permanent transmit timeout), if the transmit ring size is set too small. It needs to have enough ring elements to hold one maximum size transmit. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 20e777a2a7dc9fad3d0b016c662c2fb60e6b20e7 tree ee1b651deee6f448e86eac0f8509a3610420d5ef parent e988bcdbe92eb61ea5bfe18aaba6986184118212 author Stephen Hemminger Mon, 15 May 2006 16:30:25 -0700 committer Jeff Garzik Sat, 20 May 2006 00:17:07 -0400 [PATCH] skge: bad checksums on big-endian platforms Skge driver always causes bad checksums on big-endian. The checksum in the receive control block was being swapped when it doesn't need to be. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit e988bcdbe92eb61ea5bfe18aaba6986184118212 tree ae68cbbfdbd06453ae4843f84820c9a3c15d7c7b parent c9b84dcac6e20ec8e5424f3dff853daa863bfdd0 parent bc519f30eb039f023c15167663d5a8a14fed7dcb author Jeff Garzik Sat, 20 May 2006 00:16:17 -0400 committer Jeff Garzik Sat, 20 May 2006 00:16:17 -0400 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit c9b84dcac6e20ec8e5424f3dff853daa863bfdd0 tree b0611bb64094d18fd7171ec959eb07a0ee6799c3 parent 86fba6342dee30a1533b14da284d79e4eb66de26 author Stephen Hemminger Wed, 17 May 2006 14:37:07 -0700 committer Jeff Garzik Sat, 20 May 2006 00:15:39 -0400 [PATCH] sky2 version 1.4 Need to track impact of this group of changes. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 86fba6342dee30a1533b14da284d79e4eb66de26 tree 1ec4d7f2b874baa2f2548ed05ee4ab232b181c0f parent 86a31a759f2117816b8c78a049c41ead3ef9ef1c author Stephen Hemminger Wed, 17 May 2006 14:37:06 -0700 committer Jeff Garzik Sat, 20 May 2006 00:15:39 -0400 [PATCH] sky2: force NAPI repoll if busy If the status ring processing can't keep up with the incoming frames, it is more efficient to have NAPI keep scheduling the poll routine rather than causing another interrupt. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 86a31a759f2117816b8c78a049c41ead3ef9ef1c tree af9ecd4f029f1d564859b6dfb529f4522f675d13 parent 2d2a387199bf38c6628adb9c6184d7ab6e306148 author Stephen Hemminger Wed, 17 May 2006 14:37:05 -0700 committer Jeff Garzik Sat, 20 May 2006 00:15:39 -0400 [PATCH] sky2: more fixes for Yukon Ultra Logic error in the phy initialization code. Also, turn on wake on lan bit in status control. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 2d2a387199bf38c6628adb9c6184d7ab6e306148 tree 92c6ea0db43d7705bdf8b341c85cb060c952fb95 parent ee7abb04df92b444069be8fe47d66d809de23782 author Stephen Hemminger Wed, 17 May 2006 14:37:04 -0700 committer Jeff Garzik Sat, 20 May 2006 00:15:39 -0400 [PATCH] Subjec: sky2, skge: correct PCI id for DGE-560T The Dlink DGE-560T uses Yukon2 chipset so it needs sky2 driver; and the DGE-530T uses Yukon1 so it uses skge driver. Bug: http://bugzilla.kernel.org/show_bug.cgi?id=6544 Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit ee7abb04df92b444069be8fe47d66d809de23782 tree b96478a17f08aed0955ea6fba06cc9dde8f517fe parent 38bb6b288bf4fb954a3793e57c7339774c842a54 author Stephen Hemminger Thu, 18 May 2006 11:16:21 -0700 committer Jeff Garzik Sat, 20 May 2006 00:15:39 -0400 [PATCH] sky2: allow dual port usage If both ports are receiving on the SysKonnect dual port cards, then it appears the bus interface unit can give an interrupt status for frame before DMA has completed. This leads to bogus frames and general confusion. This is why receive checksumming is also messed up on dual port cards. A workaround for the out of order receive problem is to eliminating split transactions on PCI-X. This version is based of the current linux-2.6.git including earlier patch to disable dual ports. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 38bb6b288bf4fb954a3793e57c7339774c842a54 tree d4b16a5f6a38a95a15868d9df8ac1903252ae211 parent f34ba4e1edd82272dbc192e488c7dc9e56c4ec62 author John W. Linville Fri, 19 May 2006 10:51:21 -0400 committer Jeff Garzik Sat, 20 May 2006 00:14:49 -0400 [PATCH] via-rhine: revert "change mdelay to msleep and remove from ISR path" Revert previous patch with subject "change mdelay to msleep and remove from ISR path". This patch seems to have caused bigger problems than it solved, and it didn't solve much of a problem to begin with... Discussion about backing-out this patch can be found here: http://marc.theaimsgroup.com/?l=linux-netdev&m=114321570402396&w=2 The git commit associated w/ the original patch is: 6ba98d311d0a4ff7dc36d8f435ce60174f4c30ec Signed-off-by: John W. Linville commit f34ba4e1edd82272dbc192e488c7dc9e56c4ec62 tree a8b593a3346954321fdadc77f0c01b02cd0025b1 parent 2f880b65fdbc2d4915bddc59d75a176329570fdd author Andrew Morton Fri, 19 May 2006 02:13:21 -0700 committer Jeff Garzik Sat, 20 May 2006 00:13:05 -0400 [PATCH] revert "forcedeth: fix multi irq issues" Revert ebf34c9b6fcd22338ef764b039b3ac55ed0e297b. Maybe. Due to crashes at shutdown - see http://bugzilla.kernel.org/show_bug.cgi?id=6568. Cc: Ayaz Abdulla Cc: Manfred Spraul Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 2f880b65fdbc2d4915bddc59d75a176329570fdd tree f2374a6d31121c5969d251b1aa19e43f1a6815c3 parent fee9167214e8e515b2a1f68afc34187f2b59c182 parent 23f3bc0f2c1e26215b671499c07047c325d54d9c author Linus Torvalds Fri, 19 May 2006 18:52:59 -0700 committer Linus Torvalds Fri, 19 May 2006 18:52:59 -0700 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IB/mthca: Fix posting lists of 256 receive requests for Tavor IB/uverbs: Don't leak ref to mm on error path IB/srp: Complete correct SCSI commands on device reset IB/srp: Get rid of extra scsi_host_put()s if reconnection fails IB/srp: Don't wait for disconnection if sending DREQ fails IB/mthca: Make fw_cmd_doorbell default to 0 commit fee9167214e8e515b2a1f68afc34187f2b59c182 tree 8b12deac1bc4c988d12a8a868ec32161943bbc91 parent ae83e255045ed3cdc798664e8e189aa5cf2702eb parent b89498a1c2941c00889dd025f52dcb653a5083bc author Linus Torvalds Fri, 19 May 2006 16:48:54 -0700 committer Linus Torvalds Fri, 19 May 2006 16:48:54 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [SCTP]: Allow linger to abort 1-N style sockets. [SCTP]: Validate the parameter length in HB-ACK chunk. [SCTP]: Respect the real chunk length when walking parameters. [SCTP]: A better solution to fix the race between sctp_peeloff() and [SCTP]: Set sk_err so that poll wakes up after a non-blocking connect failure. commit ae83e255045ed3cdc798664e8e189aa5cf2702eb tree 88e58ea54439131fa3ee9730575f55aaf4b80b95 parent 890f74291c9133eaed6c0eb8514f7618d43d0925 parent 2c171bf13423dc5293188cea7f6c2da1720926e2 author Linus Torvalds Fri, 19 May 2006 16:42:25 -0700 committer Linus Torvalds Fri, 19 May 2006 16:42:25 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-mmc * master.kernel.org:/home/rmk/linux-2.6-mmc: [ARM] 3531/1: i.MX/MX1 SD/MMC ensure, that clock are stopped before new command and cleanups commit 890f74291c9133eaed6c0eb8514f7618d43d0925 tree 445a9de7b2e554bde5ec9d18d67f2c56e8477d16 parent b0c51b7d650d5109c8e71e19d5e7ce9b71af7dff parent c2a4c40651e08e465d3a6130bd9f6dcc1ce21d83 author Linus Torvalds Fri, 19 May 2006 16:42:11 -0700 committer Linus Torvalds Fri, 19 May 2006 16:42:11 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3533/1: Implement the __raw_(read|write)_can_lock functions on ARM [ARM] 3530/1: PXA Mainstone: prevent double enable_irq() in pcmcia [ARM] 3529/1: s3c24xx: fix restoring control register with undefined instruction commit b0c51b7d650d5109c8e71e19d5e7ce9b71af7dff tree dcbb5da853601a2e80829402adbd03435469eb10 parent ee433530d96a7b0af24ab616e5b51f1d89f9ae38 parent 655516c80ccb3ab2ba2d3063715889b00552a8b3 author Linus Torvalds Fri, 19 May 2006 16:41:59 -0700 committer Linus Torvalds Fri, 19 May 2006 16:41:59 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] s3c2410_wdt.c stop watchdog after boot [WATCHDOG] i8xx_tco.c - remove support for ICH6 + ICH7 [WATCHDOG] Documentation/watchdog/watchdog-api.txt - fix watchdog daemon [WATCHDOG] sc1200wdt.c printk fix commit b89498a1c2941c00889dd025f52dcb653a5083bc tree a677c2ec38b9acf7e648bf3c89d22540cc563944 parent a601266e4f3c479790f373c2e3122a766d123652 author Vladislav Yasevich Fri, 19 May 2006 14:32:06 -0700 committer Sridhar Samudrala Fri, 19 May 2006 14:32:06 -0700 [SCTP]: Allow linger to abort 1-N style sockets. Enable SO_LINGER functionality for 1-N style sockets. The socket API draft will be clarfied to allow for this functionality. The linger settings will apply to all associations on a given socket. Signed-off-by: Vladislav Yasevich Signed-off-by: Sridhar Samudrala commit a601266e4f3c479790f373c2e3122a766d123652 tree 0f22554556272153de2cbdc94bc32de5f2fa4633 parent dd2d1c6f2958d027e4591ca5d2a04dfe36ca6512 author Vladislav Yasevich Fri, 19 May 2006 14:25:53 -0700 committer Sridhar Samudrala Fri, 19 May 2006 14:25:53 -0700 [SCTP]: Validate the parameter length in HB-ACK chunk. If SCTP receives a badly formatted HB-ACK chunk, it is possible that we may access invalid memory and potentially have a buffer overflow. We should really make sure that the chunk format is what we expect, before attempting to touch the data. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala commit c2a4c40651e08e465d3a6130bd9f6dcc1ce21d83 tree e8cc87fa6e0afad219b82655df183a3412a2f1d3 parent ec64152fee25e2a63f06d40d32c7b4cb62eab9a3 author Catalin Marinas Fri, 19 May 2006 21:55:35 +0100 committer Russell King Fri, 19 May 2006 21:55:35 +0100 [ARM] 3533/1: Implement the __raw_(read|write)_can_lock functions on ARM Patch from Catalin Marinas Recent patches introduced the write_can_lock() call in the kernel/ptrace.c file. Implement the __raw_* variants on ARM (SMP) as well. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 2c171bf13423dc5293188cea7f6c2da1720926e2 tree d251705f564c8ffb081ba84c769fd2d1b229db53 parent a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e author Pavel Pisa Fri, 19 May 2006 21:48:03 +0100 committer Russell King Fri, 19 May 2006 21:48:03 +0100 [ARM] 3531/1: i.MX/MX1 SD/MMC ensure, that clock are stopped before new command and cleanups Patch from Pavel Pisa There has been problems that for some paths that clock are not stopped during new command programming and initiation. Result is issuing of incorrect command to the card. Some other problems are cleaned too. Noisy report of known ERRATUM #4 has been suppressed. Signed-off-by: Pavel Pisa Signed-off-by: Russell King commit dd2d1c6f2958d027e4591ca5d2a04dfe36ca6512 tree 5eaf4aa2ddce2cdbff1bdf04df6e7392c0cde94b parent 61c9fed41638249f8b6ca5345064eb1beb50179f author Vladislav Yasevich Fri, 19 May 2006 11:52:20 -0700 committer Sridhar Samudrala Fri, 19 May 2006 11:52:20 -0700 [SCTP]: Respect the real chunk length when walking parameters. When performing bound checks during the parameter processing, we want to use the real chunk and paramter lengths for bounds instead of the rounded ones. This prevents us from potentially walking of the end if the chunk length was miscalculated. We still use rounded lengths when advancing the pointer. This was found during a conformance test that changed the chunk length without modifying parameters. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala commit 61c9fed41638249f8b6ca5345064eb1beb50179f tree 8855a0e6cbee58a9d94e30396b7d0a1baa526900 parent 8de8c8738086501bbe3057ed6f4b70dded657488 author Vladislav Yasevich Fri, 19 May 2006 11:01:18 -0700 committer Sridhar Samudrala Fri, 19 May 2006 11:01:18 -0700 [SCTP]: A better solution to fix the race between sctp_peeloff() and sctp_rcv(). The goal is to hold the ref on the association/endpoint throughout the state-machine process. We accomplish like this: /* ref on the assoc/ep is taken during lookup */ if owned_by_user(sk) sctp_add_backlog(skb, sk); else inqueue_push(skb, sk); /* drop the ref on the assoc/ep */ However, in sctp_add_backlog() we take the ref on assoc/ep and hold it while the skb is on the backlog queue. This allows us to get rid of the sock_hold/sock_put in the lookup routines. Now sctp_backlog_rcv() needs to account for potential association move. In the unlikely event that association moved, we need to retest if the new socket is locked by user. If we don't this, we may have two packets racing up the stack toward the same socket and we can't deal with it. If the new socket is still locked, we'll just add the skb to its backlog continuing to hold the ref on the association. This get's rid of the need to move packets from one backlog to another and it also safe in case new packets arrive on the same backlog queue. The last step, is to lock the new socket when we are moving the association to it. This is needed in case any new packets arrive on the association when it moved. We want these to go to the backlog since we would like to avoid the race between this new packet and a packet that may be sitting on the backlog queue of the old socket toward the same association. Signed-off-by: Vladislav Yasevich Signed-off-by: Sridhar Samudrala commit 8de8c8738086501bbe3057ed6f4b70dded657488 tree c8c5b4b5c3d3c35993368d0e462484cc62b006f4 parent ee433530d96a7b0af24ab616e5b51f1d89f9ae38 author Sridhar Samudrala Fri, 19 May 2006 10:58:12 -0700 committer Sridhar Samudrala Fri, 19 May 2006 10:58:12 -0700 [SCTP]: Set sk_err so that poll wakes up after a non-blocking connect failure. Also fix some other cases where sk_err is not set for 1-1 style sockets. Signed-off-by: Sridhar Samudrala commit ee433530d96a7b0af24ab616e5b51f1d89f9ae38 tree ef97ce3211d8a034a24de86a06741e662be2c27e parent 2c8ac66bb2ff89e759f0d632a27cc64205e9ddd9 author Patrick McHardy Fri, 19 May 2006 02:17:18 -0700 committer David S. Miller Fri, 19 May 2006 02:17:18 -0700 [NETFILTER]: nfnetlink_log: fix byteorder confusion flags is a u16, so use htons instead of htonl. Also avoid double conversion. Noticed by Alexey Dobriyan Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2c8ac66bb2ff89e759f0d632a27cc64205e9ddd9 tree 5f0b19841fbe6e49dd17cee6da189dfeea6ff7bf parent a467704dcb4fa45da48079486f1b0e6baffb12d2 author Solar Designer Fri, 19 May 2006 02:16:52 -0700 committer David S. Miller Fri, 19 May 2006 02:16:52 -0700 [NETFILTER]: Fix do_add_counters race, possible oops or info leak (CVE-2006-0039) Solar Designer found a race condition in do_add_counters(). The beginning of paddc is supposed to be the same as tmp which was sanity-checked above, but it might not be the same in reality. In case the integer overflow and/or the race condition are triggered, paddc->num_counters might not match the allocation size for paddc. If the check below (t->private->number != paddc->num_counters) nevertheless passes (perhaps this requires the race condition to be triggered), IPT_ENTRY_ITERATE() would read kernel memory beyond the allocation size, potentially causing an oops or leaking sensitive data (e.g., passwords from host system or from another VPS) via counter increments. This requires CAP_NET_ADMIN. Signed-off-by: Solar Designer Signed-off-by: Kirill Korotaev Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a467704dcb4fa45da48079486f1b0e6baffb12d2 tree 5e08a631dfe15e7d90f372eb36a3318cae1f3b32 parent 5c170a09d9092e63af1658179f29867d32d56b55 author Alexey Dobriyan Fri, 19 May 2006 02:16:29 -0700 committer David S. Miller Fri, 19 May 2006 02:16:29 -0700 [NETFILTER]: GRE conntrack: fix htons/htonl confusion GRE keys are 16 bit. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 5c170a09d9092e63af1658179f29867d32d56b55 tree 4263c58f0e0e89e21412f67d84761971dbbdfeca parent 493e2428aa1db0e592736ad15885c6ed1e81b8af author Philip Craig Fri, 19 May 2006 02:15:47 -0700 committer David S. Miller Fri, 19 May 2006 02:15:47 -0700 [NETFILTER]: fix format specifier for netfilter log targets The prefix argument for nf_log_packet is a format specifier, so don't pass the user defined string directly to it. Signed-off-by: Philip Craig Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 493e2428aa1db0e592736ad15885c6ed1e81b8af tree abfa2a9540b4c84ce0cb33819398a792e3914ed9 parent a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e author Jesper Juhl Fri, 19 May 2006 02:15:13 -0700 committer David S. Miller Fri, 19 May 2006 02:15:13 -0700 [NETFILTER]: Fix memory leak in ipt_recent The Coverity checker spotted that we may leak 'hold' in net/ipv4/netfilter/ipt_recent.c::checkentry() when the following is true: if (!curr_table->status_proc) { ... if(!curr_table) { ... return 0; <-- here we leak. Simply moving an existing vfree(hold); up a bit avoids the possible leak. Signed-off-by: Jesper Juhl Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 23f3bc0f2c1e26215b671499c07047c325d54d9c tree a76e595b413de71d7f6fae1d959566447e1f6c5e parent 0cb4fe8d2658dc0bd1accfbb74ee288a9d6788f4 author Michael S. Tsirkin Thu, 18 May 2006 18:32:54 +0300 committer Roland Dreier Thu, 18 May 2006 11:37:03 -0700 IB/mthca: Fix posting lists of 256 receive requests for Tavor If we post a list of length 256 exactly, nreq in doorbell gets set to 256 which is wrong: it should be encoded by 0. This is because we only zero it out on the next WR, which may not be there. The solution is to ring the doorbell after posting a WQE, not before posting the next one. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 0cb4fe8d2658dc0bd1accfbb74ee288a9d6788f4 tree 26d1c7122d28acecb99698aef362d667b684bfb6 parent 093beac189e4295d968f0d38787b46f76cb0eaaa author Roland Dreier Wed, 17 May 2006 22:20:50 -0700 committer Roland Dreier Wed, 17 May 2006 22:20:50 -0700 IB/uverbs: Don't leak ref to mm on error path In ib_umem_release_on_close(), if the kmalloc() fails, then a reference to current->mm will be leaked. Fix this by adding a mmput() instead of just returning on kmalloc() failure. Signed-off-by: Roland Dreier commit a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e tree a87b764e94d4ca3f787b076e3f731a67ff68ee71 parent 679c0cd2dd61c825ab910fdbf347a8b7d1dddec4 author Stefan Richter Mon, 15 May 2006 22:09:46 +0200 committer Linus Torvalds Wed, 17 May 2006 21:32:22 -0700 [PATCH] ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devices Re-enable posted writes for status FIFO. Besides bringing back a very minor bandwidth tweak from Linux 2.6.15.x and older, this also fixes an interoperability regression since 2.6.16: http://bugzilla.kernel.org/show_bug.cgi?id=6356 (sbp2: scsi_add_device failed. IEEE1394 HD is not working anymore.) Signed-off-by: Stefan Richter Tested-by: Vanei Heidemann Tested-by: Martin Putzlocher (chip type unconfirmed) Signed-off-by: Linus Torvalds commit 679c0cd2dd61c825ab910fdbf347a8b7d1dddec4 tree 01fc830a4e2e799de61afdb986d0a6c3d5270841 parent e9a1c52c7b19d10342226c12f170d7ab644427e2 author Stefan Richter Mon, 15 May 2006 22:08:09 +0200 committer Linus Torvalds Wed, 17 May 2006 21:32:22 -0700 [PATCH] sbp2: add ability to override hardwired blacklist In case the blacklist with workarounds for device bugs yields a false positive, the module load parameter can now also be used as an override instead of an addition to the blacklist. Signed-off-by: Stefan Richter Signed-off-by: Linus Torvalds commit e9a1c52c7b19d10342226c12f170d7ab644427e2 tree 231d00c761444c650e527d048aab0776bd135fb5 parent 24d3bf884e093f9de52d31c97187f4b9b4ad7dcb author Stefan Richter Mon, 15 May 2006 22:06:37 +0200 committer Linus Torvalds Wed, 17 May 2006 21:32:21 -0700 [PATCH] sbp2: add read_capacity workaround for iPod Apple decided to copy some USB stupidity over to FireWire. The sector number returned by iPods from read_capacity is one too many. This may cause I/O errors, especially if the kernel is configured for EFI partition support. We use the same workaround as usb-storage but have to check for different model IDs. http://marc.theaimsgroup.com/?t=114233262300001 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=187409 Acknowledgements: Diagnosis and therapy by Mathieu Chouquet-Stringer , additional data about affected and unaffected Apple hardware from Vladimir Kotal, Sander De Graaf, Bryan Olmstead and Hugh Dixon. Signed-off-by: Stefan Richter Signed-off-by: Linus Torvalds commit 24d3bf884e093f9de52d31c97187f4b9b4ad7dcb tree 3580e6023f813b1167df65be37298c278434b2d7 parent cb46c3701fb7b738de1e22ac4f2d06d18f547a74 author Stefan Richter Mon, 15 May 2006 22:04:59 +0200 committer Linus Torvalds Wed, 17 May 2006 21:32:21 -0700 [PATCH] sbp2: consolidate workarounds Grand unification of the three types of workarounds we have so far. The "skip mode page 8" workaround is now limited to devices which pretend to be of TYPE_DISK instead of TYPE_RBC. This workaround is no longer enabled for Initio bridges. Patch update in anticipation of more workarounds: - Add module parameter "workarounds". - Deprecate parameter "force_inquiry_hack". - Compose the blacklist of a compound type for better readability and extensibility. - Remove a now unused #define. Signed-off-by: Stefan Richter Signed-off-by: Linus Torvalds commit cb46c3701fb7b738de1e22ac4f2d06d18f547a74 tree 7d8740ed7849d31eaea19e696a4ea098ba151a96 parent 9676489866a75fdd56b0d3e40ec7884298bb1338 parent 8872d8e1c4311dd7e5086975df9c76120a0be83b author Linus Torvalds Wed, 17 May 2006 16:30:31 -0700 committer Linus Torvalds Wed, 17 May 2006 16:30:31 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TCP]: reno sacked_out count fix [IPV6]: Endian fix in net/ipv6/netfilter/ip6t_eui64.c:match(). [TR]: Remove an unused export. [IPX]: Correct return type of ipx_map_frame_type(). [IPX]: Correct argument type of ipxrtr_delete(). [PKT_SCHED]: Potential jiffy wrap bug in dev_watchdog(). commit 9676489866a75fdd56b0d3e40ec7884298bb1338 tree 75cbfb35f4e09ad15b8753191b566d401d86de56 parent 15eb7105a74a0a5d72d006fec2192b0ec692b5cc parent 843a46f423a508b3a443a08baa903c6da02f3297 author Linus Torvalds Wed, 17 May 2006 16:13:25 -0700 committer Linus Torvalds Wed, 17 May 2006 16:13:25 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6: sky2: prevent dual port receiver problems x86_64: Check for bad dma address in b44 1GB DMA workaround The ixp2000 driver for the enp2611 was developed on a board with commit 15eb7105a74a0a5d72d006fec2192b0ec692b5cc tree b774ed6e13751f590038c1d0454436326339cd62 parent a5d1792847172077d173c959c37d4562b9ec69e6 parent cef0893dcf1fdf22943aa49e75ee1eb3bfffe5f5 author Linus Torvalds Wed, 17 May 2006 16:11:41 -0700 committer Linus Torvalds Wed, 17 May 2006 16:11:41 -0700 Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 * 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2: configfs: Make sure configfs_init() is called before consumers. configfs: configfs_mkdir() failed to cleanup linkage. configfs: Fix a reference leak in configfs_mkdir(). ocfs2: fix gfp mask in some file system paths ocfs2: Don't populate uptodate cache in ocfs2_force_read_journal() ocfs2: take meta data lock in ocfs2_file_aio_read() ocfs2: take data locks around extend commit cef0893dcf1fdf22943aa49e75ee1eb3bfffe5f5 tree 13d7116b336bf935dafe70a732395c5c1fd03be3 parent eed7a0db460595b139428d252798a83f1e1ce1d3 author Joel Becker Wed, 03 May 2006 11:38:53 -0700 committer Mark Fasheh Wed, 17 May 2006 14:38:51 -0700 configfs: Make sure configfs_init() is called before consumers. configfs_init() needs to be called first to register configfs before anyconsumers try to access it. Move up configfs in fs/Makefile to make sure it is initialized early. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit eed7a0db460595b139428d252798a83f1e1ce1d3 tree 129db180cb8bac9810b6168802914c5ae2f619a3 parent 84efad1a53dd05969094f9a2562b4e6666571c00 author Joel Becker Tue, 11 Apr 2006 21:37:20 -0700 committer Mark Fasheh Wed, 17 May 2006 14:38:51 -0700 configfs: configfs_mkdir() failed to cleanup linkage. If configfs_mkdir() errored in certain ways after the parent<->child linkage was already created, it would not undo the linkage. Also, comment the reference counting for clarity. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 84efad1a53dd05969094f9a2562b4e6666571c00 tree 15ddfe0250f5d59d56e989cd89c682096139c1f5 parent afae00ab45ea71d89086f924ebee6ca51c81e48e author Joel Becker Mon, 27 Mar 2006 18:46:09 -0800 committer Mark Fasheh Wed, 17 May 2006 14:38:50 -0700 configfs: Fix a reference leak in configfs_mkdir(). configfs_mkdir() failed to release the working parent reference in most exit paths. Also changed the exit path for readability. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit afae00ab45ea71d89086f924ebee6ca51c81e48e tree 1306e519591e2dabb4376f52e34e515b343be4ad parent dd4a2c2bfe159cc39e9672e875c8314563699764 author Sunil Mushran Wed, 12 Apr 2006 14:37:00 -0700 committer Mark Fasheh Wed, 17 May 2006 14:38:49 -0700 ocfs2: fix gfp mask in some file system paths We were using GFP_KERNEL in a handful of places which really wanted GFP_NOFS. Fix this. Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit dd4a2c2bfe159cc39e9672e875c8314563699764 tree d858215c972c637000e2a28af85830fd4665cd89 parent c4374f8a6093fbee42ac4368b3ca180d1d0c7c6d author Mark Fasheh Wed, 12 Apr 2006 14:24:05 -0700 committer Mark Fasheh Wed, 17 May 2006 14:38:48 -0700 ocfs2: Don't populate uptodate cache in ocfs2_force_read_journal() This greatly reduces the amount of memory useded during recovery. Signed-off-by: Mark Fasheh commit c4374f8a6093fbee42ac4368b3ca180d1d0c7c6d tree 6e52cb1f85a5e769bd9f23e0e59d266767e25dcf parent 53013cba4118a5cfe8f7c7ea5e5bc1c48b160f76 author Mark Fasheh Fri, 05 May 2006 19:04:35 -0700 committer Mark Fasheh Wed, 17 May 2006 14:38:47 -0700 ocfs2: take meta data lock in ocfs2_file_aio_read() Temporarily take the meta data lock in ocfs2_file_aio_read() to allow us to update our inode fields. Signed-off-by: Mark Fasheh commit 53013cba4118a5cfe8f7c7ea5e5bc1c48b160f76 tree 5170ed12fbe07b5e8557e61952aa27c25034bd7a parent 0c056c50a6218e0e577817c16ba8851af593d742 author Mark Fasheh Fri, 05 May 2006 19:04:03 -0700 committer Mark Fasheh Wed, 17 May 2006 14:38:47 -0700 ocfs2: take data locks around extend We need to take a data lock around extends to protect the pages that ocfs2_zero_extend is going to be pulling into the page cache. Otherwise an extend on one node might populate the page cache with data pages that have no lock coverage. Signed-off-by: Mark Fasheh commit a5d1792847172077d173c959c37d4562b9ec69e6 tree 8ba84daea4d3e0cb4396d08cd9264fff327b0c69 parent 0c056c50a6218e0e577817c16ba8851af593d742 parent 4c31ce8fea9760961a2d1b1d6c84b7590c17ae38 author Linus Torvalds Wed, 17 May 2006 14:28:57 -0700 committer Linus Torvalds Wed, 17 May 2006 14:28:57 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] one-line cleanup on set_irq_affinity_info [IA64] fix broken irq affinity [IA64] sn2 defconfig commit ec64152fee25e2a63f06d40d32c7b4cb62eab9a3 tree 77bdf052d8b25026ca095cfe16253d1320029535 parent c3fb04162a1c8ddcf6caa6e19020da3f0fd23103 author Thomas Gleixner Wed, 17 May 2006 20:14:29 +0100 committer Russell King Wed, 17 May 2006 20:14:29 +0100 [ARM] 3530/1: PXA Mainstone: prevent double enable_irq() in pcmcia Patch from Thomas Gleixner The mainstone board pcmcia interrupt have been enabled via setup_irq() and the following socket check calls enable_irq again. Set the NOAUTOEN flag so the interrupt is not automatically enabled in setup_irq() Signed-off-by: Thomas Gleixner Acked-by: Nicolas Pitre Signed-off-by: Russell King commit bc519f30eb039f023c15167663d5a8a14fed7dcb tree af9e2500cda4b1674f58db5c78132327e1210d6c parent 0c056c50a6218e0e577817c16ba8851af593d742 author David Woodhouse Fri, 05 May 2006 17:38:27 +0100 committer John W. Linville Wed, 17 May 2006 14:53:19 -0400 [PATCH] bcm43xx: associate on 'ifconfig up' I still need this hack to work around the fact that softmac doesn't attempt to associate when we bring the device up... Signed-off-by: David Woodhouse Signed-off-by: John W. Linville commit 093beac189e4295d968f0d38787b46f76cb0eaaa tree d5d5c476dd06b3ba6a5a7fc4787a3bbdc9d4ba63 parent ec2d7208494fe599a5ff13b40a0a20c9881f2737 author Ishai Rabinovitz Wed, 17 May 2006 09:20:48 -0700 committer Roland Dreier Wed, 17 May 2006 09:20:48 -0700 IB/srp: Complete correct SCSI commands on device reset When flushing out queued commands after a successful device reset, make sure that SRP completes the right commands, instead of calling scsi_done on the command passed into the device reset handler over and over. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit ec2d7208494fe599a5ff13b40a0a20c9881f2737 tree 32af58729f73b18d08fa8759a3408cb4058c6455 parent e65810566f3e613d9baa5512b8724ebde42ace0f author Roland Dreier Wed, 17 May 2006 09:16:03 -0700 committer Roland Dreier Wed, 17 May 2006 09:16:03 -0700 IB/srp: Get rid of extra scsi_host_put()s if reconnection fails If a reconnection attempt fails, then SRP does two scsi_host_put()s. This is a historical relic from an earlier version of the driver that took a reference on the scsi_host before trying to reconnect, so get rid of the extra scsi_host_put(). Signed-off-by: Roland Dreier commit e65810566f3e613d9baa5512b8724ebde42ace0f tree 4d2cb2737f240eff4a54d73fd4f33ced16954526 parent 1db76c14d215c8b26024dd532de3dcaf66ea30f7 author Roland Dreier Wed, 17 May 2006 09:13:21 -0700 committer Roland Dreier Wed, 17 May 2006 09:13:21 -0700 IB/srp: Don't wait for disconnection if sending DREQ fails Sending a DREQ may fail, for example because the remote target has already broken the connection. If so, then SRP should not wait for the disconnection to complete, because it never will. Signed-off-by: Roland Dreier commit c3fb04162a1c8ddcf6caa6e19020da3f0fd23103 tree 235f4fbd8f90e07092ca6ece9d544072fcd5246e parent 0c056c50a6218e0e577817c16ba8851af593d742 author Dimitry Andric Wed, 17 May 2006 16:31:11 +0100 committer Russell King Wed, 17 May 2006 16:31:11 +0100 [ARM] 3529/1: s3c24xx: fix restoring control register with undefined instruction Patch from Dimitry Andric In arch/arm/mach-s3c2410/sleep.S, the coprocessor registers are saved at suspend time, and restored at resume time. However, an undefined instruction is used when attempting to restore a non-existent "auxiliary control register". This leads to a crash on S3C2412, which has an ARM926 core instead of an ARM920. At suspend time, the following fragment runs: mrc p15, 0, r7, c2, c0, 0 @ translation table base address mrc p15, 0, r8, c2, c0, 0 @ auxiliary control register mrc p15, 0, r9, c1, c0, 0 @ control register and at resume time, the following fragment runs: mcr p15, 0, r7, c2, c0, 0 @ translation table base mcr p15, 0, r8, c1, c1, 0 @ auxilliary control ... mcr p15, 0, r9, c1, c0, 0 @ turn on MMU, etc There are several problems with these fragments: 1. The ARM920 and ARM926 cores don't have any "auxiliary control register", at least not according to the ARM920 and ARM926 TRM's. 2. The 2nd line of suspend erroneously saves the c2 register again. 3. This saved c2 value is restored using an undefined instruction. For some reason this does not crash on ARM920, but does crash on ARM926. The following patch fixes all these problems. Signed-off-by: Dimitry Andric Yes, this looks sensible Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 1db76c14d215c8b26024dd532de3dcaf66ea30f7 tree 6c9c22c450e20e98b75e835930c897c99477c788 parent 032ebf2620ef99a4fedaa0f77dc2272095ac5863 author Roland Dreier Wed, 17 May 2006 07:48:07 -0700 committer Roland Dreier Wed, 17 May 2006 07:48:07 -0700 IB/mthca: Make fw_cmd_doorbell default to 0 Setting fw_cmd_doorbell allows FW command to be queued using posted writes instead of requiring polling on a "go" bit, so it should be a performance boost. However, the option causes problems with at least some device/firmware combinations, so set the default to 0 until we understand what's going on better. Signed-off-by: Roland Dreier commit 4c31ce8fea9760961a2d1b1d6c84b7590c17ae38 tree f18228706ac73a3ddb9fa9a88329a8ffe629bf89 parent 41503def5d83bada6a2fd792e636ccc28a285f38 author Chen, Kenneth W Tue, 16 May 2006 16:34:57 -0700 committer Tony Luck Wed, 17 May 2006 06:20:59 -0700 [IA64] one-line cleanup on set_irq_affinity_info Calls to set_irq_info in set_irq_affinity_info() is redundant because irq_affinity mask was set just one line immediately above it. Remove that duplicate call. Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit 41503def5d83bada6a2fd792e636ccc28a285f38 tree 4f2c602db9cf66232001baa3be9f5952b8a50266 parent 1101ece44e00cfe31a2fd9d3222d05f927b00ef8 author Chen, Kenneth W Tue, 16 May 2006 16:29:00 -0700 committer Tony Luck Wed, 17 May 2006 06:20:23 -0700 [IA64] fix broken irq affinity When CONFIG_PCI_MSI is set, move_irq() is an empty function, causing grief when sys admin tries to bind interrupt to CPU. Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit 1101ece44e00cfe31a2fd9d3222d05f927b00ef8 tree 3160a56cf83405fee56d6f764bd396e05b2cac70 parent c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 author Jes Sorensen Mon, 15 May 2006 05:07:54 -0400 committer Tony Luck Wed, 17 May 2006 06:18:56 -0700 [IA64] sn2 defconfig Set node shift to 10 on SN2 and disable mutex debugging. Signed-off-by: Jes Sorensen Signed-off-by: Tony Luck commit 8872d8e1c4311dd7e5086975df9c76120a0be83b tree 1486697e32c65521785721fe9523f4eaee9a3e90 parent d8fd0a73169e90022dc3ccf3083ca24573b44b5c author Angelo P. Castellani Tue, 16 May 2006 21:42:11 -0700 committer David S. Miller Tue, 16 May 2006 21:42:11 -0700 [TCP]: reno sacked_out count fix From: "Angelo P. Castellani" Using NewReno, if a sk_buff is timed out and is accounted as lost_out, it should also be removed from the sacked_out. This is necessary because recovery using NewReno fast retransmit could take up to a lot RTTs and the sk_buff RTO can expire without actually being really lost. left_out = sacked_out + lost_out in_flight = packets_out - left_out + retrans_out Using NewReno without this patch, on very large network losses, left_out becames bigger than packets_out + retrans_out (!!). For this reason unsigned integer in_flight overflows to 2^32 - something. Signed-off-by: David S. Miller commit d8fd0a73169e90022dc3ccf3083ca24573b44b5c tree 0147645272a7d86fcfe102b9ce694ebe7f8bcc03 parent 6599519e9c6c56ff0f9a4ffd53f90c5b65b902f4 author Alexey Dobriyan Tue, 16 May 2006 15:24:41 -0700 committer David S. Miller Tue, 16 May 2006 15:24:41 -0700 [IPV6]: Endian fix in net/ipv6/netfilter/ip6t_eui64.c:match(). Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 6599519e9c6c56ff0f9a4ffd53f90c5b65b902f4 tree ea393e5e8c5f13afa5b0adb77b89d7eaac85d4c5 parent 4ac396c0467993853d3d58c0975151515700c07b author Adrian Bunk Tue, 16 May 2006 15:23:40 -0700 committer David S. Miller Tue, 16 May 2006 15:23:40 -0700 [TR]: Remove an unused export. This patch removes the unused EXPORT_SYMBOL(tr_source_route). (Note, the usage in net/llc/llc_output.c can't be modular.) Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 0c056c50a6218e0e577817c16ba8851af593d742 tree feabddbd93b49ce94103c6054336078f240848ee parent 4fbca5320eb102d2e15bdeffe79e125c11cf925e parent 1e316d7566b63767aa18902235c719e9e95465d0 author Linus Torvalds Tue, 16 May 2006 15:18:26 -0700 committer Linus Torvalds Tue, 16 May 2006 15:18:26 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6: [PATCH] SPI: spi_bitbang: clocking fixes [PATCH] spi: Update to PXA2xx SPI Driver [PATCH] SPI: busnum == 0 needs to work [PATCH] SPI: devices can require LSB-first encodings [PATCH] SPI: Renamed bitbang_transfer_setup to spi_bitbang_setup_transfer and export it [PATCH] SPI: Add David as the SPI subsystem maintainer [PATCH] SPI: spi bounce buffer has a minimum length [PATCH] SPI: spi whitespace fixes [PATCH] SPI: add PXA2xx SSP SPI Driver [PATCH] SPI: per-transfer overrides for wordsize and clocking commit 4ac396c0467993853d3d58c0975151515700c07b tree fb52e9578201b027ffba0292199c9acd2c4720d8 parent 53d42f541278b6c97724465b19bae4730d7a85c8 author Alexey Dobriyan Tue, 16 May 2006 15:17:49 -0700 committer David S. Miller Tue, 16 May 2006 15:17:49 -0700 [IPX]: Correct return type of ipx_map_frame_type(). Casting BE16 to int and back may or may not work. Correct, to be sure. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 4fbca5320eb102d2e15bdeffe79e125c11cf925e tree 59111c77d71bbdf557bbc30e31f5f3235ae0498c parent 509b70b677ca35a0e800807c6470181df5008d70 parent 3170a5e80be7db29ab5ccb6b4145cf28b4a156de author Linus Torvalds Tue, 16 May 2006 15:16:14 -0700 committer Linus Torvalds Tue, 16 May 2006 15:16:14 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] arch/arm/kernel/dma-isa.c: named initializers [ARM] 3527/1: MPCore Boot Lockup Fix [ARM] arch/arm/kernel/process.c: Fix warning [ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM [ARM] 3524/1: ARM EABI: more 64-bit aligned stack fixes [ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h commit 509b70b677ca35a0e800807c6470181df5008d70 tree a877b27154b0ce0aab10a1d76106a32f4701f456 parent 716f8954fb3029ca2df52a986b60af8d06f093ee parent 1281e36027a9119356bd93b5e7853c72c35dd462 author Linus Torvalds Tue, 16 May 2006 15:15:59 -0700 committer Linus Torvalds Tue, 16 May 2006 15:15:59 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial * master.kernel.org:/home/rmk/linux-2.6-serial: [ARM] 3523/1: Serial core pm_state commit 53d42f541278b6c97724465b19bae4730d7a85c8 tree cf974cb6debb01c7b54d53b0106a001941460a22 parent 338f7566e5c26a9547e25d54863ae4e4e5c856d1 author Alexey Dobriyan Tue, 16 May 2006 15:07:28 -0700 committer David S. Miller Tue, 16 May 2006 15:07:28 -0700 [IPX]: Correct argument type of ipxrtr_delete(). A single caller passes __u32. Inside function "net" is compared with __u32 (__be32 really, just wasn't annotated). Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 338f7566e5c26a9547e25d54863ae4e4e5c856d1 tree fbe483e07f8680a7718e02b869cdf5e042e2ec7b parent 716f8954fb3029ca2df52a986b60af8d06f093ee author Stephen Hemminger Tue, 16 May 2006 15:02:12 -0700 committer David S. Miller Tue, 16 May 2006 15:02:12 -0700 [PKT_SCHED]: Potential jiffy wrap bug in dev_watchdog(). There is a potential jiffy wraparound bug in the transmit watchdog that is easily avoided by using time_after(). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 1e316d7566b63767aa18902235c719e9e95465d0 tree 506783a779e1b06b20de0bc03e4b0008f77704e8 parent 9708c121c38fe864eb6f5a119f7525729686e095 author David Brownell Thu, 06 Apr 2006 22:25:56 -0700 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:58 -0700 [PATCH] SPI: spi_bitbang: clocking fixes This fixes two problems triggered by the MMC stack updating clocks: - SPI masters driver should accept a max clock speed of zero; that's one convention for marking idle devices. (Presumably that helps controllers that don't autogate clocks to "off" when not in use.) - There are more than 1000 nanoseconds per millisecond; setting the clock down to 125 KHz now works properly. Showing once again that Zero (http://en.wikipedia.org/wiki/Zero) is still an inexhaustible number of bugs. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 9708c121c38fe864eb6f5a119f7525729686e095 tree 27d5afdcafdcf10b45f4a228c739d5819cc9240c parent a020ed7521a9737bcf3e34eb880867c60c3c68d0 author Stephen Street Tue, 28 Mar 2006 14:05:23 -0800 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:58 -0700 [PATCH] spi: Update to PXA2xx SPI Driver Fix two outstanding issues with the pxa2xx_spi driver: 1) Bad cast in the function u32_writer. Thanks to Henrik Bechmann 2) Adds support for per transfer changes to speed and bits per word Signed-off-by: Stephen Street Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit a020ed7521a9737bcf3e34eb880867c60c3c68d0 tree 52941e00b05df6c1bfe228fd193fdb09cf963d15 parent ccf77cc4af5b048e20cfd9327fcc286cb69c34cc author David Brownell Mon, 03 Apr 2006 15:49:04 -0700 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:57 -0700 [PATCH] SPI: busnum == 0 needs to work We need to be able to have a "SPI bus 0" matching chip numbering; but that number was wrongly used to flag dynamic allocation of a bus number. This patch resolves that issue; now negative numbers trigger dynamic alloc. It also updates the how-to-write-a-controller-driver overview to mention this stuff. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit ccf77cc4af5b048e20cfd9327fcc286cb69c34cc tree 0a19a6948fe8bbf2128010a655e170ffebc9d8b8 parent ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b author David Brownell Mon, 03 Apr 2006 15:46:22 -0700 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:57 -0700 [PATCH] SPI: devices can require LSB-first encodings Add spi_device hook for LSB-first word encoding, and update all the (in-tree) controller drivers to reject such devices. Eventually, some controller drivers will be updated to support lsb-first encodings on the wire; no current drivers need this. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b tree 2d487a384f075f82444135a77330755f1755aa16 parent 025c398710ac24456f0288fc7e64f426c5c5508f author Kumar Gala Sun, 02 Apr 2006 16:06:35 -0500 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:57 -0700 [PATCH] SPI: Renamed bitbang_transfer_setup to spi_bitbang_setup_transfer and export it Renamed bitbang_transfer_setup to follow convention of other exported symbols from spi-bitbang. Exported spi_bitbang_setup_transfer to allow users of spi-bitbang to use the function in their own setup_transfer. Signed-off-by: Kumar Gala Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 025c398710ac24456f0288fc7e64f426c5c5508f tree 53863cd918bc5d0980d2f5bf0b71594fa9ed2f3a parent a9948b6194b46e489aa3b4d111d6dfd786c39c4b author Kumar Gala Sun, 02 Apr 2006 16:05:54 -0500 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:57 -0700 [PATCH] SPI: Add David as the SPI subsystem maintainer Add David as the SPI subsystem maintainer Signed-off-by: Kumar Gala Signed-off-by: Greg Kroah-Hartman commit a9948b6194b46e489aa3b4d111d6dfd786c39c4b tree 28f4984be0547c773ad24ef6ed882f1ae9cbede8 parent 747d844ee9a183ff3067bb1181f2a25c50649538 author David Brownell Sun, 02 Apr 2006 10:37:40 -0800 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:57 -0700 [PATCH] SPI: spi bounce buffer has a minimum length Make sure that spi_write_then_read() can always handle at least 32 bytes of transfer (total, both directions), minimizing one portability issue. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 747d844ee9a183ff3067bb1181f2a25c50649538 tree 0d35d9c2e3267765f328d7371b23433a5c7709c9 parent e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26 author David Brownell Sun, 02 Apr 2006 10:33:37 -0800 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:56 -0700 [PATCH] SPI: spi whitespace fixes This removes superfluous whitespace in the header. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26 tree 7752a74a70b6e174f347f1d56ab98717e9e93b61 parent 4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa author Stephen Street Tue, 07 Mar 2006 23:53:24 -0800 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:56 -0700 [PATCH] SPI: add PXA2xx SSP SPI Driver This driver turns a PXA2xx synchronous serial port (SSP) into a SPI master controller (see Documentation/spi/spi_summary). The driver has the following features: - Support for any PXA2xx SSP - SSP PIO and SSP DMA data transfers. - External and Internal (SSPFRM) chip selects. - Per slave device (chip) configuration. - Full suspend, freeze, resume support. Signed-off-by: Stephen Street Signed-off-by: Andrew Morton Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa tree 0ef6066c4f2c0225517a6402bb04f4b4d56afd4d parent 716f8954fb3029ca2df52a986b60af8d06f093ee author Imre Deak Fri, 17 Feb 2006 10:02:18 -0800 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:56 -0700 [PATCH] SPI: per-transfer overrides for wordsize and clocking Some protocols (like one for some bitmap displays) require different clock speed or word size settings for each transfer in an SPI message. This adds those parameters to struct spi_transfer. They are to be used when they are nonzero; otherwise the defaults from spi_device are to be used. The patch also adds a setup_transfer callback to spi_bitbang, uses it for messages that use those overrides, and implements it so that the pure bitbanging code can help resolve any questions about how it should work. Signed-off-by: Imre Deak Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 3170a5e80be7db29ab5ccb6b4145cf28b4a156de tree c9279a69bc34cd01568f506dd4f163fd350b3ea7 parent bb1a2aa617e67e2d60f22052b13422c7caeaf798 author Adrian Bunk Tue, 16 May 2006 22:09:46 +0100 committer Russell King Tue, 16 May 2006 22:09:46 +0100 [ARM] arch/arm/kernel/dma-isa.c: named initializers This patch converts struct dma_resources to named initializers. Besides fixing a compile error in -mm, it didn't sound like a bad idea. Signed-off-by: Adrian Bunk Acked-by: Alexander Schulz Signed-off-by: Russell King commit bb1a2aa617e67e2d60f22052b13422c7caeaf798 tree 01b34d62f8ec450c496bb090733d49695346442e parent 9d494ccb9ca297f80dc61a0d6357e88c86f44e92 author Harry Fearnhamm Tue, 16 May 2006 16:50:21 +0100 committer Russell King Tue, 16 May 2006 16:50:21 +0100 [ARM] 3527/1: MPCore Boot Lockup Fix Patch from Harry Fearnhamm This patch fixes the occasional lockup seen in early boot stage on RealView MPCore system. Signed-off-by: Harry Fearnhamm Signed-off-by: Russell King commit 716f8954fb3029ca2df52a986b60af8d06f093ee tree d5f983daab287e0a46ac2a76e78a13037b7ed9b6 parent a4523a8b38089478f93bc053c31f678c63f5ee1b parent cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 author Linus Torvalds Tue, 16 May 2006 08:46:10 -0700 committer Linus Torvalds Tue, 16 May 2006 08:46:10 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] Fix pSeries identification in prom_init.c [PATCH] powerpc: fix kernel version display on pseries boxes commit a4523a8b38089478f93bc053c31f678c63f5ee1b tree 96f828650d2234aac76fe39ea38b7c7250c49349 parent 40e59a61669a3cab9e0bd24644e29155d6b00970 author Roland Dreier Mon, 15 May 2006 11:41:00 -0700 committer Linus Torvalds Tue, 16 May 2006 07:59:32 -0700 [PATCH] slab: Fix kmem_cache_destroy() on NUMA With CONFIG_NUMA set, kmem_cache_destroy() may fail and say "Can't free all objects." The problem is caused by sequences such as the following (suppose we are on a NUMA machine with two nodes, 0 and 1): * Allocate an object from cache on node 0. * Free the object on node 1. The object is put into node 1's alien array_cache for node 0. * Call kmem_cache_destroy(), which ultimately ends up in __cache_shrink(). * __cache_shrink() does drain_cpu_caches(), which loops through all nodes. For each node it drains the shared array_cache and then handles the alien array_cache for the other node. However this means that node 0's shared array_cache will be drained, and then node 1 will move the contents of its alien[0] array_cache into that same shared array_cache. node 0's shared array_cache is never looked at again, so the objects left there will appear to be in use when __cache_shrink() calls __node_shrink() for node 0. So __node_shrink() will return 1 and kmem_cache_destroy() will fail. This patch fixes this by having drain_cpu_caches() do drain_alien_cache() on every node before it does drain_array() on the nodes' shared array_caches. The problem was originally reported by Or Gerlitz . Signed-off-by: Roland Dreier Acked-by: Christoph Lameter Acked-by: Pekka Enberg Signed-off-by: Linus Torvalds commit 40e59a61669a3cab9e0bd24644e29155d6b00970 tree 25db313781596303562a1a316592ffb9ff96542b parent fad7906d16e8c4926aeb5b0f1756eb9f55b2837d author Andi Kleen Mon, 15 May 2006 18:19:47 +0200 committer Linus Torvalds Tue, 16 May 2006 07:59:32 -0700 [PATCH] x86_64: Don't schedule on exception stack on preemptive kernels Extends an earlier patch from John Blackwood to more exception handlers that also run on the exception stacks. Expand the use of preempt_conditional_{sti,cli} to all cases where interrupts are to be re-enabled during exception handling while running on an IST stack. Based on original patch from Jan Beulich. Cc: John Blackwood Cc: jbeulich@novell.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fad7906d16e8c4926aeb5b0f1756eb9f55b2837d tree 1a238328b29316e3aa8d8fa9f05dedcf1d58c153 parent 5491d0f3e206beb95eeb506510d62a1dab462df1 author Andi Kleen Mon, 15 May 2006 18:19:44 +0200 committer Linus Torvalds Tue, 16 May 2006 07:59:31 -0700 [PATCH] x86_64: Fix memory hotadd heuristics This fixes some boot failures on Dell and Unisys systems with memory hotadd added. - Set hotadd_percent to 0 by default. This means anybody using hotadd memory needs to specify the value on the command line. That's because there are lots of Intel boxes which have a bogus hotplug area in their SRAT and they would waste a lot of memory before. - Fix calculation of how much memory to use when the hotplug area exceeds hotadd_percent - Fix fallback when the - Fix fallback if memory hotadd is not compiled in. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5491d0f3e206beb95eeb506510d62a1dab462df1 tree 5c4aadcfb4a93535e2f6e0f5977e930ccacec0e9 parent f0fdabf8bf187c9aafeb139a828c530ef45cf022 author Andi Kleen Mon, 15 May 2006 18:19:41 +0200 committer Linus Torvalds Tue, 16 May 2006 07:59:31 -0700 [PATCH] i386/x86_64: Force pci=noacpi on HP XW9300 This is needed to see all devices. The system has multiple PCI segments and we don't handle that properly yet in PCI and ACPI. Short term before this is fixed blacklist it to pci=noacpi. Acked-by: len.brown@intel.com Cc: gregkh@suse.de Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f0fdabf8bf187c9aafeb139a828c530ef45cf022 tree d445ab6a41a30633e335938164698bfc6152a8ad parent 639b421b911bbde1e3fb5ed037a4f8c85a5bffcb author Andi Kleen Mon, 15 May 2006 18:19:38 +0200 committer Linus Torvalds Tue, 16 May 2006 07:59:31 -0700 [PATCH] x86_64: Don't warn for overflow in nommu case when dma_mask is < 32bit This triggers for b44's 1GB DMA workaround which tries to map first and then bounces. The 32bit heuristic is reasonable because the IOMMU doesn't attempt to handle < 32bit masks anyways. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 639b421b911bbde1e3fb5ed037a4f8c85a5bffcb tree 31522e82cffe76cc13bd2f6db68d74bcbd526f53 parent c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 author Andi Kleen Mon, 15 May 2006 18:19:35 +0200 committer Linus Torvalds Tue, 16 May 2006 07:59:31 -0700 [PATCH] x86_64: Check for bad dma address in b44 1GB DMA workaround Needed for interaction with the nommu code in x86-64 which will return bad_dma_address if the address exceeds dma_mask. Cc: netdev@vger.kernel.org Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 tree 71d42f762163a309e804193efd3f0674c3e57dbb parent 3de620e8394406fd01f450b8c6e3e74464e81a78 author Benjamin Herrenschmidt Mon, 15 May 2006 15:46:03 +1000 committer Paul Mackerras Tue, 16 May 2006 21:31:25 +1000 [PATCH] Fix pSeries identification in prom_init.c The OF trampoline code prom_init.c still needs to identify IBM pSeries (PAPR) machines in order to run some platform specific code on them like instanciating the TCE tables. The code doing that detection was changed recently in 2.6.17 early stages but was done slightly incorrectly. It should be testing for an exact match of "chrp" and it currently tests for anything that begins with "chrp". That means it will incorrectly match with platforms using Maple-like device-trees and have open firmware. This fixes it by using strcmp instead of strncmp to match what the actual platform detection code does. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 3de620e8394406fd01f450b8c6e3e74464e81a78 tree 045a6604109bb566d5405998652c04954cac1725 parent c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 author Anton Blanchard Wed, 10 May 2006 13:05:54 +1000 committer Paul Mackerras Tue, 16 May 2006 21:30:57 +1000 [PATCH] powerpc: fix kernel version display on pseries boxes We are displaying the wrong thing on the operator panel (2x40 character LCD). This got broken in commit cebb21b5, when UTS_RELEASE got changed to system_utsname.version. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 9d494ccb9ca297f80dc61a0d6357e88c86f44e92 tree bff2835d78fb8cb3bdbab1cf9e235e52929e5653 parent 478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee author Russell King Tue, 16 May 2006 11:33:15 +0100 committer Russell King Tue, 16 May 2006 11:39:32 +0100 [ARM] arch/arm/kernel/process.c: Fix warning arch/arm/kernel/process.c:314: warning: assignment makes integer from pointer without a cast Signed-off-by: Russell King commit 478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee tree 827e2d2df5798a97f5aa401505dba88fee998ca3 parent 1d6760a3ac6b5691e4914a3333b48fee5c2e275d author Catalin Marinas Tue, 16 May 2006 11:30:26 +0100 committer Russell King Tue, 16 May 2006 11:39:31 +0100 [ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM Patch from Catalin Marinas This patch modifies the __ioremap_pfn and __iounmap functions in arch/arm/mm/ioremap.c to use vunmap instead of vfree. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 1d6760a3ac6b5691e4914a3333b48fee5c2e275d tree 02d0296c1155377e79b22760ca9cf9638b223425 parent 2ceec0c8c6e2780d58dece91b4b787729405d9e7 author Nicolas Pitre Tue, 16 May 2006 11:29:46 +0100 committer Russell King Tue, 16 May 2006 11:39:31 +0100 [ARM] 3524/1: ARM EABI: more 64-bit aligned stack fixes Patch from Nicolas Pitre Assembly code that calls C code must ensure the C code sees a 64-bit aligned stack pointer. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 2ceec0c8c6e2780d58dece91b4b787729405d9e7 tree 121c03865e0b8e6bc86161592ebeacb852727d04 parent c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 author Uwe Zeisberger Wed, 10 May 2006 18:11:05 +0100 committer Russell King Tue, 16 May 2006 11:39:30 +0100 [ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h Patch from Uwe Zeisberger The symbol is only used in arch/arm/kernel/head-common.S. This in turn is included from arch/arm/kernel/head.S and arch/arm/kernel/head-nommu.S which include asm-offsets.h . Signed-off-by: Uwe Zeisberger Signed-off-by: Russell King commit 1281e36027a9119356bd93b5e7853c72c35dd462 tree c10b62b061a3a3f74a1e94ac539345ebaf8708ed parent c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 author Andrew Victor Tue, 16 May 2006 11:28:49 +0100 committer Russell King Tue, 16 May 2006 11:28:49 +0100 [ARM] 3523/1: Serial core pm_state Patch from Andrew Victor The serial_core already manages the power state of the UARTs, and therefore it shouldn't suspend a UART which was previously suspended. This patch modifies serial_core only call the UART-specific power-management function if the PM state is actually changing. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 655516c80ccb3ab2ba2d3063715889b00552a8b3 tree 0fc0821a08dd30658e996d42b8bbc30607d0fe40 parent 03a8e359cf760a876f4da9b5c0c165c49564f95a author Ben Dooks Wed, 19 Apr 2006 23:02:56 +0100 committer Wim Van Sebroeck Mon, 15 May 2006 21:38:14 +0200 [WATCHDOG] s3c2410_wdt.c stop watchdog after boot If the s3c2410 watchdog timer is not enabled by the driver at startup, ensure that it is stopped in-case the boot process has enabled it. Signed-off-by: Ben Dooks Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 03a8e359cf760a876f4da9b5c0c165c49564f95a tree 2fd1d5aac0f2443dada7b1e9b3c474a05e67370f parent 92930d9e8121223e14131809c6e9959ee9e0c43f author Wim Van Sebroeck Sun, 16 Apr 2006 12:52:35 +0200 committer Wim Van Sebroeck Mon, 15 May 2006 21:37:58 +0200 [WATCHDOG] i8xx_tco.c - remove support for ICH6 + ICH7 Temporary remove support for ICH6 + ICH7. In these newer TCO's the watchdog timer has changed: the TCO_TMR register is not at the TCOBASE+0x1 offset, but changed it's place to TCOBASE+0x12 and became 10 bit long [0:9]. (Kernel BUG 6031). ICH6 + ICH7 support will be added in a new driver. Code is under test. Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 92930d9e8121223e14131809c6e9959ee9e0c43f tree 5b99b7392366595b78b796d632e151d118005bb8 parent 7071e522a58cb1b3469e4cd8664ef03a32076349 author Randy Dunlap Tue, 04 Apr 2006 20:17:26 -0700 committer Wim Van Sebroeck Mon, 15 May 2006 21:37:46 +0200 [WATCHDOG] Documentation/watchdog/watchdog-api.txt - fix watchdog daemon Fix the simple watchdog daemon program in Doc/watchdog/watchdog-api.txt to build cleanly. Signed-off-by: Randy Dunlap Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 7071e522a58cb1b3469e4cd8664ef03a32076349 tree 1c61882b28b4b7c86c4425726c8bd5f95384d770 parent d8c3291c73b958243b33f8509d4507e76dafd055 author Dave Jones Mon, 03 Apr 2006 16:04:48 -0700 committer Wim Van Sebroeck Mon, 15 May 2006 21:37:36 +0200 [WATCHDOG] sc1200wdt.c printk fix Fix printk output. sc1200wdt: build 20020303<3>sc1200wdt: io parameter must be specified Signed-off-by: Dave Jones Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 843a46f423a508b3a443a08baa903c6da02f3297 tree 635b032413590677e32b968e4c301bac3d7af554 parent de54bc0f00c23a805f4ad2146c5a1fd5e2abe1e9 author Stephen Hemminger Thu, 11 May 2006 15:07:28 -0700 committer Stephen Hemminger Mon, 15 May 2006 12:35:01 -0700 sky2: prevent dual port receiver problems When both ports are receiving simultaneously, the receive logic gets confused and may pass up a packet before it is full. This causes hangs, and IP will see lots of garbage packets. There is even the potential for data corruption if a later arriving packet DMA's into freed memory. It looks like a hardware bug because status arrives for a packet but no data is there. Until this bug is worked out, block the user from bringing up both ports at once. Signed-off-by: Stephen Hemminger commit de54bc0f00c23a805f4ad2146c5a1fd5e2abe1e9 tree ded841bc40c3d5c63013c8f3a7bcc83c3d56ffdc parent 1ea739a5f9f469a57d804ebcf70514b8a5efe9da author Andi Kleen Mon, 15 May 2006 18:19:35 +0200 committer Stephen Hemminger Mon, 15 May 2006 12:26:00 -0700 x86_64: Check for bad dma address in b44 1GB DMA workaround Needed for interaction with the nommu code in x86-64 which will return bad_dma_address if the address exceeds dma_mask. Cc: netdev@vger.kernel.org Signed-off-by: Andi Kleen Signed-off-by: Stephen Hemminger commit 1ea739a5f9f469a57d804ebcf70514b8a5efe9da tree 48269d9f017b7f09eab3577ba78ed81ad9faa7f5 parent 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 author Lennert Buytenhek Mon, 15 May 2006 12:25:29 -0700 committer Stephen Hemminger Mon, 15 May 2006 12:25:29 -0700 The ixp2000 driver for the enp2611 was developed on a board with three gigabit ports, but some enp2611 models only have two ports (and only one onboard PM3386.) The current driver assumes there are always three ports and so it doesn't work on the two-port version of the board at all. This patch adds a bit of logic to the enp2611 driver to limit the number of ports to 2 if the second PM3386 isn't detected. Signed-off-by: Lennert Buytenhek Signed-off-by: Stephen Hemminger commit c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 tree f06021acf77cc63e869a0fb75348eec93f99c2c1 parent 194a61b8e09ac526c33777a688ee2a1504d7fbc3 author Andrew Morton Mon, 15 May 2006 09:44:43 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:58 -0700 [PATCH] dl2k needs dma-mapping.h On alpha: drivers/net/dl2k.c: In function `rio_free_tx': drivers/net/dl2k.c:768: error: `DMA_48BIT_MASK' undeclared (first use in this function) drivers/net/dl2k.c:768: error: (Each undeclared identifier is reported only once drivers/net/dl2k.c:768: error: for each function it appears in.) drivers/net/dl2k.c: In function `receive_packet': drivers/net/dl2k.c:896: error: `DMA_48BIT_MASK' undeclared (first use in this function) drivers/net/dl2k.c: In function `rio_close': drivers/net/dl2k.c:1803: error: `DMA_48BIT_MASK' undeclared (first use in this function) Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 194a61b8e09ac526c33777a688ee2a1504d7fbc3 tree 8319b7deca72b265317102ea0dfd5c9442f474ba parent d3779e7989cfdba854b843fe605f8df9e991cd18 author Andrew Morton Mon, 15 May 2006 09:44:42 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:58 -0700 [PATCH] jffs2 warning fixes fs/jffs2/nodelist.c: In function `check_node_data': fs/jffs2/nodelist.c:441: warning: unsigned int format, different type arg (arg 4) fs/jffs2/nodelist.c:464: warning: int format, different type arg (arg 5) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3779e7989cfdba854b843fe605f8df9e991cd18 tree b535626d492020e650c2014b44cc182f05353eac parent 264a341231e8af2c2e35ac15d26de76f1198525b author Peter Osterlund Mon, 15 May 2006 09:44:40 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:58 -0700 [PATCH] devices.txt: remove pktcdvd entry Changing the driver to use dynamic device numbers was one of the many changes that were made in order to have the driver accepted into the mainline kernel. Therefore I would say that the entry in devices.txt is obsolete. This patch removes it. Signed-off-by: Peter Osterlund Cc: Torben Mathiasen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 264a341231e8af2c2e35ac15d26de76f1198525b tree c86301f2a55057e29425731965d5fdea264494f8 parent 79afecfaabbe42e2a8a7e28880517f1721f2f3a7 author Thomas Kleffel Mon, 15 May 2006 09:44:37 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:58 -0700 [PATCH] ide_cs: Add IBM microdrive to known IDs Add the IBM microdrive to the known PCMCIA IDs for ide_cs. Signed-off-by: Thomas Kleffel Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79afecfaabbe42e2a8a7e28880517f1721f2f3a7 tree 26b577c7c882e1fec21e4dedb2c938bc742e8964 parent bfe2e9349f318883c036607c64b6205d573a28ff author Aneesh Kumar Mon, 15 May 2006 09:44:36 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:58 -0700 [PATCH] Fix typos in Documentation/memory-barriers.txt Fix some typos in Documentation/memory-barriers.txt Signed-off-by: Aneesh Kumar K.V Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfe2e9349f318883c036607c64b6205d573a28ff tree c1ea32e56a4346638867d3320834abc3f29f32e9 parent b2d596d8e08099b47e0a75aa4b7f82aae780e851 author Alexey Dobriyan Mon, 15 May 2006 09:44:35 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] gigaset: endian fix Signed-off-by: Alexey Dobriyan Cc: Hansjoerg Lipp Cc: Tilman Schmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2d596d8e08099b47e0a75aa4b7f82aae780e851 tree 5b76a8b0122e76564d98003425dbd06dff420230 parent ce007ea59729d627f62bb5fa8c1a81e25653a0ad author Pavel Machek Mon, 15 May 2006 09:44:34 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] fix hotplug kconfig help HOTPLUG_CPU entry says "Say Y..." then "Say N.". Slightly ugly, so I fixed it up, and added remark about suspend on SMP as a bonus. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce007ea59729d627f62bb5fa8c1a81e25653a0ad tree c09308c9da8b75462510fce1719ce4a29143964a parent eee391a66d774e644bf3cbb35403562e09d88bb2 author Carl-Daniel Hailfinger Mon, 15 May 2006 09:44:33 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] smbus unhiding kills thermal management Do not enable the SMBus device on Asus boards if suspend is used. We do not reenable the device on resume, leading to all sorts of undesirable effects, the worst being a total fan failure after resume on Samsung P35 laptop. Signed-off-by: Carl-Daniel Hailfinger Signed-off-by: Pavel Machek Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eee391a66d774e644bf3cbb35403562e09d88bb2 tree 1c04e7edb60a5c129c8e118decfea8b5ba5076a3 parent be6e028b6422878df2e799a74609a03a553c7dad author Andrew Morton Mon, 15 May 2006 09:44:30 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] revert "vfs: propagate mnt_flags into do_loopback/vfsmount" Revert commit f6422f17d3a480f21917a3895e2a46b968f56a08, due to Valdis.Kletnieks@vt.edu wrote: > > There seems to have been a bug introduced in this changeset: > > Am running 2.6.17-rc3-mm1. When this changeset is applied, 'mount --bind' > misbehaves: > > > # mkdir /foo > > # mount -t tmpfs -o rw,nosuid,nodev,noexec,noatime,nodiratime none /foo > > # mkdir /foo/bar > > # mount --bind /foo/bar /foo > > # tail -2 /proc/mounts > > none /foo tmpfs rw,nosuid,nodev,noexec,noatime,nodiratime 0 0 > > none /foo tmpfs rw 0 0 > > Reverting this changeset causes both mounts to have the same options. > > (Thanks to Stephen Smalley for tracking down the changeset...) > Cc: Herbert Poetzl Cc: Christoph Hellwig Cc: Cc: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be6e028b6422878df2e799a74609a03a553c7dad tree 8903854a9d6f82f3ec0b4e6087ff0fbad80578db parent 3835a9bd07778d87dea37fbf190f70883515e8fc author Andy Whitcroft Mon, 15 May 2006 09:44:29 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] root mount failure: emit filesystems attempted When we fail to mount from a valid root device list out the filesystems we have tried to mount it with. This gives the user vital diagnostics as to what is missing from their kernel. For example in the fragment below the kernel does not have CRAMFS compiled into the kernel and yet appears to recognise it at the RAMDISK detect stage. Later the mount fails as we don't have the filesystem. RAMDISK: cramfs filesystem found at block 0 RAMDISK: Loading 1604KiB [1 disk] into ram disk... done. XFS: bad magic number XFS: SB validate failed No filesystem could mount root, tried: reiserfs ext3 ext2 msdos vfat iso9660 jfs xfs Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(8,1) Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3835a9bd07778d87dea37fbf190f70883515e8fc tree e094973e46552335bb1ecaa9eaee04788df45b16 parent bb53a76116a8af13ee2581c85c02fe40e0c1a599 author Alexey Dobriyan Mon, 15 May 2006 09:44:27 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] fs/compat.c: fix 'if (a |= b )' typo Mentioned by Mark Armbrust somewhere on Usenet. Signed-off-by: Alexey Dobriyan Cc: David Woodhouse Cc: Ulrich Drepper Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb53a76116a8af13ee2581c85c02fe40e0c1a599 tree 1338b1488774d50aa8f6586c72a6e6b1400e3327 parent 655fdeab809a5612b0eab6aee873b00d26404ca7 author Daniel Walker Mon, 15 May 2006 09:44:27 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] tpm_register_hardware gcc 4.1 warning fix drivers/char/tpm/tpm.c: In function 'tpm_register_hardware': drivers/char/tpm/tpm.c:1157: warning: assignment from incompatible pointer type Signed-off-by: Daniel Walker Acked-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 655fdeab809a5612b0eab6aee873b00d26404ca7 tree 9aa5608c1ee21cf03abae11b8ae2f13c18d9c12c parent 2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 author Alan Cox Mon, 15 May 2006 09:44:26 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] Final rio polish Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 tree ff9daf3ca4ad802fe1c25adf40aa65d76d49b770 parent 64471ebe534dc6cedd72849b2324b52cb5249eb9 author Kylene Jo Hall Mon, 15 May 2006 09:44:25 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] tpm: fix constant Fix the constant used for the base address when it cannot be determined from ACPI. It was off by one order of magnitude. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64471ebe534dc6cedd72849b2324b52cb5249eb9 tree 3686422779a7bd5846fd0adaffa964d3455ea2eb parent e6333fd4ddf7a583480017f535b9ea53c116ab81 author Benjamin LaHaise Mon, 15 May 2006 09:44:24 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] Add Core Solo and Core Duo support to oprofile Add support to oprofile for the Intel Core Solo and Core Duo processors. See also the patch to add support to oprofile-0.9.1-8.1.1 at http://www.kvack.org/~bcrl/patches/oprofile/oprofile-core-0.9.1.diff . Signed-off-by: Benjamin LaHaise Cc: Philippe Elie Cc: John Levon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6333fd4ddf7a583480017f535b9ea53c116ab81 tree df1aeae28ce51103a0c9eda8f7d40e463297b2ef parent 41e5a6ac80c600e1f8bda0a4871f0b797e097d78 author Hua Zhong Mon, 15 May 2006 09:44:22 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] fix can_share_swap_page() when !CONFIG_SWAP can_share_swap_page() is used to check if the page has the last reference. This avoids allocating a new page for COW if it's the last page. However, if CONFIG_SWAP is not set, can_share_swap_page() is defined as 0, thus always causes a copy for the last COW page. The below simple patch fixes it. Signed-off-by: Hua Zhong Cc: David Howells Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41e5a6ac80c600e1f8bda0a4871f0b797e097d78 tree e2796bac0d285751d027eff931e31c0842669788 parent 343f1fe6f2e3fb4912db241e639b0721c2e14f2e author Latchesar Ionkov Mon, 15 May 2006 09:44:21 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] v9fs: signal handling fixes Multiple races can happen when v9fs is interrupted by a signal and Tflush message is sent to the server. After v9fs sends Tflush it doesn't wait until it receives Rflush, and possibly the response of the original message. This behavior may confuse v9fs what fids are allocated by the file server. This patch fixes the races and the fid allocation. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 343f1fe6f2e3fb4912db241e639b0721c2e14f2e tree 80f5c857ff7d4cd162c7d3fc0b23abc348de9559 parent 3dc7b82ea7649356bf027fba50c16ca50cec31e2 author Latchesar Ionkov Mon, 15 May 2006 09:44:18 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] v9fs: Twalk memory leak v9fs leaks memory if the file server responds with Rerror to a Twalk message. The patch fixes the leak. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dc7b82ea7649356bf027fba50c16ca50cec31e2 tree 52bb14b8021c851d6cbd765f74aafa6c33ea631e parent 263de9b582b0f9b6ad5a0651b7df884fe80d6c3c author Richard Purdie Mon, 15 May 2006 09:44:17 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] LED: Fix sysfs store function error handling Fix the error handling of some LED _store functions. This corrects them to return -EINVAL if the value is not numeric with an optional byte of trailing whitespace. Signed-off-by: Richard Purdie Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 263de9b582b0f9b6ad5a0651b7df884fe80d6c3c tree 256bfce6d1d3ae66e85ae2d5e79be74766ba5f4a parent 68673afd443c5eeb4cebfb9026e3675f43d79f2b author Richard Purdie Mon, 15 May 2006 09:44:16 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] LED: Add maintainer entry for the LED subsystem Add a MAINTAINERS entry for the LED subsystem. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68673afd443c5eeb4cebfb9026e3675f43d79f2b tree b8350ec63cee168284b35016aa097334c215d633 parent a8d2e7d95229db9999682113bfac40b49978f212 author Richard Purdie Mon, 15 May 2006 09:44:15 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] Backlight/LCD Class: Fix sysfs _store error handling The backlight and LCD class _store functions currently accept values like "34 some random strings" without error. This corrects them to return -EINVAL if the value is not numeric with an optional byte of trailing whitespace. Signed-off-by: Richard Purdie Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8d2e7d95229db9999682113bfac40b49978f212 tree f45f31fa12e3f795966006b8cb19ccc4e913f103 parent 39d24e64263cd3211705d3b61ea4171c65030921 author Richard Purdie Mon, 15 May 2006 09:44:14 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] LED: Improve Kconfig information Improve the NEW_LEDS Kconfig information to say what it does as well as what it doesn't. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39d24e64263cd3211705d3b61ea4171c65030921 tree b527b1395b070180b7f930c0a89530f11bce7b3c parent 48564e628bd7662d7a0b3ac81c41cd0e4cc36dae author Mike Kravetz Mon, 15 May 2006 09:44:13 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] add slab_is_available() routine for boot code slab_is_available() indicates slab based allocators are available for use. SPARSEMEM code needs to know this as it can be called at various times during the boot process. Signed-off-by: Mike Kravetz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48564e628bd7662d7a0b3ac81c41cd0e4cc36dae tree 44f5d76fb7dfa2636b790a0aea1fe8568807a088 parent 2e367a82fc2da335455984a7722c721dd3fa782b author Jan Niehusmann Mon, 15 May 2006 09:44:12 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] smbfs: Fix slab corruption in samba error path Yesterday, I got the following error with 2.6.16.13 during a file copy from a smb filesystem over a wireless link. I guess there was some error on the wireless link, which in turn caused an error condition for the smb filesystem. In the log, smb_file_read reports error=4294966784 (0xfffffe00), which also shows up in the slab dumps, and also is -ERESTARTSYS. Error code 27499 corresponds to 0x6b6b, so the rq_errno field seems to be the only one being set after freeing the slab. In smb_add_request (which is the only place in smbfs where I found ERESTARTSYS), I found the following: if (!timeleft || signal_pending(current)) { /* * On timeout or on interrupt we want to try and remove the * request from the recvq/xmitq. */ smb_lock_server(server); if (!(req->rq_flags & SMB_REQ_RECEIVED)) { list_del_init(&req->rq_queue); smb_rput(req); } smb_unlock_server(server); } [...] if (signal_pending(current)) req->rq_errno = -ERESTARTSYS; I guess that some codepath like smbiod_flush() caused the request to be removed from the queue, and smb_rput(req) be called, without SMB_REQ_RECEIVED being set. This violates an asumption made by the quoted code. Then, the above code calls smb_rput(req) again, the req gets freed, and req->rq_errno = -ERESTARTSYS writes into the already freed slab. As list_del_init doesn't cause an error if called multiple times, that does cause the observed behaviour (freed slab with rq_errno=-ERESTARTSYS). If this observation is correct, the following patch should fix it. I wonder why the smb code uses list_del_init everywhere - using list_del instead would catch such situations by poisoning the next and prev pointers. May 4 23:29:21 knautsch kernel: [17180085.456000] ipw2200: Firmware error detected. Restarting. May 4 23:29:21 knautsch kernel: [17180085.456000] ipw2200: Sysfs 'error' log captured. May 4 23:33:02 knautsch kernel: [17180306.316000] ipw2200: Firmware error detected. Restarting. May 4 23:33:02 knautsch kernel: [17180306.316000] ipw2200: Sysfs 'error' log already exists. May 4 23:33:02 knautsch kernel: [17180306.968000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:34:18 knautsch kernel: [17180383.256000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:34:18 knautsch kernel: [17180383.284000] SMB connection re-established (-5) May 4 23:37:19 knautsch kernel: [17180563.956000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:40:09 knautsch kernel: [17180733.636000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:40:26 knautsch kernel: [17180750.700000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:43:02 knautsch kernel: [17180907.304000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:43:08 knautsch kernel: [17180912.324000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:43:34 knautsch kernel: [17180938.416000] smb_errno: class Unknown, code 27499 from command 0x6b May 4 23:43:34 knautsch kernel: [17180938.416000] Slab corruption: start=c4ebe09c, len=244 May 4 23:43:34 knautsch kernel: [17180938.416000] Redzone: 0x5a2cf071/0x5a2cf071. May 4 23:43:34 knautsch kernel: [17180938.416000] Last user: [](smb_rput+0x53/0x90 [smbfs]) May 4 23:43:34 knautsch kernel: [17180938.416000] 000: 6b 6b 6b 6b 6b 6b 6b 6b 6a 6b 6b 6b 6b 6b 6b 6b May 4 23:43:34 knautsch kernel: [17180938.416000] 0f0: 00 fe ff ff May 4 23:43:34 knautsch kernel: [17180938.416000] Next obj: start=c4ebe19c, len=244 May 4 23:43:34 knautsch kernel: [17180938.416000] Redzone: 0x5a2cf071/0x5a2cf071. May 4 23:43:34 knautsch kernel: [17180938.416000] Last user: [<00000000>](_stext+0x3feffde0/0x30) May 4 23:43:34 knautsch kernel: [17180938.416000] 000: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b May 4 23:43:34 knautsch kernel: [17180938.416000] 010: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b May 4 23:43:34 knautsch kernel: [17180938.460000] SMB connection re-established (-5) May 4 23:43:42 knautsch kernel: [17180946.292000] ipw2200: Firmware error detected. Restarting. May 4 23:43:42 knautsch kernel: [17180946.292000] ipw2200: Sysfs 'error' log already exists. May 4 23:45:04 knautsch kernel: [17181028.752000] ipw2200: Firmware error detected. Restarting. May 4 23:45:04 knautsch kernel: [17181028.752000] ipw2200: Sysfs 'error' log already exists. May 4 23:45:05 knautsch kernel: [17181029.868000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:45:36 knautsch kernel: [17181060.984000] smb_errno: class Unknown, code 27499 from command 0x6b May 4 23:45:36 knautsch kernel: [17181060.984000] Slab corruption: start=c4ebe09c, len=244 May 4 23:45:36 knautsch kernel: [17181060.984000] Redzone: 0x5a2cf071/0x5a2cf071. May 4 23:45:36 knautsch kernel: [17181060.984000] Last user: [](smb_rput+0x53/0x90 [smbfs]) May 4 23:45:36 knautsch kernel: [17181060.984000] 000: 6b 6b 6b 6b 6b 6b 6b 6b 6a 6b 6b 6b 6b 6b 6b 6b May 4 23:45:36 knautsch kernel: [17181060.984000] 0f0: 00 fe ff ff May 4 23:45:36 knautsch kernel: [17181060.984000] Next obj: start=c4ebe19c, len=244 May 4 23:45:36 knautsch kernel: [17181060.984000] Redzone: 0x5a2cf071/0x5a2cf071. May 4 23:45:36 knautsch kernel: [17181060.984000] Last user: [<00000000>](_stext+0x3feffde0/0x30) May 4 23:45:36 knautsch kernel: [17181060.984000] 000: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b May 4 23:45:36 knautsch kernel: [17181060.984000] 010: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b May 4 23:45:36 knautsch kernel: [17181061.024000] SMB connection re-established (-5) May 4 23:46:17 knautsch kernel: [17181102.132000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:47:46 knautsch kernel: [17181190.468000] smb_errno: class Unknown, code 27499 from command 0x6b May 4 23:47:46 knautsch kernel: [17181190.468000] Slab corruption: start=c4ebe09c, len=244 May 4 23:47:46 knautsch kernel: [17181190.468000] Redzone: 0x5a2cf071/0x5a2cf071. May 4 23:47:46 knautsch kernel: [17181190.468000] Last user: [](smb_rput+0x53/0x90 [smbfs]) May 4 23:47:46 knautsch kernel: [17181190.468000] 000: 6b 6b 6b 6b 6b 6b 6b 6b 6a 6b 6b 6b 6b 6b 6b 6b May 4 23:47:46 knautsch kernel: [17181190.468000] 0f0: 00 fe ff ff May 4 23:47:46 knautsch kernel: [17181190.468000] Next obj: start=c4ebe19c, len=244 May 4 23:47:46 knautsch kernel: [17181190.468000] Redzone: 0x5a2cf071/0x5a2cf071. May 4 23:47:46 knautsch kernel: [17181190.468000] Last user: [<00000000>](_stext+0x3feffde0/0x30) May 4 23:47:46 knautsch kernel: [17181190.468000] 000: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b May 4 23:47:46 knautsch kernel: [17181190.468000] 010: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b May 4 23:47:46 knautsch kernel: [17181190.492000] SMB connection re-established (-5) May 4 23:49:20 knautsch kernel: [17181284.828000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:49:39 knautsch kernel: [17181303.896000] smb_file_read: //some_file validation failed, error=4294966784 Signed-off-by: Jan Niehusmann Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e367a82fc2da335455984a7722c721dd3fa782b tree c2d1030acacd80fe96e7a483bccad3b1702e5c86 parent 5e376613899076396d0c97de67ad072587267370 author Marcelo Tosatti Mon, 15 May 2006 09:44:08 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] Marcelo has moved Signed-off-by: Marcelo Tosatti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e376613899076396d0c97de67ad072587267370 tree ecc15c25ee4da7754aa7d137dccebab68820399e parent 0159677857c5ada0a0a2c03a4dd59312382b73d0 author Trent Piepho Mon, 15 May 2006 09:44:06 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] symbol_put_addr() locks kernel Even since a previous patch: Fix race between CONFIG_DEBUG_SLABALLOC and modules Sun, 27 Jun 2004 17:55:19 +0000 (17:55 +0000) http://www.kernel.org/git/?p=linux/kernel/git/torvalds/old-2.6-bkcvs.git;a=commit;h=92b3db26d31cf21b70e3c1eadc56c179506d8fbe The function symbol_put_addr() will deadlock the kernel. symbol_put_addr() would acquire modlist_lock, then while holding the lock call two functions kernel_text_address() and module_text_address() which also try to acquire the same lock. This deadlocks the kernel of course. This patch changes symbol_put_addr() to not acquire the modlist_lock, it doesn't need it since it never looks at the module list directly. Also, it now uses core_kernel_text() instead of kernel_text_address(). The latter has an additional check for addr inside a module, but we don't need to do that since we call module_text_address() (the same function kernel_text_address uses) ourselves. Signed-off-by: Trent Piepho Cc: Zwane Mwaikambo Acked-by: Rusty Russell Cc: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0159677857c5ada0a0a2c03a4dd59312382b73d0 tree 51c3ed1fad1c0bcf732a9810b97f7a68790a75e7 parent 6a050da45b5d855b48b057446847ff1542977b52 author Martin Schwidefsky Mon, 15 May 2006 09:44:05 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] s390: add vmsplice system call Add new vmsplice system call and add missing __NR_xxx defines for sys_set_robust_list, sys_get_robust_list, sys_splice, sys_sync_file_range and sys_tee. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a050da45b5d855b48b057446847ff1542977b52 tree f455f444ddd5be62740cd430c595c6d6a13fb4db parent 698d070746770aaaec78ab4ffa3ab1f1d5c6abe8 author Mark Huang Mon, 15 May 2006 09:44:03 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] initramfs: fix CPIO hardlink check Copy the filenames of hardlinks when inserting them into the hash, since the "name" pointer may point to scratch space (name_buf). Not doing so results in corruption if the scratch space is later overwritten: the wrong file may be hardlinked, or, if the scratch space contains garbage, the link will fail and a 0-byte file will be created instead. Signed-off-by: Mark Huang Acked-by: Al Viro Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 698d070746770aaaec78ab4ffa3ab1f1d5c6abe8 tree 00aab6741bbc7e8c419903a7d8f4f876889c7a8a parent ac924c6034d9095f95ee889f7e31bbb9145da0c2 author Greg Smith Mon, 15 May 2006 09:44:02 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] s390: lcs incorrect test While debugging why our LCS emulator is having some problems I noticed the following weirdness in drivers/s390/net/lcs.c routine lcs_irq. The `if' statement is always true since SCHN_STAT_PCI is defined as 0x80. Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac924c6034d9095f95ee889f7e31bbb9145da0c2 tree 2db4fc64a008ff2b81a0faf381d8c21ccc5006b2 parent 5afdbd6e84c7fbdaa7cfde4cbee0d3a5f4f56da2 author Andrew Morton Mon, 15 May 2006 09:43:59 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] setup_per_zone_pages_min() overflow fix As pointed out in http://bugzilla.kernel.org/show_bug.cgi?id=6490, this function can experience overflows on 32-bit machines, causing our response to changed values of min_free_kbytes to go whacky. Fixing it efficiently is all too hard, so fix it with 64-bit math instead. Cc: Ake Sandgren Cc: Martin Bligh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5afdbd6e84c7fbdaa7cfde4cbee0d3a5f4f56da2 tree 9b4c317054b833245372f0c0e64b015469825479 parent 986733e01d258c26107f1da9d8d47c718349ad2f author Heiko Carstens Mon, 15 May 2006 09:43:59 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] s390: exploit rcu_needs_cpu() interface Exploit rcu_needs_cpu() interface to keep the cpu 'ticking' if necessary. Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 986733e01d258c26107f1da9d8d47c718349ad2f tree 5e0f04a707b8c341f79927ba6fffd0ad55d85c29 parent 3b7c8108273bed41a2fc04533cc9f2026ff38c8e author Heiko Carstens Mon, 15 May 2006 09:43:58 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] RCU: introduce rcu_needs_cpu() interface With "Paul E. McKenney" Introduce rcu_needs_cpu() interface. This can be used to tell if there will be a new rcu batch on a cpu soon by looking at the curlist pointer. This can be used to avoid to enter a tickless idle state where the cpu would miss that a new batch is ready when rcu_start_batch would be called on a different cpu. Signed-off-by: Heiko Carstens Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b7c8108273bed41a2fc04533cc9f2026ff38c8e tree d437254b0cd1b07ecc33631fea13ad79f925353b parent a7b862f663d81858531dfccc0537bc9d8a2a4121 author Olaf Kirch Mon, 15 May 2006 09:43:57 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] smbfs chroot issue (CVE-2006-1864) Mark Moseley reported that a chroot environment on a SMB share can be left via "cd ..\\". Similar to CVE-2006-1863 issue with cifs, this fix is for smbfs. Steven French wrote: Looks fine to me. This should catch the slash on lookup or equivalent, which will be all obvious paths of interest. Signed-off-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7b862f663d81858531dfccc0537bc9d8a2a4121 tree 00d5e21bd77f789150db61fdd999c73d59fa78b2 parent 73d58588091e81e5ee4266488e2fb09a410f1512 author Chris Wedgwood Mon, 15 May 2006 09:43:55 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] VIA quirk fixup, additional PCI IDs An earlier commit (75cf7456dd87335f574dcd53c4ae616a2ad71a11) changed an overly-zealous PCI quirk to only poke those VIA devices that need it. However, some PCI devices were not included in what I hope is now the full list. Consequently we're failing to run the quirk on all machines which need it, causing IRQ routing failures. This should I hope correct this. Thanks to Masoud Sharbiani for pointing this out and testing the fix. Signed-off-by: Chris Wedgwood Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73d58588091e81e5ee4266488e2fb09a410f1512 tree 38effb2a3d6ba36aa9839adffb2ec4f8e737a509 parent 94585136606e0598a93ec145d9a899c8ec9b2208 author Benjamin Herrenschmidt Mon, 15 May 2006 09:43:53 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:54 -0700 [PATCH] pcmcia Oopses fixes Fix some NULL dereferences in the pcmcia code when using old userland tools. Signed-off-by: Benjamin Herrenschmidt Acked-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94585136606e0598a93ec145d9a899c8ec9b2208 tree ae20ed8b78f9ef2e12ec02eac7380942e6860ca2 parent 90d5ede5985f3b172cc3ccd89bf8c52a209088a5 author Kylene Jo Hall Mon, 15 May 2006 09:43:53 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:54 -0700 [PATCH] tpm: update module dependencies The TIS driver is dependent upon information from the ACPI table for device discovery thus it compiles but does no actual work without this dependency. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90d5ede5985f3b172cc3ccd89bf8c52a209088a5 tree 3163c41681c1cf7d90a7c272c82378413198d16f parent a5370553952a9a414860d878b67c49eff11313bd author Stefan Schweizer Mon, 15 May 2006 09:43:52 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:54 -0700 [PATCH] Fix capi reload by unregistering the correct major I am having the bug FATAL: Error inserting capi ([..]/capi.ko): Device or resource busy when I try to reload capi after loading it. in dmesg: capi20: unable to get major 68 Fix the issue which is caused by setting the major to zero when registering the chrdev succeeded. (akpm: this means that we can again not use `major=0' (dynamic major allocation) for this driver). Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5370553952a9a414860d878b67c49eff11313bd tree 8a893bd5e6519fbb7e1b46506096607be7093a50 parent 6aff5cb8ec270db569800b1bb59bd20003a76f07 author Ian Kent Mon, 15 May 2006 09:43:51 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:54 -0700 [PATCH] autofs4: NFY_NONE wait race fix This patch fixes two problems. First, the comparison of entries in the waitq.c was incorrect. Second, the NFY_NONE check was incorrect. The test of whether the dentry is mounted if ineffective, for example, if an expire fails then we could wait forever on a non existant expire. The bug was identified by Jeff Moyer. The patch changes autofs4 to wait on expires only as this is all that's needed. If there is no existing wait when autofs4_wait is call with a type of NFY_NONE it delays until either a wait appears or the the expire flag is cleared. Signed-off-by: Ian Kent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6aff5cb8ec270db569800b1bb59bd20003a76f07 tree 93e876b49dbbbd9e34b8d8ba99db38b4d51f27d9 parent 0cccca06f9870eb6daa89357b8a99ad041865553 author Adrian Bunk Mon, 15 May 2006 09:43:50 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:54 -0700 [PATCH] fs/open.c: unexport sys_openat Remove the unused EXPORT_SYMBOL_GPL(sys_openat). Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0cccca06f9870eb6daa89357b8a99ad041865553 tree 216251e4cbbdbb9509ed0b6fc769050ece2fb93e parent 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 author Serge E. Hallyn Mon, 15 May 2006 09:43:48 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:54 -0700 [PATCH] selinux: check for failed kmalloc in security_sid_to_context() Check for NULL kmalloc return value before writing to it. Signed-off-by: Serge E. Hallyn Acked-by: James Morris Cc: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 tree 7220f29b3d3e068c139904093ae3eb49b41f1ef2 parent 032ebf2620ef99a4fedaa0f77dc2272095ac5863 author Linus Torvalds Sat, 13 May 2006 08:01:23 -0700 committer Linus Torvalds Sat, 13 May 2006 08:01:23 -0700 Revert "[PATCH] i386: export: memory more than 4G through /proc/iomem" This reverts commit 10dbe196a8da6b3196881269c6639c0ec11c36cb. The resource struct is still 32-bit, so trying to save a 64-bit memory size there obviously won't work. When we merge the 64-bit resource series, we can re-enable this. Thanks to Sachin Sant and Maneesh Soni for debugging Cc: Maneesh Soni Cc: Sachin Sant Cc: Russell King Cc: Sharyathi Nagesh Cc: Arjan van de Ven Cc: Vivek Goyal Signed-off-by: Linus Torvalds commit 032ebf2620ef99a4fedaa0f77dc2272095ac5863 tree 18a341e1548a304efea7543c715d23255ada6fa3 parent 18552b8f227bddf569dade5c69798a37839ea913 author Linus Torvalds Fri, 12 May 2006 18:42:09 -0700 committer Linus Torvalds Fri, 12 May 2006 18:42:09 -0700 Alternative fix for MMC oops on unmount after removal Make sure to clear the driverfs_dev pointer when we do del_gendisk() (on disk removal), so that other users that may still have a ref to the disk won't try to use the stale pointer. Also move the KOBJ_REMOVE uevent handler up, so that the uevent still has access to the driverfs_dev data. This all should hopefully fix the problems with MMC umounts after device removals that caused commit 56cf6504fc1c0c221b82cebc16a444b684140fb7 and its reversal (1a2acc9e9214699a99389e323e6686e9e0e2ca67). Original problem reported by Todd Blumer and others. Acked-by: Greg KH Cc: Russell King Cc: James Bottomley Cc: Erik Mouw Cc: Andrew Vasquez Cc: Todd Blumer Signed-off-by: Linus Torvalds commit 8a2ae70a9b4dc88c83b4644c58d06d74f2cb70c9 tree 01fa02d2311608329d11395c627c4a7b3c3f5402 parent 68a26aecb3829d013f612def3c8995efdbad3306 author Ingo Molnar Tue, 02 May 2006 09:00:31 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:25 -0300 V4L/DVB (3965): Fix CONFIG_VIDEO_VIVI=y build bug CONFIG_VIDEO_VIVI depends on CONFIG_VIDEO_BUF. Signed-off-by: Ingo Molnar Signed-off-by: Mauro Carvalho Chehab commit 68a26aecb3829d013f612def3c8995efdbad3306 tree 56b706c6754d7c0c3be4ffef6f086a95bdaeca48 parent 1095136dee95d27d27cebc52bd502f7facee8600 author Adrian Bunk Fri, 28 Apr 2006 10:48:41 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:23 -0300 V4L/DVB (3964): Bt8xx/bttv-cards.c: fix off-by-one errors This patch fixes two off-by-one errors spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 1095136dee95d27d27cebc52bd502f7facee8600 tree 2d6dc255843a2db567e7379771712b4cfc54c47e parent 765bf9770fda950e6615451ad1a4b8866bda7dfa author Andrew Morton Thu, 27 Apr 2006 10:10:58 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:21 -0300 V4L/DVB (3914): Vivi build fix drivers/media/video/vivi.c: In function `vivi_map_sg': drivers/media/video/vivi.c:799: error: `DMA_NONE' undeclared (first use in this function) drivers/media/video/vivi.c:799: error: (Each undeclared identifier is reported only once drivers/media/video/vivi.c:799: error: for each function it appears in.) Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 765bf9770fda950e6615451ad1a4b8866bda7dfa tree 42f26ccf3aaf456c3c5382f3fd4f409d3d0b0e25 parent ba5f0a4e15e736d99d698ce498bd6f1f16d014cf author Andrew Morton Thu, 27 Apr 2006 10:09:27 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:18 -0300 V4L/DVB (3912): Sparc32 vivi fix Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit ba5f0a4e15e736d99d698ce498bd6f1f16d014cf tree 995ec62451991440e552d89ffacbe763634e81d6 parent dd31d5ac7345b2c728bf7eb37b06383776174232 author Michael Krufky Sun, 23 Apr 2006 01:55:38 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:17 -0300 V4L/DVB (3832): Get_dvb_firmware: download nxt2002 firmware from new driver location BBTI has updated their driver, and removed the old one from their website. This patch updates the get_dvb_firmware script to download the firmware from the new driver location. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit dd31d5ac7345b2c728bf7eb37b06383776174232 tree a838b59bfc67278c3459a70208a562ce926cd935 parent 7bbbc0a28e6cfcef66e2180206257b959dad2006 author Rusty Scott Sat, 22 Apr 2006 16:15:07 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:16 -0300 V4L/DVB (3829): Fix frequency values in the ranges structures of the LG TDVS H06xF tuners Frequency range values in the current driver for the LG TDVS H06xF tuners appear to have been a transposing of the 5 in the mid range 160-455 instead of 165-450. This patch corrects the pll programming for these tuners as per the datasheet. Signed-off-by: Rusty Scott Signed-off-by: Mac Michaels Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7bbbc0a28e6cfcef66e2180206257b959dad2006 tree 4755403c20dfd0841652aa5433701b1dc1304703 parent 7d16eaa3d0d41a6e871e5c82720bcd006b202d55 author Mikhail Gusarov Thu, 20 Apr 2006 13:18:50 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:14 -0300 V4L/DVB (3826): Saa7134: Missing 'break' in Terratec Cinergy 400 TV initialization There is a missing break in card initialization function. Might screw up initialization of Terratec Cinergy 400 TV. Signed-off-by: Mikhail Gusarov Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7d16eaa3d0d41a6e871e5c82720bcd006b202d55 tree c3d44ea9a30887aac9e3d0ed3b1fe66b25a943f7 parent 5691c8473936508c51639b6ff8467e55d8b129c1 author Hans Verkuil Sun, 23 Apr 2006 05:54:56 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:12 -0300 V4L/DVB (3825): Remove broken 'fast firmware load' from cx25840. The fast firmware load hack in cx25840 uses private data. In fact, it breaks pvrusb2 and doesn't work at all with ivtv. It is a unsafe implementation and so it is removed. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5691c8473936508c51639b6ff8467e55d8b129c1 tree 9b544d9de02afa35c4f2bb0c81a4c40b7d78cd8e parent 7157e2b6ff6fdd24d7e54d9856aa24ea88527ca9 author Michael Krufky Wed, 19 Apr 2006 20:40:01 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:11 -0300 V4L/DVB (3819): Cxusb-bluebird: bug-fix: power down corrupts frontend This patch prevents a bug where the frontend is unable to tune after waking from powered down state. Now, the device remains powered on until it is disconnected, just like the windows driver. It seems that the bluebird firmware is unable to successfully handle tuning after a powered down state. This patch fixes all of the FusionHDTV Bluebird USB2 devices. The Medion MD95700 will still behave as before, since it was unaffected by this bug. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7157e2b6ff6fdd24d7e54d9856aa24ea88527ca9 tree f3c8a833a2b362fafaf53c0ff763afab5283e1ef parent 70047f9cca231126981f360c79cde98ea30410b2 author Hans Verkuil Sun, 16 Apr 2006 17:17:42 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:10 -0300 V4L/DVB (3813): Add support for TCL M2523_5N_E tuner. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 70047f9cca231126981f360c79cde98ea30410b2 tree aabe74c0f39d3c05d2d315cee9d5c14f77d58300 parent 0e4558ab4a89a127e0de36746552da9353e35f10 author Yeasah Pell Thu, 13 Apr 2006 17:26:22 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:08 -0300 V4L/DVB (3804): Tweak bandselect setup fox cx24123 *) Allow forcing the bandselect value with a module parameter to facilitate determining the correct bandselect frequencies. *) Changes the bandselect frequency thresholds based on experiments with the above parameter in conjunction with the values in the spec. Signed-off-by: Yeasah Pell Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 0e4558ab4a89a127e0de36746552da9353e35f10 tree 19fe0a9c2c9d9d4f5ed5f4e7b08ddfbf1b466010 parent dce1dfc2a5736bfc82df5d3fd6396022c7bbbbd8 author Yeasah Pell Thu, 13 Apr 2006 17:24:13 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:07 -0300 V4L/DVB (3803): Various correctness fixes to tuning. *) Sets an additional tuner parameter (demodulator sample gain) that wasn't being set before. *) Removes the low symbol rate tuner parameter tweaks in the previous patch -- it appears those tweaks are not necessary with the demodulator sample gain set correctly. *) Cleanup and document the demodulator register initialization sequence. *) Change set_fec routine to disable FEC auto scan when a specific code rate is selected. *) Remove error message when reported FEC is invalid (which happens sometimes when the card has no signal) Signed-off-by: Yeasah Pell Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit dce1dfc2a5736bfc82df5d3fd6396022c7bbbbd8 tree d849c602c78f49b91ef051a14e2b0e9da2fe7a04 parent caf970e09c42843eb3b8456fc0e815f9b5385873 author Yeasah Pell Thu, 13 Apr 2006 11:40:59 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:05 -0300 V4L/DVB (3797): Always wait for diseqc queue to become ready before transmitting a diseqc message The previous DISEQC code didn't wait, so it was unreliable Signed-off-by: Yeasah Pell Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit caf970e09c42843eb3b8456fc0e815f9b5385873 tree 91b15ba87bb1f1ee84e2568d1034b48125bbf043 parent a74b51fca9d9b6774413d700ade1e9ae1f0c0e75 author Mauro Carvalho Chehab Thu, 13 Apr 2006 11:29:13 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:04 -0300 V4L/DVB (3796): Add several debug messages to cx24123 code Current debug messages at cx24123 are next to useless, since they don't print the values sent/read to registers. With this patch, debug=1 will show comprehensive messages. debug=2 will show also read/write operations at I2C bus. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew de Quincey commit a74b51fca9d9b6774413d700ade1e9ae1f0c0e75 tree ac02ba7f67f5b51805a4a0dda1d09701c1e3aab8 parent 3a63fc4bfd8579bda1f6a03b3fcb792f59cb15f8 author Vadim Catana Thu, 13 Apr 2006 10:19:52 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:02 -0300 V4L/DVB (3795): Fix for CX24123 & low symbol rates - fixed the reception of channels with low symbol rates. ( The VGA1 and VGA2 offsets recommended by cx24109 docs for symbol rates from 1 to 5 MSps do not work. I changed them to values found experimentally. The charge pump current and FILTUNE voltage are now set to values recommended in the docs. This improves reception for symbol rates < 15 MSps. The values written in the SYSSymbolRate registers are calculated with better precision. ) - fixed the cx24123_get_fec() function. It was returning the values for DCII mode. - removed some unused variables Signed-off-by: Vadim Catana Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 3a63fc4bfd8579bda1f6a03b3fcb792f59cb15f8 tree 1c10d0dad730b74c5a7cfe68970b076533a6a136 parent 7c908fbb0139fa1080412d0590189abfe2df87eb author Michael Krufky Tue, 11 Apr 2006 18:16:22 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:55:00 -0300 V4L/DVB (3792): Kbuild: DVB_BT8XX must select DVB_ZL10353 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7c908fbb0139fa1080412d0590189abfe2df87eb tree 2cec8f26118a835e47f5c37d399b4384a96478d9 parent b37492be25be5ff0551bff8b479e783498ebe838 author Eric Sesterhenn Tue, 11 Apr 2006 18:19:33 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:59 -0300 V4L/DVB (3790): Use after free in drivers/media/video/em28xx/em28xx-video.c In several places we use dev->devno right after we kfree() dev. This fixes coverity bug id #1065 Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit b37492be25be5ff0551bff8b479e783498ebe838 tree d833105fdedba7cc16b258bc9e5d9209ae3fc682 parent 4fff598fc700a9f2089a3351a54e049d79faa631 author Mauro Carvalho Chehab Tue, 11 Apr 2006 18:07:49 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:58 -0300 V4L/DVB (3788): Fix compilation with V4L1_COMPAT Signed-off-by: Mauro Carvalho Chehab commit 4fff598fc700a9f2089a3351a54e049d79faa631 tree 80fd3e52b329ed43bc8dd28173726b14e94e6c08 parent c1d1ea9e0f83a89d7afa1c84fac8312e2e08c85e author Mauro Carvalho Chehab Sun, 09 Apr 2006 16:20:19 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:56 -0300 V4L/DVB (3782): Removed uneeded stuff from pwc Makefile Signed-off-by: Mauro Carvalho Chehab commit c1d1ea9e0f83a89d7afa1c84fac8312e2e08c85e tree 3a6bae707222eb1ee8f52fe2f23847da25995c1e parent cd41e28e2d0f198ad56840bf8ba13cb41b129bab author Mauro Carvalho Chehab Sun, 09 Apr 2006 15:51:18 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:54 -0300 V4L/DVB (3775): Add VIVI Kconfig stuff Signed-off-by: Mauro Carvalho Chehab commit cd41e28e2d0f198ad56840bf8ba13cb41b129bab tree a11b7e23c14625a4b019b43eecdc8fff2ee62463 parent ea76ce526ec1af3e07f3dd9107ca93f0c82fc9c9 author Mauro Carvalho Chehab Sun, 09 Apr 2006 15:43:41 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:53 -0300 V4L/DVB (3774): Create V4L1 config options V4L1 API is depreciated and should be removed soon from kernel. This patch adds two new options, one to disable V4L1 drivers, and another to disable V4L1 compat module. This way, it would be easy to check what still depends on V4L1 stuff, allowing also to test if app works fine with V4L2 only support. Signed-off-by: Mauro Carvalho Chehab commit ea76ce526ec1af3e07f3dd9107ca93f0c82fc9c9 tree 275d1859419f497847f12dd62b9129538c72759f parent bba3ad76a82eb458d31b136fa2414216e20c99cc author Jose Alberto Reguero Tue, 11 Apr 2006 10:19:25 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:52 -0300 V4L/DVB (3767): Pvr350 tv out (saa7127) Witout this patch tv out don't work properly with my pvr350 card. Signed-off-by: Jose Alberto Reguero Signed-off-by: Mauro Carvalho Chehab commit bba3ad76a82eb458d31b136fa2414216e20c99cc tree 3b727a066fe78d7c88cf08c633d4b3887b0e1f37 parent 9175b8544ff7b73b158df370acc1d828b28b80b7 author Duncan Sands Tue, 11 Apr 2006 10:18:57 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:50 -0300 V4L/DVB (3766): Correct buffer size calculations in cx88-core.c The computation in cx88_risc_buffer suffers from the mistake: a non-zero padding value can cause more page borders to be crossed, leading to big buffer over-runs. This patch changes the additive constant from 3 + 4 to 4 It also changees the constant in cx88_risc_databuffer from 3 + 4 to 2, because 2 dwords are the correct vaule. Signed-off-by: Duncan Sands Signed-off-by: Mauro Carvalho Chehab commit 9175b8544ff7b73b158df370acc1d828b28b80b7 tree 2e8bbc48bad88705cb539b4ca234e230822a1cfb parent f1de3e7c5c9d8e65937addce83b42331bdad15a1 author Trent Piepho Mon, 10 Apr 2006 09:40:37 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:49 -0300 V4L/DVB (3763): Bug fix: Wrong tuner was used pcHDTV HD-3000 card It looks like the HD3000 was prototyped with the 7610 tuner when the driver was developed, but the cards appear to have always shipped with the 7612 tuner and the driver was never adjusted for it. The definition needs to be corrected. - The HD-3000 was prototyped with a Thomson DTT7610, but production versions used a DTT7612 tuner. - This patch changes both dvb-pll settings and V4L tuner type. Signed-off-by: Trent Piepho Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f1de3e7c5c9d8e65937addce83b42331bdad15a1 tree f5f43b78b25f28442fb4c0ef25f479d8f2dd3281 parent a064fad337e27cfe74c04509e88ef4d2c9138ec2 author Mauro Carvalho Chehab Fri, 07 Apr 2006 18:50:09 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:47 -0300 V4L/DVB (3745): Fix a bug at pluto2 Makefile When pluto2 were selected, all other module dependencies were just discarded. Signed-off-by: Mauro Carvalho Chehab commit a064fad337e27cfe74c04509e88ef4d2c9138ec2 tree 2486e6ab6c8927974d2978dd92ddbb8189fd55ad parent 6445401673fe486ba15a39370d41100df6d73b1f author Andrew de Quincey Thu, 06 Apr 2006 17:05:46 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:46 -0300 V4L/DVB (3743): Fix some more potential oopses Spotted a couple more places where it fails to check if dvb_register_adapter() fails. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 6445401673fe486ba15a39370d41100df6d73b1f tree 0b5283aa3db5f10d963d2d4d260e5960161af864 parent 71a8dffb07ae40af87b2f7b93dcd5810e2c558bf author Andrew de Quincey Thu, 06 Apr 2006 14:32:23 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:44 -0300 V4L/DVB (3742): Set tone/voltage again if the frontend was reinitialised Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 71a8dffb07ae40af87b2f7b93dcd5810e2c558bf tree fee362170b0a71a5c33eada971e9baa3dac711c8 parent 7a766f9ddd74b50d6069f054a3004ece0439f5c1 author Andrew de Quincey Thu, 06 Apr 2006 09:42:46 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:43 -0300 V4L/DVB (3740): Fix oops in budget-av with CI Now that the CI code reinitialises the frontend, need to move the CI initialisation to after the frontend init in order to ensure the frontend is always in a good state. Fixes an oops caused by the frontend being NULL as well. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 7a766f9ddd74b50d6069f054a3004ece0439f5c1 tree db88a76df1cf9dade1804bba8f1175a6556939e5 parent a7286033f951ebc78527e63f335516ea2f95e142 author Sergey Vlasov Fri, 07 Apr 2006 10:04:56 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:41 -0300 V4L/DVB (3738): Saa7134: Fix oops with disable_ir=1 When disable_ir=1 parameter is used, or when saa7134_input_init1() fails for any other reason, dev->remote will remain NULL, and the driver will oops in saa7134_hwinit2(). Therefore dev->remote must be checked before dereferencing. Signed-off-by: Sergey Vlasov Signed-off-by: Mauro Carvalho Chehab commit a7286033f951ebc78527e63f335516ea2f95e142 tree 0535a3f9298ff74686329f06af37564b3da4bffd parent 96b194c12e1206e5cdccf55ea71bb38ce1124bd9 author Michael Krufky Tue, 04 Apr 2006 22:23:04 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:40 -0300 V4L/DVB (3731): Kbuild: drivers/media/video/bt8xx: remove $(src) from include path - replaced '$(src)/..' with 'drivers/media/video' Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 96b194c12e1206e5cdccf55ea71bb38ce1124bd9 tree 664868dafbd5ec05cfaab1418010d1365062641e parent f47f4763cde162656448fcd1ada9d5e8101a00d2 author Andrew de Quincey Wed, 05 Apr 2006 14:09:45 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:38 -0300 V4L/DVB (3726): Fix TT budget-ci 1.1 CI slots It turns out the firmware on the TT budget-ci 1.1 slots doesn't generate interrupts. This patch adds support for this using polling mode on these slots. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit f47f4763cde162656448fcd1ada9d5e8101a00d2 tree 0c97ba901c2df64d1cd7e28567464351c9f6b3a1 parent 3203f94a25ea04b3052d22c7be9518538862d88f author Andrew de Quincey Tue, 04 Apr 2006 09:41:47 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:37 -0300 V4L/DVB (3725): Fix mutex in dvb_register_device to work. This mutex is meant to stop two devices getting the same ID. dvbdev_get_free_id() scans the list of already allocated devices to find a free id. Unfortunately, since the mutex is unlocked before the card is added to the above list, it is still possible for two of them to get the same id. Its debatable whether this mutex lock is actually needed, but I'm unwilling to just remove it in case something does depend on it. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 3203f94a25ea04b3052d22c7be9518538862d88f tree 5227daa69929027e83e49be2c169891fda76cfc5 parent faa88df860fdfad13afc99fc7201432f9263b3b5 author Duncan Sands Sun, 02 Apr 2006 04:14:57 -0300 committer Mauro Carvalho Chehab Fri, 12 May 2006 19:54:35 -0300 V4L/DVB (3704): Fix some errors on bttv_risc_overlay There are tree mistakes on bttv_risc_overlay. 1) When skip_odd is true, the number of lines for which instructions are written is (height+1)/2, not height/2. 2) This occurs when clipping: the number of instruction bytes written can be as much as 8 + 12*nclips, not 8 + 8*nclips, as currently estimated. 3) Coverity check were wrong with nskips=0, since it means that it can clipped at most one line. Signed-off-by: Duncan Sands Signed-off-by: Mauro Carvalho Chehab commit 18552b8f227bddf569dade5c69798a37839ea913 tree 2538b43849d9ba6da32e1a309907c9ad488a939c parent faa88df860fdfad13afc99fc7201432f9263b3b5 parent bd89efc532fe41f867f848144cc8b42054ddf6f9 author Linus Torvalds Fri, 12 May 2006 15:39:32 -0700 committer Linus Torvalds Fri, 12 May 2006 15:39:32 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NEIGH]: Fix IP-over-ATM and ARP interaction. [TG3]: ethtool always report port is TP. commit faa88df860fdfad13afc99fc7201432f9263b3b5 tree 0c5b480922c4a2d65154f610ae04928790de96da parent 1b52fa98edd1c3e663ea4a06519e3d20976084a8 parent 586152560ae8df2a9babf1a8b667d7a145cb8208 author Linus Torvalds Fri, 12 May 2006 15:26:29 -0700 committer Linus Torvalds Fri, 12 May 2006 15:26:29 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Fix warning on prom_getproperty in openprom.c [SPARC]: Handle UNWIND_INFO properly. [SPARC64]: Update defconfig. [SPARC]: show device name in /proc/dvma_map [SPARC]: Remove duplicate symbol exports commit 1b52fa98edd1c3e663ea4a06519e3d20976084a8 tree 178d5fd1fe2230b39f49cd36f481024e49878eb1 parent 6f4bb3d8205d943acafa2f536f37131777524b67 author Sean Hefty Fri, 12 May 2006 14:57:52 -0700 committer Roland Dreier Fri, 12 May 2006 14:57:52 -0700 IB: refcount race fixes Fix race condition during destruction calls to avoid possibility of accessing object after it has been freed. Instead of waking up a wait queue directly, which is susceptible to a race where the object is freed between the reference count going to 0 and the wake_up(), use a completion to wait in the function doing the freeing. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6f4bb3d8205d943acafa2f536f37131777524b67 tree c91bbf0190eef4e36be82fed70a6cbd4f01694a3 parent be1fd94fd698e9dfa2676f688d4e9b034e0d4b9e author Roland Dreier Fri, 12 May 2006 14:57:52 -0700 committer Roland Dreier Fri, 12 May 2006 14:57:52 -0700 IB/ipath: Properly terminate PCI ID table The ipath driver's table of PCI IDs needs a { 0, } entry at the end. This makes all of the device aliases visible to userspace so hotplug loads the module for all supported devices. Without the patch, modinfo ipath_core only shows: alias: pci:v00001FC1d0000000Dsv*sd*bc*sc*i* instead of the correct: alias: pci:v00001FC1d00000010sv*sd*bc*sc*i* alias: pci:v00001FC1d0000000Dsv*sd*bc*sc*i* Signed-off-by: Roland Dreier Signed-off-by: Bryan O'Sullivan commit bd89efc532fe41f867f848144cc8b42054ddf6f9 tree fcf90049cb5a15bf6689cdbc6038c3fe22079009 parent ef34814426862c41c061520d4ac833be5914b5ba author Simon Kelley Fri, 12 May 2006 14:56:08 -0700 committer David S. Miller Fri, 12 May 2006 14:56:08 -0700 [NEIGH]: Fix IP-over-ATM and ARP interaction. The classical IP over ATM code maintains its own IPv4 <-> ARP table, using the standard neighbour-table code. The neigh_table_init function adds this neighbour table to a linked list of all neighbor tables which is used by the functions neigh_delete() neigh_add() and neightbl_set(), all called by the netlink code. Once the ATM neighbour table is added to the list, there are two tables with family == AF_INET there, and ARP entries sent via netlink go into the first table with matching family. This is indeterminate and often wrong. To see the bug, on a kernel with CLIP enabled, create a standard IPv4 ARP entry by pinging an unused address on a local subnet. Then attempt to complete that entry by doing ip neigh replace lladdr nud reachable Looking at the ARP tables by using ip neigh show will reveal two ARP entries for the same address. One of these can be found in /proc/net/arp, and the other in /proc/net/atm/arp. This patch adds a new function, neigh_table_init_no_netlink() which does everything the neigh_table_init() does, except add the table to the netlink all-arp-tables chain. In addition neigh_table_init() has a check that all tables on the chain have a distinct address family. The init call in clip.c is changed to call neigh_table_init_no_netlink(). Since ATM ARP tables are rather more complicated than can currently be handled by the available rtattrs in the netlink protocol, no functionality is lost by this patch, and non-ATM ARP manipulation via netlink is rescued. A more complete solution would involve a rtattr for ATM ARP entries and some way for the netlink code to give neigh_add and friends more information than just address family with which to find the correct ARP table. [ I've changed the assertion checking in neigh_table_init() to not use BUG_ON() while holding neigh_tbl_lock. Instead we remember that we found an existing tbl with the same family, and after dropping the lock we'll give a diagnostic kernel log message and a stack dump. -DaveM ] Signed-off-by: Simon Kelley Signed-off-by: David S. Miller commit 586152560ae8df2a9babf1a8b667d7a145cb8208 tree 18c02fc0987e4f42ea6ab212b01caebfda49be80 parent 06a1be167ea77c436657587e26cd4d7d6401784c author Martin Habets Fri, 12 May 2006 12:53:59 -0700 committer David S. Miller Fri, 12 May 2006 12:53:59 -0700 [SPARC]: Fix warning on prom_getproperty in openprom.c Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit ef34814426862c41c061520d4ac833be5914b5ba tree b844afa6b8c0f9ef5062c5a37462b1f47b858baf parent d649dafd0713f2f3dfe29baa783868db33aa2c11 author Karsten Keil Fri, 12 May 2006 12:49:08 -0700 committer David S. Miller Fri, 12 May 2006 12:49:08 -0700 [TG3]: ethtool always report port is TP. Even with fiber cards ethtool reports that the connected port is TP, the patch fix this. Signed-off-by: Karsten Keil Acked-by: Michael Chan Signed-off-by: David S. Miller commit 06a1be167ea77c436657587e26cd4d7d6401784c tree 1d9ed9094496a1e02bfe551631b03495db337a89 parent 1f8aa2f66b7253d1a42ead0142c7a00d2df5ac89 author David S. Miller Fri, 12 May 2006 12:45:50 -0700 committer David S. Miller Fri, 12 May 2006 12:45:50 -0700 [SPARC]: Handle UNWIND_INFO properly. For sparc32 we need R_SPARC_UA32 relocation support, for sparc64 we need the handle R_SPARC_DISP32 relocations. Based upon reports and initial patch by Martin Habets. Signed-off-by: David S. Miller commit be1fd94fd698e9dfa2676f688d4e9b034e0d4b9e tree fc19e966f53d2bc7202fd4565d999595515ce50b parent 0d38eddab9ce6de3a9d6d583043dfa97b6bc0d3b parent 95563d343fec8d3e2f667c95230ac4ab7674b757 author Linus Torvalds Fri, 12 May 2006 12:14:52 -0700 committer Linus Torvalds Fri, 12 May 2006 12:14:52 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: [PATCH] scx200_acb: Fix for the CS5535 errata [PATCH] scx200_acb: Fix resource name use after free [PATCH] scx200_acb: Fix return on init error commit 0d38eddab9ce6de3a9d6d583043dfa97b6bc0d3b tree 59f1f4d3712ce3658f7540704d64c8d8ad6d4635 parent 1a2acc9e9214699a99389e323e6686e9e0e2ca67 parent df3fccb14ad02c5fabe095a104a0323c223f2833 author Linus Torvalds Fri, 12 May 2006 12:14:19 -0700 committer Linus Torvalds Fri, 12 May 2006 12:14:19 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: [PATCH] USB: fix omninet driver bug [PATCH] USB: add ark3116 usb to serial driver [PATCH] usbserial: Fixes leak in serial_open() error path. [PATCH] usbserial: Fixes use-after-free in serial_open(). [PATCH] USB: Emagic USB firmware loading fixes [PATCH] USB: add an IBM USB keyboard to the HID_QUIRK_NOGET blacklist [PATCH] USB: Add Sieraa Wireless 580 evdo card to airprime.c [PATCH] USB: ftdi_sio: add device id for ACT Solutions HomePro ZWave interface [PATCH] USB: ftdi_sio: Add support for HCG HF Dual ISO RFID Reader [PATCH] USB: ub oops in block_uevent [PATCH] USB: usbcore: don't check the device's power source [PATCH] USB: fix OHCI PM regression [PATCH] USB: pegasus fixes (logstorm, suspend) [PATCH] USBATM: fix modinfo output [PATCH] USBATM: change the default speedtouch iso altsetting [PATCH] USB: fix bug in ohci-hcd.c ohci_restart() commit 1a2acc9e9214699a99389e323e6686e9e0e2ca67 tree 8f8072ba0624ceb63ac0115a81d85435323fe79c parent d8c3291c73b958243b33f8509d4507e76dafd055 author Linus Torvalds Fri, 12 May 2006 12:08:46 -0700 committer Linus Torvalds Fri, 12 May 2006 12:08:46 -0700 Revert "[BLOCK] Fix oops on removal of SD/MMC card" This reverts commit 56cf6504fc1c0c221b82cebc16a444b684140fb7. Both Erik Mouw and Andrew Vasquez independently pinpointed this commit as causing problems, where the slab cache for a driver is never released (most obviously causing problems when immediately re-loading that driver, resulting in a "kmem_cache_create: duplicate cache " message, but it can also cause other trouble). James Bottomley dug into it, and reports: "OK, here's the scoop. The problem patch adds a get of driverfs_dev in add_disk(), but doesn't put it again until disk_release() (which occurs on final put_disk() of the gendisk). However, in SCSI, the driverfs_dev is the sdev_gendev. That means there's a reference held on sdev_gendev until final disk put. Unfortunately, we use the driver model driver_remove to trigger del_gendisk (which removes the gendisk from visibility and decrements the refcount), so we've introduced an unbreakable deadlock in the reference counting with this. I suggest simply reversing this patch at the moment. If Russell and Jens can tell me what they're trying to do I'll see if there's another way to do it." so hereby the patch gets reverted, waiting for a better fix. Cc: Jens Axboe Cc: Russell King Cc: James Bottomley Cc: Erik Mouw Cc: Andrew Vasquez Signed-off-by: Linus Torvalds commit df3fccb14ad02c5fabe095a104a0323c223f2833 tree 4db98656e7dedd27139bdb5de5e85ee847695b4a parent 815ddc99dd8108908d14c699a37d0f5974da6def author Greg Kroah-Hartman Tue, 02 May 2006 08:44:45 +0200 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:10 -0700 [PATCH] USB: fix omninet driver bug I introduced this way back in 2.6.13 when adding the port lock logic. This device talks out through different "ports" all at the same time, so the lock logic was wrong, preventing any data from ever being sent properly. Thanks a lot to Bernhard Reiter for being patient and helping with debugging this. Cc: Bernhard Reiter Signed-off-by: Greg Kroah-Hartman commit 815ddc99dd8108908d14c699a37d0f5974da6def tree d1e82ecdb93e1da6c9f370c8489ff63945e2d70b parent 71a84163ca6b4e36744978385e94150af32f9d75 author Greg Kroah-Hartman Fri, 12 May 2006 11:05:29 -0700 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] USB: add ark3116 usb to serial driver Based on Simon's original driver, with some minor code cleanups and tidying by me. Cc: Simon Schulz Signed-off-by: Greg Kroah-Hartman commit 71a84163ca6b4e36744978385e94150af32f9d75 tree 2f00bcc4c102660e55c2ff840ce4db6d44ede988 parent 704936a25bda9bb12e35bb222d5e3f26186dc279 author Luiz Fernando Capitulino Thu, 11 May 2006 22:34:24 -0300 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] usbserial: Fixes leak in serial_open() error path. If serial_open() fails at the port assignment or mutex_lock_interruptible() is interrupted, the 'serial' object will never be freed. We should call kref_put() when those errors happens. Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit 704936a25bda9bb12e35bb222d5e3f26186dc279 tree 723b247a002e47be72d4ba203277870de0fea220 parent 16c23f7d88cbcce491f9370b2846fad66e8ef319 author Luiz Fernando Capitulino Thu, 11 May 2006 22:34:17 -0300 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] usbserial: Fixes use-after-free in serial_open(). If the device is disconnected while serial_open() is executing and either try_module_get() or the device specific open function fails, the kref_put() call in the 'bailout_kref_put' label will free the memory pointed out by 'port'. The subsequent dereferences in the 'bailout_kref_put' label will be invalid. The fix is just to assure kref_put() is called after any 'port' usage. Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit 16c23f7d88cbcce491f9370b2846fad66e8ef319 tree 7e69ad84548acabb0bebcfd594c1986292947d83 parent 332bbf613868a5d5938ad9fb7436b2beae72d53d author Monty Tue, 09 May 2006 12:37:22 -0700 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] USB: Emagic USB firmware loading fixes It's become apparent as machines get faster that the emagic kernel firmware loaders (based on the ezusb loader) have a reset race. a 400MHz TiBook never tripped it, but a 2GHz Pentium M seems to hit it about 30% of the time. The bug is seen as a hung USB box and the kernel error: drivers/usb/misc/emi62.c: emi62_load_firmware - error loading firmware: error = -110 The patch below inserts a delay after deasserting reset to allow the box to settle before a new command is issued. This affects only device startup. Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 332bbf613868a5d5938ad9fb7436b2beae72d53d tree 02fc85e7046a4a586e5a1a91f3cb3dcf8a8dcf28 parent b68f7de02ae380ddb4e5e457e3fe945ddfd0aa08 author Olaf Hering Fri, 05 May 2006 11:07:21 +0200 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] USB: add an IBM USB keyboard to the HID_QUIRK_NOGET blacklist After recent changes, the USB keyboard as shipped with IBM pSeries systems does not work anymore, unless the keyboard is replugged after reboot. Adding this model to the blacklist fixes it. Signed-off-by: Olaf Hering Signed-off-by: Greg Kroah-Hartman commit b68f7de02ae380ddb4e5e457e3fe945ddfd0aa08 tree 671bd42200534fcb638838d19f4ec84bdc33925e parent 72a9f958421a519e69b3e7b409948c3a294f4a32 author Ken Brush Mon, 08 May 2006 20:24:12 -0500 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:08 -0700 [PATCH] USB: Add Sieraa Wireless 580 evdo card to airprime.c This adds the Sierra Wireless card to airprime.c. I tested this on my laptop. Signed-off-by: Ken Brush Signed-off-by: Greg Kroah-Hartman commit 95563d343fec8d3e2f667c95230ac4ab7674b757 tree 4e0c4f18ff45abe5f691f860633ed0a6bfbcd65b parent b33d0798e6cfae1fcee75afc808fe5690a48a814 author Jordan Crouse Fri, 28 Apr 2006 22:53:30 +0200 committer Greg Kroah-Hartman Tue, 09 May 2006 13:04:21 -0700 [PATCH] scx200_acb: Fix for the CS5535 errata This is a fix for the CS5535 errata 111: When the SMBus controller tries to access a non-existing device, it sets the NEGACK bit, SMBus I/O offset 01h[4], to 1 after it detects no acknowledge at the ninth clock. The specification states that the bit can be cleared by writing a 1 to it, but under certain circumstances it is possible for this bit to not clear. Writing a 0 to the bit resets the internal state machine and clears the issue. Since all writable bits in ACBST are W1C bits (write-one-to-clear) the second write doesn't affect any other logic except the buggy NEGACK state machine. The second write clears an internal register which is responsible for "overwriting" the NEGACK bit in ACBST. Signed-off-by: Jordan Crouse Signed-off-by: Andrew Morton Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit b33d0798e6cfae1fcee75afc808fe5690a48a814 tree fee80034c1633f195c1f32493063208abde7d5ca parent 6f9c2963888e60e46a9e0bd09a25740abce29262 author Jean Delvare Wed, 26 Apr 2006 23:00:16 +0200 committer Greg Kroah-Hartman Tue, 09 May 2006 13:04:21 -0700 [PATCH] scx200_acb: Fix resource name use after free We can't pass a string on the stack to request_region. As soon as we leave the function that stack is gone and the string is lost. Let's use the same string we identify the i2c_adapter with instead, it's more simple, more consistent, and just works. This is the second half of fix to bug #6445. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 6f9c2963888e60e46a9e0bd09a25740abce29262 tree a6f6a310c409fefda006790a77c7ae0d559a33ca parent e515f048c46e457ef61ce9c8b56bd36e825a48a0 author Jean Delvare Wed, 26 Apr 2006 22:50:32 +0200 committer Greg Kroah-Hartman Tue, 09 May 2006 13:04:21 -0700 [PATCH] scx200_acb: Fix return on init error The scx200_acb driver shouldn't return failure after initialization if it successfully registered at least one i2c_adapter, else we are leaking resources. The driver was OK in that respect up to 2.6.16, a recent change broke it. This is part of the fix to bug #6445. Signed-off-by: Jean Delvare Cc: Ben Gardner Signed-off-by: Greg Kroah-Hartman commit 72a9f958421a519e69b3e7b409948c3a294f4a32 tree 52a2c09831f26a592c5490fa044620f904578414 parent 20a0f47e18c646bcc772282512fc59e56b2fc968 author Razvan Gavril Thu, 04 May 2006 11:35:49 +0300 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:56 -0700 [PATCH] USB: ftdi_sio: add device id for ACT Solutions HomePro ZWave interface Signed-off-by: Razvan Gavril Signed-off-by: Greg Kroah-Hartman commit 20a0f47e18c646bcc772282512fc59e56b2fc968 tree 552f6f3d30107ae7546463180d5589e93af1a967 parent 77ef6c4d6e23653a79eedacdd6d1d0da7083e59c author Ian Abbott Thu, 04 May 2006 11:34:25 +0100 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: ftdi_sio: Add support for HCG HF Dual ISO RFID Reader This patch adds support for ACG Identification Technologies GmbH's HF Dual ISO Reader (an RFID tag reader) to the ftdi_sio driver's device ID table. The product ID was supplied by anotonios (anton at goto10 dot org) on the ftdi-usb-sio-devel list and subsequently verified by myself (Ian Abbott). Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 77ef6c4d6e23653a79eedacdd6d1d0da7083e59c tree 5dd68fb616175ffcf2939beaef8ed06a43179173 parent 436f5762bcd4929825a0725d4bc78337e6fc0d8f author Pete Zaitcev Wed, 03 May 2006 00:16:00 -0700 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: ub oops in block_uevent In kernel 2.6.16, if a mounted storage device is removed, an oops happens because ub supplies an interface device (and kobject) to the block layer, but neglects to pin it. And apparently, the block layer expects its users to pin device structures. The code in ub was broken this way for years. But the bug was exposed only by 2.6.16 when it started to call block_uevent on close, which traverses device structures (kobjects actually). Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 436f5762bcd4929825a0725d4bc78337e6fc0d8f tree f2f709575ddec3b58d1c7c13af82bdcfc82dbfcf parent db4cefaaea4c6d67cdaebfd315abc791c5c9d22f author Alan Stern Tue, 02 May 2006 15:22:41 -0400 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: usbcore: don't check the device's power source The choose_configuration() routine contains code the determine the device's power source, so that configurations requiring external power can be ruled out if the device is running on bus power. Unfortunately it turns out that some devices have errors in their config descriptors and other devices don't like the GET_DEVICE_STATUS request. Since that information wasn't used for anything else, this patch (as673) removes the code, leaving only a comment. It fixes bugzilla entry #6448. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit db4cefaaea4c6d67cdaebfd315abc791c5c9d22f tree 111e4ada3f449fd71be268de7e5afbaf4299e333 parent 7e713b825610de9a9584c189c72e2d9f2326359c author David Brownell Mon, 01 May 2006 22:07:13 -0700 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: fix OHCI PM regression This fixes a small regression in USB controller power usage for many OHCI controllers, notably including every non-PCI version of OHCI: on those systems, the runtime autosuspend mechanism is no longer enabled. The change moves to saner defaults. All root hubs are expected to handle remote wakeup (and hence autosuspend), although drivers for buggy silicon may override that default. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 7e713b825610de9a9584c189c72e2d9f2326359c tree d0936b3d12c2185f537b339942719ca2cedbef9d parent 6275cdfa0fe032208937a3567ebb8bcfd42d20b1 author David Brownell Mon, 01 May 2006 14:02:45 -0700 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: pegasus fixes (logstorm, suspend) Teach "pegasus" to handle a few of the disconnect fault paths without hundreds of usless syslog messages. Handle the carrier check workqueue entry even if the driver has not been opened. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 6275cdfa0fe032208937a3567ebb8bcfd42d20b1 tree dfb84d591316f8b3d21e724574d98359fd0260b1 parent 67c752b41a4238c1a2d7eebcd061ff8c1127d3e9 author Duncan Sands Fri, 28 Apr 2006 18:52:16 +0200 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:54 -0700 [PATCH] USBATM: fix modinfo output Because of the way stringify works, using an expression like 64 * 1024 for UDSL_MAX_BUF_SIZE results in 64 * 1024 turning up in the modinfo output instead of 65536. So use 65536 directly (this was the only way I found of fixing this). Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 67c752b41a4238c1a2d7eebcd061ff8c1127d3e9 tree b2a568a12e965fc76f276c108a0e7027e84eb6a3 parent 839ab1d4ce4dfd7e6c189391a82c584292488b41 author Duncan Sands Fri, 28 Apr 2006 18:44:06 +0200 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:54 -0700 [PATCH] USBATM: change the default speedtouch iso altsetting The maximum possible bandwidth for a speedtouch modem is about 7Mbaud. You can only get this by using isochronous urbs (enable_isoc=1) and altsetting 3. With the current default altsetting of 2, the modem maxes out at about 4Mbaud. So change the default altsetting to 3 when using isochronous urbs. It would be nice to base the altsetting on the detected line speed, but that's hard given the current design. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 839ab1d4ce4dfd7e6c189391a82c584292488b41 tree 052591e6d261b96052367fd9baaa2fcd1ae38d5f parent e515f048c46e457ef61ce9c8b56bd36e825a48a0 author David Brownell Wed, 26 Apr 2006 14:39:11 -0700 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:54 -0700 [PATCH] USB: fix bug in ohci-hcd.c ohci_restart() A loop on a power-lost resume path used the wrong index. I suspect khubd has been working around such bugs. Noticed by Andreas Mohr . Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1f8aa2f66b7253d1a42ead0142c7a00d2df5ac89 tree d5e65e11301d33e91e207efa44454350f8ba32f0 parent 4cfbd7eb24975e942c3b6c0119c953c3a7a5f787 author David S. Miller Mon, 08 May 2006 15:13:14 -0700 committer David S. Miller Mon, 08 May 2006 15:13:14 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 4cfbd7eb24975e942c3b6c0119c953c3a7a5f787 tree dbda6c396a00aa89beaedf2fb00d047c3335f825 parent bb3426ad6659282d9244d4909e69aa639d0360d0 author Martin Habets Sun, 07 May 2006 23:43:19 -0700 committer David S. Miller Sun, 07 May 2006 23:43:19 -0700 [SPARC]: show device name in /proc/dvma_map This patch will set the device name in a resource, which will be shown in /proc/dvma_map. Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit bb3426ad6659282d9244d4909e69aa639d0360d0 tree c46e768412146e7791d163664edc72ecffe7f99e parent 9d21f09ca03d1142f1988001f228d02581d8986c author Martin Habets Sun, 07 May 2006 23:04:06 -0700 committer David S. Miller Sun, 07 May 2006 23:04:06 -0700 [SPARC]: Remove duplicate symbol exports This patch resolves the following build warnings seen in 2.6.17-rc3: WARNING: vmlinux: 'sys_close' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'memchr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strstr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strnlen' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strrchr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strchr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcmp' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strncat' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcat' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strncpy' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcpy' exported twice. Previous export was in vmlinux Signed-off-by: Martin Habets Signed-off-by: David S. Miller