commit 0967d61ea0d8e8a7826bd8949cd93dd1e829ac55 Author: Linus Torvalds Date: Tue Aug 5 21:49:54 2008 -0700 Linux 2.6.27-rc2 commit 18351070b86d155713cf790b26af4f21b1fd0b29 Author: Linus Torvalds Date: Tue Aug 5 21:42:21 2008 -0700 Re-introduce "[SCSI] extend the last_sector_bug flag to cover more sectors" This re-introduces commit 2b142900784c6e38c8d39fa57d5f95ef08e735d8, which was reverted due to the regression it caused by commit fca082c9f1e11ec07efa8d2f9f13688521253f36. That regression was not root-caused by the original commit, it was just uncovered by it, and the real fix was done by Alan Stern in commit 580da34847488b404218d1d7f53b156f245f5555 ("Fix USB storage hang on command abort"). We can thus re-introduce the change that was confirmed by Alan Jenkins to be still required by his odd card reader. Cc: Alan Jenkins Cc: Alan Stern Cc: James Bottomley Signed-off-by: Linus Torvalds commit e63e03273b89f7248baa56cf242474f661e776e1 Merge: 37193fb... ffb2084... Author: Linus Torvalds Date: Tue Aug 5 19:37:42 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (78 commits) AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE pktgen: mac count pktgen: random flow bridge: Eliminate unnecessary forward delay bridge: fix compile warning in net/bridge/br_netfilter.c ipv4: remove unused field in struct flowi (include/net/flow.h). tg3: Fix 'scheduling while atomic' errors net: Kill plain NET_XMIT_BYPASS. net_sched: Add qdisc __NET_XMIT_BYPASS flag net_sched: Add qdisc __NET_XMIT_STOLEN flag iwl3945: fix merge mistake for packet injection iwlwifi: grap nic access before accessing periphery registers iwlwifi: decrement rx skb counter in scan abort handler iwlwifi: fix unhandled interrupt when HW rfkill is on iwlwifi: implement iwl5000_calc_rssi iwlwifi: memory allocation optimization iwlwifi: HW bug fixes p54: Fix potential concurrent access to private data rt2x00: Disable link tuning in rt2500usb iwlwifi: Don't use buffer allocated on the stack for led names ... commit ffb208479bd62ab26c29a242faeb1de1c6d5fcdc Author: Ralf Baechle Date: Tue Aug 5 18:46:57 2008 -0700 AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE Since 49ffcf8f99e8d33ec8afb450956804af518fd788 ("sysctl: update sysctl_check_table") setting struct ctl_table.procname = NULL does no longer work as it used to the way the AX.25 code is expecting it to resulting in the AX.25 sysctl registration code to break if CONFIG_AX25_DAMA_SLAVE was not set as in some distribution kernels. Kernel releases from 2.6.24 are affected. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit ff2a79a5a934fe0dbb136ffad61f79b5c6385614 Author: Robert Olsson Date: Tue Aug 5 18:45:05 2008 -0700 pktgen: mac count dst_mac_count and src_mac_count patch from Eneas Hunguana We have sent one mac address to much. Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 1211a64554065316e02b3c62b320088ad4f63260 Author: Robert Olsson Date: Tue Aug 5 18:44:26 2008 -0700 pktgen: random flow Random flow generation has not worked. This fixes it. Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit ef647f1300d69adb8223d970554d59d7e244db6d Author: Stephen Hemminger Date: Tue Aug 5 18:42:51 2008 -0700 bridge: Eliminate unnecessary forward delay From: Stephen Hemminger Based upon original patch by Herbert Xu, which contained the following problem description: -------------------- When the forward delay is set to zero, we still delay the setting of the forwarding state by one or possibly two timers depending on whether STP is enabled. This could either turn out to be instantaneous, or horribly slow depending on the load of the machine. As there is nothing preventing us from enabling forwarding straight away, this patch eliminates this potential delay by executing the code directly if the forward delay is zero. The effect of this problem is that immediately after the carrier comes on a port, the bridge will drop all packets received from that port until it enters forwarding mode, thus causing unnecessary packet loss. Note that this patch doesn't fully remove the delay due to the link watcher. We should also check the carrier state when we are about to drop an incoming packet because the port is disabled. But that's for another patch. -------------------- This version of the fix takes a different approach, in that it just does the state change directly. Signed-off-by: David S. Miller commit 37193fb4639fa94f91cbbab1e8aca596300e1d94 Author: Randy Dunlap Date: Tue Aug 5 14:59:29 2008 -0700 docbook: fix s390 fatal error after header files moved Fix (fatal error) s390 docbook file to handle renamed header files. Signed-off-by: Randy Dunlap cc: Martin Schwidefsky Signed-off-by: Linus Torvalds commit 8c275ce327447f4cf3d0904d1a5a6ffa1b92de7f Author: Andrew Morton Date: Tue Aug 5 13:01:42 2008 -0700 drivers/media/video/vino.c needs v4l2-ioctl.h mips allmodconfig: drivers/media/video/vino.c: In function `vino_free_buffer_with_count': drivers/media/video/vino.c:811: warning: passing arg 1 of `virt_to_phys' makes pointer from integer without a cast drivers/media/video/vino.c: In function `vino_allocate_buffer': drivers/media/video/vino.c:889: warning: passing arg 1 of `virt_to_phys' makes pointer from integer without a cast drivers/media/video/vino.c: In function `vino_ioctl': drivers/media/video/vino.c:4364: error: implicit declaration of function `video_usercopy' The patch fixes the error, but not the warnings. Cc: Mauro Carvalho Chehab Cc: Hans Verkuil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfe195fb79e88c334481f1362fef52f6d2e30b2d Author: Benny Halevy Date: Tue Aug 5 13:01:41 2008 -0700 mm: fix uninitialized variables for find_vma_prepare callers gcc 4.3.0 correctly emits the following warnings. When a vma covering addr is found, find_vma_prepare indeed returns without setting pprev, rb_link, and rb_parent. mm/mmap.c: In function `insert_vm_struct': mm/mmap.c:2085: warning: `rb_parent' may be used uninitialized in this function mm/mmap.c:2085: warning: `rb_link' may be used uninitialized in this function mm/mmap.c:2084: warning: `prev' may be used uninitialized in this function mm/mmap.c: In function `copy_vma': mm/mmap.c:2124: warning: `rb_parent' may be used uninitialized in this function mm/mmap.c:2124: warning: `rb_link' may be used uninitialized in this function mm/mmap.c:2123: warning: `prev' may be used uninitialized in this function mm/mmap.c: In function `do_brk': mm/mmap.c:1951: warning: `rb_parent' may be used uninitialized in this function mm/mmap.c:1951: warning: `rb_link' may be used uninitialized in this function mm/mmap.c:1949: warning: `prev' may be used uninitialized in this function mm/mmap.c: In function `mmap_region': mm/mmap.c:1092: warning: `rb_parent' may be used uninitialized in this function mm/mmap.c:1092: warning: `rb_link' may be used uninitialized in this function mm/mmap.c:1089: warning: `prev' may be used uninitialized in this function Hugh adds: in fact, none of find_vma_prepare's callers use those values when a vma is found to be already covering addr, it's either an error or an occasion to munmap and repeat. Okay, let's quieten the compiler (but I would prefer it if pprev, rb_link and rb_parent were meaningful in that case, rather than whatever's in them from descending the tree). Signed-off-by: Benny Halevy Signed-off-by: Hugh Dickins Cc: "Ryan Hope" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf1db69fbf4ff511e88736ce2e6318846f34492b Author: Richard Hughes Date: Tue Aug 5 13:01:35 2008 -0700 pm_qos: spelling fixes A documentation cleanup patch. With a minor tweak to clarify units for kbs. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: mark gross Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c44319dc6deb0028ef7811670bf1e4bc6644672 Author: Alexander Beregalov Date: Tue Aug 5 13:01:34 2008 -0700 proc: fix warnings proc: fix warnings fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'u64' fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 4 has type 'u64' fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 5 has type 'u64' fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 6 has type 'u64' fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 7 has type 'u64' fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 8 has type 'u64' fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 9 has type 'u64' Signed-off-by: Alexander Beregalov Acked-by: Andrea Righi Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc39778f952a820b7da45756a900a4778da343cd Author: Huang Weiyi Date: Tue Aug 5 13:01:33 2008 -0700 drivers/misc/sgi-gru/grutlbpurge.c: removed duplicated #include Removed duplicated include in drivers/misc/sgi-gru/grutlbpurge.c. Signed-off-by: Huang Weiyi Cc: Jack Steiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc60bf1d8328076c27fe07c1849a5c8399bafc39 Author: Alexander Beregalov Date: Tue Aug 5 13:01:33 2008 -0700 omfs: fix warning fs/omfs/inode.c:495: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'u64' fs/omfs/inode.c:495: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type '__be64' Signed-off-by: Alexander Beregalov Acked-by: Bob Copeland Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32ab8f97dd95592b17e684f7722caa0556087b99 Author: Randy Dunlap Date: Tue Aug 5 13:01:32 2008 -0700 kernel-doc: skip nested struct/union cleanly Fix handling of nested structs or unions. The regex to strip (eliminate) nested structs or unions was limited to only 0 or 1 matches. This can cause an uneven number of left/right braces to be stripped, which causes this: Warning(linux-2.6.27-rc1-git2//include/net/mac80211.h:336): No description found for parameter '}' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2dc1f4adb4b5b02d87e49e115e5107f4da790c0 Author: Jan Beulich Date: Tue Aug 5 13:01:31 2008 -0700 dma: fix order calculation in dma_mark_declared_memory_occupied() get_order() takes byte-sized input, not a page-granular one. Irrespective of this fix I'm inclined to believe that this doesn't work right anyway - bitmap_allocate_region() has an implicit assumption of 'pos' being suitable for 'order', which this function doesn't seem to enforce (and since it's being called with a byte-granular value there's no reason to believe that the callers would make sure device_addr is passed accordingly - it's also not documented that way). Signed-off-by: Jan Beulich Cc: James E.J. Bottomley Cc: Ingo Molnar Cc: Dmitry Baryshkov Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 978cc90c469b38bcbbfd00a8c183d74e5b17bf45 Author: Alexander Beregalov Date: Tue Aug 5 13:01:29 2008 -0700 atyfb_base.c: fix warning drivers/video/aty/atyfb_base.c:2663: warning: 'aty_resume_chip' defined but not used Signed-off-by: Alexander Beregalov Cc: Ville Syrjala Cc: Antonino A. Daplas Cc: Mark Asselstine Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5394ba0fd892291eb425649fdbc82b673e0b7956 Author: Julia Lawall Date: Tue Aug 5 13:01:28 2008 -0700 drivers/video/fsl-diu-fb.c: add missing of_node_put of_node_put is needed before discarding a value received from of_find_node_by_type, eg in error handling code. The semantic patch that makes the change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ struct device_node *n; struct device_node *n1; struct device_node *n2; statement S; identifier f1,f2; expression E1,E2; constant C; @@ n = of_find_node_by_type(...) ... if (!n) S ... when != of_node_put(n) when != n1 = f1(n,...) when != E1 = n when any when strict ( + of_node_put(n); return -C; | of_node_put(n); | n2 = f2(n,...) | E2 = n | return ...; ) // Signed-off-by: Julia Lawall Acked-by: Krzysztof Helt Cc: Timur Tabi Cc: York Sun Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9bd6ceb666e76b9a3caefa158827a571ead55b6a Author: Jean Delvare Date: Tue Aug 5 13:01:27 2008 -0700 radeonfb: give i2c buses nicer names The name of the i2c buses shows in the output of "i2cdetect -l", so it's important to give informative names. Signed-off-by: Jean Delvare Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c213ddf330e29f9d141705444dc45683adbb99b0 Author: Krzysztof Helt Date: Tue Aug 5 13:01:26 2008 -0700 fbcon: fix scrolling after logo is cleared If the 'clear' command is used on the frame buffer with a logo the upper area is filled by few lines but not scrolled anymore. Fix this by removing the protected area for the logo if any part of the logo is cleared. Signed-off-by: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit efc491814308f89d5ef6c4fe19ae4552a67d4132 Author: David Miller Date: Tue Aug 5 13:01:25 2008 -0700 radeon: misc corrections I have a new PCI-E radeon RV380 series card (PCI device ID 5b64) that hangs in my sparc64 boxes when the init scripts set the font. The problem goes away if I disable acceleration. I haven't figured out that bug yet, but along the way I found some corrections to make based upon some auditing. 1) The RB2D_DC_FLUSH_ALL value used by the kernel fb driver and the XORG video driver differ. I've made the kernel match what XORG is using. 2) In radeonfb_engine_reset() we have top-level code structure that roughly looks like: if (family is 300, 350, or V350) do this; else do that; ... if (family is NOT 300, OR family is NOT 350, OR family is NOT V350) do another thing; this last conditional makes no sense, is always true, and obviously was likely meant to be "family is NOT 300, 350, or V350". So I've made the code match the intent. Signed-off-by: David S. Miller Acked-by: Benjamin Herrenschmidt Tested-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6ac436dcc4c34709bcde355f3f2254ac0a183d4 Author: Mark Asselstine Date: Tue Aug 5 13:01:24 2008 -0700 Remove the deprecated cli() sti() functions These functions have been deprecated for some time now but remained until all legacy callers could be removed. With a few commits in 2.6.26 this has happened so now we can remove these deprecated functions. Signed-off-by: Mark Asselstine Reviewed-by: Matthew Wilcox Cc: Alan Cox Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8cd6819842b79953c61250c719f61e01e51dd8cd Author: Ben Dooks Date: Tue Aug 5 13:01:24 2008 -0700 backlight: add MODULE_ALIAS() to pwm_backlight driver Add the missing MODULE_ALIAS() to the pwm_backlight driver. Cc: Russell King Signed-off-by: Ben Dooks Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14563a4ec450f35c70fbe5f6ac5199e9d5a0edc5 Author: Ben Dooks Date: Tue Aug 5 13:01:22 2008 -0700 backlight: add more information output to pwm_backlight Make the error paths in the pwm_backlight driver more informative in the probe path, especially for the times that it finds an error. Cc: Russell King Signed-off-by: Ben Dooks Cc: Richard Purdie Acked-by: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26cb8bb21b11245a53f79d9fa766537752f77d88 Author: Mike Frysinger Date: Tue Aug 5 13:01:21 2008 -0700 blackfin RTC driver: drop PIE/stopwatch code since the hardware can only do a max of 1HZ and this same functionality is provided by UIE Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e12af37d9ee09c2ac6da26a51c77754dec09fed4 Author: Mike Frysinger Date: Tue Aug 5 13:01:21 2008 -0700 blackfin RTC driver: convert PIE handling to irq_set_state() as pointed out by David Brownell Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 140fab14aef093cedf87f69234474c04fdcec99c Author: Mike Frysinger Date: Tue Aug 5 13:01:20 2008 -0700 blackfin RTC driver: wait for the write complete interrupt complete before sleeping Since we use the write complete interrupt, wait for it to complete before sleeping so we don't wake right back up due to it Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b128fe04a3087d6e974b87402dc6e75d3142186 Author: Mike Frysinger Date: Tue Aug 5 13:01:19 2008 -0700 blackfin RTC driver: disable the write complete irq upon close Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 605eb8b3c05e970caf71c48f693efe33c212fb7b Author: Mike Frysinger Date: Tue Aug 5 13:01:18 2008 -0700 blackfin RTC driver: don't bother passing the rtc struct down to bfin_rtc_int_{set,clear} since it isnt needed (shaves off ~100bytes) Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Bryan Wu Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 813006f4bb4a39afdde8ab2e3559971c029d1dc0 Author: Mike Frysinger Date: Tue Aug 5 13:01:18 2008 -0700 blackfin RTC driver: add support for power management framework Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Bryan Wu Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5aeb776d0c2bb1dd3ef01f4805929e2bc2923e7b Author: Sonic Zhang Date: Tue Aug 5 13:01:17 2008 -0700 blackfin RTC driver: Fix bug Only RTC interrupt can wake up deeper sleep core Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu Signed-off-by: Bryan Wu Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd279f6127c0f64dfb0055bc0adb97a284a08df3 Author: Mike Frysinger Date: Tue Aug 5 13:01:15 2008 -0700 blackfin RTC driver: if we dont define irq_set_freq, the common rtc-dev layer will give us the same behavior of returning ENOTTY Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Bryan Wu Cc: David Brownell Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c69ad71bcdecbaab82cfacb1dc967bd7fd967a3b Author: David Brownell Date: Tue Aug 5 13:01:14 2008 -0700 genirq: better warning on irqchip->set_type() failure While I'm glad to finally see the hole fixed whereby passing an invalid IRQ trigger type to request_irq() would be ignored, the current diagnostic isn't quite useful. Fixed by also listing the trigger type which was rejected. Signed-off-by: David Brownell Acked-by: Uwe Kleine-König Cc: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b2becc8cffdccdd60c63099f592ddd35aa6c34f Author: Oleg Nesterov Date: Tue Aug 5 13:01:13 2008 -0700 semaphore: __down_common: use signal_pending_state() Change __down_common() to use signal_pending_state() instead of open coding. The changes in kernel/semaphore.o are just artifacts, the state checks are optimized away. Signed-off-by: Oleg Nesterov Cc: Ingo Molnar Cc: Matthew Wilcox Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32194450330be327f3b25bf6b66298bd122599e9 Author: Tom Zanussi Date: Tue Aug 5 13:01:10 2008 -0700 relay: fix "full buffer with exactly full last subbuffer" accounting problem In relay's current read implementation, if the buffer is completely full but hasn't triggered the buffer-full condition (i.e. the last write didn't cross the subbuffer boundary) and the last subbuffer is exactly full, the subbuffer accounting code erroneously finds nothing available. This patch fixes the problem. Signed-off-by: Tom Zanussi Cc: Eduard - Gabriel Munteanu Cc: Pekka Enberg Cc: Jens Axboe Cc: Mathieu Desnoyers Cc: Andrea Righi Cc: [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60cadec9da7b6c91aca51f408c828f7e74a68379 Author: Shadi Ammouri Date: Tue Aug 5 13:01:09 2008 -0700 spi: new orion_spi driver This adds an SPI driver for the SPI controller found in various Marvell Orion ARM SoCs. It currently supports only one slave, which must use SPI mode 0. [dbrownell@users.sourceforge.net: cleanups, meet specs, pass "sparse"] Signed-off-by: Shadi Ammouri Signed-off-by: Saeed Bishara Signed-off-by: Lennert Buytenhek Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 756fcab27756f32722b748e2aff3393eef9a589d Author: Hannes Reinecke Date: Tue Aug 5 13:01:08 2008 -0700 block/cciss.c: remove pointless curr_queue calculation curr_queue is a local variable in a for loop, and it's being initialized at the start of each loop. So any assignment at the end of the loop is pointless. Signed-off-by: Hannes Reinecke Cc: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 594a8819774b09ee5bf72d23300489459ff1f882 Author: Ondrej Zajicek Date: Tue Aug 5 13:01:06 2008 -0700 vt8623fb: fix kernel oops commit 20e061fb750d36ec0ffcb2e44ed7dafa9018223b Author: Ondrej Zajicek Date: Mon Apr 28 02:15:18 2008 -0700 fbdev: framebuffer_alloc() fixes Correct the dev arg of framebuffer_alloc() in arkfb, s3fb and vt8623fb. causes a null-pointer deref because "info->dev is NULL, info was just kzallocated". Signed-off-by: Ondrej Zajicek Reported-by: "MadLoisae@gmx.net" Tested-by: "MadLoisae@gmx.net" Cc: Alexey Dobriyan Cc: "Antonino A. Daplas" Cc: Krzysztof Helt Cc: [2.6.26.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6e2bee26eee190b20cd87e71b288bca6a5357a4 Author: Bernhard Walle Date: Tue Aug 5 13:01:05 2008 -0700 kdump: report actual value of VMCOREINFO_OSRELEASE in VMCOREINFO The current implementation reports the structure name as VMCOREINFO_OSRELEASE in VMCOREINFO, e.g. VMCOREINFO_OSRELEASE=init_uts_ns.name.release That doesn't make sense because it's always the same. Instead, use the value, e.g. VMCOREINFO_OSRELEASE=2.6.26-rc3 That's also what the 'makedumpfile -g' does. Signed-off-by: Bernhard Walle Cc: "Ken'ichi Ohmichi" Acked-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 775587b6d769af3ba779a12ce790db4ccf0d1676 Author: Anton Vorontsov Date: Tue Aug 5 13:01:02 2008 -0700 powerpc: 86xx: mpc8610_hpcd: add watchdog node Signed-off-by: Anton Vorontsov Cc: Kumar Gala Cc: Wim Van Sebroeck Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c9ffc9c3d61dfcafd7cdb61c7b94f2d7ac408fb Author: Andrew Morton Date: Tue Aug 5 13:01:01 2008 -0700 mm_init.c: avoid ifdef-inside-macro-expansion gcc-3.2: mm/mm_init.c:77:1: directives may not be used inside a macro argument mm/mm_init.c:76:47: unterminated argument list invoking macro "mminit_dprintk" mm/mm_init.c: In function `mminit_verify_pageflags_layout': mm/mm_init.c:80: `mminit_dprintk' undeclared (first use in this function) mm/mm_init.c:80: (Each undeclared identifier is reported only once mm/mm_init.c:80: for each function it appears in.) mm/mm_init.c:80: syntax error before numeric constant Also fix a typo in a comment. Reported-by: Adrian Bunk Cc: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35ad1c8803921b28541ad28bfb18dc3b6295ba98 Merge: 580da34... f454cbe... Author: Linus Torvalds Date: Tue Aug 5 11:39:33 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide: ->cable_detect method cannot be marked __devinit ide: ->quirkproc method cannot be marked __devinit cs5520: add enablebits checking cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks() ide-cd: fix endianity for the error message in cdrom_read_capacity ide: remove CONFIG_IDE_MAX_HWIFS remove unneeded #include 's ide: fix regression caused by ide_device_{get,put}() addition (take 2) remove unnecessary includes ide: sanitize struct ide_port_ops documentation (take 2) ide: fix ide_fix_driveid() ide: fix pre-EIDE SWDMA support on big-endian commit 580da34847488b404218d1d7f53b156f245f5555 Author: Alan Stern Date: Tue Aug 5 13:05:17 2008 -0400 Fix USB storage hang on command abort Okay, I found the cause of the hang. It is a simple bug in the USB scatter-gather library, caused by changes added in response to the S-G chaining modification. This patch (as1125) fixes a bug in the USB scatter-gather library. Early exit from the S-G initialization loop does not reset the count of outstanding URBs. Signed-off-by: Alan Stern Cc: Matthew Dharm Cc: David Brownell Cc: Alan Jenkins Cc: James Bottomley Cc: Greg KH Signed-off-by: Linus Torvalds commit f454cbe8cd38b6d447e74ddaf012017fea42717e Author: Bartlomiej Zolnierkiewicz Date: Tue Aug 5 18:17:04 2008 +0200 ide: ->cable_detect method cannot be marked __devinit Now that we have warm-plug support ->cable_detect method no longer can be be marked __devinit. Signed-off-by: Bartlomiej Zolnierkiewicz commit 36de994809264f752e51b74e77a9c49091d14230 Author: Bartlomiej Zolnierkiewicz Date: Tue Aug 5 18:17:03 2008 +0200 ide: ->quirkproc method cannot be marked __devinit Now that we have warm-plug support ->quirkproc method no longer can be be marked __devinit. Signed-off-by: Bartlomiej Zolnierkiewicz commit 24307ffabd5b39bad443641f54b12ee2ba7a38ac Author: Bartlomiej Zolnierkiewicz Date: Tue Aug 5 18:17:03 2008 +0200 cs5520: add enablebits checking Based on sparse comments in OpenFirmware code (no Cx5510/Cx5520 datasheet here). This fixes 2.6.26 regression reported by TAKADA and caused by addition of warm-plug support. Tested-by: TAKADA Yoshihito Signed-off-by: Bartlomiej Zolnierkiewicz commit af744e3294d09d706c4eae26cffaaa68a8d40337 Author: Tejun Heo Date: Tue Aug 5 18:17:02 2008 +0200 cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks() According to MMC-3 (or any later versions) READ TOCs are mandatory commands and have nothing to do with CDC_PLAY_AUDIO. I have no idea why the check was put there in the first place but it now only breaks automatic actions on certain drives. Note that this test was only effective when ide-cdrom was being used as sr didn't mask CDC_PLAY_AUDIO according to the capabilities. Signed-off-by: Tejun Heo Acked-by: Jens Axboe Cc: Borislav Petkov Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 938bb03d188a1e688fb0bcae49788f540193e80a Author: Petr Tesarik Date: Tue Aug 5 18:17:02 2008 +0200 ide-cd: fix endianity for the error message in cdrom_read_capacity Aesthetic regards aside, commit e8e7b9eb11c34ee18bde8b7011af41938d1ad667 still leaves a bug in the error message, because it uses the unconverted big-endian value for printk. Fix this by using a local variable in machine byte order. The result is correct, more readable, and also produces slightly shorter code on i386. Signed-off-by: Petr Tesarik Cc: Jens Axboe Cc: Jan Kara Cc: Andrew Morton Cc: Acked-by: Borislav Petkov [bart: __u32 -> u32] Signed-off-by: Bartlomiej Zolnierkiewicz commit c5bfc3757f1d843a8e1261840c1f53c5062f8e92 Author: Adrian Bunk Date: Tue Aug 5 18:17:01 2008 +0200 ide: remove CONFIG_IDE_MAX_HWIFS The benefits of a user settable CONFIG_IDE_MAX_HWIFS have become pretty tiny and are no longer considered worth the trouble of an own option. Simply always #define MAX_HWIFS to 10. Signed-off-by: Adrian Bunk Signed-off-by: Bartlomiej Zolnierkiewicz commit 0e25f710618ce919ac5ae4850c90d3fca19565c3 Author: Adrian Bunk Date: Tue Aug 5 18:17:00 2008 +0200 remove unneeded #include 's This patch remove unneeded #include 's. It also adds a required #include that was previously implicitely pulled by ide.h Signed-off-by: Adrian Bunk [bart: revert change to tests/lkdtm.c (spotted by Stephen Rothwell)] Signed-off-by: Bartlomiej Zolnierkiewicz commit d3e33ff59facec005e48ba3360502b73a04e4b4e Author: Bartlomiej Zolnierkiewicz Date: Tue Aug 5 18:16:59 2008 +0200 ide: fix regression caused by ide_device_{get,put}() addition (take 2) On Monday 28 July 2008, Benjamin Herrenschmidt wrote: [...] > Vector: 300 (Data Access) at [c58b7b80] > pc: c014f264: elv_may_queue+0x10/0x44 > lr: c0152750: get_request+0x2c/0x2c0 > sp: c58b7c30 > msr: 1032 > dar: c > dsisr: 40000000 > current = 0xc58aaae0 > pid = 854, comm = media-bay > enter ? for help > mon> t > [c58b7c40] c0152750 get_request+0x2c/0x2c0 > [c58b7c70] c0152a08 get_request_wait+0x24/0xec > [c58b7cc0] c0225674 ide_cd_queue_pc+0x58/0x1a0 > [c58b7d40] c022672c ide_cdrom_packet+0x9c/0xdc > [c58b7d70] c0261810 cdrom_get_disc_info+0x60/0xd0 > [c58b7dc0] c026208c cdrom_mrw_exit+0x1c/0x11c > [c58b7e30] c0260f7c unregister_cdrom+0x84/0xe8 > [c58b7e50] c022395c ide_cd_release+0x80/0x84 > [c58b7e70] c0163650 kref_put+0x54/0x6c > [c58b7e80] c0223884 ide_cd_put+0x40/0x5c > [c58b7ea0] c0211100 generic_ide_remove+0x28/0x3c > [c58b7eb0] c01e9d34 __device_release_driver+0x78/0xb4 > [c58b7ec0] c01e9e44 device_release_driver+0x28/0x44 > [c58b7ee0] c01e8f7c bus_remove_device+0xac/0xd8 > [c58b7f00] c01e7424 device_del+0x104/0x198 > [c58b7f20] c01e74d0 device_unregister+0x18/0x30 > [c58b7f40] c02121c4 __ide_port_unregister_devices+0x6c/0x88 > [c58b7f60] c0212398 ide_port_unregister_devices+0x38/0x80 > [c58b7f80] c0208ca4 media_bay_step+0x1cc/0x5c0 > [c58b7fb0] c0209124 media_bay_task+0x8c/0xcc > [c58b7fd0] c00485c0 kthread+0x48/0x84 > [c58b7ff0] c0011b20 kernel_thread+0x44/0x60 The guilty commit turned out to be 08da591e14cf87247ec09b17c350235157a92fc3 ("ide: add ide_device_{get,put}() helpers"). ide_device_put() is called before kref_put() in ide_cd_put() so IDE device is already gone by the time ide_cd_release() is reached. Fix it by calling ide_device_get() before kref_get() and ide_device_put() after kref_put() in all affected device drivers. v2: Brown paper bag time. In v1 cd->drive was referenced after dropping last reference on cd object (which could result in OOPS in ide_device_put() as reported/debugged by Mariusz Kozlowski). Fix it by caching cd->drive in the local variable (fix other device drivers too). Reported-by: Benjamin Herrenschmidt Reported-by: Mariusz Kozlowski Cc: FUJITA Tomonori Cc: Borislav Petkov Tested-by: Mariusz Kozlowski Tested-by: Benjamin Herrenschmidt Signed-off-by: Bartlomiej Zolnierkiewicz commit b5b9309d3415480b3e66314a1d6c89db58bff9de Author: Bartlomiej Zolnierkiewicz Date: Tue Aug 5 18:16:58 2008 +0200 remove unnecessary includes Following files don't need at all: - arch/mips/jazz/setup.c - arch/sh/boards/mach-systemh/irq.c - drivers/macintosh/mediabay.c - drivers/scsi/hptiop.c - drivers/usb/storage/freecom.c - arch/powerpc/include/asm/ide.h - init/main.c Cc: Christoph Hellwig Signed-off-by: Bartlomiej Zolnierkiewicz commit 39b986a6c73434d122967dc86efb295ab9a28437 Author: Bartlomiej Zolnierkiewicz Date: Tue Aug 5 18:16:57 2008 +0200 ide: sanitize struct ide_port_ops documentation (take 2) v2: Add missing '@'-s. (Noticed by Randy Dunlap) Cc: Randy Dunlap Signed-off-by: Bartlomiej Zolnierkiewicz commit 242f44261e6c5fdc13e3cd12f949ab717dc37d58 Author: Bartlomiej Zolnierkiewicz Date: Tue Aug 5 18:16:56 2008 +0200 ide: fix ide_fix_driveid() Fix byte-swapping for id->words161_175[], id->words206_254[] and id->words206_254[]. Luckily all words previously left in little-endian byte-order are marked as reserved so this fix shouldn't affect user-space applications. Signed-off-by: Bartlomiej Zolnierkiewicz commit 367fdcb4e401161e51aaee5d06b3f82098bafefc Author: Bartlomiej Zolnierkiewicz Date: Tue Aug 5 18:16:55 2008 +0200 ide: fix pre-EIDE SWDMA support on big-endian id->tDMA is of 'unsigned char' type so endianness is already correct and calling le16_to_cpu() is wrong. Signed-off-by: Bartlomiej Zolnierkiewicz commit 33e334950abda8e42c3b6e6f280fad0d4ab92141 Merge: ad61980... 3e2236c... Author: David S. Miller Date: Tue Aug 5 01:28:35 2008 -0700 Merge branch 'no-ath9k' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit ad619800e4e034cad44299b2a22df9eebb043ac3 Author: Rami Rosen Date: Tue Aug 5 01:21:22 2008 -0700 bridge: fix compile warning in net/bridge/br_netfilter.c This patch fixes the following warning due to incompatible pointer assignment: net/bridge/br_netfilter.c: In function 'br_netfilter_rtable_init': net/bridge/br_netfilter.c:116: warning: assignment from incompatible pointer type This warning is due to commit 4adf0af6818f3ea52421dc0bae836cfaf20ef72a from July 30 (send correct MTU value in PMTU (revised)). Signed-off-by: Rami Rosen Signed-off-by: David S. Miller commit 95c3e8bfcdea8676e2d4d61910c379f4502049bf Author: Rami Rosen Date: Tue Aug 5 01:19:50 2008 -0700 ipv4: remove unused field in struct flowi (include/net/flow.h). This patch removes an unused field (flags) from struct flowi; it seems that this "flags" field was used once in the past for multipath routing with FLOWI_FLAG_MULTIPATHOLDROUTE flag (which does no longer exist); however, the "flags" field of struct flowi is not used anymore. Signed-off-by: Rami Rosen Signed-off-by: David S. Miller commit 2f751b67a8be698cec52f786910ef4f0beffe9a7 Author: Matt Carlson Date: Mon Aug 4 23:17:34 2008 -0700 tg3: Fix 'scheduling while atomic' errors This patch fixes the 'scheduling while atomic' errors introduced by commit 12dac0756d357325b107fe6ec24921ec38661839 ("tg3: adapt tg3 to use reworked PCI PM code"). The first hunk of the patch removes an unnecessary tg3_set_power_state() call. The chip will already be in the D0 state either due to a chip reset or through a previous call to tg3_set_power_state(). The second hunk of the patch moves the tg3_set_power_state() call outside the critical section guarded by tg3_full_lock() and tg3_full_unlock() functions. The power state of the device is and should be outside the lock's domain and all other tg3_set_power_state() calls support this. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit cc6533e98a7f3cb7fce9d740da49195c7aa523a4 Author: David S. Miller Date: Mon Aug 4 23:04:08 2008 -0700 net: Kill plain NET_XMIT_BYPASS. dst_input() was doing something completely absurd, looping on skb->dst->input() if NET_XMIT_BYPASS was seen, but these functions never return such an error. And as a result plain ole' NET_XMIT_BYPASS has no more references and can be completely killed off. Signed-off-by: David S. Miller commit c27f339af90bb874a7a9c680b17abfd32d4a727b Author: Jarek Poplawski Date: Mon Aug 4 22:39:11 2008 -0700 net_sched: Add qdisc __NET_XMIT_BYPASS flag Patrick McHardy noticed that it would be nice to handle NET_XMIT_BYPASS by NET_XMIT_SUCCESS with an internal qdisc flag __NET_XMIT_BYPASS and to remove the mapping from dev_queue_xmit(). David Miller spotted a serious bug in the first version of this patch. Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit 378a2f090f7a478704a372a4869b8a9ac206234e Author: Jarek Poplawski Date: Mon Aug 4 22:31:03 2008 -0700 net_sched: Add qdisc __NET_XMIT_STOLEN flag Patrick McHardy noticed: "The other problem that affects all qdiscs supporting actions is TC_ACT_QUEUED/TC_ACT_STOLEN getting mapped to NET_XMIT_SUCCESS even though the packet is not queued, corrupting upper qdiscs' qlen counters." and later explained: "The reason why it translates it at all seems to be to not increase the drops counter. Within a single qdisc this could be avoided by other means easily, upper qdiscs would still increase the counter when we return anything besides NET_XMIT_SUCCESS though. This means we need a new NET_XMIT return value to indicate this to the upper qdiscs. So I'd suggest to introduce NET_XMIT_STOLEN, return that to upper qdiscs and translate it to NET_XMIT_SUCCESS in dev_queue_xmit, similar to NET_XMIT_BYPASS." David Miller noticed: "Maybe these NET_XMIT_* values being passed around should be a set of bits. They could be composed of base meanings, combined with specific attributes. So you could say "NET_XMIT_DROP | __NET_XMIT_NO_DROP_COUNT" The attributes get masked out by the top-level ->enqueue() caller, such that the base meanings are the only thing that make their way up into the stack. If it's only about communication within the qdisc tree, let's simply code it that way." This patch is trying to realize these ideas. Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit ca5de404ff036a29b25e9a83f6919c9f606c5841 Author: Nick Piggin Date: Sat Aug 2 12:02:13 2008 +0200 fs: rename buffer trylock Like the page lock change, this also requires name change, so convert the raw test_and_set bitop to a trylock. Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds commit 529ae9aaa08378cfe2a4350bded76f32cc8ff0ce Author: Nick Piggin Date: Sat Aug 2 12:01:03 2008 +0200 mm: rename page trylock Converting page lock to new locking bitops requires a change of page flag operation naming, so we might as well convert it to something nicer (!TestSetPageLocked_Lock => trylock_page, SetPageLocked => set_page_locked). This also facilitates lockdeping of page lock. Signed-off-by: Nick Piggin Acked-by: KOSAKI Motohiro Acked-by: Peter Zijlstra Acked-by: Andrew Morton Acked-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit e9ba9698187ddbc0c5bfcf41de0349a662d23d02 Merge: 2e1e921... ae58388... Author: Linus Torvalds Date: Mon Aug 4 19:04:36 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Remove all cpumask_t local variables in xcall dispatch. sparc64: Kill error_mask from hypervisor_xcall_deliver(). sparc64: Build cpu list and mondo block at top-level xcall_deliver(). sparc64: Disable local interrupts around xcall_deliver_impl() invocation. sparc64: Make all xcall_deliver's go through common helper function. sparc64: Always allocate the send mondo blocks, even on non-sun4v. sparc64: Make smp_cross_call_masked() take a cpumask_t pointer. sparc64: Directly call xcall_deliver() in smp_start_sync_tick_client. sparc64: Call xcall_deliver() directly in some cases. sparc64: Use cpumask_t pointers and for_each_cpu_mask_nr() in xcall_deliver. sparc64: Use xcall_deliver() consistently. sparc64: Use function pointer for cross-call sending. arch/sparc64/kernel/signal.c: removed duplicated #include sparc64: Need to disable preemption around smp_tsb_sync(). commit 2e1e9212ed8c532c6b324de77d3cafef5d2bc846 Merge: 2acb802... f5663f5... Author: Linus Torvalds Date: Mon Aug 4 17:26:15 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (29 commits) sh: enable maple_keyb in dreamcast_defconfig. SH2(A) cache update nommu: Provide vmalloc_exec(). add addrespace definition for sh2a. sh: Kill off ARCH_SUPPORTS_AOUT and remnants of a.out support. sh: define GENERIC_HARDIRQS_NO__DO_IRQ. sh: define GENERIC_LOCKBREAK. sh: Save NUMA node data in vmcore for crash dumps. sh: module_alloc() should be using vmalloc_exec(). sh: Fix up __bug_table handling in module loader. sh: Add documentation and integrate into docbook build. sh: Fix up broken kerneldoc comments. maple: Kill useless private_data pointer. maple: Clean up maple_driver_register/unregister routines. input: Clean up maple keyboard driver maple: allow removal and reinsertion of keyboard driver module sh: /proc/asids depends on MMU. arch/sh/boards/mach-se/7343/irq.c: removed duplicated #include arch/sh/boards/board-ap325rxa.c: removed duplicated #include sh/boards/Makefile typo fix ... commit 2acb802b0c5485aedb46e23b2b45e49573454c09 Merge: d8f4b81... 9c4cb82... Author: Linus Torvalds Date: Mon Aug 4 17:25:06 2008 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: powerpc: Remove use of CONFIG_PPC_MERGE powerpc: Force printing of 'total_memory' to unsigned long long powerpc: Fix compiler warning in arch/powerpc/mm/mem.c powerpc: Move include files to arch/powerpc/include/asm commit d8f4b819c3a5b54a978c6fe5249a17cff490c4a1 Merge: 115a326... f072181... Author: Linus Torvalds Date: Mon Aug 4 17:24:28 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: kconfig: drop the ""trying to assign nonexistent symbol" warning kconfig: always write out .config commit 115a326c1e5cab457924356123bbfd7d783ecf9d Author: Roland McGrath Date: Mon Aug 4 13:56:01 2008 -0700 tracehook: kerneldoc fix My last change to tracehook.h made it confuse the kerneldoc parser. Move the #define's before the comment so it's happy again. Signed-off-by: Roland McGrath Acked-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 18f6db95dcfa68e93bafe435381299abbffb5c7e Author: Paul Mundt Date: Mon Aug 4 11:21:23 2008 +0100 mn10300: Fix up __bug_table handling in module loader. Platforms that are using GENERIC_BUG must call in to module_bug_finalize()/module_bug_cleanup() in order to scan modules with their own __bug_table sections that are otherwise unaccounted. Signed-off-by: Paul Mundt Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit b13ad6f47c172761a3ce06f0fd12d19118b3076c Merge: f1b134f... 1a61c88... Author: Linus Torvalds Date: Mon Aug 4 17:21:38 2008 -0700 Merge branch 'audit.b56' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current * 'audit.b56' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: Re: [PATCH] Fix the kernel panic of audit_filter_task when key field is set commit f1b134fdf6d36c975b4a66cf952565cd73aebdba Merge: 7274264... e8bac9e... Author: Linus Torvalds Date: Mon Aug 4 17:19:18 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] scsi_transport_spi: fix oops in revalidate [SCSI] ses: fix VPD inquiry overrun [SCSI] block: Fix miscalculation of sg_io timeout in CDROM_SEND_PACKET handler. [SCSI] hptiop: add more PCI device IDs commit 7274264f60cc0b71389efed286001ff0860c3141 Author: Stephen Rothwell Date: Sun Aug 3 22:02:10 2008 +0200 m68k: some asm-sparc include files moved So copy their contents into the asm-m68k files. Signed-off-by: Stephen Rothwell Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 725aad24c3ba96a7c06448c14c265a466cdbd663 Author: Jeremy Fitzhardinge Date: Sun Aug 3 09:33:03 2008 -0700 __sched_setscheduler: don't do any policy checks when not "user" The "user" parameter to __sched_setscheduler indicates whether the change is being done on behalf of a user process or not. If not, we shouldn't apply any permissions checks, so don't call security_task_setscheduler(). Signed-off-by: Jeremy Fitzhardinge Tested-by: Steve Wise Cc: Rusty Russell Cc: "Rafael J. Wysocki" Signed-off-by: Linus Torvalds commit 5941de8eadc287f3f47b87ce9888734ee07d210b Merge: c44df74... c6557e7... Author: Linus Torvalds Date: Mon Aug 4 17:15:07 2008 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] move include/asm-s390 to arch/s390/include/asm commit c44df7413fd711bca818111b94cbd7ce5f3600a9 Merge: 103a1d5... 0e09c86... Author: Linus Torvalds Date: Mon Aug 4 17:14:21 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6: pcmcia: rsrc_nonstatic: check value, not pointer commit 103a1d5c57fac3623613b130b104f5b03367b31c Author: Alan Cox Date: Mon Aug 4 17:56:28 2008 +0100 sc1200 watchdog driver: Fix locking, sems and coding style Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 81830061bbae282d37c9af30084a1116b6239520 Author: Andrew Morton Date: Mon Aug 4 17:56:02 2008 +0100 alpha: Fix breakage in wdt_pci drivers/watchdog/wdt_pci.c: In function 'wdtpci_ctr_mode': drivers/watchdog/wdt_pci.c:120: error: implicit declaration of function 'udelay' {standard input}: Assembler messages: Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9f2d1f0da766f84fdb96c9bd79ed0f97036635cb Author: Alan Cox Date: Mon Aug 4 17:55:35 2008 +0100 wdt: Cleanup and sort out locking and inb_p Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 41dc8b72e37c514f7332cbc3f3dd864910c2a1fa Author: Alan Cox Date: Mon Aug 4 17:54:46 2008 +0100 s3c2410_wdt watchdog driver: Locking and coding style Kill off use of semaphores. Fix ioctl races and locking holes. From: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit d6547378df1c11bc6790b87abedb3526ded40ef9 Author: Alan Cox Date: Mon Aug 4 17:54:01 2008 +0100 it8712f_wdt: Locking and coding style Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 670d59c0ae31a872341785b1d93add284c1653ff Author: Alan Cox Date: Mon Aug 4 17:53:22 2008 +0100 ar7_wdt watchdog driver: Fix locking Use unlocked_ioctl Remove semaphores Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d5cae364148088911bdf007a8aaefb46a92f16f7 Author: Alan Cox Date: Mon Aug 4 17:47:07 2008 +0100 vt: Deadlock workaround 2.6.26 corrected the mutex locking on tty resizing to fix the case where you could get the tty/vt sizing out of sync. That turns out to have a deadlock. The actual fix is really major and I've got it lined up as part of the ops changes for 2.6.28 so for 2.6.26/2.6.27 it is safer to reintroduce this ages old minor bug. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit d7283353221e73a793847252d063ff9186885160 Author: Alan Cox Date: Mon Aug 4 17:21:18 2008 +0100 cris: Fixup compile problems It now compiles with the tty changes but isn't tested (which has to be better than not compiling.. Closes bug #11218 Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b1cbefe5d5fc2d4a6109961d914027172ce8e152 Author: Alan Cox Date: Mon Aug 4 17:22:11 2008 +0100 blackfin: Fix compile failure in tty code Blackfin peers into the ldisc in an odd way for IRDA snooping which therefore got missed. Simple enough fix. Closes bug #11233 Signed-off-by: Linus Torvalds commit c635fd3d3de9dec4729135add72c2ff32595605b Merge: 82e68f7... cf368d2... Author: Linus Torvalds Date: Mon Aug 4 17:03:56 2008 -0700 Merge git://git.infradead.org/users/dwmw2/random-2.6 * git://git.infradead.org/users/dwmw2/random-2.6: drivers/video/console/promcon.c: fix build error Fix IHEX firmware generation/loading commit 82e68f7ffec3800425f2391c8c86277606860442 Author: Willy Tarreau Date: Sat Aug 2 18:25:16 2008 +0200 sound: ensure device number is valid in snd_seq_oss_synth_make_info snd_seq_oss_synth_make_info() incorrectly reports information to userspace without first checking for the validity of the device number, leading to possible information leak (CVE-2008-3272). Reported-By: Tobias Klein Acked-and-tested-by: Takashi Iwai Cc: stable@kernel.org Signed-off-by: Willy Tarreau Signed-off-by: Linus Torvalds commit 82248a5e92793014d156a12dbcbba633794ce9f8 Merge: c2d5ced... 31981db... Author: Linus Torvalds Date: Mon Aug 4 17:00:37 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6: Add DIP switch readout for HFC-4S IOB4ST Fix remaining big endian issue of hfcmulti mISDN cleanup user interface mISDN fix main ISDN Makefile commit c2d5cedadcd3976cfc1fa5590e3a73a059c6401a Author: Huang Weiyi Date: Sat Aug 2 21:10:23 2008 +0800 drivers/char/efirtc.c: removed duplicated #include Removed duplicated include in drivers/char/efirtc.c. Signed-off-by: Huang Weiyi Signed-off-by: Linus Torvalds commit a477097d9c37c1cf289c7f0257dffcfa42d50197 Author: KOSAKI Motohiro Date: Mon Aug 4 13:41:14 2008 -0700 mlock() fix return values Halesh says: Please find the below testcase provide to test mlock. Test Case : =========================== #include #include #include #include #include #include #include #include #include int main(void) { int fd,ret, i = 0; char *addr, *addr1 = NULL; unsigned int page_size; struct rlimit rlim; if (0 != geteuid()) { printf("Execute this pgm as root\n"); exit(1); } /* create a file */ if ((fd = open("mmap_test.c",O_RDWR|O_CREAT,0755)) == -1) { printf("cant create test file\n"); exit(1); } page_size = sysconf(_SC_PAGE_SIZE); /* set the MEMLOCK limit */ rlim.rlim_cur = 2000; rlim.rlim_max = 2000; if ((ret = setrlimit(RLIMIT_MEMLOCK,&rlim)) != 0) { printf("Cant change limit values\n"); exit(1); } addr = 0; while (1) { /* map a page into memory each time*/ if ((addr = (char *) mmap(addr,page_size, PROT_READ | PROT_WRITE,MAP_SHARED,fd,0)) == MAP_FAILED) { printf("cant do mmap on file\n"); exit(1); } if (0 == i) addr1 = addr; i++; errno = 0; /* lock the mapped memory pagewise*/ if ((ret = mlock((char *)addr, 1500)) == -1) { printf("errno value is %d\n", errno); printf("cant lock maped region\n"); exit(1); } addr = addr + page_size; } } ====================================================== This testcase results in an mlock() failure with errno 14 that is EFAULT, but it has nowhere been specified that mlock() will return EFAULT. When I tested the same on older kernels like 2.6.18, I got the correct result i.e errno 12 (ENOMEM). I think in source code mlock(2), setting errno ENOMEM has been missed in do_mlock() , on mlock_fixup() failure. SUSv3 requires the following behavior frmo mlock(2). [ENOMEM] Some or all of the address range specified by the addr and len arguments does not correspond to valid mapped pages in the address space of the process. [EAGAIN] Some or all of the memory identified by the operation could not be locked when the call was made. This rule isn't so nice and slighly strange. but many people think POSIX/SUS compliance is important. Reported-by: Halesh Sadashiv Tested-by: Halesh Sadashiv Signed-off-by: KOSAKI Motohiro Cc: [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc329442b9fd365bec95718013586c07ff600c34 Author: Gerard Kam Date: Mon Aug 4 13:41:12 2008 -0700 atmel_spi: fix hang due to missed interrupt For some time my at91sam9260 board with JFFS2 on serial flash (m25p80) would hang when accessing the serial flash and SPI bus. Slowing the SPI clock down to 9 MHz reduced the occurrence of the hang from "always" during boot to a nuisance level that allowed other SW development to continue. Finally had to address this issue when an application stresses the I/O to always cause a hang. Hang seems to be caused by a missed SPI interrupt, so that the task ends up waiting forever after calling spi_sync(). The fix has 2 parts. First is to halt the DMA engine before the "current" PDC registers are loaded. This ensures that the "next" registers are loaded before the DMA operation takes off. The second part of the fix is a kludge that adds a "completion" interrupt in case the ENDRX interrupt for the last segment of the DMA chaining operation was missed. The patch allows the SPI clock for the serial flash to be increased from 9 MHz to 15 MHz (or more?). No hangs or SPI overruns were encountered. Haavard: while this patch does indeed improve things, I still see overruns and CRC errors on my NGW100 board when running the DataFlash at 10 MHz. However, I think some improvement is better than nothing, so I'm passing this on for inclusion in 2.6.27. Signed-off-by: Gerard Kam Signed-off-by: Haavard Skinnemoen Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5aa6cf302c2758702348aab7457e516d3a5121b9 Author: Ben Dooks Date: Mon Aug 4 13:41:10 2008 -0700 spi: S3C24XX: reset register status on resume. Fix a bug in the spi_s3c24xx driver where it does not reset the registers of the hardware when resuming from suspend (this block has been reset over suspend). Signed-off-by: Ben Dooks Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae583885bfd07474789059cdef399289bd66c8d0 Author: David S. Miller Date: Mon Aug 4 16:56:15 2008 -0700 sparc64: Remove all cpumask_t local variables in xcall dispatch. All of the xcall delivery implementation is cpumask agnostic, so we can pass around pointers to const cpumask_t objects everywhere. The sad remaining case is the argument to arch_send_call_function_ipi(). Signed-off-by: David S. Miller commit 1a3f7d98e5f50f21ce6fb1406a35531d9596c5c6 Author: Linus Torvalds Date: Mon Aug 4 16:50:38 2008 -0700 Revert "UFS: add const to parser token table" This reverts commit f9247273cb69ba101877e946d2d83044409cc8c5 (and fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 - "fix fs/nfs/nfsroot.c compilation" - that fixed a missed conversion). The changes cause problems for at least the sparc build. Let's re-do them when the exact issues are resolved. Requested-by: Andrew Morton Requested-by: Steven Whitehouse Cc: David Miller Signed-off-by: Linus Torvalds commit ed4d9c66eb941a416c8cb9a0138c69d46d82fc4f Author: David S. Miller Date: Mon Aug 4 16:47:57 2008 -0700 sparc64: Kill error_mask from hypervisor_xcall_deliver(). It can eat up a lot of stack space when NR_CPUS is large. We retain some of it's functionality by reporting at least one of the cpu's which are seen in error state. Signed-off-by: David S. Miller commit 90f7ae8a55190f5edfb9fda957e25c994ed39ec4 Author: David S. Miller Date: Mon Aug 4 16:42:58 2008 -0700 sparc64: Build cpu list and mondo block at top-level xcall_deliver(). Then modify all of the xcall dispatch implementations get passed and use this information. Now all of the xcall dispatch implementations do not need to be mindful of details such as "is current cpu in the list?" and "is cpu online?" Signed-off-by: David S. Miller commit fca082c9f1e11ec07efa8d2f9f13688521253f36 Author: Linus Torvalds Date: Mon Aug 4 16:36:20 2008 -0700 Revert "[SCSI] extend the last_sector_bug flag to cover more sectors" This reverts commit 2b142900784c6e38c8d39fa57d5f95ef08e735d8, since it seems to break some other USB storage devices (at least a JMicron USB to ATA bridge). As such, while it apparently fixes some cardreaders, it would need to be made conditional on the exact reader it fixes in order to avoid causing regressions. Cc: Alan Jenkins Cc: James Bottomley Signed-off-by: Linus Torvalds commit c02a5119e862dea9a1361182840d41ae1fe24227 Author: David S. Miller Date: Mon Aug 4 16:18:40 2008 -0700 sparc64: Disable local interrupts around xcall_deliver_impl() invocation. Signed-off-by: David S. Miller commit deb16999e452b74011dac5b2fe0d6258df81a2a1 Author: David S. Miller Date: Mon Aug 4 16:16:20 2008 -0700 sparc64: Make all xcall_deliver's go through common helper function. This just facilitates the next changeset where we'll be building the cpu list and mondo block in this helper function. Signed-off-by: David S. Miller commit 43f589235e223418d5807ebcddca73ec8a45f52c Author: David S. Miller Date: Mon Aug 4 16:13:51 2008 -0700 sparc64: Always allocate the send mondo blocks, even on non-sun4v. The idea is that we'll use this cpu list array and mondo block even for non-hypervisor platforms. Signed-off-by: David S. Miller commit 91a4231cc2efb9134373bb2a93be96a284955607 Author: David S. Miller Date: Mon Aug 4 00:51:18 2008 -0700 sparc64: Make smp_cross_call_masked() take a cpumask_t pointer. Ideally this could be simplified further such that we could pass the pointer down directly into the xcall_deliver() implementation. But if we do that we need to do the "cpu_online(cpu)" and "cpu != self" checks down in those functions. Signed-off-by: David S. Miller commit 24445a4ac9d3fdd3f96f0ad277cb2ba274470d94 Author: David S. Miller Date: Mon Aug 4 00:02:31 2008 -0700 sparc64: Directly call xcall_deliver() in smp_start_sync_tick_client. We know the cpu is online and not the current cpu here. Signed-off-by: David S. Miller commit 199266305311d060b6e057fa5c7de01f218bb911 Author: David S. Miller Date: Sun Aug 3 23:56:28 2008 -0700 sparc64: Call xcall_deliver() directly in some cases. For these cases the callers make sure: 1) The cpus indicated are online. 2) The current cpu is not in the list of indicated cpus. Therefore we can pass a pointer to the mask directly. One of the motivations in this transformation is to make use of "&cpumask_of_cpu(cpu)" which evaluates to a pointer to constant data in the kernel and thus takes up no stack space. Hopefully someone in the future will change the interface of arch_send_call_function_ipi() such that it passes a const cpumask_t pointer so that this will optimize ever further. Signed-off-by: David S. Miller commit cd5bc89debb4045d55eeffe325b97f2dfba4ddea Author: David S. Miller Date: Sun Aug 3 23:24:26 2008 -0700 sparc64: Use cpumask_t pointers and for_each_cpu_mask_nr() in xcall_deliver. Signed-off-by: David S. Miller commit 622824dbb536f7bdc241eefc3e1ae31c463b4eb8 Author: David S. Miller Date: Sun Aug 3 23:07:18 2008 -0700 sparc64: Use xcall_deliver() consistently. There remained some spots still vectoring to the appropriate *_xcall_deliver() function manually. Signed-off-by: David S. Miller commit 5e0797e5b84408a13260a107e2f7a49ee6342ae4 Author: David S. Miller Date: Sun Aug 3 22:52:41 2008 -0700 sparc64: Use function pointer for cross-call sending. Initialize it using the smp_setup_processor_id() hook. Signed-off-by: David S. Miller commit abd9e6982815ad7bd2c70dbf4cc0c08b48229d6e Author: Huang Weiyi Date: Sun Aug 3 00:04:13 2008 -0700 arch/sparc64/kernel/signal.c: removed duplicated #include Removed duplicated #include in arch/sparc64/kernel/signal.c. Signed-off-by: Huang Weiyi Signed-off-by: David S. Miller commit a3cf5e6b6f2548b036921da5ab6325dc8a76e207 Author: David S. Miller Date: Sun Aug 3 00:01:05 2008 -0700 sparc64: Need to disable preemption around smp_tsb_sync(). Based upon a bug report by Mariusz Kozlowski It uses smp_call_function_masked() now, which has a preemption-disabled requirement. Signed-off-by: David S. Miller commit f072181e6403b0fe2e2aa800a005497b748fd284 Author: Sam Ravnborg Date: Mon Aug 4 22:29:37 2008 +0200 kconfig: drop the ""trying to assign nonexistent symbol" warning They really stand out now that make *config is less chatty - and they are generally ignored - so drop them. Signed-off-by: Sam Ravnborg Cc: Roman Zippel Cc: Adrian Bunk commit 22127f246dc37ed5bea0915f7860002ba6d87da7 Author: Sam Ravnborg Date: Mon Aug 4 22:18:07 2008 +0200 kconfig: always write out .config Always write out .config also in the case where config did not change. This fixes: http://bugzilla.kernel.org/show_bug.cgi?id=11230 Signed-off-by: Sam Ravnborg Cc: Josh Boyer Cc: Adrian Bunk commit 3e2236c108792c3afbbfbe3f373ee7fdd68eda8e Author: Zhu Yi Date: Mon Aug 4 16:00:48 2008 +0800 iwl3945: fix merge mistake for packet injection We should allow packets transmission in monitor mode for 3945. The patch fixes a merge error with 2.6.26 kernel. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 2d3db679511be102741cb2d5f8c2b8a1ededdee7 Author: Tomas Winkler Date: Mon Aug 4 16:00:47 2008 +0800 iwlwifi: grap nic access before accessing periphery registers We need to grap nic access before accessing periphery registers. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 14652562364dad636ddce2cd11e71702ca21bfbd Author: Emmanuel Grumbach Date: Mon Aug 4 16:00:46 2008 +0800 iwlwifi: decrement rx skb counter in scan abort handler This patch decrements rx skb counter in scan abort handler. Signed-off-by: Emmanuel Grumbach Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit c1842d6150c4efe1d01e7a8cf86c63aec6223486 Author: Tomas Winkler Date: Mon Aug 4 16:00:43 2008 +0800 iwlwifi: fix unhandled interrupt when HW rfkill is on This patch fixes unhandled interrupt when HW rfkill is on during devices start up. The behavior changes, now open is successful even when rfkill is on. This is to align with the situation when rfkill is set on after opening. Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit caab8f1a5d0da583b6ffe41afea2774c676444ca Author: Tomas Winkler Date: Mon Aug 4 16:00:42 2008 +0800 iwlwifi: implement iwl5000_calc_rssi This patch implements rssi calculation for 5000 HW. Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit da99c4b6c25964b90c79f19beccda208df1a865a Author: Gregory Greenman Date: Mon Aug 4 16:00:40 2008 +0800 iwlwifi: memory allocation optimization This patch optimizes memory allocation. The cmd member of iwl_tx_queue was allocated previously as a continuous block of memory. This patch allocates separate memory chunks for each command and maps/unmaps these chunks in the run time. Signed-off-by: Gregory Greenman Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 4c43e0d0ecd5196ed5c67f64ed2f1860770eed34 Author: Tomas Winkler Date: Mon Aug 4 16:00:39 2008 +0800 iwlwifi: HW bug fixes This patch adds few HW bug fixes. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 6041e2a08c50e3fcaf1e56422bfafda62c597cea Author: Larry Finger Date: Sun Aug 3 17:58:36 2008 -0500 p54: Fix potential concurrent access to private data Experience with the rtl8187 driver has shown that mac80211 can make calls to the config callback routine in rapid succession. This patch creates a mutex that protects the private data in several of the routines called by mac80211. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit d06193f311102b2c990ec5f66b470ea49ecc73a4 Author: Ivo van Doorn Date: Sun Aug 3 23:36:01 2008 +0200 rt2x00: Disable link tuning in rt2500usb In the legacy rt2570 driver the link tuner was never really called. And now the reason has finally become apparent: It breaks TX capabilities As soon as the device has been associated all following TX frames will be queued in the hardware and never transmitted to the air. Disabling sections of the link tuner did not have the expected result, but completely disabling the link tuner did have the right result (Both of my rt2570 devices came back to life). This should fix Fedora bug: 411481 v2: Fix typos Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 5cbbb376d65ed181ed290cea505ba37a0425ee25 Author: Sven Wegener Date: Fri Aug 1 21:57:16 2008 +0200 iwlwifi: Don't use buffer allocated on the stack for led names Having the buffer on the stack and even re-using it for all led devices is bad. Not being able to resolve the name member of the led device structure to a meaningful value leads to confusion during ad-hoc debugging and potential breakage in the future, if we ever decide to access the name member outside of the registration function. Move the buffer to our private per led device structures so that it is accessible after registration. A quick grep didn't yield any occurence of using the led device name parameter outside of the led device registration function, so currently we should already be safe for normal operation. Signed-off-by: Sven Wegener Cc: Richard Purdie Acked-by: Zhu Yi Signed-off-by: John W. Linville commit 4fc22b21b3fcb3580c32b70605ef114178f8e611 Author: Tomas Winkler Date: Mon Jul 21 18:54:42 2008 +0300 iwlwifi: rename 4965 to AGN This patch renames driver name from 4965 to AGN The driver supports both 4965AGN and 5000AGN family The driver's original module name iwl4965.ko remains as an alias Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit 3ac7f14694dd38273d9d96f1c873233d71190c15 Author: Tomas Winkler Date: Mon Jul 21 02:40:14 2008 +0300 iwlwifi: fix checkpatch.pl errors This patch fixes errors reported by checkpatch in iwlwifi drivers Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit 25bc2deda9e8a430ed49f507a1120fb2c86abf33 Author: Tomas Winkler Date: Mon Jul 21 02:40:13 2008 +0300 iwlwifi: rename iwl4965-base.c to iwl-agn.c This patch renames iwl4965-base.c to iwl-agn.c Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit 80693ceb78b08baa3b66a900d9225b2cf9c6f0ed Author: Daniel Drake Date: Sat Jul 19 23:31:17 2008 +0100 mac80211: automatic IBSS channel selection When joining an ad-hoc network, the user is currently required to specify the channel. The network will not be joined otherwise, unless it happens to be sitting on the currently active channel. This patch implements automatic channel selection when the user has not locked the interface onto a specific channel. Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit b5d7be5e665f29274cfe6645b661acb38cb1d19b Author: Tomas Winkler Date: Sat Jul 19 04:41:24 2008 +0300 iwlwifi: use dtim_period from association, and set listen_interval This patch uses dtim_period from association, and sets the listen_interval. Signed-off-by: Tomas Winkler Signed-off-by: Emmanuel Grumbach Signed-off-by: John W. Linville commit e170402e5459c12ed8f5bfaa11e6550eba09e57a Author: Denis V. Lunev Date: Sat Jul 19 04:04:18 2008 +0300 iwlwifi: RS small compile warnings without CONFIG_IWLWIFI_DEBUG iwl-agn-rs.c: In function 'rs_clear': iwl-agn-rs.c:2405: warning: unused variable 'priv Signed-off-by: Denis V. Lunev Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit 4aa41f12aa4f08a10b0b07ed334faa3638ba8e9c Author: Emmanuel Grumbach Date: Fri Jul 18 13:53:09 2008 +0800 iwlwifi: bug fix in AGG flow - cast const to ULL This patch fixes a bug in AGG flow: u64 bitmap = 0; bitmap |= 1 << 32 results to be 0xffffffff80000000. Signed-off-by: Emmanuel Grumbach Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit c785d1d5018b93878a9280b0c04df96682cc6eff Author: Esti Kummer Date: Fri Jul 18 13:53:07 2008 +0800 iwlwifi: set led register in disassociation This patch sets the led register in disassociation flow according to rf-kill state : off - in case of rf_kill, on - otherwise. Signed-off-by: Esti Kummer Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 3ce84b9f2f495f59c4a4e68d814c348eaa497f65 Author: Tomas Winkler Date: Fri Jul 18 13:53:06 2008 +0800 iwlwifi: kill iwl4965_fill_rs_info iwl4965_fill_rs_info was used in sysfs. This info is already present in iwl-agn-rs debugfs. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit e227ceac8429ecd775c213838f0415700727b7b4 Author: Tomas Winkler Date: Fri Jul 18 13:53:05 2008 +0800 iwlwifi: rename iwl-4695-rs to iwl-agn-rs This patch renames iwl-4965-rs to iwl-agn-rs as it provides rate scale capability for all AGN capable iwlwifi drivers. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit e2e3c57b271d74ed8fd4d378f1517525ef7e5921 Author: Tomas Winkler Date: Fri Jul 18 13:53:04 2008 +0800 iwlwifi: move iwl4965_set_pwr_src to iwl4965-base.c This patch moves iwl4965_set_pwr_src to iwl4965-base.c. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 4bf64efd26f5610cde4fb7846e2f37bd1f62d3a9 Author: Tomas Winkler Date: Fri Jul 18 13:53:03 2008 +0800 iwlwifi: move beacon handling to iwl4965-base.c This patch concentrates becaon handling in iwl4965-base.c. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d783b061077f92af55244aef1df8780b0f46b5af Author: Tomas Winkler Date: Fri Jul 18 13:53:02 2008 +0800 iwlwifi: move iwl4965_mac_ampdu_action to iwl4965-base.c This patch moves iwl4965_mac_ampdu_action to iwl4965-base.c. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit ea95bba41e69c616bb1512cf59d22f33266b8568 Author: Tomas Winkler Date: Fri Jul 18 13:53:00 2008 +0800 mac80211: make listen_interval be limited by low level driver This patch makes possible for a driver to specify maximal listen interval The possibility for user to configure listen interval is not implemented yet, currently the maximum provided by the driver or 1 is used. Mac80211 uses config handler to set listen interval for to the driver. Signed-off-by: Tomas Winkler Signed-off-by: Emmanuel Grumbach Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 98f7dfd86cbbd377e2cbc293529681b914296f68 Author: Emmanuel Grumbach Date: Fri Jul 18 13:52:59 2008 +0800 mac80211: pass dtim_period to low level driver This patch adds the dtim_period in ieee80211_bss_conf, this allows the low level driver to know the dtim_period, and to plan power save accordingly. Signed-off-by: Emmanuel Grumbach Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 298df1f62aa69881528bf0f1c3c14395bc447846 Author: Esti Kummer Date: Fri Jul 18 13:52:58 2008 +0800 iwlwifi: corrects power_level in sysfs This patch corrects power_level in sysfs. Signed-off-by: Esti Kummer Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit ca579617d81baf5865498eb5fae58e453ee77c2c Author: Mohamed Abbas Date: Fri Jul 18 13:52:57 2008 +0800 iwlwifi: add power save to 5000 HW This patch adds support for power save for 5000 HW. Signed-off-by: Mohamed Abbas Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 1a61c88defcd611bd148d6c960b498e1b8bbbe00 Author: zhangxiliang Date: Sat Aug 2 10:56:37 2008 +0800 Re: [PATCH] Fix the kernel panic of audit_filter_task when key field is set Sorry, I miss a blank between if and "(". And I add "unlikely" to check "ctx" in audit_match_perm() and audit_match_filetype(). This is a new patch for it. Signed-off-by: Zhang Xiliang Signed-off-by: Al Viro commit f5663f5bded3364158e2d31904173cb1debc2ecd Author: Paul Mundt Date: Mon Aug 4 16:52:34 2008 +0900 sh: enable maple_keyb in dreamcast_defconfig. Signed-off-by: Paul Mundt commit cce2d453e4940d3fccd42a6917d01027148e11c3 Author: Yoshinori Sato Date: Mon Aug 4 16:33:47 2008 +0900 SH2(A) cache update Includes: - SH2 (7619) Writeback support. - SH2A cache handling fix. Signed-off-by: Yoshinori Sato Signed-off-by: Paul Mundt commit 1af446edfe3239b2b731f3458b3c285c397464cc Author: Paul Mundt Date: Mon Aug 4 16:01:47 2008 +0900 nommu: Provide vmalloc_exec(). Now that SH has switched to vmalloc_exec() for PAGE_KERNEL_EXEC usage, it's apparent that nommu has no vmalloc_exec() definition of its own. Stub in the one from mm/vmalloc.c. Signed-off-by: Paul Mundt commit d8eb2fab18b856fcaebe2619e8eaaa152baebc66 Author: Takashi Yoshii Date: Mon Aug 4 14:28:38 2008 +0900 add addrespace definition for sh2a. Newfile: arch/sh/include/cpu-sh2a/cpu/addrspace.h This file seems had be removed to use fallback (cpu-common/cpu/addrspace.h), but, I'd like to add sh2a specific file here, because 1. the values defined there are not suitable for sh2a. 2. I don't think there is "common" definition for these values. Values are chosen by consideration of followings... P1 is 0. perhaps no question. P2 is from hardware manual, which says no-cache area starts at 20000000. It means that P? space size=20000000. P3 is P2+size since asm/ptrace.h uses P3 as a end of P2. P4 is P3+size since asm/fixup.h uses P4 as a end of P3. Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit 42ced5561a3f49ba0ef09e94ccc016841fc94aa7 Author: Paul Mundt Date: Mon Aug 4 14:18:53 2008 +0900 sh: Kill off ARCH_SUPPORTS_AOUT and remnants of a.out support. SH never really supported a.out, so this was all just copied over blindly from x86 way back when. As we don't reference linux/a.out.h anywhere in the tree, these can now safely be killed off. Signed-off-by: Paul Mundt commit 5093c9a4e41518425d42c0bb5bb92f514ec77b1d Author: Paul Mundt Date: Mon Aug 4 14:17:13 2008 +0900 sh: define GENERIC_HARDIRQS_NO__DO_IRQ. We haven't called in to __do_IRQ() in a long time, so it seems like a reasonable time to switch this on by default. Signed-off-by: Paul Mundt commit bdcab87b1c54f61dbc0a77648fee4c2b17964d5c Author: Paul Mundt Date: Mon Aug 4 14:09:15 2008 +0900 sh: define GENERIC_LOCKBREAK. Needed for fixing up the __raw_spin_is_contended() reference which results in a build error. Signed-off-by: Paul Mundt commit c3b4adfa65bae300a143188491e285556ca80fff Author: Paul Mundt Date: Mon Aug 4 13:42:49 2008 +0900 sh: Save NUMA node data in vmcore for crash dumps. Presently the NUMA node data isn't saved on kexec. This implements a simple arch_crash_save_vmcoreinfo() for saving off the relevant data. Signed-off-by: Paul Mundt commit 4b59c97325371d51275bdb50523fa98a301615b0 Author: Paul Mundt Date: Mon Aug 4 13:34:29 2008 +0900 sh: module_alloc() should be using vmalloc_exec(). SH-X2 extended mode TLB allows for toggling of the exec bit, so make sure we are using the right protection bits for module space there also. Signed-off-by: Paul Mundt commit 3108cf061228c2c2951006c80fb6fe832000adda Author: Paul Mundt Date: Mon Aug 4 13:32:04 2008 +0900 sh: Fix up __bug_table handling in module loader. We should be calling in to the lib/bug.c module helpers, fix that up. Signed-off-by: Paul Mundt commit 6e583ce5242f32e925dcb198f7123256d0798370 Author: Stephen Hemminger Date: Sun Aug 3 21:29:57 2008 -0700 net: eliminate refcounting in backlog queue Avoid the overhead of atomic increment/decrement on each received packet. This helps performance of non-NAPI devices (like loopback). Use cleanup function to walk queue on each cpu and clean out any left over packets. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 283d07ac201ee9f8aa6dc6f7519436b48760baff Author: Wei Yongjun Date: Sun Aug 3 21:15:59 2008 -0700 ipv6: Do not drop packet if skb->local_df is set to true The old code will drop IPv6 packet if ipfragok is not set, since ipfragok is obsoleted, will be instead by used skb->local_df, so this check must be changed to skb->local_df. This patch fix this problem and not drop packet if skb->local_df is set to true. Signed-off-by: Wei Yongjun Acked-by: Herbert Xu Signed-off-by: David S. Miller commit f880374c2fe37aad3fa62253a4bc125d7a933aad Author: Herbert Xu Date: Sun Aug 3 21:15:08 2008 -0700 sctp: Drop ipfargok in sctp_xmit function The ipfragok flag controls whether the packet may be fragmented either on the local host on beyond. The latter is only valid on IPv4. In fact, we never want to do the latter even on IPv4 when PMTU is enabled. This is because even though we can't fragment packets within SCTP due to the prtocol's inherent faults, we can still fragment it at IP layer. By setting the DF bit we will improve the PMTU process. RFC 2960 only says that we SHOULD clear the DF bit in this case, so we're compliant even if we set the DF bit. In fact RFC 4960 no longer has this statement. Once we make this change, we only need to control the local fragmentation. There is already a bit in the skb which controls that, local_df. So this patch sets that instead of using the ipfragok argument. The only complication is that there isn't a struct sock object per transport, so for IPv4 we have to resort to changing the pmtudisc field for every packet. This should be safe though as the protocol is single-threaded. Note that after this patch we can remove ipfragok from the rest of the stack too. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b5ed042249cb5f76a428aa40ca219d591dad9eea Author: Paul Mundt Date: Mon Aug 4 12:53:55 2008 +0900 sh: Add documentation and integrate into docbook build. This adds some preliminary docbook bits for SH, tying in to the few interfaces that are exposed and that have adequate kerneldoc comments. Signed-off-by: Paul Mundt commit 6a9545bd95e88d61df942b9087cb59b8c7a6dc56 Author: Paul Mundt Date: Mon Aug 4 12:51:06 2008 +0900 sh: Fix up broken kerneldoc comments. These were completely unparseable, so fix them up. Signed-off-by: Paul Mundt commit 9c4cb82515130c62224e23fdf7c13c8f6c59c614 Author: Kumar Gala Date: Sat Aug 2 02:44:11 2008 +1000 powerpc: Remove use of CONFIG_PPC_MERGE Now that arch/ppc is gone and CONFIG_PPC_MERGE is always set, remove the dead code associated with !CONFIG_PPC_MERGE from arch/powerpc and include/asm-powerpc. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit c7c8eede2739289df02a1ab297cc476c6f38dca7 Author: Tony Breeds Date: Fri Aug 1 11:38:39 2008 +1000 powerpc: Force printing of 'total_memory' to unsigned long long total_memory is a 'phys_addr_t', Which can be either 64 or 32 bits. Force printing as unsigned long long to silence the warning. Signed-off-by: Tony Breeds Signed-off-by: Paul Mackerras commit fb61063587982b52304d62cdbb6a0a88d26ae7ef Author: Tony Breeds Date: Thu Jul 31 13:51:42 2008 +1000 powerpc: Fix compiler warning in arch/powerpc/mm/mem.c Explicitly cast to unsigned long long, rather than u64. Signed-off-by: Tony Breeds Signed-off-by: Paul Mackerras commit b8b572e1015f81b4e748417be2629dfe51ab99f9 Author: Stephen Rothwell Date: Fri Aug 1 15:20:30 2008 +1000 powerpc: Move include files to arch/powerpc/include/asm from include/asm-powerpc. This is the result of a mkdir arch/powerpc/include/asm git mv include/asm-powerpc/* arch/powerpc/include/asm Followed by a few documentation/comment fixups and a couple of places where was being used explicitly. Of the latter only one was outside the arch code and it is a driver only built for powerpc. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 617870632de6739fca0893f3e6648e9ae1bd0ddb Author: Paul Mundt Date: Mon Aug 4 10:58:24 2008 +0900 maple: Kill useless private_data pointer. We can simply wrap in to the dev_set/get_drvdata(), there's no reason to track an extra level of private data on top of the struct device. Signed-off-by: Paul Mundt commit 63870295de9adb365cd121dab94379b8cfdf986a Author: Paul Mundt Date: Mon Aug 4 10:39:46 2008 +0900 maple: Clean up maple_driver_register/unregister routines. These were completely inconsistent. Clean these up to take a maple_driver pointer directly for consistency. Signed-off-by: Paul Mundt commit cfb266c0ee0ea0b7bfa8189e3a3a80344dec6112 Author: Yang Hongyang Date: Sun Aug 3 18:16:15 2008 -0700 ipv6: Fix the return value of Set Hop-by-Hop options header with NULL data pointer When Set Hop-by-Hop options header with NULL data pointer and optlen is not zero use setsockopt(), the kernel successfully return 0 instead of return error EINVAL or EFAULT. This patch fix the problem. Signed-off-by: Yang Hongyang Signed-off-by: David S. Miller commit 1730554f253deb65fe5112c54b2f898d5318a328 Author: Florian Westphal Date: Sun Aug 3 18:13:44 2008 -0700 ipv6: syncookies: free reqsk on xfrm_lookup error cookie_v6_check() did not call reqsk_free() if xfrm_lookup() fails, leaking the request sock. Signed-off-by: Florian Westphal Signed-off-by: David S. Miller commit 459021fe3627083ea6678a7b29f9f74accf9c6fd Author: Adrian McMenamin Date: Mon Aug 4 10:09:03 2008 +0900 input: Clean up maple keyboard driver Have a single probe function instead of a probe and a connect function. Also tidy a comment. Signed-off-by: Adrian McMenamin Signed-off-by: Paul Mundt commit 86d9d32c7b17f8145dc8cbc9667e6385bf8ebc67 Author: Adrian McMenamin Date: Wed Jul 30 12:31:38 2008 -0700 maple: allow removal and reinsertion of keyboard driver module Allow the removal (and subsequent reinsertion) of the maple_keyb (maple keyboard) driver by adding a working removal function. Also tidy long lines. Signed-off-by: Adrian McMenamin Cc: Dmitry Torokhov Cc: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit c07abb6dbec754511427dd847f10cfdec6d36b3c Author: Paul Mundt Date: Mon Aug 4 08:11:03 2008 +0900 sh: /proc/asids depends on MMU. Signed-off-by: Paul Mundt commit adf044c8778de98dae29c5ce9973b7e43964674f Author: Sven Wegener Date: Sun Aug 3 14:06:44 2008 -0700 net: Add missing extra2 parameter for ip_default_ttl sysctl Commit 76e6ebfb40a2455c18234dcb0f9df37533215461 ("netns: add namespace parameter to rt_cache_flush") acceses the extra2 parameter of the ip_default_ttl ctl_table, but it is never set to a meaningful value. When e84f84f276473dcc673f360e8ff3203148bdf0e2 ("netns: place rt_genid into struct net") is applied, we'll oops in rt_cache_invalidate(). Set extra2 to init_net, to avoid that. Reported-by: Marcin Slusarz Signed-off-by: Sven Wegener Tested-by: Marcin Slusarz Acked-by: Denis V. Lunev Signed-off-by: David S. Miller commit 8f616cd5249e03c9e1b371623d85e76d4b86bbc1 Merge: 7e31aa1... 7d55992... Author: Linus Torvalds Date: Sun Aug 3 10:50:44 2008 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: remove write-only variables from ext4_ordered_write_end ext4: unexport jbd2_journal_update_superblock ext4: Cleanup whitespace and other miscellaneous style issues ext4: improve ext4_fill_flex_info() a bit ext4: Cleanup the block reservation code path ext4: don't assume extents can't cross block groups when truncating ext4: Fix lack of credits BUG() when deleting a badly fragmented inode ext4: Fix ext4_ext_journal_restart() ext4: fix ext4_da_write_begin error path jbd2: don't abort if flushing file data failed ext4: don't read inode block if the buffer has a write error ext4: Don't allow lg prealloc list to be grow large. ext4: Convert the usage of NR_CPUS to nr_cpu_ids. ext4: Improve error handling in mballoc ext4: lock block groups when initializing ext4: sync up block and inode bitmap reading functions ext4: Allow read/only mounts with corrupted block group checksums ext4: Fix data corruption when writing to prealloc area commit 7e31aa11fc672bbe0dd0da59513c9efe3809ced7 Merge: 071f492... 9cb7117... Author: Linus Torvalds Date: Sun Aug 3 10:39:02 2008 -0700 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 5182/1: pxa: Fix pcm990 compilation [ARM] Fix explicit asm(-arm)?/arch-foo references [ARM] move include/asm-arm to arch/arm/include/asm [ARM] Remove explicit dependency for misc.o from compressed/Makefile [ARM] initrd: claim initrd memory exclusively [ARM] pxa: add support for L2 outer cache on XScale3 (attempt 2) [ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout [ARM] add Sascha Hauer as Freescale i.MX Maintainer [ARM] i.MX: add missing clock functions exports [ARM] i.MX: remove set_imx_fb_info() export [ARM] mx1ads: make mmc platform data available for modules [ARM] mx2: add missing Kconfig dependency commit c48e64ae574a1e30a23174701560a222a192e4c3 Author: Huang Weiyi Date: Sun Aug 3 22:18:51 2008 +0800 arch/sh/boards/mach-se/7343/irq.c: removed duplicated #include Removed duplicated include in arch/sh/boards/mach-se/7343/irq.c. Signed-off-by: Huang Weiyi Signed-off-by: Paul Mundt commit 8edd744202e83ac2fce13f4898a90b403cc22141 Author: Huang Weiyi Date: Sun Aug 3 22:18:48 2008 +0800 arch/sh/boards/board-ap325rxa.c: removed duplicated #include Removed duplicated include in arch/sh/boards/board-ap325rxa.c. Signed-off-by: Huang Weiyi Signed-off-by: Paul Mundt commit 9cb7117fa4858468014f76bd996076985111e955 Author: Guennadi Liakhovetski Date: Sun Aug 3 00:02:35 2008 +0100 [ARM] 5182/1: pxa: Fix pcm990 compilation Compiling pcm990 produces an error: In file included from arch/arm/mach-pxa/pcm990-baseboard.c:25: include/linux/ide.h:645: error: 'CONFIG_IDE_MAX_HWIFS' undeclared here (not in a function) Fix it by removing unneeded header include. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Russell King commit cf368d2f9aced8adc8bd6b1f04294a71551d5fce Author: Alexander Beregalov Date: Sun Aug 3 03:03:57 2008 +0400 drivers/video/console/promcon.c: fix build error drivers/video/console/promcon.c:158: error: implicit declaration of function 'con_protect_unimap' Introduced by commit a29ccf6f823a84d89e1c7aaaf221cf7282022024 ("embedded: fix vc_translate operator precedence"). Signed-off-by: Alexander Beregalov Cc: Tim Bird Signed-off-by: David Woodhouse commit e5a4a72d4f88f4389e9340d383ca67031d1b8536 Author: Lennert Buytenhek Date: Sun Aug 3 01:23:10 2008 -0700 net: use software GSO for SG+CSUM capable netdevices If a netdevice does not support hardware GSO, allowing the stack to use GSO anyway and then splitting the GSO skb into MSS-sized pieces as it is handed to the netdevice for transmitting is likely still a win as far as throughput and/or CPU usage are concerned, since it reduces the number of trips through the output path. This patch enables the use of GSO on any netdevice that supports SG. If a GSO skb is then sent to a netdevice that supports SG but does not support hardware GSO, net/core/dev.c:dev_hard_start_xmit() will take care of doing the necessary GSO segmentation in software. Signed-off-by: Lennert Buytenhek Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 745e203164a9057e0de769ff4649e6e455daf753 Author: Chris Larson Date: Sun Aug 3 01:10:55 2008 -0700 net: fix missing pneigh entries in the neighbor seq_file code When pneigh entries exist, but the user's read buffer isn't sufficient to hold them all, one of the pneigh entries will be missing from the results. In neigh_get_idx_any, the number of elements which neigh_get_idx encountered is not correctly subtracted from the position number before the call to pneigh_get_idx. neigh_get_idx reduces the position by 1 for each call to neigh_get_next, but it does not reduce it by one for the first element (neigh_get_first). The patch alters the neigh_get_idx and pneigh_get_idx functions to subtract one from pos, for the first element, when pos is non-zero. Signed-off-by: Chris Larson Signed-off-by: David S. Miller commit bff69732c9947f821a64a8477f7dcaa9c30e6a69 Author: Chris Larson Date: Sun Aug 3 01:02:41 2008 -0700 net: in the first call to neigh_seq_next, call neigh_get_first, not neigh_get_idx. neigh_seq_next won't be called both with *pos > 0 && v == SEQ_START_TOKEN, so there's no point calling neigh_get_idx when we're on the start token, just call neigh_get_first directly. Signed-off-by: Chris Larson Signed-off-by: David S. Miller commit 7e43f1128d4c4bd91786ca6abff45a91e88f9776 Author: David S. Miller Date: Sat Aug 2 23:27:37 2008 -0700 pkt_sched: Make sure RTNL is held in qdisc_root_lock(). It is the only legal environment in which this can be used. Add some commentary explaining the situation. Signed-off-by: David S. Miller commit 35ed4e75989c4e84a44b25569bbf09b98f923880 Author: David S. Miller Date: Sat Aug 2 23:25:50 2008 -0700 mac80211: Use queue_lock() in ieee80211_ht_agg_queue_remove(). qdisc_root_lock() is only %100 safe to use when the RTNL semaphore is held. Signed-off-by: David S. Miller commit 5fb662297b8a4bdadd60371c34b760efca948ebc Author: David S. Miller Date: Sat Aug 2 20:02:43 2008 -0700 pkt_sched: Use qdisc_lock() on already sampled root qdisc. Based upon a bug report by Jeff Kirsher. Don't use qdisc_root_lock() in these cases as the root qdisc could have been changed, and we'd thus lock the wrong object. Tested by Emil S Tantilov who confirms that this seems to fix the problem. Signed-off-by: David S. Miller commit 7d55992d60caa390460bad1a974eb2b3c11538f4 Author: Eric Sandeen Date: Sat Aug 2 21:22:18 2008 -0400 ext4: remove write-only variables from ext4_ordered_write_end The variables 'from' and 'to' are not used anywhere. Signed-off-by: Eric Sandeen Acked-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 596400f0f322c78347e35c197b66faf09a9c1e02 Author: Adrian Bunk Date: Sat Aug 2 19:53:44 2008 +0300 sh/boards/Makefile typo fix The following build error was caused by an obvious typo: <-- snip --> ... LD arch/sh/mm/built-in.o make[2]: *** No rule to make target `arch/sh/boards/board-shmin..o', needed by `arch/sh/boards/built-in.o'. Stop. <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Paul Mundt commit bccf650270a94cec6e9238743e84c6e01de30c70 Author: Russell King Date: Sat Aug 2 22:33:18 2008 +0100 [ARM] Fix explicit asm(-arm)?/arch-foo references No file should be explicitly referencing its own platform headers by specifying an absolute include path. Fix these paths to use standard includes. Signed-off-by: Russell King commit 4baa9922430662431231ac637adedddbb0cfb2d7 Author: Russell King Date: Sat Aug 2 10:55:55 2008 +0100 [ARM] move include/asm-arm to arch/arm/include/asm Move platform independent header files to arch/arm/include/asm, leaving those in asm/arch* and asm/plat* alone. Signed-off-by: Russell King commit 85ebd00334099fd5d296bcae74a66c943d46686d Author: Marc Zyngier Date: Sat Aug 2 19:12:23 2008 +0200 Fix IHEX firmware generation/loading Fix both the IHEX firmware generation (len field always null, and EOF marker a byte too short) and loading (struct ihex_binrec needs to be packed to reflect the on-disk structure). Signed-off-by: Marc Zyngier Signed-off-by: David Woodhouse commit 071f4924844c435a3ae0cdbab7d7df2f1da85713 Merge: d9c5661... f1136d0... Author: Linus Torvalds Date: Sat Aug 2 09:14:49 2008 -0700 Merge git://git.infradead.org/users/dwmw2/random-2.6 * git://git.infradead.org/users/dwmw2/random-2.6: [MTD] Fix !CONFIG_BLOCK compile for mtdsuper.c firmware: silence __fw_modbuild and __fw_modinst 'Nothing to be done' messages commit d9c566198bfdf72a041322a093fdc1a2dc231170 Merge: 1726384... 0a4949c... Author: Linus Torvalds Date: Sat Aug 2 09:14:23 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Do not clobber %g7 in setcontext() trap. sparc64: Kill __show_regs(). sparc: Add __KERNEL__ ifdef protection to pt_regs helpers. sparc64: Kill smp_report_regs(). sparc64: Kill VERBOSE_SHOWREGS code. sparc64: Hook up trigger_all_cpu_backtrace(). sparc64: Make global reg dumping even more useful. sparc: Ignore drivers/video/console/promcon_tbl.c conmakehash generated file sparc64: FUTEX_OP_ANDN fix sparc: merge of_platform_{32,64}.h sparc64: Kill isa_bus_type. sparc64: Fix global reg snapshotting on self-cpu. commit 17263849c7ad2279667dd298083eceefcd1b5845 Author: OGAWA Hirofumi Date: Sat Aug 2 13:59:37 2008 +0900 fat: Fix allow_utime option FAT has to handle the newly introduced ATTR_TIMES_SET for allow_utime option. Signed-off-by: OGAWA Hirofumi Signed-off-by: Linus Torvalds commit 84209e02de48d72289650cc5a7ae8dd18223620f Author: Miklos Szeredi Date: Fri Aug 1 20:28:47 2008 +0200 mm: dont clear PG_uptodate on truncate/invalidate Brian Wang reported that a FUSE filesystem exported through NFS could return I/O errors on read. This was traced to splice_direct_to_actor() returning a short or zero count when racing with page invalidation. However this is not FUSE or NFSD specific, other filesystems (notably NFS) also call invalidate_inode_pages2() to purge stale data from the cache. If this happens while such pages are sitting in a pipe buffer, then splice(2) from the pipe can return zero, and read(2) from the pipe can return ENODATA. The zero return is especially bad, since it implies end-of-file or disconnected pipe/socket, and is documented as such for splice. But returning an error for read() is also nasty, when in fact there was no error (data becoming stale is not an error). The same problems can be triggered by "hole punching" with madvise(MADV_REMOVE). Fix this by not clearing the PG_uptodate flag on truncation and invalidation. Signed-off-by: Miklos Szeredi Acked-by: Nick Piggin Cc: Andrew Morton Cc: Jens Axboe Signed-off-by: Linus Torvalds commit 31981db0d0b665713ab3e9531f936fdb67947225 Author: Karsten Keil Date: Sat Aug 2 16:40:37 2008 +0200 Add DIP switch readout for HFC-4S IOB4ST Also the HFC-4S IOB4ST has DIP switches and jumpers to configure the port. Signed-off-by: Karsten Keil commit b3e0aeeb7e0f89791c4c3bdfd98b36074c5178e6 Author: Karsten Keil Date: Sat Aug 2 16:35:53 2008 +0200 Fix remaining big endian issue of hfcmulti The driver was not so bad at big endian at all, only the optimised fifo read/write functions need a fix, with this fix the driver works on a pegasus PPC machine. Signed-off-by: Karsten Keil commit ff4cc1de2401ad44ae084c3f5a9e898af0879520 Author: Karsten Keil Date: Wed Jul 30 18:26:58 2008 +0200 mISDN cleanup user interface The channelmap should have the same size on 32 and 64 bit systems and should not depend on endianess. Thanks to David Woodhouse for spotting this. Signed-off-by: Karsten Keil commit 780aefed1e179b23dcfbd6cfcb627ec3bd0a164c Author: Karsten Keil Date: Tue Jul 29 18:47:22 2008 +0200 mISDN fix main ISDN Makefile Compile hardware directory independent from selecting CAPI support. Signed-off-by: Karsten Keil commit ff4db0a043a5dee7180bdffd178e61cd02812c68 Author: Russell King Date: Sat Aug 2 15:21:31 2008 +0100 [ARM] Remove explicit dependency for misc.o from compressed/Makefile Signed-off-by: Russell King commit 82f97b8d3cb3982ec97e081598c671fab2c321b0 Author: Ivo van Doorn Date: Sat Aug 2 01:31:09 2008 -0700 rt2x00: Fix compile warning rt2x00usb_vendor_request_large_buff is write-only, so it is safe to make the argument a const. Fixes compile warning: drivers/net/wireless/rt2x00/rt73usb.c: In function 'rt73usb_load_firmware': drivers/net/wireless/rt2x00/rt73usb.c:916: warning: passing argument 5 of 'rt2x00usb_vendor_request_large_buff' discards qualifiers from pointer target typ Signed-off-by: Ivo van Doorn Signed-off-by: David S. Miller commit f1136d022af8f07a97f59c6d07483bdb82ffbd8e Author: David Woodhouse Date: Sat Aug 2 00:01:21 2008 +0100 [MTD] Fix !CONFIG_BLOCK compile for mtdsuper.c As reported by Adrian Bunk, commit d5686b444ff3f72808d2b3fbd58672a86cdf38e7 (switch mtd and dm-table to lookup_bdev()) causes the following compile error with CONFIG_BLOCK=n: CC drivers/mtd/mtdsuper.o drivers/mtd/mtdsuper.c: In function `get_sb_mtd': drivers/mtd/mtdsuper.c:184: error: implicit declaration of function 'lookup_bdev' drivers/mtd/mtdsuper.c:184: warning: assignment makes pointer from integer without a cast drivers/mtd/mtdsuper.c:197: error: implicit declaration of function 'bdput' make[3]: *** [drivers/mtd/mtdsuper.o] Error 1 Fix it by putting the block device lookup inside #ifdef CONFIG_BLOCK Signed-off-by: David Woodhouse commit 759da9267177e5005c8f21e11d29d26f4f459744 Author: David Woodhouse Date: Fri Aug 1 23:58:36 2008 +0100 firmware: silence __fw_modbuild and __fw_modinst 'Nothing to be done' messages People don't like them and think they're errors. Leave the __fw_install one though; when 'make firmware_install' does nothing, it's best to have a 'Nothing to be done for...' message rather than just doing nothing. Signed-off-by: David Woodhouse commit e9e80ea5f2129e135e3a6fa260314b1c6d99b19a Merge: 2b12a4c... 56decd3... Author: David S. Miller Date: Fri Aug 1 22:08:51 2008 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 49de935c107a53b0eba336efceb1dc3a8be64f87 Author: Adrian Bunk Date: Sat Aug 2 01:13:44 2008 +0300 sh: fix LIBGCC Commit f15cbe6f1a4b4d9df59142fc8e4abb973302cf44 (sh: migrate to arch/sh/include/) moved KBUILD_CFLAGS (which is used by LIBGCC) below LIBGCC, causing build errors like the following: <-- snip --> ... LD .tmp_vmlinux1 arch/sh/kernel/built-in.o: In function `module_clk_recalc': clock-sh4.c:(.text+0x80f0): undefined reference to `__udivsi3_i4i' ... make[1]: *** [.tmp_vmlinux1] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Paul Mundt commit 4385e12b291a6816987cb88a74fc116f520180f8 Author: Paul Mundt Date: Sat Aug 2 07:14:09 2008 +0900 sh: Revert the location change of auto-generated asm/machtypes.h This ended up causing build breakage on O= builds, as reported by Adrian: <-- snip --> ... CC init/main.o In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/irq.h:4, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/irq.h:23, from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/hardirq.h:5, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/hardirq.h:7, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/asm-generic/local.h:5, from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/local.h:4, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/module.h:19, from /home/bunk/linux/kernel-2.6/git/linux-2.6/init/main.c:13: /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/machvec.h:15:27: error: asm/machtypes.h: No such file or directory make[2]: *** [init/main.o] Error 1 <-- snip --> So we simply move machtypes.h back to its original place. asm-offsets.h is still generated there regardless, until such a time that we find a better place to stash auto-generated files. Reported-by: Adrian Bunk Signed-off-by: Paul Mundt commit 2b12a4c524812fb3f6ee590a02e65b95c8c32229 Merge: 4744b43... 7f30491... Author: Linus Torvalds Date: Fri Aug 1 14:59:11 2008 -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] Move include/asm-ia64 to arch/ia64/include/asm commit 4744b43431e8613f920c5cba88346756f53c5165 Author: Tim Bird Date: Fri Aug 1 14:05:50 2008 -0700 embedded: fix vc_translate operator precedence This fixes a bug in operator precedence in the newly introduced vc_translate macro. Without this fix, the translation of some characters on the kernel console is garbled. This patch was copied to the e-mail list previously for testing. Now, all reports confirm that it works, so this is an official post for application. Signed-off-by: Tim Bird Signed-off-by: David Woodhouse commit 3669bc143fb3d389918379547f4a6b28a757b7fe Author: Jack Steiner Date: Fri Aug 1 15:08:15 2008 -0500 Remove EXPORTS of follow_page & zap_page_range Delete 2 EXPORTs that were accidentally sent upstream. Signed-off-by: Jack Steiner Signed-off-by: Linus Torvalds commit a97762a77f927577525868e39661084170ce3605 Author: Steven Rostedt Date: Thu Jul 31 12:40:52 2008 -0400 dual license ftrace.txt I asked legal about the licensing of ftrace.txt, and they told me that, unless the Documentation directory is specifically set up to handle non GPL licenses (which it does not appear to be), then it would be best to put ftrace.txt under the GPL. This patch adds a dual license to ftrace.txt such that it is under both the FDL and the GPL. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit 784dd7b64ca661722f539db906d56ce54906f2fb Author: David Howells Date: Thu Jul 31 13:46:33 2008 +0100 FRV: Wire up new system calls Wire up for FRV the system calls that were added in the last merge window. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 02c363808981b67e631fe71cc7e952497f761bef Author: David Howells Date: Thu Jul 31 13:01:30 2008 +0100 MN10300: Wire up new system calls Wire up system calls added in the last merge window for the MN10300 arch. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 3ab36ab68531ad90648fdeedcaf437f121572ede Author: Eugeniy Meshcheryakov Date: Thu Jul 31 10:03:19 2008 +0100 try harder to load tty ldisc driver Currently function tty_ldisc_get() tries to load an ldisc driver module only when tty_ldisc_try_get() returns -EAGAIN. This happens only if module is being unloaded. If ldisc module is not loaded tty_ldisc_try_get() returns -EINVAL and this case is not handled in tty_ldisc_get(), so request_module() is not called. Attached patch fixes this by calling request_module() if tty_ldisc_try_get() returned any error code. I discovered this when my UMTS modem stopped working with 2.6.27-rc1 because module ppp_async was not loaded. Signed-off-by: Eugeniy Meshcheryakov Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 84ff7a001270258f71d6ab0d164f351e32c9718a Merge: 478735e... 1f4170e... Author: Linus Torvalds Date: Fri Aug 1 12:48:16 2008 -0700 Merge branch 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm * 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: KVM: s390: Fix kvm on IBM System z10 KVM: Advertise synchronized mmu support to userspace KVM: Synchronize guest physical memory map to host virtual memory map KVM: Allow browsing memslots with mmu_lock KVM: Allow reading aliases with mmu_lock commit 478735e42bfa047384afa72dceb408035532db20 Merge: 0ef89d2... 6f5fd8e... Author: Linus Torvalds Date: Fri Aug 1 12:47:53 2008 -0700 Merge branch 'zero-len' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.