commit 3c25fa740e2084a3950f581378ec29a3c307ddfc Merge: 9d6fa8f 30b4caf Author: Linus Torvalds Date: Sun Jun 12 11:06:36 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: use join_transaction in btrfs_evict_inode() Btrfs - use %pU to print fsid Btrfs: fix extent state leak on failed nodatasum reads btrfs: fix unlocked access of delalloc_inodes Btrfs: avoid stack bloat in btrfs_ioctl_fs_info() btrfs: remove 64bit alignment padding to allow extent_buffer to fit into one fewer cacheline Btrfs: clear current->journal_info on async transaction commit Btrfs: make sure to recheck for bitmaps in clusters btrfs: remove unneeded includes from scrub.c btrfs: reinitialize scrub workers btrfs: scrub: errors in tree enumeration Btrfs: don't map extent buffer if path->skip_locking is set Btrfs: unlock the trans lock properly Btrfs: don't map extent buffer if path->skip_locking is set Btrfs: fix duplicate checking logic Btrfs: fix the allocator loop logic Btrfs: fix bitmap regression Btrfs: don't commit the transaction if we dont have enough pinned bytes Btrfs: noinline the cluster searching functions Btrfs: cache bitmaps when searching for a cluster commit 9d6fa8fa7042622f8ed9c0988de665464d4584a6 Merge: c7ca6b0 05e2054 Author: Linus Torvalds Date: Sun Jun 12 11:04:25 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda: Fix inaudible internal speakers on CyberpowerPC Gamer Xplorer N57001 laptop ALSA: Use %pV for snd_printk() ALSA: hda - Fix initialization of hp pins with master_mute in Realtek ALSA: hda - Fix invalid unsol tag for some alc262 model quirks ASoC: SAMSUNG: Fix the incorrect referencing of I2SCON register ASoC: snd_soc_new_{mixer,mux,pga} make sure to use right DAPM context ASoC: fsl: fix initialization of DMA buffers ASoC: WM8804 does not support sample rates below 32kHz ASoC: Fix WM8962 headphone volume update for use of advanced caches ASoC: Blackfin: bf5xx-ad1836: Fix codec device name ALSA: hda: Fix quirk for Dell Inspiron 910 ASoC: AD1836: Fix setting the PCM format ASoC: Check for NULL register bank in snd_soc_get_cache_val() ASoC: Add missing break in WM8915 FLL source selection ASoC: Only update SYSCLK_ENA when pausing WM8915 SYSCLK ASoC: atmel_ssc: Don't try to free ssc if request failed commit c7ca6b0fcfb309dbb3d81dc9315e960f6fb14cb9 Merge: 08d63aa 3307d0d Author: Linus Torvalds Date: Sun Jun 12 11:04:11 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: ide-cd: signedness warning fix again commit 08d63aac436b2ad35d9e864b9ebb05bc8b9bb653 Merge: 152b92d e5ea3f1 Author: Linus Torvalds Date: Sun Jun 12 11:03:29 2011 -0700 Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 * 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6: gpio/basic_mmio: add missing include of spinlock_types.h gpio/nomadik: fix sleepmode for elder Nomadik commit 152b92db7ad2c6d6c11c8eab07e90b73a90c8b76 Merge: b99ca60 84860c7 Author: Linus Torvalds Date: Sun Jun 12 11:03:08 2011 -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: (55 commits) ISDN, hfcsusb: Don't leak in hfcsusb_ph_info() netpoll: call dev_put() on error in netpoll_setup() net: ep93xx_eth: fix DMA API violations net: ep93xx_eth: drop GFP_DMA from call to dma_alloc_coherent() net: ep93xx_eth: allocate buffers using kmalloc() net: ep93xx_eth: pass struct device to DMA API functions ep93xx: set DMA masks for the ep93xx_eth vlan: Fix the ingress VLAN_FLAG_REORDER_HDR check dl2k: EEPROM CRC calculation wrong endianess on bigendian machine NET: am79c961: fix assembler warnings NET: am79c961: ensure multicast filter is correctly set at open NET: am79c961: ensure asm() statements are marked volatile ethtool.h: fix typos ep93xx_eth: Update MAINTAINERS ipv4: Fix packet size calculation for raw IPsec packets in __ip_append_data netpoll: prevent netpoll setup on slave devices net: pmtu_expires fixes gianfar:localized filer table iwlegacy: fix channel switch locking mac80211: fix IBSS teardown race ... commit b99ca60c83a631adaba9c2fff8f2dd14d3517a61 Merge: 56a2105 1780f2d Author: Linus Torvalds Date: Sat Jun 11 19:56:25 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: AppArmor: Fix sleep in invalid context from task_setrlimit commit 84860c725364372a331589a600ce6a00437a14f8 Author: Jesper Juhl Date: Sat Jun 11 06:36:42 2011 +0000 ISDN, hfcsusb: Don't leak in hfcsusb_ph_info() We leak the memory allocated to 'phi' when the variable goes out of scope in hfcsusb_ph_info(). Signed-off-by: Jesper Juhl Signed-off-by: David S. Miller commit 83fe32de63e60af34fa8dae83716cb13b8677abd Author: Dan Carpenter Date: Sat Jun 11 18:55:22 2011 -0700 netpoll: call dev_put() on error in netpoll_setup() There is a dev_put(ndev) missing on an error path. This was introduced in 0c1ad04aecb "netpoll: prevent netpoll setup on slave devices". Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit f1c089e3192f1afdfa76226dc38ef81b08ac810d Author: Mika Westerberg Date: Sat Jun 11 08:39:58 2011 +0000 net: ep93xx_eth: fix DMA API violations Russell King said: > > So, to summarize what its doing: > > 1. It allocates buffers for rx and tx. > 2. It maps them with dma_map_single(). > This transfers ownership of the buffer to the DMA device. > 3. In ep93xx_xmit, > 3a. It copies the data into the buffer with skb_copy_and_csum_dev() > This violates the DMA buffer ownership rules - the CPU should > not be writing to this buffer while it is (in principle) owned > by the DMA device. > 3b. It then calls dma_sync_single_for_cpu() for the buffer. > This transfers ownership of the buffer to the CPU, which surely > is the wrong direction. > 4. In ep93xx_rx, > 4a. It calls dma_sync_single_for_cpu() for the buffer. > This at least transfers the DMA buffer ownership to the CPU > before the CPU reads the buffer > 4b. It then uses skb_copy_to_linear_data() to copy the data out. > At no point does it transfer ownership back to the DMA device. > 5. When the driver is removed, it dma_unmap_single()'s the buffer. > This transfers ownership of the buffer to the CPU. > 6. It frees the buffer. > > While it may work on ep93xx, it's not respecting the DMA API rules, > and with DMA debugging enabled it will probably encounter quite a few > warnings. This patch fixes these violations. Signed-off-by: Mika Westerberg Acked-by: Russell King Acked-by: H Hartley Sweeten Tested-by: Petr Stetiar Signed-off-by: David S. Miller commit 1f758a4341ac83289a549e6ba2d29a08cf639717 Author: Mika Westerberg Date: Sat Jun 11 08:39:57 2011 +0000 net: ep93xx_eth: drop GFP_DMA from call to dma_alloc_coherent() Commit a197b59ae6e8 (mm: fail GFP_DMA allocations when ZONE_DMA is not configured) made page allocator to return NULL if GFP_DMA is set but CONFIG_ZONE_DMA is disabled. This causes ep93xx_eth to fail: WARNING: at mm/page_alloc.c:2251 __alloc_pages_nodemask+0x11c/0x638() Modules linked in: [] (unwind_backtrace+0x0/0xf4) from [] (warn_slowpath_common+0x48/0x60) [] (warn_slowpath_common+0x48/0x60) from [] (warn_slowpath_null+0x1c/0x24) [] (warn_slowpath_null+0x1c/0x24) from [] (__alloc_pages_nodemask+0x11c/0x638) [] (__alloc_pages_nodemask+0x11c/0x638) from [] (__dma_alloc+0x8c/0x3ec) [] (__dma_alloc+0x8c/0x3ec) from [] (dma_alloc_coherent+0x54/0x60) [] (dma_alloc_coherent+0x54/0x60) from [] (ep93xx_open+0x20/0x864) [] (ep93xx_open+0x20/0x864) from [] (__dev_open+0xb8/0x108) [] (__dev_open+0xb8/0x108) from [] (__dev_change_flags+0x70/0x128) [] (__dev_change_flags+0x70/0x128) from [] (dev_change_flags+0x10/0x48) [] (dev_change_flags+0x10/0x48) from [] (ip_auto_config+0x190/0xf68) [] (ip_auto_config+0x190/0xf68) from [] (do_one_initcall+0x34/0x18c) [] (do_one_initcall+0x34/0x18c) from [] (kernel_init+0x94/0x134) [] (kernel_init+0x94/0x134) from [] (kernel_thread_exit+0x0/0x8) Since there is no restrictions for DMA on ep93xx, we can fix this by just removing the GFP_DMA flag from the call. Signed-off-by: Mika Westerberg Acked-by: Russell King Acked-by: H Hartley Sweeten Tested-by: Petr Stetiar Signed-off-by: David S. Miller commit 3247a1fcee49b571b40c4bd723439ce5c64f56ad Author: Mika Westerberg Date: Sat Jun 11 08:39:56 2011 +0000 net: ep93xx_eth: allocate buffers using kmalloc() We can use simply kmalloc() to allocate the buffers. This also simplifies the code and allows us to perform DMA sync operations more easily. Memory is allocated with only GFP_KERNEL since there are no DMA allocation restrictions on this platform. Signed-off-by: Mika Westerberg Acked-by: Russell King Acked-by: H Hartley Sweeten Tested-by: Petr Stetiar Signed-off-by: David S. Miller commit fc9b4910b00039da054f221e2821be0519261101 Author: Mika Westerberg Date: Sat Jun 11 08:39:55 2011 +0000 net: ep93xx_eth: pass struct device to DMA API functions We shouldn't use NULL for any DMA API functions, unless we are dealing with ISA or EISA device. So pass correct struct dev pointer to these functions. Signed-off-by: Mika Westerberg Signed-off-by: David S. Miller commit fa70cf472c0bc3a0d7e613a418cfc1117b796c6c Author: Mika Westerberg Date: Sat Jun 11 08:39:54 2011 +0000 ep93xx: set DMA masks for the ep93xx_eth Since the driver uses the DMA API, we should pass it valid DMA masks. Signed-off-by: Mika Westerberg Acked-by: Russell King Acked-by: H Hartley Sweeten Tested-by: Petr Stetiar Signed-off-by: David S. Miller commit 0b5c9db1b11d3175bb42b80663a9f072f801edf5 Author: Jiri Pirko Date: Fri Jun 10 06:56:58 2011 +0000 vlan: Fix the ingress VLAN_FLAG_REORDER_HDR check Testing of VLAN_FLAG_REORDER_HDR does not belong in vlan_untag but rather in vlan_do_receive. Otherwise the vlan header will not be properly put on the packet in the case of vlan header accelleration. As we remove the check from vlan_check_reorder_header rename it vlan_reorder_header to keep the naming clean. Fix up the skb->pkt_type early so we don't look at the packet after adding the vlan tag, which guarantees we don't goof and look at the wrong field. Use a simple if statement instead of a complicated switch statement to decided that we need to increment rx_stats for a multicast packet. Hopefully at somepoint we will just declare the case where VLAN_FLAG_REORDER_HDR is cleared as unsupported and remove the code. Until then this keeps it working correctly. Signed-off-by: Eric W. Biederman Signed-off-by: Jiri Pirko Acked-by: Changli Gao Signed-off-by: David S. Miller commit 06866bf5c5ad8989119a145fdb54a9fbcafa702d Author: Daniel Hellstrom Date: Fri Jun 10 04:55:16 2011 +0000 dl2k: EEPROM CRC calculation wrong endianess on bigendian machine Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit f777737885a69d37132c956f1e8deab676693157 Author: Russell King - ARM Linux Date: Fri Jun 10 00:52:35 2011 +0000 NET: am79c961: fix assembler warnings Fix: /tmp/ccvoZ6h8.s: Assembler messages: /tmp/ccvoZ6h8.s:284: Warning: register range not in ascending order /tmp/ccvoZ6h8.s:881: Warning: register range not in ascending order /tmp/ccvoZ6h8.s:1087: Warning: register range not in ascending order by ensuring that we have temporary variables placed into specific registers. Reorder the code a bit to allow the resulting assembly to be slightly more optimal. Signed-off-by: Russell King Signed-off-by: David S. Miller commit bfc6501324427a97814de1587f89d73bf8677057 Author: Russell King - ARM Linux Date: Fri Jun 10 00:52:14 2011 +0000 NET: am79c961: ensure multicast filter is correctly set at open We were clearing out the multicast filter whenever the interface was upped, and not setting the mode bits correctly. This can cause problems if there are any multicast addresses already set at this point, or if ALLMULTI was set. Signed-off-by: Russell King Signed-off-by: David S. Miller commit d814dee0e1a5d9b2f858b91551a0dd0608f777a1 Author: Russell King - ARM Linux Date: Fri Jun 10 00:51:54 2011 +0000 NET: am79c961: ensure asm() statements are marked volatile Without this the compiler can (and does) optimize register reads away from within loops, and other such optimizations. Signed-off-by: Russell King Signed-off-by: David S. Miller commit 3307d0d83b7bf636dc6dd2aa4a584d0f52cc185b Author: Connor Hansen Date: Sat Jun 11 15:06:48 2011 -0700 ide-cd: signedness warning fix again One of the legit warnings 'make W=3 drivers/ide/ide-cd.c' generates is: drivers/ide/ide-cd.c: In function ide_cd_do_request drivers/ide/ide-cd.c:828:2: warning: conversion to int from \ unsigned int may change the sign of the result drivers/ide/ide-cd.c:833:2: warning: conversion to int from \ unsigned int may change the sign of the result nsectors is declared int, should be unsigned int. blk_rq_sectors() returns unsigned int, and ide_complete_rq expects unsigned int as well. Fixes both warnings. Signed-off-by: Connor Hansen Signed-off-by: David S. Miller commit 56a210526adb2854d5b7c398a40260720390ee05 Author: David Howells Date: Sat Jun 11 12:29:58 2011 +0100 linux/seqlock.h should #include asm/processor.h for cpu_relax() It uses cpu_relax(), and so needs Without this patch, I see: CC arch/mn10300/kernel/asm-offsets.s In file included from include/linux/time.h:8, from include/linux/timex.h:56, from include/linux/sched.h:57, from arch/mn10300/kernel/asm-offsets.c:7: include/linux/seqlock.h: In function 'read_seqbegin': include/linux/seqlock.h:91: error: implicit declaration of function 'cpu_relax' whilst building asb2364_defconfig on MN10300. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 30b4caf5d73af5c99cf1b2b46496d8bc35330992 Author: Li Zefan Date: Wed Jun 8 03:56:44 2011 +0000 Btrfs: use join_transaction in btrfs_evict_inode() The WARN_ON() in start_transaction() was triggered while balancing. The cause is btrfs_relocate_chunk() started a transaction and then called iput() on the inode that stores free space cache, and iput() called btrfs_start_transaction() again. Reported-by: Tsutomu Itoh Signed-off-by: Li Zefan Reviewed-by: Josef Bacik Signed-off-by: Chris Mason commit 22b63a2971c5657dfc1bf4514f9410fc90c8b2c2 Author: Ilya Dryomov Date: Wed Feb 9 16:05:31 2011 +0200 Btrfs - use %pU to print fsid Get rid of FIXME comment. Uuids from dmesg are now the same as uuids given by btrfs-progs. Signed-off-by: Ilya Dryomov Signed-off-by: Chris Mason commit 08d2f347e877e489ca098c87a6fd2e872fef9767 Author: Jan Schmidt Date: Wed May 4 16:18:50 2011 +0200 Btrfs: fix extent state leak on failed nodatasum reads When encountering an EIO while reading from a nodatasum extent, we insert an error record into the inode's failure tree. btrfs_readpage_end_io_hook returns early for nodatasum inodes. We'd better clear the failure tree in that case, otherwise the kernel complains about BUG extent_state: Objects remaining on kmem_cache_close() on rmmod. Signed-off-by: Jan Schmidt Signed-off-by: Chris Mason commit 0e735872fb4b157a2fc94d4443f367e9aeb533a6 Merge: 5be7675 6eef312 Author: Chris Mason Date: Fri Jun 10 18:58:08 2011 -0400 Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs-unstable-arne into for-linus commit 5be76758f35ec6578e5b9b150aa513ac26bd9c54 Author: David Sterba Date: Thu Jun 9 10:02:51 2011 +0000 btrfs: fix unlocked access of delalloc_inodes list_splice_init will make delalloc_inodes empty, but without a spinlock around, this may produce corrupted list head, accessed in many placess, The race window is very tight and nobody seems to have hit it so far. Signed-off-by: David Sterba Signed-off-by: Chris Mason commit 027ed2f0044e95a97ed34db2d55a9ca95ba84385 Author: Li Zefan Date: Wed Jun 8 08:27:56 2011 +0000 Btrfs: avoid stack bloat in btrfs_ioctl_fs_info() The size of struct btrfs_ioctl_fs_info_args is as big as 1KB, so don't declare the variable on stack. Signed-off-by: Li Zefan Reviewed-by: Josef Bacik Signed-off-by: Chris Mason commit 9eb9104c665aae2401a1723c044669eb10240072 Author: richard kennedy Date: Tue Jun 7 10:46:32 2011 +0000 btrfs: remove 64bit alignment padding to allow extent_buffer to fit into one fewer cacheline Reorder extent_buffer to remove 8 bytes of alignment padding on 64 bit builds. This shrinks its size to 128 bytes allowing it to fit into one fewer cache lines and allows more objects per slab in its kmem_cache. slabinfo extent_buffer reports :- before:- Sizes (bytes) Slabs ---------------------------------- Object : 136 Total : 123 SlabObj: 136 Full : 121 SlabSiz: 4096 Partial: 0 Loss : 0 CpuSlab: 2 Align : 8 Objects: 30 after :- Object : 128 Total : 4 SlabObj: 128 Full : 2 SlabSiz: 4096 Partial: 0 Loss : 0 CpuSlab: 2 Align : 8 Objects: 32 Signed-off-by: Richard Kennedy Signed-off-by: Chris Mason commit 38e880540f983045da7a00fbc50daad238207fc5 Author: Sage Weil Date: Fri Jun 10 18:43:13 2011 +0000 Btrfs: clear current->journal_info on async transaction commit Normally current->jouranl_info is cleared by commit_transaction. For an async snap or subvol creation, though, it runs in a work queue. Clear it in btrfs_commit_transaction_async() to avoid leaking a non-NULL journal_info when we return to userspace. When the actual commit runs in the other thread it won't care that it's current->journal_info is already NULL. Signed-off-by: Sage Weil Tested-by: Jim Schutt Signed-off-by: Chris Mason commit 38e87880666091fe9c572a7a2ed2e771d97ca5aa Author: Chris Mason Date: Fri Jun 10 16:36:57 2011 -0400 Btrfs: make sure to recheck for bitmaps in clusters Josef recently changed the free extent cache to look in the block group cluster for any bitmaps before trying to add a new bitmap for the same offset. This avoids BUG_ON()s due covering duplicate ranges. But it didn't go quite far enough. A given free range might span between one or more bitmaps or free space entries. The code has looping to cover this, but it doesn't check for clustered bitmaps every time. This shuffles our gotos to check for a bitmap in the cluster for every new bitmap entry we try to add. Signed-off-by: Chris Mason commit 05e205429d3f73ad4f9f0d84e8a95e978237d6fd Merge: 7ab1fc0 3319550 Author: Takashi Iwai Date: Fri Jun 10 17:49:34 2011 +0200 Merge branch 'fix/asoc' into for-linus commit e5ea3f12d41d96edf4ad9374db2b1725e457acec Author: Jamie Iles Date: Fri Jun 10 13:44:49 2011 +0100 gpio/basic_mmio: add missing include of spinlock_types.h include/linux/basic_mmio_gpio.h uses a spinlock_t without including any of the spinlock headers resulting in this compiler warning. include/linux/basic_mmio_gpio.h:51:2: error: expected specifier-qualifier-list before 'spinlock_t' Explicitly include linux/spinlock_types.h to fix it. Signed-off-by: Jamie Iles Signed-off-by: Grant Likely commit 7ab1fc0af3464d231e17eb729a03495d93d0cc5c Author: Daniel T Chen Date: Fri Jun 10 10:14:01 2011 -0400 ALSA: hda: Fix inaudible internal speakers on CyberpowerPC Gamer Xplorer N57001 laptop BugLink: https://launchpad.net/bugs/761171 The original reporter needs the model=auto quirk for his internal speakers to be audible in the latest daily snapshot, so add an entry in the quirk table for his PCI SSID. A trivially different version of this patch using the model=asus quirk should be applied to the 2.6.38 and 2.6.39 stable kernels. We don't use the asus quirk in 3.0-rc2, because 3.0-rc2's autoparser is much improved. Reported-and-tested-by: tomdeering7 Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 890ee02ac12c02c4712b6d7dd062ff4d6d37691c Author: Takashi Iwai Date: Fri Jun 10 15:32:31 2011 +0200 ALSA: Use %pV for snd_printk() Clean up snd_printk() helper using the %pV prefix for recursive printks. This also automagically fixes an Oops with RO/NX-enabled modules. Tested-by: Maarten Lankhorst Signed-off-by: Takashi Iwai commit c0a20263dbe1fc5f394913d71063c9cd8282c5db Author: Takashi Iwai Date: Fri Jun 10 15:28:15 2011 +0200 ALSA: hda - Fix initialization of hp pins with master_mute in Realtek Some Reatlek model quirks use master_mute bool switch for controlling the master-mute of outputs. For these cases, the initialization of HP pins/amps were forgotten during the transition to the common automute helper function in 3.0 development time, and resulted in the muted HP output as default. This patch fixes the issue by adjusting the HP output explicitly with master_mute switch. Tested-by: Michal Hocko Signed-off-by: Takashi Iwai commit 20f5e0b36d968326fab3b720035f226113e34ae9 Author: Takashi Iwai Date: Fri Jun 10 09:31:54 2011 +0200 ALSA: hda - Fix invalid unsol tag for some alc262 model quirks The tag number was forgotten to be fixed after cleaning up the model quirks for ALC262 fujitsu and lenovo-3000 models. Tested-by: Michal Hocko Signed-off-by: Takashi Iwai commit 6eef3125886df260ca0e8758d141308152226f6a Author: Arne Jansen Date: Fri Jun 10 13:04:58 2011 +0200 btrfs: remove unneeded includes from scrub.c Signed-off-by: Arne Jansen commit 632dd772fcbde2ba37c0e8983bd38ef4a1eac906 Author: Arne Jansen Date: Fri Jun 10 12:07:07 2011 +0200 btrfs: reinitialize scrub workers Scrub starts the workers each time a scrub starts and stops them after it finished. This patch adds an initialization for the workers before each start, otherwise the workers behave strangely. Signed-off-by: Arne Jansen commit 8c51032f978bac5bec5dae0c5de4f85db97c1cc9 Author: Arne Jansen Date: Fri Jun 3 10:09:26 2011 +0200 btrfs: scrub: errors in tree enumeration due to the semantics of btrfs_search_slot the path can point to an invalid slot when ret > 0. This condition went unnoticed, which in turn could have led to an incomplete scrubbing. Signed-off-by: Arne Jansen commit ad3e34bba4b64ab8e1f5ea1a17768e1a0d9648ea Author: Josef Bacik Date: Wed Jun 8 14:45:50 2011 -0400 Btrfs: don't map extent buffer if path->skip_locking is set Arne's scrub stuff exposed a problem with mapping the extent buffer in reada_for_search. He searches the commit root with multiple threads and with skip_locking set, so we can race and overwrite node->map_token since node isn't locked. So fix this so that we only map the extent buffer if we don't already have a map_token and skip_locking isn't set. Without this patch scrub would panic almost immediately, with the patch it doesn't panic anymore. Thanks, Reported-by: Arne Jansen Signed-off-by: Josef Bacik commit 33195500edf260e8c8809ab9dfc67f50e0ce031f Author: Sangbeom Kim Date: Fri Jun 10 10:36:54 2011 +0900 ASoC: SAMSUNG: Fix the incorrect referencing of I2SCON register If DMA active status should be checked, I2SCON register should be referenced. In this patch, Fix the incorrect referencing of I2SCON register. Reported-by : Lakkyung Jung Signed-off-by: Sangbeom Kim Acked-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown Cc: stable@kernel.org commit 45694c2895c194ffa74becde4120af6eb6afeefe Merge: 7f45e5c 8c56cac Author: Linus Torvalds Date: Thu Jun 9 20:14:21 2011 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: fix unexpectedly frozen port after ata_eh_reset() commit 7f45e5cd1718ed769295033ca214032848a0097d Merge: 6aeccec 10f0d07 Author: Linus Torvalds Date: Thu Jun 9 16:33:01 2011 -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: sparc32, leon: bugfix in LEON SMP interrupt init sparc32, sun4m: bugfix in SMP IPI traphandler sparc: Remove unnecessary semicolons Add support for allocating irqs for bootbus devices Do not skip interrupt sources in sun4d interrupt handler and acknowledge interrupts correctly Restructure sun4d_build_device_irq so that timer interrupts can be allocated sparc: PCIC_PCI needs SPARC32 dependency sparc: Do not select GENERIC_HARDIRQS_NO_DEPRECATED sparc32,leon: add GRPCI2 PCI Host driver sparc32,leon: added LEON-common low-level PCI routines sparc32: added CONFIG_PCIC_PCI Kconfig setting commit 6aecceccf5aa626b0af203e54ca62cbf308c53d8 Merge: dfb863a 5d61b9f Author: Linus Torvalds Date: Thu Jun 9 16:27:42 2011 -0700 Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: perf: Use make kernelversion instead of parsing the Makefile kbuild: Hack for depmod not handling X.Y versions kbuild: Move depmod call to a separate script kbuild: Fix for empty SUBLEVEL or PATCHLEVEL kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL kbuild: silence Nothing to be done for 'all' message commit 10f0d07c51516bd24b040016c6d4304eef05f115 Author: Daniel Hellstrom Date: Thu Jun 9 02:54:09 2011 +0000 sparc32, leon: bugfix in LEON SMP interrupt init During converting per-cpu ticker to genirq layer some IRQ initialization code was removed by commit 2cf9530420e446bb61f665d02afeb81070106900 ("sparc32,leon: per-cpu ticker use genirq per-cpu handler"). This patch reintroduces the code at the same place it was removed from. IRQ12 - IRQ14 will crash on LEON SMP without this patch because it will run the SUN4M IRQ trap handler. Reported-by: Jan Andersson Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit a7d82a0a3cd547494294baee7f9764ea44bead73 Author: Daniel Hellstrom Date: Thu Jun 9 02:54:08 2011 +0000 sparc32, sun4m: bugfix in SMP IPI traphandler Three new IPIs were introduced by commit ecbc42b70acbc6327adefe9635db93fcf62bf59d ("sparc32, sun4m: Implemented SMP IPIs support for SUN4M machines"), the old handler was already prepared for IPIs but handled only IRQ14 and IRQ13, this patch adds support for the new IPI at IRQ12. The IPI trap handler looks at the mask rather than the pending IRQ/IPI, this bug may have masked the problem above, introduced by the same commit. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit b4c8cc88c18213688268d1d53a51d97ce2f19a64 Author: Yegor Yefremov Date: Thu Jun 9 15:05:48 2011 -0700 ethtool.h: fix typos Signed-off-by: Yegor Yefremov Signed-off-by: David S. Miller commit 5587912fcff1da2ff8494fa33cf9d92dc6982c11 Author: H Hartley Sweeten Date: Thu Jun 9 15:00:21 2011 -0700 ep93xx_eth: Update MAINTAINERS Lennert stated that he has been short on time lately. Since I'm maintaining the ep93xx core stuff, I'm willing to also take over maintaining the Ethernet driver. Signed-off-by: H Hartley Sweeten Acked-by: Mika Westerberg Acked-by: Lennert Buytenhek Signed-off-by: David S. Miller commit 96d7303e9cfb6a9bc664174a4dfdb6fa689284fe Author: Steffen Klassert Date: Sun Jun 5 20:48:47 2011 +0000 ipv4: Fix packet size calculation for raw IPsec packets in __ip_append_data We assume that transhdrlen is positive on the first fragment which is wrong for raw packets. So we don't add exthdrlen to the packet size for raw packets. This leads to a reallocation on IPsec because we have not enough headroom on the skb to place the IPsec headers. This patch fixes this by adding exthdrlen to the packet size whenever the send queue of the socket is empty. This issue was introduced with git commit 1470ddf7 (inet: Remove explicit write references to sk/inet in ip_append_data) Signed-off-by: Steffen Klassert Signed-off-by: David S. Miller commit 5d61b9fd19d9f3cf653dbba615876e7792eea5ea Author: Michal Marek Date: Mon May 30 14:12:09 2011 +0200 perf: Use make kernelversion instead of parsing the Makefile Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Signed-off-by: Michal Marek commit bfe5424a8b31624e7a476f959d552999f931e7c7 Author: Michal Marek Date: Thu Jun 9 16:35:41 2011 +0200 kbuild: Hack for depmod not handling X.Y versions depmod from module-init-tools < 3.13 and the busybox depmod check if the kernel release starts with ... To support these versions, we create a symlink with two numbers prepended. Signed-off-by: Michal Marek commit fc4da9a3e68b1f64237fafda084f61067f568a99 Author: Michal Marek Date: Thu Jun 9 15:35:22 2011 +0200 kbuild: Move depmod call to a separate script Do not bloat the Makefile with multiline shell statements. No user-visible change intended. Signed-off-by: Michal Marek commit 78d3bb4483ba1b206dbaaf209219ed517b01f7da Author: Michal Marek Date: Mon May 30 13:37:20 2011 +0200 kbuild: Fix for empty SUBLEVEL or PATCHLEVEL expr treats all numbers as decimals, so prepending a zero is safe. Note that the KERNEL_VERSION() macro still takes three arguments, 3.0 has to be written as KERNEL_VERSION(3,0,0). Signed-off-by: Michal Marek commit cacd54ef49b75cb31d78bb7b8dd900690aac7bdf Author: Michal Marek Date: Mon May 30 13:36:07 2011 +0200 kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL Omit the second dot for releases without SUBLEVEL. If PATCHLEVEL is also empty, only display VERSION. Signed-off-by: Michal Marek commit 33d78647dc409784c18aa71995346e6955802fe0 Author: Linus Walleij Date: Thu Jun 9 11:08:47 2011 +0200 gpio/nomadik: fix sleepmode for elder Nomadik The mach-nomadik machine did not compile properly due to bad ux500-specific functions being called. Introduce new state variables to fix this up. Reported-by: Axel Lin Cc: Alessandro Rubini Cc: Prafulla Wadaskar Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit dfb863a714b81848504d3b73ca0ecae90b91cbc0 Merge: 461df4d 307cfe7 Author: Linus Torvalds Date: Thu Jun 9 13:50:25 2011 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Force page alignment for initrd reserved memory dtc/powerpc: remove obsolete .gitignore entries powerpc/85xx: fix race bug of calling request_irq after enable elbc interrupts powerpc/book3e: Fix CPU feature handling on e5500 in 32-bit mode powerpc/fsl_rio: Fix compile error when CONFIG_FSL_RIO not set commit 461df4ded3a143f09f9d0e870e7b16b787dc0591 Merge: 361932b 8aa460e Author: Linus Torvalds Date: Thu Jun 9 13:09:07 2011 -0700 Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: staging: iio: max517: Fix iio_info changes Staging: mei: fix debug code Staging: cx23885: fix include of altera.h staging: iio: error case memory leak fix staging: ath6kl: Fix a kernel panic during suspend/resume staging: gma500: get control from firmware framebuffer if conflicts staging: gma500: Skip bogus LVDS VBT mode and check for LVDS before adding backlight staging: usbip: bugfix prevent driver unbind staging: iio: industrialio-trigger: set iio_poll_func private_data staging: rts_pstor: use bitwise operator instead of logical one staging: fix ath6kl build when CFG80211 is not enabled staging: brcm80211: fix for 'multiple definition of wl_msg_level' build err staging: fix olpc_dcon build, needs BACKLIGHT_CLASS_DEVICE Staging: remove STAGING_EXCLUDE_BUILD option Staging: altera: move .h file to proper place commit 361932bf84657b5dc0779046c751f06998c0d81f Merge: 90494cc 5f98ecd Author: Linus Torvalds Date: Thu Jun 9 12:52:44 2011 -0700 Merge branch 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6 * 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6: swiotlb: Export swioltb_nr_tbl and utilize it as appropiate. commit 90494cc567319cd53574306f3b94fb3c7ff8fe88 Merge: 5ebe550 7f20caf Author: Linus Torvalds Date: Thu Jun 9 12:52:30 2011 -0700 Merge branch 'stable/broadcom.ibft-bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6 * 'stable/broadcom.ibft-bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6: iscsi_ibft: iscsi_ibft_find unused variable i commit 5ebe5500fb808c9079ec81a7841482c72d30de56 Merge: 29cf519 62b62c5 Author: Linus Torvalds Date: Thu Jun 9 12:52:05 2011 -0700 Merge branch 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32 * 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32: unicore32: using generic-y format for one line asm-generic files unicore32: change PERCPU to PERCPU_SECTION unicore32: add KBUILD_DEFCONFIG with unicore32_defconfig (old debug_defconfig) unicore32: change zImage physical address, though it's PIC codes unicore32: move rtc-puv3.c to drivers/rtc directory commit 29cf519ee086686e5f0fc91cbb2d601dd1190f9c Author: Joe Perches Date: Thu Jun 9 11:23:37 2011 -0700 vsprintf: Update %pI6c to not compress a single 0 RFC 5952 (http://tools.ietf.org/html/rfc5952) mandates that 2 or more consecutive 0's are required before using :: compression. Update ip6_compressed_string to match the RFC and update the http reference as well. Signed-off-by: Joe Perches Signed-off-by: Linus Torvalds commit dac853ae89043f1b7752875300faf614de43c74b Author: Mathias Krause Date: Thu Jun 9 20:05:18 2011 +0200 exec: delay address limit change until point of no return Unconditionally changing the address limit to USER_DS and not restoring it to its old value in the error path is wrong because it prevents us using kernel memory on repeated calls to this function. This, in fact, breaks the fallback of hard coded paths to the init program from being ever successful if the first candidate fails to load. With this patch applied switching to USER_DS is delayed until the point of no return is reached which makes it possible to have a multi-arch rootfs with one arch specific init binary for each of the (hard coded) probed paths. Since the address limit is already set to USER_DS when start_thread() will be invoked, this redundancy can be safely removed. Signed-off-by: Mathias Krause Cc: Al Viro Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit e23535ca11525945bd7fca05ac5941efba232498 Merge: 0c1ad04 51e6525 Author: John W. Linville Date: Thu Jun 9 14:23:30 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem commit 8aa460e9e9f6eb6c23c8b244516bedddee901ceb Author: Roland Stigge Date: Thu Jun 9 16:21:00 2011 +0200 staging: iio: max517: Fix iio_info changes struct iio_info introduced a bug where the second channel of a MAX518 can't be used. This commit fixes the typo (using max518 instead of the max517 struct). Signed-off-by: Roland Stigge Signed-off-by: Greg Kroah-Hartman commit 8eb73c6c2675f708283822bd058ad1e416836ba2 Author: Dan Carpenter Date: Thu Jun 9 10:18:23 2011 +0300 Staging: mei: fix debug code ! has higher precedence than !=. H_RDY is 8 and since neither 0 nor 1 are equal to 8 the original condition was always true. Signed-off-by: Dan Carpenter Acked-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman commit 3473f3c06a36865ae05993041fff35ee928342a7 Author: Josef Bacik Date: Thu Jun 9 10:15:17 2011 -0400 Btrfs: unlock the trans lock properly In btrfs_wait_for_commit if we came upon a transaction that had committed we just exited, but that's bad since we are holding the trans_lock. So break instead so that the lock is dropped. Thanks, Reported-by: David Sterba Signed-off-by: Josef Bacik commit 25b8b936ed44814a5ce6fc3b2a21401f33cd56f6 Author: Josef Bacik Date: Wed Jun 8 14:36:54 2011 -0400 Btrfs: don't map extent buffer if path->skip_locking is set Arne's scrub stuff exposed a problem with mapping the extent buffer in reada_for_search. He searches the commit root with multiple threads and with skip_locking set, so we can race and overwrite node->map_token since node isn't locked. So fix this so that we only map the extent buffer if we don't already have a map_token and skip_locking isn't set. Without this patch scrub would panic almost immediately, with the patch it doesn't panic anymore. Thanks, Reported-by: Arne Jansen Signed-off-by: Josef Bacik commit 4b80b8c2eee5282dab57f094fd3893c0c09f750c Author: Lars-Peter Clausen Date: Thu Jun 9 13:22:36 2011 +0200 ASoC: snd_soc_new_{mixer,mux,pga} make sure to use right DAPM context Currently it is possible that snd_soc_new_{mixer,mux,pga} is called with a DAPM context not matching the widgets context. This can lead to a wrong prefix_len calculation, which will result in undefined behaviour. To avoid this always use the DAPM context from the widget itself. Signed-off-by: Lars-Peter Clausen Acked-by: Liam Girdwood Signed-off-by: Mark Brown Cc: stable@kernel.org commit 7f20caff0ef6ce87dbb044389d43bfa1093cd3af Author: Connor Hansen Date: Sun Jun 5 03:35:09 2011 -0700 iscsi_ibft: iscsi_ibft_find unused variable i int i is only needed if CONFIG_ACPI is set so move it within a new ifdef so kernels without ACPI don't allocate space for nothing. Fixes warning too. Signed-off-by: Connor Hansen Signed-off-by: Peter Jones [v2: Fixed warning when CONFIG_ACPI was defined] Signed-off-by: Konrad Rzeszutek Wilk commit 0cd114fff9ace7014c0d3ef8ab385fc5d3cf2d2f Author: Timur Tabi Date: Wed Jun 8 15:02:56 2011 -0500 ASoC: fsl: fix initialization of DMA buffers The DMA (PCM) driver used by some Freescale PowerPC supports separate DAIs for playback and capture, so DMA buffers should be allocated only for the initialized streams. Instead of checking for the number of active channels, which apparently is not reliable, check to see if the actual stream object exists. Also provide a better name for the DMA interrupt. Signed-off-by: Timur Tabi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 3115ae174620eeab4b16f52c8d0a9a35d2717e3c Author: Mark Brown Date: Wed Jun 8 18:07:49 2011 +0100 ASoC: WM8804 does not support sample rates below 32kHz Reported-by: Kieran O'Leary Signed-off-by: Mark Brown Acked-by: Liam Girdwood Cc: stable@kernel.org commit 181e976327cf33095837c579608ebed42d2ad992 Author: Peter Foley Date: Wed Jun 8 20:58:32 2011 -0400 kbuild: silence Nothing to be done for 'all' message This patch silences a Makefile.asm-generic message by defining a dummy rule for all. make -f /usr/src/git/scripts/Makefile.asm-generic \ obj=arch/x86/include/generated/asm make[1]: Nothing to be done for `all'. Signed-off-by: Peter Foley Signed-off-by: Michal Marek commit 62b62c5c29468412cadd39dfb1113d3f0a323cfe Author: Guan Xuetao Date: Thu May 26 18:17:43 2011 +0800 unicore32: using generic-y format for one line asm-generic files The patch adds one-line asm-generic files in arch/unicore32/include/asm/Kbuild Also, remove the old implementation in arch/unicore32/Makefile see commit from Sam Ravnborg kbuild: asm-generic support Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit 42733b3c4861799b3c30c1e416099324bb577960 Author: Guan Xuetao Date: Thu May 26 17:19:20 2011 +0800 unicore32: change PERCPU to PERCPU_SECTION The patch changes PERCPU to PERCPU_SECTION see commit from Tejun Heo <0415b00d175e0d8945e6785aad21b5f157976ce0> percpu: Always align percpu output section to PAGE_SIZE Signed-off-by: Guan Xuetao Acked-by: Tejun Heo commit 978b42e6f6f48560b18661a5e187aec7329a094b Author: Guan Xuetao Date: Mon May 16 15:28:19 2011 +0800 unicore32: add KBUILD_DEFCONFIG with unicore32_defconfig (old debug_defconfig) Rename debug_defconfig to unicore32_defconfig, which is a minimal config for PKUnity-v3 (130nm) SoC board. Also, add KBUILD_DEFCONFIG to use 'make defconfig'. Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit f4728fd21f6d81bb2100da7eb9c675f1a74ad30d Author: Guan Xuetao Date: Wed Apr 20 19:06:53 2011 +0800 unicore32: change zImage physical address, though it's PIC codes U-boot will load the kernel image to 48M physical memory address. The patch changes it to the correct address, though it's PIC codes. Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit 2809e80b8a73d556b2302e273966fb15db16c51e Author: Guan Xuetao Date: Thu May 26 16:43:27 2011 +0800 unicore32: move rtc-puv3.c to drivers/rtc directory The patch moves rtc driver for PKUnity-v3 SoC from arch/unicore32/kernel/ to drivers/rtc/, with renaming it to rtc-puv3.c. Also, Kconfig, Makefile, and MAINTAINERS are modified correspondingly. Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit 0c1ad04aecb975f2a2014e1bc5a2fa23923ecbd9 Author: WANG Cong Date: Thu Jun 9 00:28:13 2011 -0700 netpoll: prevent netpoll setup on slave devices In commit 8d8fc29d02a33e4bd5f4fa47823c1fd386346093 (netpoll: disable netpoll when enslave a device), we automatically disable netpoll when the underlying device is being enslaved, we also need to prevent people from setuping netpoll on devices that are already enslaved. Signed-off-by: WANG Cong Signed-off-by: David S. Miller commit fe6fe792faec3fc2d2db39b69651682b8c4e7fcb Author: Eric Dumazet Date: Wed Jun 8 06:07:07 2011 +0000 net: pmtu_expires fixes commit 2c8cec5c10bc (ipv4: Cache learned PMTU information in inetpeer) added some racy peer->pmtu_expires accesses. As its value can be changed by another cpu/thread, we should be more careful, reading its value once. Add peer_pmtu_expired() and peer_pmtu_cleaned() helpers Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 6c43e0465f56248d9da56f2c4665ce1696766814 Author: Wu Jiajun-B06378 Date: Tue Jun 7 21:46:51 2011 +0000 gianfar:localized filer table Each eTSEC device should own localized filer table. Signed-off-by: Jiajun Wu Signed-off-by: David S. Miller commit 307cfe715344e15eda12dad3bb14f794115ca823 Author: Benjamin Herrenschmidt Date: Thu Jun 9 16:52:38 2011 +1000 powerpc: Force page alignment for initrd reserved memory When using 64K pages with a separate cpio rootfs, U-Boot will align the rootfs on a 4K page boundary. When the memory is reserved, and subsequent early memblock_alloc is called, it will allocate memory between the 64K page alignment and reserved memory. When the reserved memory is subsequently freed, it is done so by pages, causing the early memblock_alloc requests to be re-used, which in my case, caused the device-tree to be clobbered. This patch forces the reserved memory for initrd to be kernel page aligned, and will move the device tree if it overlaps with the range extension of initrd. This patch will also consolidate the identical function free_initrd_mem() from mm/init_32.c, init_64.c to mm/mem.c, and adds the same range extension when freeing initrd. free_initrd_mem() is also moved to the __init section. Many thanks to Milton Miller for his input on this patch. [BenH: Fixed build without CONFIG_BLK_DEV_INITRD] Signed-off-by: Dave Carroll Cc: Benjamin Herrenschmidt Signed-off-by: Benjamin Herrenschmidt commit d660474e840a8ec5dc770f1a15d44e0045d411a6 Merge: 43d795c 704102a6 Author: Benjamin Herrenschmidt Date: Thu Jun 9 14:46:32 2011 +1000 Merge remote branch 'kumar/merge' into merge commit 43d795c6320fce4c1b3b38ae764fb465230745ef Merge: 06e8684 c49f878 Author: Benjamin Herrenschmidt Date: Thu Jun 9 14:46:12 2011 +1000 Merge remote branch 'gcl/powerpc/merge' into merge commit 1780f2d3839a0d3eb85ee014a708f9e2c8f8ba0e Author: John Johansen Date: Wed Jun 8 15:07:47 2011 -0700 AppArmor: Fix sleep in invalid context from task_setrlimit Affected kernels 2.6.36 - 3.0 AppArmor may do a GFP_KERNEL memory allocation with task_lock(tsk->group_leader); held when called from security_task_setrlimit. This will only occur when the task's current policy has been replaced, and the task's creds have not been updated before entering the LSM security_task_setrlimit() hook. BUG: sleeping function called from invalid context at mm/slub.c:847 in_atomic(): 1, irqs_disabled(): 0, pid: 1583, name: cupsd 2 locks held by cupsd/1583: #0: (tasklist_lock){.+.+.+}, at: [] do_prlimit+0x61/0x189 #1: (&(&p->alloc_lock)->rlock){+.+.+.}, at: [] do_prlimit+0x94/0x189 Pid: 1583, comm: cupsd Not tainted 3.0.0-rc2-git1 #7 Call Trace: [] __might_sleep+0x10d/0x112 [] slab_pre_alloc_hook.isra.49+0x2d/0x33 [] kmem_cache_alloc+0x22/0x132 [] prepare_creds+0x35/0xe4 [] aa_replace_current_profile+0x35/0xb2 [] aa_current_profile+0x45/0x4c [] apparmor_task_setrlimit+0x19/0x3a [] security_task_setrlimit+0x11/0x13 [] do_prlimit+0xd2/0x189 [] sys_setrlimit+0x3b/0x48 [] system_call_fastpath+0x16/0x1b Signed-off-by: John Johansen Reported-by: Miles Lane Cc: stable@kernel.org Signed-off-by: James Morris commit c49f8789f532ae39019135ca038e9bc0d15aaa4a Author: Wolfram Sang Date: Sat Mar 12 17:44:10 2011 +0100 dtc/powerpc: remove obsolete .gitignore entries dtc was moved and .gitignores have been added to the new location. So, we can delete the old, forgotten ones. Signed-off-by: Wolfram Sang Cc: Benjamin Herrenschmidt Signed-off-by: Grant Likely commit 06e86849cf4019945a106913adb9ff0abcc01770 Merge: 13e12d1 3b3eca3 Author: Linus Torvalds Date: Wed Jun 8 15:58:51 2011 -0700 Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Runtime: Fix loops in pm_runtime_clk_notify() PM / Intel IOMMU: Fix init_iommu_pm_ops() for CONFIG_PM unset commit 13e12d14e2dccc7995b8f15a5678a338ab4e6a8c Author: Linus Torvalds Date: Wed Jun 8 15:18:19 2011 -0700 vfs: reorganize 'struct inode' layout a bit This tries to make the 'struct inode' accesses denser in the data cache by moving a commonly accessed field (i_security) closer to other fields that are accessed often. It also makes 'i_state' just an 'unsigned int' rather than 'unsigned long', since we only use a few bits of that field, and moves it next to the existing 'i_flags' so that we potentially get better structure layout (although depending on config options, i_flags may already have packed in the same word as i_lock, so this improves packing only for the case of spinlock debugging) Out 'struct inode' is still way too big, and we should probably move some other fields around too (the acl fields in particular) for better data cache access density. Other fields (like the inode hash) are likely to be entirely irrelevant under most loads. Signed-off-by: Linus Torvalds commit 95f4efb2d78661065aaf0be57f5bf00e4d2aea1d Author: Linus Torvalds Date: Wed Jun 8 15:11:56 2011 -0700 selinux: simplify and clean up inode_has_perm() This is a rather hot function that is called with a potentially NULL "struct common_audit_data" pointer argument. And in that case it has to provide and initialize its own dummy common_audit_data structure. However, all the _common_ cases already pass it a real audit-data structure, so that uncommon NULL case not only creates a silly run-time test, more importantly it causes that function to have a big stack frame for the dummy variable that isn't even used in the common case! So get rid of that stupid run-time behavior, and make the (few) functions that currently call with a NULL pointer just call a new helper function instead (naturally called inode_has_perm_noapd(), since it has no adp argument). This makes the run-time test be a static code generation issue instead, and allows for a much denser stack since none of the common callers need the dummy structure. And a denser stack not only means less stack space usage, it means better cache behavior. So we have a win-win-win from this simplification: less code executed, smaller stack footprint, and better cache behavior. Signed-off-by: Linus Torvalds commit 4c1f683a4a343808536a5617ede85dfc34430472 Merge: 365a13a d6d0f66 Author: Linus Torvalds Date: Wed Jun 8 14:27:48 2011 -0700 Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (28 commits) MAINTAINERS: add a maintainer to Gadget Framework USB: serial: add another 4N-GALAXY.DE PID to ftdi_sio driver Revert "USB: option: add ID for ZTE MF 330" drivers/usb/host/ohci-pxa27x.c: add missing clk_put USB: CONFIG_USB_GADGET_DUALSPEED is not user-configurable USB: dummy-hcd needs the has_tt flag usb-storage: redo incorrect reads usb/renesas_usbhs: free uep on removal usb/s3c-hsudc: fix error path usb/pxa25x_udc: cleanup the LUBBOCK err path usb/mv_udc_core: fix compile usb: gadget: include to fix compiling error USB: s3c-hsotg: Tone down debugging usb: remove bad dput after dentry_unhash USB: core: Tolerate protocol stall during hub and port status read musb: fix prefetch build failure USB: cdc-acm: Adding second ACM channel support for Nokia E7 and C7 usb-gadget: unlock data->lock mutex on error path in ep_write() USB: option Add blacklist for ZTE K3765-Z (19d2:2002) option: add Prolink PH300 modem IDs ... commit d6d0f665ad869c8ad8b8a42c4393e02dfe227e12 Author: Felipe Balbi Date: Wed Jun 8 19:16:28 2011 +0300 MAINTAINERS: add a maintainer to Gadget Framework I'll be continuing the amazing work Dave has done with the Gadget Framework. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 365a13a582e6a80c639c54dc2a83b03b9ff0169a Merge: d21131b a80fd9d Author: Linus Torvalds Date: Wed Jun 8 13:54:46 2011 -0700 Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6 * 'spi/merge' of git://git.secretlab.ca/git/linux-2.6: spi/rtc-m41t93: Use spi_get_drvdata() for SPI devices spi/omap2: fix uninitialized variable commit d21131bb0aa9e2ffbd256c62ee270f3c9a2a9a2c Merge: 467701e 83fb086 Author: Linus Torvalds Date: Wed Jun 8 13:54:29 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: trivial: add space in fsc error message cifs: silence printk when establishing first session on socket CIFS ACL support needs CONFIG_KEYS, so depend on it possible memory corruption in cifs_parse_mount_options() cifs: make CIFS depend on CRYPTO_ECB cifs: fix the kernel release version in the default security warning message commit 7e24cf43f7dcd6312473f01b59be60662232ffce Merge: a26d31c 33726bf Author: Greg Kroah-Hartman Date: Wed Jun 8 13:50:00 2011 -0700 Merge 3.0-rc2 + Linus's latest into usb-linus This is needed to get the following MAINTAINERS patch to apply properly. Signed-off-by: Greg Kroah-Hartman commit a26d31cef06f43a76327c21235e75450869df2b8 Author: Steffen Sledz Date: Tue Jun 7 14:01:56 2011 +0200 USB: serial: add another 4N-GALAXY.DE PID to ftdi_sio driver E.g. newer CAN 2.0 A/B <=> USB 2.0 converters report idProduct=f3c2. Signed-off-by: Steffen Sledz Cc: stable Signed-off-by: Greg Kroah-Hartman commit f6a398298d34af66ec3a2d82a44a4dbc5277357d Author: Josef Bacik Date: Mon Jun 6 10:50:35 2011 -0400 Btrfs: fix duplicate checking logic When merging my code into the integration test the second check for duplicate entries got screwed up. This patch fixes it by dropping ret2 and just using ret for the return value, and checking if we got an error before adding the bitmap to the local list. Thanks, Signed-off-by: Josef Bacik commit 723bda2083d44edbd6be0f0b09f902120dc07442 Author: Josef Bacik Date: Fri May 27 16:11:38 2011 -0400 Btrfs: fix the allocator loop logic I was testing with empty_cluster = 0 to try and reproduce a problem and kept hitting early enospc panics. This was because our loop logic was a little confused. So this is what I did 1) Make the loop variable the ultimate decider on wether we should loop again isntead of checking to see if we had an uncached bg, empty size or empty cluster. 2) Increment loop before checking to see what we are on to make the loop definitions make more sense. 3) If we are on the chunk alloc loop don't set empty_size/empty_cluster to 0 unless we didn't actually allocate a chunk. If we did allocate a chunk we should be able to easily setup a new cluster so clearing empty_size/empty_cluster makes us less efficient. This kept me from hitting panics while trying to reproduce the other problem. Thanks, Signed-off-by: Josef Bacik commit 2cdc342c204dba69ca3b2ec43d8e6ff41ed920b8 Author: Josef Bacik Date: Fri May 27 14:07:49 2011 -0400 Btrfs: fix bitmap regression In cleaning up the clustering code I accidently introduced a regression by adding bitmap entries to the cluster rb tree. The problem is if we've maxed out the number of bitmaps we can have for the block group we can only add free space to the bitmaps, but since the bitmap is on the cluster we can't find it and we try to create another one. This would result in a panic because the total bitmaps was bigger than the max bitmaps that were allowed. This patch fixes this by checking to see if we have a cluster, and then looking at the cluster rb tree to see if it has a bitmap entry and if it does and that space belongs to that bitmap, go ahead and add it to that bitmap. I could hit this panic every time with an fs_mark test within a couple of minutes. With this patch I no longer hit the panic and fs_mark goes to completion. Thanks, Signed-off-by: Josef Bacik commit a80fd9db0e1909a03e5d5a29e2e73001e38d12f5 Author: Geert Uytterhoeven Date: Wed Jun 8 21:48:03 2011 +0200 spi/rtc-m41t93: Use spi_get_drvdata() for SPI devices One new offender detected by the recently increased type checking in platform_get_drvdata(): drivers/rtc/rtc-m41t93.c: In function ‘m41t93_remove’: drivers/rtc/rtc-m41t93.c:192: warning: passing argument 1 of ‘platform_get_drvdata’ from incompatible pointer type Use spi_get_drvdata() instead of platform_get_drvdata(), cfr. commit 42fea15d6dc410e62dac6a764142045280624a5b ("spi/rtc-{ds1390,ds3234,m41t94}: Use spi_get_drvdata() for SPI devices") Signed-off-by: Geert Uytterhoeven Signed-off-by: Grant Likely commit f2bb8f5cfb3bce595b2de251ed7638047fc4e530 Author: Josef Bacik Date: Wed May 25 13:10:16 2011 -0400 Btrfs: don't commit the transaction if we dont have enough pinned bytes I noticed when running an enospc test that we would get stuck committing the transaction in check_data_space even though we truly didn't have enough space. So check to see if bytes_pinned is bigger than num_bytes, if it's not don't commit the transaction. Thanks, Signed-off-by: Josef Bacik commit 3de85bb95cc50d0977cbb7a0c605e894be4c790d Author: Josef Bacik Date: Wed May 25 13:07:37 2011 -0400 Btrfs: noinline the cluster searching functions When profiling the find cluster code it's hard to tell where we are spending our time because the bitmap and non-bitmap functions get inlined by the compiler, so make that not happen. Thanks, Signed-off-by: Josef Bacik commit 86d4a77ba3dc4ace238a0556541a41df2bd71d49 Author: Josef Bacik Date: Wed May 25 13:03:16 2011 -0400 Btrfs: cache bitmaps when searching for a cluster If we are looking for a cluster in a particularly sparse or fragmented block group, we will do a lot of looping through the free space tree looking for various things, and if we need to look at bitmaps we will endup doing the whole dance twice. So instead add the bitmap entries to a temporary list so if we have to do the bitmap search we can just look through the list of entries we've found quickly instead of having to loop through the entire tree again. Thanks, Signed-off-by: Josef Bacik commit 467701e2862454b25e6cdf1171e0cea88ed5f21d Merge: 33726bf f124c6a Author: Linus Torvalds Date: Wed Jun 8 12:03:37 2011 -0700 Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: off by one errors in multicalls.c xen: use the trigger info we already have to choose the irq handler commit 51e65257142a87fe46a1ce5c35c86c5baf012614 Author: Stanislaw Gruszka Date: Wed Jun 8 15:26:31 2011 +0200 iwlegacy: fix channel switch locking We use priv->mutex to avoid race conditions between chswitch_done() and mac_channel_switch(), when marking channel switch in progress. But chswitch_done() can be called in atomic context from rx_csa() or with mutex already taken from commit_rxon(). To fix remove mutex from chswitch_done() and use atomic bitops for marking channel switch pending. Cc: stable@kernel.org # 2.6.39+ Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit f3209bea110cade12e2b133da8b8499689cb0e2e Author: Johannes Berg Date: Wed Jun 8 13:27:29 2011 +0200 mac80211: fix IBSS teardown race Ignacy reports that sometimes after leaving an IBSS joining a new one didn't work because there still were stations on the list. He fixed it by flushing stations when attempting to join a new IBSS, but this shouldn't be happening in the first case. When I looked into it I saw a race condition in teardown that could cause stations to be added after flush, and thus cause this situation. Ignacy confirms that after applying my patch he hasn't seen this happen again. Reported-by: Ignacy Gawedzki Debugged-by: Ignacy Gawedzki Tested-by: Ignacy Gawedzki Cc: stable@kernel.org Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 43e4e0b94984b45d52048e3ac027cac15c718b65 Author: Wey-Yi Guy Date: Fri May 27 08:40:24 2011 -0700 iwlagn: send tx power command if defer cause by RXON not match During channge channel, tx power will not send to uCode, the tx power command should send after scan complete. but should also can send after RXON command. Stable fix identified by Stanislaw Gruszka . Signed-off-by: Wey-Yi Guy Cc: stable@kernel.org [2.6.38+] Signed-off-by: John W. Linville commit e2d4dc5af36673e64e29973c974246eafe63548f Author: Greg Kroah-Hartman Date: Wed Jun 8 09:18:32 2011 -0700 Staging: cx23885: fix include of altera.h The cx23885 driver was including staging/altera.h, but that file has moved back into the driver directory. Why a non-staging driver was including a staging driver is beyond me, but this fixes the build so everything is happy for now. For the record, it's not ok for a non-staging driver to depend on a staging one, as that implies that the non-staging one should also be in the staging tree if that's needed. Cc: Igor M. Liplianin Cc: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman commit 83fb086e0ecd879a4676cf12fc7afc1f9ecd1784 Author: Jeff Layton Date: Wed Jun 8 07:35:24 2011 -0400 cifs: trivial: add space in fsc error message Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 33726bf2140a0e7c9de3ccd7cba6d69962f0b773 Merge: 5b28f6a d7ebe75 Author: Linus Torvalds Date: Wed Jun 8 08:36:15 2011 -0700 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Fix comments in include/linux/perf_event.h perf: Comment /proc/sys/kernel/perf_event_paranoid to be part of user ABI perf python: Fix argument name list of read_on_cpu() perf evlist: Don't die if sample_{id_all|type} is invalid perf python: Use exception to propagate errors perf evlist: Remove dependency on debug routines perf, cgroups: Fix up for new API commit 5b28f6a25ee202046e2d57bd431671bc23cf3dd1 Merge: 46671b0 c226feb Author: Linus Torvalds Date: Wed Jun 8 08:22:29 2011 -0700 Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 * 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6: gpio/samsung: make Kconfig options def_bool gpio/exynos4: Fix incorrect mapping of gpio pull-up macro to register setting GPIO: OMAP: add locking around calls to _set_gpio_triggering GPIO: OMAP: fix setting IRQWAKEN bits for OMAP4 GPIO: OMAP: fix section mismatch warnings gpio: Fix gpio-exynos4 build fails in mainline commit 46671b035504eb345124b4b275b37726a48bdbaa Merge: 18367c0 d364ee4 Author: Linus Torvalds Date: Wed Jun 8 08:21:48 2011 -0700 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: [media] soc_camera: preserve const attribute [media] uvc_entity: initialize return value [media] media: Fix media device minor registration [media] Make nchg variable signed because the code compares this variable against negative values [media] omap3isp: fix compiler warning [media] v4l: Fix media_entity_to_video_device macro argument name [media] ivtv: Internally separate encoder & decoder standard setting [media] ivtvfb: Add sanity check to ivtvfb_pan_display() [media] ivtvfb: use display information in info not in var for panning [media] ivtv: Make two ivtv_msleep_timeout calls uninterruptable [media] anysee: return EOPNOTSUPP for unsupported I2C messages [media] gspca - ov519: Set the default frame rate to 15 fps [media] gspca - stv06xx: Set a lower default value of gain for hdcs sensors [media] gspca: Remove coarse_expo_autogain.h [media] gspca - ov519: Change the ovfx2 bulk transfer size [media] gspca - ov519: Fix a regression for ovfx2 webcams commit 18367c0ec73671fbfea35f13ae52d39437c53eb5 Merge: 81de916 805c221 Author: Linus Torvalds Date: Wed Jun 8 08:19:14 2011 -0700 Merge branch 'drm-radeon-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-radeon-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms: disable hdmi audio by default drm/radeon/kms: fix for radeon on systems >4GB without hardware iommu drm/radeon/kms: set family for use in parser. commit c226feb013ce81a18512fb4827bf7c2352d8b470 Merge: 32919a2 85ec7b9 Author: Grant Likely Date: Wed Jun 8 09:12:16 2011 -0600 Merge branch 'for_3.0/gpio-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/merge commit 81de916f19cf5f1437c0b9ed817364f0f7c81961 Author: Linus Torvalds Date: Wed Jun 8 07:46:30 2011 -0700 tty_buffer: get rid of 'seen_tail' logic in flush_to_ldisc The flush_to_ldisc() work entry has special logic to notice when it has seen the original tail of the data queue, and it avoids continuing the flush if it sees that _original_ tail rather than the current tail. This logic can trigger in case somebody is constantly adding new data to the tty while the flushing is active - and the intent is to avoid excessive CPU usage while flushing the tty, especially as we used to do this from a softirq context which made it non-preemptible. However, since we no longer re-arm the work-queue from within itself (because that causes other trouble: see commit a5660b41af6a "tty: fix endless work loop when the buffer fills up"), this just leads to possible hung tty's (most easily seen in SMP and with a test-program that floods a pty with data - nobody seems to have reported this for any real-life situation yet). And since the workqueue isn't done from timers and softirq's any more, it's doubtful whether the CPU useage issue is really relevant any more. So just remove the logic entirely, and see if anybody ever notices. Alternatively, we might want to re-introduce the "re-arm the work" for just this case, but then we'd have to re-introduce the delayed work model or some explicit timer, which really doesn't seem worth it for this. Reported-and-tested-by: Guillaume Chazarain Cc: Alan Cox Cc: Felipe Balbi Cc: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 0f82bdf572fc6e42147151aa4d52542f7fc6d793 Author: Mark Brown Date: Tue Jun 7 23:42:04 2011 +0100 ASoC: Fix WM8962 headphone volume update for use of advanced caches Signed-off-by: Mark Brown Acked-by: Liam Girdwood Cc: stable@kernel.org commit 805c22168da76a65c978017d0fe0d59cd048e995 Author: Alex Deucher Date: Mon Jun 6 17:39:16 2011 -0400 drm/radeon/kms: disable hdmi audio by default The current RE'd code causes blank screens and display problems on a lot of systems. So disable it by default for now. It can still be enabled by setting the audio parameter to 1. E.g.: radeon.audio=1 Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=38010 https://bugs.freedesktop.org/show_bug.cgi?id=27731 https://bugs.freedesktop.org/show_bug.cgi?id=35970 https://bugs.freedesktop.org/show_bug.cgi?id=26195 and many other reported problems. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 62fff811d73095bd95579d72f558f03c78f7914a Author: Daniel Haid Date: Wed Jun 8 20:04:45 2011 +1000 drm/radeon/kms: fix for radeon on systems >4GB without hardware iommu On my x86_64 system with >4GB of ram and swiotlb instead of a hardware iommu (because I have a VIA chipset), the call to pci_set_dma_mask (see below) with 40bits returns an error. But it seems that the radeon driver is designed to have need_dma32 = true exactly if pci_set_dma_mask is called with 32 bits and false if it is called with 40 bits. I have read somewhere that the default are 32 bits. So if the call fails I suppose that need_dma32 should be set to true. And indeed the patch fixes the problem I have had before and which I had described here: http://choon.net/forum/read.php?21,106131,115940 Acked-by: Alex Deucher cc: stable@kernel.org Signed-off-by: Dave Airlie commit 428c6e3630b343d5b3034af914015d10c94bb90e Author: Dave Airlie Date: Wed Jun 8 19:58:29 2011 +1000 drm/radeon/kms: set family for use in parser. Wierdly the kms parser never initialised the family, it wasn't really used much, but the fmt checker patch started using it and it fell over. Reported-by: Markus Trippelsdorf Signed-off-by: Dave Airlie commit e756682c8baa47da1648c0c016e9f48ed66bc32d Author: Steffen Klassert Date: Sun Jun 5 20:46:03 2011 +0000 xfrm: Fix off by one in the replay advance functions We may write 4 byte too much when we reinitialize the anti replay window in the replay advance functions. This patch fixes this by adjusting the last index of the initialization loop. Signed-off-by: Steffen Klassert Signed-off-by: David S. Miller commit cb0a02ecf95e5f47d92e7d4c513cc1f7aeb40cda Merge: d681f12 c5182b8 Author: Linus Torvalds Date: Tue Jun 7 19:21:11 2011 -0700 Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Ensure we locate the passed IRQ in irq_alloc_descs() genirq: Fix descriptor init on non-sparse IRQs irq: Handle spurios irq detection for threaded irqs genirq: Print threaded handler in spurious debug output commit d681f1204d701cafbc45fa90e0ac977acddc33cc Merge: 6715a52 2601887 Author: Linus Torvalds Date: Tue Jun 7 19:20:53 2011 -0700 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86/amd-iommu: Fix boot crash with hidden PCI devices x86/amd-iommu: Use only per-device dma_ops x86/amd-iommu: Fix 3 possible endless loops commit 6715a52a581c891e9a2034abe1c81ddb482d70b3 Merge: ef23980 6c6c54e Author: Linus Torvalds Date: Tue Jun 7 19:20:28 2011 -0700 Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Fix/clarify set_task_cpu() locking rules lockdep: Fix lock_is_held() on recursion sched: Fix schedstat.nr_wakeups_migrate sched: Fix cross-cpu clock sync on remote wakeups commit ef2398019b305827ea7130ebaf7bf521b444530e Merge: 12871a0 dcc32b8 Author: Linus Torvalds Date: Tue Jun 7 19:09:26 2011 -0700 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/nv40: fall back to paged dma object for the moment drm/nouveau: fix leak of gart mm node drm/nouveau: fix vram page mapping when crossing page table boundaries drm/nv17-nv40: Fix modesetting failure when pitch == 4096px (fdo bug 35901). drm/nouveau: don't create accel engine objects when noaccel=1 drm/nvc0: recognise 0xdX chipsets as NV_C0 drm/i915: Add a no lvds quirk for the Asus EeeBox PC EB1007 drm/i915: Share the common force-audio property between connectors drm/i915: Remove unused enum "chip_family" drm/915: fix relaxed tiling on gen2: tile height drm/i915/crt: Explicitly return false if connected to a digital monitor drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0 drm/i915: Only print out the actual number of fences for i915_error_state drm/i915: s/addr & ~PAGE_MASK/offset_in_page(addr)/ drm: i915: correct return status in intel_hdmi_mode_valid() drm/i915: fix regression after clock gating init split drm/i915: fix if statement in ivybridge irq handler commit 12871a0bd67dd4db4418e1daafcd46e9d329ef10 Merge: ecff4fc f3aecea Author: Linus Torvalds Date: Tue Jun 7 19:09:17 2011 -0700 Merge branch 'drm-radeon-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-radeon-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms/atom: fix PHY init drm/radeon/kms: add missing Evergreen texture formats to the CS parser drm/radeon/kms: viewport height has to be even drm/radeon/kms: remove duplicate reg from r600 safe regs drm/radeon/kms: add support for Llano Fusion APUs drm/radeon/kms: add llano pci ids drm/radeon/kms: fill in asic struct for llano drm/radeon/kms: add family ids for llano APUs drm/radeon: fix oops in ttm reserve when pageflipping (v2) drm/radeon/kms: clean up the radeon kms Kconfig drm/radeon/kms: fix thermal sensor reading on juniper drm/radeon/kms: add missing case for cayman thermal sensor drm/radeon/kms: add blit support for cayman (v2) drm/radeon/kms/blit: workaround some hw issues on evergreen+ commit ecff4fcc7bbaf060646d2160123f8dc02605a047 Merge: 58a9a36 1c3cc11 Author: Linus Torvalds Date: Tue Jun 7 19:07:22 2011 -0700 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: timers: Consider slack value in mod_timer() clockevents: Handle empty cpumask gracefully commit 58a9a36b5444cbd921cdfc8ddd344d9983cc2c7b Merge: 22b174f 74b5c5b Author: Linus Torvalds Date: Tue Jun 7 19:06:28 2011 -0700 Merge branch 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: Initialize kvm before registering the mmu notifier KVM: x86: use proper port value when checking io instruction permission KVM: add missing void __user * cast to access_ok() call commit 22b174f8b7daf59f01b7b76e95c14edf41bf45fa Author: Grant Likely Date: Mon Jun 6 00:40:48 2011 -0600 MAINTAINERS: Saying goodbye to David Brownell We had to say goodbye when David passed away recently. David had a huge impact on our community, both personally in the lives of the people he worked with, and technically in the design and maintenance of several subsystems. He is greatly missed. He also leaves behind a number of much loved subsystems now orphaned. This patch updates the MAINTAINERS file for the areas that David was responsible for and adds an entry for him to the CREDITS file. Signed-off-by: Grant Likely Acked-by: Harry Wei Signed-off-by: Linus Torvalds commit 9c125d2af8f4d06ea62a4d8ff100af392a0a3a3b Merge: 4018237 1adffba Author: Linus Torvalds Date: Tue Jun 7 19:04:21 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6: fat: Fix corrupt inode flags when remove ATTR_SYS flag commit 40182373ac6cbbd10c6d08ba339947eea009d513 Author: David Howells Date: Mon Jun 6 15:47:23 2011 +0100 MN10300: Add missing _sdata declaration _sdata needs to be declared in the linker script now as of commit a2d063ac216c ("extable, core_kernel_data(): Make sure all archs define _sdata") Signed-off-by: David Howells Cc: Steven Rostedt Signed-off-by: Linus Torvalds commit db1c9dfa649f9bd8dc11415fbfe5cfe1e24c5b33 Author: David Howells Date: Mon Jun 6 15:47:14 2011 +0100 MN10300: die_if_no_fixup() shouldn't use get_user() as it doesn't call set_fs() die_if_no_fixup() shouldn't use get_user() as it doesn't call set_fs() to indicate that it wants to probe a kernel address. Instead it should use probe_kernel_read(). This fixes the problem of gdb seeing SIGILL rather than SIGTRAP when hitting the KGDB special breakpoint upon SysRq+g being seen. The problem was that die_if_no_fixup() was failing to read the opcode of the instruction that caused the exception, and thus not fixing up the exception. This caused gdb to get a S04 response to the $? request in its remote protocol rather than S05 - which would then cause it to continue with $C04 rather than $c in an attempt to pass the signal onto the inferior process. The kernel, however, does not support $Cnn, and so objects by returning an E22 response, indicating an error. gdb does not expect this and prints: warning: Remote failure reply: E22 and then returns to the gdb command prompt unable to continue. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 2e65d1f6eecc176ba1341541b5f41edd7eb4346a Author: David Howells Date: Mon Jun 6 15:47:05 2011 +0100 MN10300: Fix one of the kernel debugger cacheflush variants One of the kernel debugger cacheflush variants escaped proper testing. Two of the labels are wrong, being derived from the code that was copied to construct the variant. The first label results in the following assembler message: AS arch/mn10300/mm/cache-dbg-flush-by-reg.o arch/mn10300/mm/cache-dbg-flush-by-reg.S: Assembler messages: arch/mn10300/mm/cache-dbg-flush-by-reg.S:123: Error: symbol `debugger_local_cache_flushinv_no_dcache' is already defined And the second label results in the following linker message: arch/mn10300/mm/built-in.o:(.text+0x1d39): undefined reference to `mn10300_local_icache_inv_range_reg_end' arch/mn10300/mm/built-in.o:(.text+0x1d39): relocation truncated to fit: R_MN10300_PCREL16 against undefined symbol `mn10300_local_icache_inv_range_reg_end' To test this file the following configuration pieces must be set: CONFIG_AM34=y CONFIG_MN10300_CACHE_WBACK=y CONFIG_MN10300_DEBUGGER_CACHE_FLUSH_BY_REG=y CONFIG_MN10300_CACHE_MANAGE_BY_REG=y CONFIG_AM34_HAS_CACHE_SNOOP=n Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit aec040e29e804b40fa2934ec7a5be9f515f23098 Merge: 8ea656b 6c61cfe Author: Linus Torvalds Date: Tue Jun 7 18:47:53 2011 -0700 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] fix kvm defines for 31 bit compile [S390] use generic RCU page-table freeing code [S390] qdio: Split SBAL entry flags [S390] kvm-s390: fix stfle facilities numbers >=64 [S390] kvm-s390: Fix host crash on misbehaving guests commit 8ea656bdc9d3c39e18f2bd5d8ffe0301fde64f72 Merge: d205df9 1fcecf2 Author: Linus Torvalds Date: Tue Jun 7 18:46:37 2011 -0700 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (21 commits) ARM: OMAP4: MMC: increase delay for pbias arm: omap2plus: move NAND_BLOCK_SIZE out of boards omap4: hwmod: Enable the keypad omap3: Free Beagle rev gpios when they are read, so others can read them later arm: omap3: beagle: Ensure msecure is mux'd to be able to set the RTC omap: rx51: Don't power up speaker amplifier at bootup omap: rx51: Set regulator V28_A always on ARM: OMAP4: MMC: no regulator off during probe for eMMC arm: omap2plus: fix ads7846 pendown gpio request ARM: OMAP2: Add missing iounmap in omap4430_phy_init ARM: omap4: Pass core and wakeup mux tables to omap4_mux_init ARM: omap2+: mux: Allow board mux settings to be NULL OMAP4: fix return value of omap4_l3_init OMAP: iovmm: fix SW flags passed by user arch/arm/mach-omap1/dma.c: Invert calls to platform_device_put and platform_device_del OMAP2+: mux: fix compilation warnings OMAP: SRAM: Fix warning: format '%08lx' expects type 'long unsigned int' arm: omap3: cm-t3517: fix section mismatch warning OMAP2+: Fix 9 section mismatch(es) warnings from mach-omap2/built-in.o ARM: OMAP2: Add missing include of linux/gpio.h ... commit d205df9955feb9c2ae63ac1387804e225ff22605 Merge: 2421007 f90e5b5 Author: Linus Torvalds Date: Tue Jun 7 18:44:10 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: Processes waiting on inode glock that no processes are holding commit 24210071e0dd7da1a945a2a1686b93f2b2f3b410 Merge: 8397345 a50d28de Author: Linus Torvalds Date: Tue Jun 7 18:41:26 2011 -0700 Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x: video: Fix use-after-free by vga16fb on rmmod video: Convert vmalloc/memset to vzalloc efifb: Disallow manual bind and unbind efifb: Fix mismatched request/release_mem_region efifb: Enable write-combining drivers/video/pxa168fb.c: add missing clk_put drivers/video/imxfb.c: add missing clk_put fbdev: bf537-lq035: add missing blacklight properties type savagefb: Use panel CVT mode as default fbdev: sh_mobile_lcdcfb: Fix up fallout from MERAM changes. commit 8397345172aa5cdcbc133977af9d525f45b874ea Merge: 59c5f46 e6bc45d Author: Linus Torvalds Date: Tue Jun 7 18:36:59 2011 -0700 Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: vfs: make unlink() and rmdir() return ENOENT in preference to EROFS lmLogOpen() broken failure exit usb: remove bad dput after dentry_unhash more conservative S_NOSEC handling commit 6cb79b3f3ba2b14590cac02ee13ab7410b6225ed Author: Joe Perches Date: Fri Jun 3 14:45:23 2011 +0000 sparc: Remove unnecessary semicolons Semicolons are not necessary after switch/while/for/if braces so remove them. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 9eeb08986f41c0740306f6f56cf04e619e2fe525 Author: oftedal Date: Wed Jun 1 11:11:41 2011 +0000 Add support for allocating irqs for bootbus devices Some devices that can generate interrupts are connected directly to the CPU through the bootbus on sun4d. This patch allows IRQs to be allocated for such devices. The information used for allocating interrupts for sbus devices are present at the corresponding SBI node. For bootbus devices this information is present in the bootbus node. Signed-off-by: Kjetil Oftedal Signed-off-by: David S. Miller commit ea160584574e345495e75ee4a7d3a7dbcad9e16c Author: oftedal Date: Wed Jun 1 11:04:20 2011 +0000 Do not skip interrupt sources in sun4d interrupt handler and acknowledge interrupts correctly During the introduction of genirq on sparc32 bugs were introduced in the interrupt handler for sun4d. The interrupts handler checks the status of the various sbus interfaces in the system and generates a virtual interrupt, based upon the location of the interrupt source. This lookup was broken by restructuring the code in such a way that index and shift operations were performed prior to comparing this against the values read from the interrupt controllers. This could cause the handler to loop eternally as the interrupt source could be skipped before any check was performed. Additionally sun4d_encode_irq performs shifting internally, so it should not be performed twice. In sun4d_unmask interrupts were not correctly acknowledged, as the corresponding bit it the interrupt mask was not actually cleared. Signed-off-by: Kjetil Oftedal Signed-off-by: David S. Miller commit 5fba17084e5d1b00bf24e17b2b580cfa7705e7be Author: oftedal Date: Wed Jun 1 10:43:50 2011 +0000 Restructure sun4d_build_device_irq so that timer interrupts can be allocated sun4d_build_device_irq was called without a valid platform_device when the system timer was initialized on sun4d systems. This caused a NULL pointer crash. Josip Rodin suggested that the current sun4d_build_device_irq should be split into two functions. So that the timer initialization could skip the slot and sbus interface detection code in sun4d_build_device_irq, as this does not make sence due to the timer interrupts not being generated from a device located on sbus. Signed-off-by: Kjetil Oftedal Signed-off-by: David S. Miller commit 3095ec895fd5ec19a7cb60b5cbfa766d68a74a24 Author: Greg Kroah-Hartman Date: Tue Jun 7 15:03:37 2011 -0700 Revert "USB: option: add ID for ZTE MF 330" This reverts commit a559d2c8c1bf652ea2d0ecd6ab4a250fcdb37db8. Turns out that device id 0x1d6b:0x0002 is a USB hub, which causes havoc when the option driver tries to bind to it. So revert this as it doesn't seem to be needed at all. Thanks to Michael Tokarev and Paweł Drobek for working on resolving this issue. Cc: Paweł Drobek Cc: Michael Tokarev Cc: Dominik Brodowski Cc: stable Signed-off-by: Greg Kroah-Hartman commit 3b3eca3116861113ccc0e1ca3b98cb43598f46a7 Author: Rafael J. Wysocki Date: Tue Jun 7 23:34:58 2011 +0200 PM / Runtime: Fix loops in pm_runtime_clk_notify() The loops over connection ID strings in pm_runtime_clk_notify() should actually iterate over the strings and not over the elements of the first of them, so make them behave as appropriate. This fixes a regression introduced by commit 600b776eb39a13a28b090 (OMAP1 / PM: Use generic clock manipulation routines for runtime PM). Reported-and-tested-by: Janusz Krzysztofik Signed-off-by: Rafael J. Wysocki commit 665c8c8ee405738375b679246b49342ce38ba056 Author: Williams, Mitch A Date: Tue Jun 7 14:22:57 2011 -0700 igb: fix i350 SR-IOV failture When SR-IOV is enabled, i350 devices fail to pass traffic. This is due to the driver attempting to enable RSS on the PF device, which is not supported by the i350. When max_vfs is specified on an i350 adapter, set the number of RSS queues to 1. This issue affects 2.6.39 as well. CC: stable@kernel.org Signed-off-by: Mitch Williams Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 32919a28cc8470b1526f77b2f12cca8841b9ac62 Author: H Hartley Sweeten Date: Tue Jun 7 14:37:27 2011 -0600 gpio/samsung: make Kconfig options def_bool The Samsung GPIO drivers are always built-in when the relevant platform is selected.  Change the Kconfig symbol to def_bool y dependant on the platform. Signed-off-by: H Hartley Sweeten Acked-by: Kyungmin Park Signed-off-by: Grant Likely commit 8c56cacc724c7650b893d43068fa66044aa29a61 Author: Tejun Heo Date: Wed May 25 13:19:39 2011 +0200 libata: fix unexpectedly frozen port after ata_eh_reset() To work around controllers which can't properly plug events while reset, ata_eh_reset() clears error states and ATA_PFLAG_EH_PENDING after reset but before RESET is marked done. As reset is the final recovery action and full verification of devices including onlineness and classfication match is done afterwards, this shouldn't lead to lost devices or missed hotplug events. Unfortunately, it forgot to thaw the port when clearing EH_PENDING, so if the condition happens after resetting an empty port, the port could be left frozen and EH will end without thawing it, making the port unresponsive to further hotplug events. Thaw if the port is frozen after clearing EH_PENDING. This problem is reported by Bruce Stenning in the following thread. http://thread.gmane.org/gmane.linux.kernel/1123265 stable: I think we should weather this patch a bit longer in -rcX before sending it to -stable. Please wait at least a month after this patch makes upstream. Thanks. -v2: Fixed spelling in the comment per Dave Howorth. Signed-off-by: Tejun Heo Reported-by: Bruce Stenning Cc: stable@kernel.org Cc: Dave Howorth Signed-off-by: Jeff Garzik commit 99592ba4a80edb84938e7e0cf71fdecff1ce67fd Author: Rafael J. Wysocki Date: Tue Jun 7 21:32:31 2011 +0200 PM / Intel IOMMU: Fix init_iommu_pm_ops() for CONFIG_PM unset If CONFIG_PM is not set, init_iommu_pm_ops() introduced by commit 134fac3f457f3dd753ecdb25e6da3e5f6629f696 (PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev) is not defined appropriately. Fix this issue. Reported-by: Tony Luck Signed-off-by: Rafael J. Wysocki commit 53aebb5312c797e4b63fb50473a55ed054b3cb2f Author: Andre Bartke Date: Thu Jun 2 00:21:45 2011 +0200 staging: iio: error case memory leak fix The data pointer should be freed in the error cases of adis16400_trigger_handler(). Signed-off-by: Andre Bartke Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 0d422f4237ce515678ebbb8781881e5d2e58b9d4 Author: Vasanthakumar Thiagarajan Date: Wed Jun 1 13:44:11 2011 +0530 staging: ath6kl: Fix a kernel panic during suspend/resume The kernel panic happens when we try to complete a pending scan request while going to suspend state. The cause for this kernel panic is accessing a freed memory (ar->arWmin). This is freed before ar6k_cfg80211_scanComplete_event() getting called where it is dereferenced. RIP: 0010:[] [] wlan_iterate_nodes+0x16/0xc0 [ath6kl] RSP: 0018:ffff8800719fbce8 EFLAGS: 00010296 RAX: ffff880071bbcc00 RBX: ffff880037b22520 RCX: ffff880077413c80 RDX: ffff880037b221c0 RSI: ffffffffa041ef10 RDI: 0000000000000020 RBP: ffff8800719fbd18 R08: 0000000000000001 R09: 0000000000000001 R10: 0000000000000400 R11: 0000000000000000 R12: 0000000000000010 R13: ffff8800719fbdd8 R14: 00007fff83a84b60 R15: 0000000000000001 FS: 00007fdccb8a7700(0000) GS:ffff880077400000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000148 CR3: 0000000070604000 CR4: 00000000000006f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process rmmod (pid: 1998, threadinfo ffff8800719fa000, task ffff880066712d80) Stack: 0000000000000000 ffff880037b22520 0000000000000010 ffff8800719fbdd8 00007fff83a84b60 0000000000000001 ffff8800719fbd28 ffffffffa0429fe2 ffff8800719fbd58 ffffffffa041ee5f ffff8800719fbd58 ffff880037b22520 Call Trace: [] wmi_iterate_nodes+0x12/0x20 [ath6kl] [] ar6k_cfg80211_scanComplete_event+0x3f/0xf0 [ath6kl] [] ar6000_close+0x61/0x100 [ath6kl] [] __dev_close_many+0x96/0x100 [] dev_close_many+0x9d/0x120 [] rollback_registered_many+0xe8/0x290 [] unregister_netdevice_queue+0x96/0x100 [] unregister_netdev+0x20/0x30 [] ar6000_destroy+0x119/0x180 [ath6kl] [] ar6k_cleanup_module+0x2a/0x33 [ath6kl] [] sys_delete_module+0x19e/0x270 [] system_call_fastpath+0x16/0x1b Code: c3 0f 1f 40 00 48 89 df e8 68 ff ff ff eb df 66 0f 1f 44 00 00 55 48 89 e5 41 57 41 56 41 55 41 54 53 48 83 ec 08 0f 1f 44 00 00 8b af 28 01 00 00 4c 8d 7f 08 49 89 fc 48 89 f3 49 89 d6 41 RIP [] wlan_iterate_nodes+0x16/0xc0 [ath6kl] RSP Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Greg Kroah-Hartman commit aaa5c677910d313ca1318c905c799c459c6f0078 Author: Michael Chang Date: Mon May 30 14:28:25 2011 +0800 staging: gma500: get control from firmware framebuffer if conflicts Many Linux distributions would enable vesafb in order to display early stage boot splash. In this case, we will get garbled X Window screen if running X fbdev on psbfb. This is because fb0 is occupied by vesafb while psbfb is on fb1. They tried to drive the same pieces of hardware at the same time. With unmodified X start-up, it would try to use default fb0 framebuffer device and unfortunately it is now broken becaues fb1 supersedes it. We should let psbfb takeover framebuffer control from vesafb to get around this problem. See also commit : 4410f3910947dcea8672280b3adecd53cec4e85e Signed-off-by: Michael Chang Cc: Alan Cox Cc: stable Signed-off-by: Greg Kroah-Hartman commit 3ab8be53155617fa7ecc5b8cd259a458727a1d90 Author: Patrik Jakobsson Date: Tue May 24 13:04:56 2011 +0100 staging: gma500: Skip bogus LVDS VBT mode and check for LVDS before adding backlight On the Fit-PC2 the VBT reports an invalid fixed panel mode for LVDS, this gets in the way for SDVO. This patch makes VBT parsing skip the invalid mode. When there is no LVDS output the backlight support crashes so the patch also checks for this before enabling it. Signed-off-by: Patrik Jakobsson Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit d3ac0778801708caecb2b172328064255a350432 Author: Arjan Mels Date: Fri May 20 23:25:46 2011 +0200 staging: usbip: bugfix prevent driver unbind Implemented pre_reset and post_reset methods of the driver to prevent the driver from being unbound upon a device reset. Because of this also the asynchronous reset introduced to prevent a race condition is no longer necessary (and sometimes causes problems, because it comes later then expected). Signed-off-by: Arjan Mels Cc: Greg Kroah-Hartman Cc: Takahiro Hirofuchi Cc: Max Vozeler Cc: usbip-devel Signed-off-by: Greg Kroah-Hartman commit c11c4eebdd75fc0f443a3f794a2ddc85afed1932 Author: Michael Hennerich Date: Wed May 25 14:42:07 2011 +0200 staging: iio: industrialio-trigger: set iio_poll_func private_data Failure to set iio_poll_func private_data, causes zero pointer access violations in all consumer trigger handlers. Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit cddac88f437b0370d3c0ac4c0b2d6c1ff914522d Author: Nicolas Kaiser Date: Wed May 25 02:03:02 2011 +0200 staging: rts_pstor: use bitwise operator instead of logical one Looks like a typo. Signed-off-by: Nicolas Kaiser Reviewed-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit 827e4a07e8d0f6cf18e82988ae8daea3b5feab98 Author: Randy Dunlap Date: Tue May 17 15:15:19 2011 -0700 staging: fix ath6kl build when CFG80211 is not enabled Fix build errors when CONFIG_CFG80211 is not enabled: drivers/built-in.o: In function `ar6k_cfg80211_deinit': (.text+0x189b71): undefined reference to `cfg80211_scan_done' drivers/built-in.o: In function `ar6k_cfg80211_deinit': (.text+0x189b86): undefined reference to `wiphy_unregister' drivers/built-in.o: In function `ar6k_cfg80211_deinit': (.text+0x189b8d): undefined reference to `wiphy_free' drivers/built-in.o: In function `ar6k_cfg80211_init': (.text+0x18add7): undefined reference to `wiphy_new' drivers/built-in.o: In function `ar6k_cfg80211_init': (.text+0x18ae48): undefined reference to `wiphy_register' drivers/built-in.o: In function `ar6k_cfg80211_tkip_micerr_event': (.text+0x18ae95): undefined reference to `cfg80211_michael_mic_failure' drivers/built-in.o: In function `ar6k_cfg80211_scan_node': (.text+0x18afb5): undefined reference to `__ieee80211_get_channel' drivers/built-in.o: In function `ar6k_cfg80211_scan_node': (.text+0x18afd2): undefined reference to `cfg80211_inform_bss_frame' drivers/built-in.o: In function `ar6k_cfg80211_disconnect_event': (.text+0x18b046): undefined reference to `cfg80211_ibss_joined' drivers/built-in.o: In function `ar6k_cfg80211_disconnect_event': (.text+0x18b176): undefined reference to `cfg80211_connect_result' drivers/built-in.o: In function `ar6k_cfg80211_disconnect_event': (.text+0x18b190): undefined reference to `cfg80211_disconnected' drivers/built-in.o: In function `ar6k_cfg80211_connect_event': (.text+0x18b291): undefined reference to `cfg80211_get_bss' drivers/built-in.o: In function `ar6k_cfg80211_connect_event': (.text+0x18b457): undefined reference to `cfg80211_put_bss' drivers/built-in.o: In function `ar6k_cfg80211_connect_event': (.text+0x18b4fa): undefined reference to `cfg80211_roamed' Signed-off-by: Randy Dunlap Cc: Luis R. Rodriguez Cc: Joe Perches Cc: Naveen Singh Signed-off-by: Peter Foley Signed-off-by: Greg Kroah-Hartman commit e1c78de9a462f45dacdc8c27baf77aa680bcf8a4 Author: Roland Vossen Date: Tue May 24 13:35:21 2011 +0200 staging: brcm80211: fix for 'multiple definition of wl_msg_level' build err Reported-by: Linus Torvalds Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 91e623deccd5726ff97f1da6ac48dcc26048034a Author: Randy Dunlap Date: Wed May 25 19:17:06 2011 -0700 staging: fix olpc_dcon build, needs BACKLIGHT_CLASS_DEVICE Fix olpc_dcon.c build by selecting the needed kconfig symbol BACKLIGHT_CLASS_DEVICE. olpc_dcon.c:(.text+0x11588b): undefined reference to `backlight_device_register' Signed-off-by: Randy Dunlap Cc: Andres Salomon Cc: Chris Ball Cc: Jon Nettleton Signed-off-by: Greg Kroah-Hartman commit fe35a59e16fbd426194d5d081d59aa18752d1f4d Author: Greg Kroah-Hartman Date: Tue Jun 7 12:23:57 2011 -0700 Staging: remove STAGING_EXCLUDE_BUILD option Part of the requirement to be in the staging tree is that the code must build, so let's make it easier for people to build the code to test/prove this out. Based on a recommendation from Linus to implement this. Signed-off-by: Greg Kroah-Hartman commit 85ab9ee946da58f26d8a1d7b71664748bdc0f3b0 Author: Greg Kroah-Hartman Date: Tue Jun 7 12:19:14 2011 -0700 Staging: altera: move .h file to proper place Staging drivers should be self-contained, without files in the include/ directories. So move the altera.h file back to the driver directory for now, until it moves out of the staging tree. Cc: Igor M. Liplianin Cc: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman commit 57a27e1d6a3bb9ad4efeebd3a8c71156d6207536 Author: Luciano Coelho Date: Tue Jun 7 20:42:26 2011 +0300 nl80211: fix overflow in ssid_len When one of the SSID's length passed in a scan or sched_scan request is larger than 255, there will be an overflow in the u8 that is used to store the length before checking. This causes the check to fail and we overrun the buffer when copying the SSID. Fix this by checking the nl80211 attribute length before copying it to the struct. This is a follow up for the previous commit 208c72f4fe44fe09577e7975ba0e7fa0278f3d03, which didn't fix the problem entirely. Reported-by: Ido Yariv Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 6633d649788e72400b02098bd389585e2c56a557 Author: Mike McCormack Date: Tue Jun 7 08:58:31 2011 +0900 rtlwifi: Avoid modifying skbs that are resubmitted In the case we fail to allocate a new skb, the old skb should be resubmitted unmodified. Fixes bug introduced in a9e12869758430424804. Signed-off-by: Mike McCormack Acked-by: Larry Finger Signed-off-by: John W. Linville commit 4fea2e0e59dab863a63fa1638b86d850896cd861 Author: Mike McCormack Date: Tue May 31 08:50:24 2011 +0900 rtlwifi: Fix logic in rx_interrupt Should pass along packet if there's no CRC and no hardware error. Signed-off-by: Mike McCormack Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit bb77f6341728624314f488ebd8b4c69f2caa33ea Author: John W. Linville Date: Tue Jun 7 14:03:08 2011 -0400 Revert "mac80211: stop queues before rate control updation" This reverts commit 1d38c16ce4156f63b45abbd09dd28ca2ef5172b4. The mac80211 maintainer raised complaints about abuse of the CSA stop reason, and about whether this patch actually serves its intended purpose at all. Signed-off-by: John W. Linville commit 0bf8fa04e80a562641f687547053f98670f25cf9 Author: Thomas Abraham Date: Tue Jun 7 14:04:49 2011 +0530 gpio/exynos4: Fix incorrect mapping of gpio pull-up macro to register setting The S3C_GPIO_PULL_UP macro value incorrectly maps to a reserved setting of GPIO pull up/down registers on Exynos4 platform. Fix this incorrect mapping by adding wrappers to the s3c_gpio_setpull_updown and s3c_gpio_getpull_updown functions. Signed-off-by: Thomas Abraham Acked-by: Kyungmin Park Signed-off-by: Grant Likely commit 7febe2be36035e5c75128e8cc3baeb1f30fa2bc4 Author: Julia Lawall Date: Wed Jun 1 19:10:06 2011 +0200 drivers/usb/host/ohci-pxa27x.c: add missing clk_put Add a label before the call to clk_put and jump to that in the error handling code that occurs after the call to clk_get has succeeded. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression e1,e2; statement S; @@ e1 = clk_get@p1(...); ... when != e1 = e2 when != clk_put(e1) when any if (...) { ... when != clk_put(e1) when != if (...) { ... clk_put(e1) ... } * return@p3 ...; } else S // Signed-off-by: Julia Lawall Acked-by: Eric Miao Signed-off-by: Greg Kroah-Hartman commit 97b2f900335befbf6c4323ea6fd560ea5df4d154 Author: Alan Stern Date: Tue Jun 7 11:31:05 2011 -0400 USB: CONFIG_USB_GADGET_DUALSPEED is not user-configurable This patch (as1468) changes the Kconfig definition for USB_GADGET_DUALSPEED. This option is determined entirely by which device controller drivers are to be built, through Select statements; it does not need to be (and should not be) configurable by the user. Also, the "default n" line is superfluous -- everything defaults to N. Signed-off-by: Alan Stern Acked-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit c5c69f3f0dcf9b569c8f3ad67f3af92cfcedac43 Author: Alan Stern Date: Tue Jun 7 11:33:01 2011 -0400 USB: dummy-hcd needs the has_tt flag Like with other host controllers capable of operating at both high speed and full speed, we need to indicate that the emulated controller presented by dummy-hcd has this ability. Otherwise usbcore will not accept full-speed gadgets under dummy-hcd. This patch (as1469) sets the appropriate has_tt flag. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 21c13a4f7bc185552c4b402b792c3bbb9aa69df0 Author: Alan Stern Date: Tue Jun 7 11:35:52 2011 -0400 usb-storage: redo incorrect reads Some USB mass-storage devices have bugs that cause them not to handle the first READ(10) command they receive correctly. The Corsair Padlock v2 returns completely bogus data for its first read (possibly it returns the data in encrypted form even though the device is supposed to be unlocked). The Feiya SD/SDHC card reader fails to complete the first READ(10) command after it is plugged in or after a new card is inserted, returning a status code that indicates it thinks the command was invalid, which prevents the kernel from retrying the read. Since the first read of a new device or a new medium is for the partition sector, the kernel is unable to retrieve the device's partition table. Users have to manually issue an "hdparm -z" or "blockdev --rereadpt" command before they can access the device. This patch (as1470) works around the problem. It adds a new quirk flag, US_FL_INVALID_READ10, indicating that the first READ(10) should always be retried immediately, as should any failing READ(10) commands (provided the preceding READ(10) command succeeded, to avoid getting stuck in a loop). The patch also adds appropriate unusual_devs entries containing the new flag. Signed-off-by: Alan Stern Tested-by: Sven Geggus Tested-by: Paul Hartman CC: Matthew Dharm CC: Signed-off-by: Greg Kroah-Hartman commit e6bc45d65df8599fdbae73be9cec4ceed274db53 Author: Theodore Ts'o Date: Mon Jun 6 19:19:40 2011 -0400 vfs: make unlink() and rmdir() return ENOENT in preference to EROFS If user space attempts to remove a non-existent file or directory, and the file system is mounted read-only, return ENOENT instead of EROFS. Either error code is arguably valid/correct, but ENOENT is a more specific error message. Reported-by: Michael Tokarev Signed-off-by: "Theodore Ts'o" Signed-off-by: Al Viro commit 9054760ff585a7fa436599990b63a585ae89ff4d Author: Al Viro Date: Sun Jun 5 19:22:56 2011 +0100 lmLogOpen() broken failure exit Callers of lmLogOpen() expect it to return -E... on failure exits, which is what it returns, except for the case of blkdev_get_by_dev() failure. It that case lmLogOpen() return the error with the wrong sign... Signed-off-by: Al Viro Acked-by: Dave Kleikamp commit 6c6c54e1807faf116724451ef2bd14993780470a Author: Peter Zijlstra Date: Fri Jun 3 17:37:07 2011 +0200 sched: Fix/clarify set_task_cpu() locking rules Sergey reported a CONFIG_PROVE_RCU warning in push_rt_task where set_task_cpu() was called with both relevant rq->locks held, which should be sufficient for running tasks since holding its rq->lock will serialize against sched_move_task(). Update the comments and fix the task_group() lockdep test. Reported-and-tested-by: Sergey Senozhatsky Cc: Oleg Nesterov Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/r/1307115427.2353.3456.camel@twins Signed-off-by: Ingo Molnar commit f2513cde93f0957d5dc6c09bc24b0cccd27d8e1d Author: Peter Zijlstra Date: Mon Jun 6 12:32:43 2011 +0200 lockdep: Fix lock_is_held() on recursion The main lock_is_held() user is lockdep_assert_held(), avoid false assertions in lockdep_off() sections by unconditionally reporting the lock is taken. [ the reason this is important is a lockdep_assert_held() in ttwu() which triggers a warning under lockdep_off() as in printk() which can trigger another wakeup and lock up due to spinlock recursion, as reported and heroically debugged by Arne Jansen ] Reported-and-tested-by: Arne Jansen Signed-off-by: Peter Zijlstra Cc: Linus Torvalds Cc: Link: http://lkml.kernel.org/r/1307398759.2497.966.camel@laptop Signed-off-by: Ingo Molnar commit 064d58ee3afb8a865a72d24e069c7258ec38640e Author: Lars-Peter Clausen Date: Tue Jun 7 10:24:46 2011 +0200 ASoC: Blackfin: bf5xx-ad1836: Fix codec device name Fix the codec_name field of the dai_link to match the actual device name of the codec. Otherwise the card won't be instantiated. Signed-off-by: Lars-Peter Clausen Acked-by: Liam Girdwood Signed-off-by: Mark Brown Cc: stable@kernel.org commit 26018874e3584f1658570d41d57d4c34f6a53aa0 Author: Joerg Roedel Date: Mon Jun 6 16:50:14 2011 +0200 x86/amd-iommu: Fix boot crash with hidden PCI devices Some PCIe cards ship with a PCI-PCIe bridge which is not visible as a PCI device in Linux. But the device-id of the bridge is present in the IOMMU tables which causes a boot crash in the IOMMU driver. This patch fixes by removing these cards from the IOMMU handling. This is a pure -stable fix, a real fix to handle this situation appriatly will follow for the next merge window. Cc: stable@kernel.org # > 2.6.32 Signed-off-by: Joerg Roedel commit 264524d5e5195f6e0f099bee20253a22b651e272 Author: Heiko Carstens Date: Mon Jun 6 20:50:03 2011 +0000 net: cpu offline cause napi stall Frank Blaschka reported : During heavy network load we turn off/on cpus. Sometimes this causes a stall on the network device. Digging into the dump I found out following: napi is scheduled but does not run. From the I/O buffers and the napi state I see napi/rx_softirq processing has stopped because the budget was reached. napi stays in the softnet_data poll_list and the rx_softirq was raised again. I assume at this time the cpu offline comes in, the rx softirq is raised/moved to another cpu but napi stays in the poll_list of the softnet_data of the now offline cpu. Reviewing dev_cpu_callback (net/core/dev.c) I did not find the poll_list is transfered to the new cpu. This patch is a straightforward implementation of Frank suggestion : Transfert poll_list and trigger NET_RX_SOFTIRQ on new cpu. Reported-by: Frank Blaschka Signed-off-by: Heiko Carstens Signed-off-by: Eric Dumazet Tested-by: Eric Dumazet Signed-off-by: David S. Miller commit 6407d74c5106bb362b4087693688afd34942b094 Author: Alexander Holler Date: Tue Jun 7 00:51:35 2011 -0700 bridge: provide a cow_metrics method for fake_ops Like in commit 0972ddb237 (provide cow_metrics() methods to blackhole dst_ops), we must provide a cow_metrics for bridges fake_dst_ops as well. This fixes a regression coming from commits 62fa8a846d7d (net: Implement read-only protection and COW'ing of metrics.) and 33eb9873a28 (bridge: initialize fake_rtable metrics) ip link set mybridge mtu 1234 --> [ 136.546243] Pid: 8415, comm: ip Tainted: P 2.6.39.1-00006-g40545b7 #103 ASUSTeK Computer Inc. V1Sn /V1Sn [ 136.546256] EIP: 0060:[<00000000>] EFLAGS: 00010202 CPU: 0 [ 136.546268] EIP is at 0x0 [ 136.546273] EAX: f14a389c EBX: 000005d4 ECX: f80d32c0 EDX: f80d1da1 [ 136.546279] ESI: f14a3000 EDI: f255bf10 EBP: f15c3b54 ESP: f15c3b48 [ 136.546285] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 [ 136.546293] Process ip (pid: 8415, ti=f15c2000 task=f4741f80 task.ti=f15c2000) [ 136.546297] Stack: [ 136.546301] f80c658f f14a3000 ffffffed f15c3b64 c12cb9c8 f80d1b80 ffffffa1 f15c3bbc [ 136.546315] c12da347 c12d9c7d 00000000 f7670b00 00000000 f80d1b80 ffffffa6 f15c3be4 [ 136.546329] 00000004 f14a3000 f255bf20 00000008 f15c3bbc c11d6cae 00000000 00000000 [ 136.546343] Call Trace: [ 136.546359] [] ? br_change_mtu+0x5f/0x80 [bridge] [ 136.546372] [] dev_set_mtu+0x38/0x80 [ 136.546381] [] do_setlink+0x1a7/0x860 [ 136.546390] [] ? rtnl_fill_ifinfo+0x9bd/0xc70 [ 136.546400] [] ? nla_parse+0x6e/0xb0 [ 136.546409] [] rtnl_newlink+0x361/0x510 [ 136.546420] [] ? vmalloc_sync_all+0x100/0x100 [ 136.546429] [] ? error_code+0x5a/0x60 [ 136.546438] [] ? rtnl_configure_link+0x80/0x80 [ 136.546446] [] rtnetlink_rcv_msg+0xfa/0x210 [ 136.546454] [] ? __rtnl_unlock+0x20/0x20 [ 136.546463] [] netlink_rcv_skb+0x8e/0xb0 [ 136.546471] [] rtnetlink_rcv+0x1c/0x30 [ 136.546479] [] netlink_unicast+0x23a/0x280 [ 136.546487] [] netlink_sendmsg+0x26b/0x2f0 [ 136.546497] [] sock_sendmsg+0xc8/0x100 [ 136.546508] [] ? __alloc_pages_nodemask+0xe1/0x750 [ 136.546517] [] ? _copy_from_user+0x42/0x60 [ 136.546525] [] ? verify_iovec+0x4c/0xc0 [ 136.546534] [] sys_sendmsg+0x1c5/0x200 [ 136.546542] [] ? __do_fault+0x310/0x410 [ 136.546549] [] ? do_wp_page+0x1d6/0x6b0 [ 136.546557] [] ? handle_pte_fault+0xe1/0x720 [ 136.546565] [] ? sys_getsockname+0x7f/0x90 [ 136.546574] [] ? handle_mm_fault+0xb1/0x180 [ 136.546582] [] ? vmalloc_sync_all+0x100/0x100 [ 136.546589] [] ? do_page_fault+0x173/0x3d0 [ 136.546596] [] ? sys_recvmsg+0x3b/0x60 [ 136.546605] [] sys_socketcall+0x293/0x2d0 [ 136.546614] [] sysenter_do_call+0x12/0x26 [ 136.546619] Code: Bad EIP value. [ 136.546627] EIP: [<00000000>] 0x0 SS:ESP 0068:f15c3b48 [ 136.546645] CR2: 0000000000000000 [ 136.546652] ---[ end trace 6909b560e78934fa ]--- Signed-off-by: Alexander Holler Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 13fcb7bd322164c67926ffe272846d4860196dc6 Author: Eric Dumazet Date: Mon Jun 6 22:42:06 2011 -0700 af_packet: prevent information leak In 2.6.27, commit 393e52e33c6c2 (packet: deliver VLAN TCI to userspace) added a small information leak. Add padding field and make sure its zeroed before copy to user. Signed-off-by: Eric Dumazet CC: Patrick McHardy Signed-off-by: David S. Miller commit 0a1896b27b030529ec770aefd790544a1bdb7d5a Author: Daniel T Chen Date: Mon Jun 6 18:55:34 2011 -0400 ALSA: hda: Fix quirk for Dell Inspiron 910 BugLink: https://launchpad.net/bugs/792712 The original reporter states that sound from the internal speakers is inaudible until using the model=auto quirk. This symptom is due to an existing quirk mask for 0x102802b* that uses the model=dell quirk. To limit the possible regressions, leave the existing quirk mask but add a higher priority specific mask for the reporter's PCI SSID. Reported-and-tested-by: rodni hipp Cc: [2.6.38+] Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 9c4843ea576107a3c1fb94f2f758f198e9fe9e54 Author: Jeff Layton Date: Mon Jun 6 15:40:23 2011 -0400 cifs: silence printk when establishing first session on socket When signing is enabled, the first session that's established on a socket will cause a printk like this to pop: CIFS VFS: Unexpected SMB signature This is because the key exchange hasn't happened yet, so the signature field is bogus. Don't try to check the signature on the socket until the first session has been established. Also, eliminate the specific check for SMB_COM_NEGOTIATE since this check covers that case too. Cc: stable@kernel.org Cc: Shirish Pargaonkar Signed-off-by: Jeff Layton Signed-off-by: Steve French commit dcc32b838b449aef8533f130cfad41b912bfb228 Merge: de52bca 4cff3ce Author: Dave Airlie Date: Tue Jun 7 10:07:09 2011 +1000 Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into drm-fixes * 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next: drm/nv40: fall back to paged dma object for the moment drm/nouveau: fix leak of gart mm node drm/nouveau: fix vram page mapping when crossing page table boundaries drm/nv17-nv40: Fix modesetting failure when pitch == 4096px (fdo bug 35901). drm/nouveau: don't create accel engine objects when noaccel=1 drm/nvc0: recognise 0xdX chipsets as NV_C0 commit 79b3891587741dfac72cdfead1f2764b56a567b0 Author: David S. Miller Date: Mon Jun 6 17:00:35 2011 -0700 irda: iriap: Use seperate lockdep class for irias_objects->hb_spinlock The SEQ output functions grab the obj->attrib->hb_spinlock lock of sub-objects found in the hash traversal. These locks are in a different realm than the one used for the irias_objects hash table itself. So put the latter into it's own lockdep class. Reported-by: Dave Jones Signed-off-by: David S. Miller commit de52bcab836e6ad21bb0c03c6030725044b2819e Merge: 59c5f46 6a574b5 Author: Dave Airlie Date: Tue Jun 7 09:54:04 2011 +1000 Merge remote branch 'keithp/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes * 'keithp/drm-intel-fixes' of /ssd/git/drm-next: drm/i915: Add a no lvds quirk for the Asus EeeBox PC EB1007 drm/i915: Share the common force-audio property between connectors drm/i915: Remove unused enum "chip_family" drm/915: fix relaxed tiling on gen2: tile height drm/i915/crt: Explicitly return false if connected to a digital monitor drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0 drm/i915: Only print out the actual number of fences for i915_error_state drm/i915: s/addr & ~PAGE_MASK/offset_in_page(addr)/ drm: i915: correct return status in intel_hdmi_mode_valid() drm/i915: fix regression after clock gating init split drm/i915: fix if statement in ivybridge irq handler commit 3019de124b9f5b1526cb3668b74af14371e21795 Author: David S. Miller Date: Mon Jun 6 16:41:33 2011 -0700 net: Rework netdev_drivername() to avoid warning. This interface uses a temporary buffer, but for no real reason. And now can generate warnings like: net/sched/sch_generic.c: In function dev_watchdog net/sched/sch_generic.c:254:10: warning: unused variable drivername Just return driver->name directly or "". Reported-by: Connor Hansen Signed-off-by: David S. Miller commit 3af51ac9c0889a188aaa3defe5134ef97c80d7c5 Author: Sebastian Andrzej Siewior Date: Fri Jun 3 19:50:48 2011 +0200 usb/renesas_usbhs: free uep on removal Can't find evidence that this is actually done. Cc: Kuninori Morimoto Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Greg Kroah-Hartman commit 6bc129532176fcafb4202b73b3f431986391a362 Author: Sebastian Andrzej Siewior Date: Fri Jun 3 19:50:47 2011 +0200 usb/s3c-hsudc: fix error path I doubt the clock is optional. In case it is it should not return with an error code because we leak everything. Cc: Jingoo Han Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Greg Kroah-Hartman commit a6207b17ece4ea40c378233b1ddf2a7f4288419d Author: Sebastian Andrzej Siewior Date: Fri Jun 3 19:50:46 2011 +0200 usb/pxa25x_udc: cleanup the LUBBOCK err path this is more backwords than it has to be. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Greg Kroah-Hartman commit cb42447374eb4348b75ec677bf9c77958c7d10e0 Author: Sebastian Andrzej Siewior Date: Fri Jun 3 19:50:45 2011 +0200 usb/mv_udc_core: fix compile |drivers/usb/gadget/mv_udc_core.c:2108: error: label `error' used but not defined This seems to be broken since the initial commit. I changed this to a simple return. The other user is the probe code which lets ->probe() fail on error here. |drivers/usb/gadget/mv_udc_core.c:2107: warning: passing argument 1 of `dev_err' from incompatible pointer type |drivers/usb/gadget/mv_udc_core.c:2118: warning: initialization from incompatible pointer type |drivers/usb/gadget/mv_udc_core.c:2119: warning: initialization from incompatible pointer type |drivers/usb/gadget/mv_udc_core.c:2130: error: initializer element is not constant |drivers/usb/gadget/mv_udc_core.c:2130: error: (near initialization for `udc_driver.driver.pm') Cc: Chao Xie Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Greg Kroah-Hartman commit b38b03b363a53067e8b8f3f43f00b6428bd5319c Author: Bryan Wu Date: Thu Jun 2 12:51:29 2011 +0800 usb: gadget: include to fix compiling error drivers/usb/gadget/at91_udc.c: In function 'write_fifo': drivers/usb/gadget/at91_udc.c:421:2: error: implicit declaration of function 'prefetch' make[3]: *** [drivers/usb/gadget/at91_udc.o] Error 1 make[2]: *** [drivers/usb/gadget] Error 2 make[2]: *** Waiting for unfinished jobs.... Signed-off-by: Bryan Wu Signed-off-by: Greg Kroah-Hartman commit 83a018045659ee2cc9b1390ddb8b2a247d269bc4 Author: Mark Brown Date: Wed Jun 1 17:16:15 2011 +0100 USB: s3c-hsotg: Tone down debugging Currently the s3c-hsotg driver is extremely chatty, producing voluminous with large register dumps even in default operation. Tone this down so we're not chatty unless DEBUG is defined. Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman commit 1d4a4bde6b1cd4c8bbe1dd20dee18416a62b9c51 Author: Sage Weil Date: Tue May 31 09:11:11 2011 -0700 usb: remove bad dput after dentry_unhash Commit 64252c75a (vfs: remove dget() from dentry_unhash()) removed the useless dget from dentry_unhash but didn't fix up this caller in the usb code. There used to be exactly one dput per dentry_unhash call; now there are none. Tested-by: Sebastian Andrzej Siewior Signed-off-by: Sage Weil Signed-off-by: Greg Kroah-Hartman commit 4cff3ce5fe5c3c88f103d58c5e7855f9519960e4 Author: Ben Skeggs Date: Wed Jun 1 14:08:49 2011 +1000 drm/nv40: fall back to paged dma object for the moment PCI(E)GART isn't quite stable it seems, fall back to old method until I get the time to sort it out properly. Signed-off-by: Ben Skeggs commit 960bdba08e06a1f35fc2fe784aa293dee58abc68 Author: Ben Skeggs Date: Mon May 30 09:28:31 2011 +1000 drm/nouveau: fix leak of gart mm node Signed-off-by: Ben Skeggs commit 73c337e70e75bb94dcb21459dd06afad0746634c Author: Ben Skeggs Date: Sat May 28 02:12:04 2011 +1000 drm/nouveau: fix vram page mapping when crossing page table boundaries Hopefully the cause of nvc0 "page jumping" issue. Signed-off-by: Ben Skeggs commit c1003d9c90f410777ab57f675b2a575c9c7ab5d7 Author: Francisco Jerez Date: Tue May 24 15:57:14 2011 +0200 drm/nv17-nv40: Fix modesetting failure when pitch == 4096px (fdo bug 35901). Reported-by: Mario Bachmann Tested-by: Greg Turner Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 18b54c4d5893f32641d4961563c0f196cc04dc83 Author: Ben Skeggs Date: Wed May 25 15:22:33 2011 +1000 drm/nouveau: don't create accel engine objects when noaccel=1 Fixes various potential oopses. Signed-off-by: Ben Skeggs commit cdf81a235f11c8a55023c6b181d21d519a8a5967 Author: Ben Skeggs Date: Wed May 25 14:39:52 2011 +1000 drm/nvc0: recognise 0xdX chipsets as NV_C0 Should hopefully get modesetting at least from this, it appears these are GF119 chipsets. Accel will come eventually, once I order a board. Signed-off-by: Ben Skeggs commit 85ec7b970553369e0c956fab1d7a6022f2a99369 Author: Colin Cross Date: Mon Jun 6 13:38:18 2011 -0700 GPIO: OMAP: add locking around calls to _set_gpio_triggering _set_gpio_triggering uses read-modify-write on bank registers, lock bank->lock around all calls to it to prevent register corruption if two cpus access gpios in the same bank at the same time. Signed-off-by: Colin Cross Signed-off-by: Kevin Hilman commit 0622b25bf071fd83c6eef6b61fb5f3f12a418528 Author: Colin Cross Date: Mon Jun 6 13:38:17 2011 -0700 GPIO: OMAP: fix setting IRQWAKEN bits for OMAP4 Setting the IRQWAKEN bit was overwriting previous IRQWAKEN bits, causing only the last bit set to take effect, resulting in lost wakeups when the GPIO controller is in idle. Replace direct writes to IRQWAKEN with MOD_REG_BIT calls to perform a read-modify-write on the register. Signed-off-by: Colin Cross Signed-off-by: Kevin Hilman commit d52b31deffe1956ac62d0b81b915c9b52cffb814 Author: Russell King Date: Fri May 27 13:56:12 2011 -0700 GPIO: OMAP: fix section mismatch warnings WARNING: arch/arm/plat-omap/built-in.o(.devinit.text+0x46c): Section mismatch in reference from the function omap_gpio_probe() to the function .init.text:omap_gpio_chip_init() The function __devinit omap_gpio_probe() references a function __init omap_gpio_chip_init(). If omap_gpio_chip_init is only used by omap_gpio_probe then annotate omap_gpio_chip_init with a matching annotation. Signed-off-by: Russell King Signed-off-by: Kevin Hilman commit 3824c1ddaf744be44b170a335332b9d6afe79254 Author: Libor Pechacek Date: Fri May 20 14:53:25 2011 +0200 USB: core: Tolerate protocol stall during hub and port status read Protocol stall should not be fatal while reading port or hub status as it is transient state. Currently hub EP0 STALL during port status read results in failed device enumeration. This has been observed with ST-Ericsson (formerly Philips) USB 2.0 Hub (04cc:1521) after connecting keyboard. Signed-off-by: Libor Pechacek Acked-by: Alan Stern Cc: stable Signed-off-by: Greg Kroah-Hartman commit 9303961f5b8c8da0b65b897fb6521d2a123ec8a8 Author: Mike Frysinger Date: Wed May 25 08:13:24 2011 -0400 musb: fix prefetch build failure After the prefetch/list.h restructure, drivers need to explicitly include linux/prefetch.h in order to use the prefetch() function. Otherwise, the current driver fails to build: drivers/usb/musb/musb_core.c: In function 'musb_write_fifo': drivers/usb/musb/musb_core.c:219: error: implicit declaration of function 'prefetch' make[3]: *** [drivers/usb/musb/musb_core.o] Error 1 Signed-off-by: Mike Frysinger Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 4061fde2fa80f40cb27114f60500d38d0afcf350 Author: Toby Gray Date: Mon Jun 6 14:52:48 2011 +0100 USB: cdc-acm: Adding second ACM channel support for Nokia E7 and C7 This adds the Nokia E7 and C7 to the list of devices in cdc-acm, allowing the secondary ACM channel on the device to be exposed. Without this patch the ACM driver won't claim this secondary channel as it's marked as having a vendor-specific protocol. Signed-off-by: Toby Gray Cc: stable Signed-off-by: Greg Kroah-Hartman commit 3898115896c7f18cb7009de691c43cb3d92bb82a Author: Alexey Khoroshilov Date: Fri May 27 08:37:40 2011 +0400 usb-gadget: unlock data->lock mutex on error path in ep_write() ep_write() acquires data->lock mutex in get_ready_ep() and releases it on all paths except for one: when usb_endpoint_xfer_isoc() failed. The patch adds mutex_unlock(&data->lock) at that path. It is similar to commit 00cc7a5 ("usb-gadget: unlock data->lock mutex on error path in ep_read()"), it was not fixed at that time by accident. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov Signed-off-by: Greg Kroah-Hartman commit 7e8e62e4a5d26e4cb45f25dddd093837d75616c2 Author: Torsten Hilbrich Date: Mon Jun 6 15:39:55 2011 +0200 USB: option Add blacklist for ZTE K3765-Z (19d2:2002) The funtion option_send_status times out when sending USB messages to the interfaces 0, 1, and 2 of this UMTS stick. This results in a 5s timeout in the function causing other tty operations to feel very sluggish. This patch adds a blacklist entry for these 3 interfaces on the ZTE K3765-Z device. I was also able to reproduce the problem with v2.6.38 and v2.6.39. This is very similar to a problem fixed in commit 7a89e4cb9cdaba92f5fbc509945cf4e3c48db4e2 Author: Herton Ronaldo Krzesinski Date: Wed Mar 9 09:19:48 2011 +0000 USB: serial: option: Apply OPTION_BLACKLIST_SENDSETUP also for ZTE MF626 Signed-off-by: Torsten Hilbrich Cc: stable Signed-off-by: Greg Kroah-Hartman commit 5c3e4076ee8253c1e3688d10653ddee47a03b0db Author: Dan Williams Date: Mon Jun 6 16:55:41 2011 -0500 option: add Prolink PH300 modem IDs Simple ID addition. Signed-off-by: Dan Williams Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman commit 15badbcc8eede58b0d7e53a3acde1c90a7b6e40e Author: Dan Williams Date: Mon Jun 6 16:22:44 2011 -0500 option: add Alcatel X200 to sendsetup blacklist This modem really wants sendsetup blacklisted for interfaces 0 and 1, otherwise the kernel hardlocks for about 10 seconds while waiting for the modem's firmware to respond, which it of course doesn't do. A slight complication here is that TCT (who owns the Alcatel brand) used the same USB IDs for the X200 as the X060s despite the devices having completely different firmware and AT command sets, so we end up adding the X060s to the blacklist at the same time. PSA to OEMs: don't use the same USB IDs for different devices. Really. It makes your kittens cry. Signed-off-by: Dan Williams Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman commit cdacb598fe7ab85de80908c818dd7d66a2971117 Author: Dan Williams Date: Mon Jun 6 16:08:39 2011 -0500 option: add Zoom 4597 modem USB IDs Uses Longcheer-based firmware and AT command set. Signed-off-by: Dan Williams Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman commit eab54042cd850778febae18098e77000dd298630 Merge: 59c5f46 cd3c18b Author: Greg Kroah-Hartman Date: Mon Jun 6 15:55:57 2011 -0700 Merge branch 'for-usb-linus' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus * 'for-usb-linus' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/sarah/xhci: USB: xhci - fix interval calculation for FS isoc endpoints xhci: Disable MSI for some Fresco Logic hosts. xhci: Do not issue device reset when device is not setup xhci: Add defines for hardcoded slot states xhci: Bigendian fix for xhci_check_bandwidth() xhci: Bigendian fix for skip_isoc_td() commit 5a079c305ad4dda9708b7a29db4a8bd38e21c3a6 Author: Marcus Meissner Date: Mon Jun 6 06:00:07 2011 +0000 net/ipv6: check for mistakenly passed in non-AF_INET6 sockaddrs Same check as for IPv4, also do for IPv6. (If you passed in a IPv4 sockaddr_in here, the sizeof check in the line before would have triggered already though.) Signed-off-by: Marcus Meissner Cc: Reinhard Max Signed-off-by: David S. Miller commit 8ca695f273709a9d147826716a8dee3e0eb2407f Author: Lars-Peter Clausen Date: Mon Jun 6 13:38:35 2011 +0200 ASoC: AD1836: Fix setting the PCM format Signed-off-by: Lars-Peter Clausen Acked-by: Liam Girdwood Signed-off-by: Mark Brown Cc: stable@kernel.org commit 2b22b1b1e169c6591aa125525223f70e40ed4acf Merge: 85fadea c111147 Author: David S. Miller Date: Mon Jun 6 13:25:36 2011 -0700 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 5f98ecdbcef1920323d8777c0ba55dbd4335d3cf Author: FUJITA Tomonori Date: Sun Jun 5 11:47:29 2011 +0900 swiotlb: Export swioltb_nr_tbl and utilize it as appropiate. By default the io_tlb_nslabs is set to zero, and gets set to whatever value is passed in via swiotlb_init_with_tbl function. The default value passed in is 64MB. However, if the user provides the 'swiotlb=' the default value is ignored and the value provided by the user is used... Except when the SWIOTLB is used under Xen - there the default value of 64MB is used and the Xen-SWIOTLB has no mechanism to get the 'io_tlb_nslabs' filled out by setup_io_tlb_npages functions. This patch provides a function for the Xen-SWIOTLB to call to see if the io_tlb_nslabs is set and if so use that value. Signed-off-by: FUJITA Tomonori Signed-off-by: Konrad Rzeszutek Wilk commit 51892dbbd511911c0f965a36b431fc3e8f1e4f8a Author: Stanislaw Gruszka Date: Mon Jun 6 15:11:30 2011 +0200 iwl4965: set tx power after rxon_assoc Setting tx power can be deferred during scan or changing channel. If after that correct tx power settings will not be sent to device, we can observe transmission problems and timeouts. Force to send tx power settings also after partial rxon change, to assure device always be configured with up-to-date settings. Resolves: https://bugzilla.kernel.org/show_bug.cgi?id=36492 Cc: stable@kernel.org # 2.6.39+ Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 3bb42a64960253353278876ca8da6b0a7d3bea87 Author: Stanislaw Gruszka Date: Sat Jun 4 16:48:54 2011 +0200 rt2x00: fix rmmod crash Avoid queue and run autowakeup_work when device is not present anymore. That prevent rmmod and device remove crash introduced by: commit 1c0bcf89d85cc97a0d9ce4cd909351a81fa4fdde Author: Ivo van Doorn Date: Sat Apr 30 17:18:18 2011 +0200 rt2x00: Add autowake support for USB hardware Signed-off-by: Stanislaw Gruszka Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 42b70a5f6d18165a075d189d1bee82fad7cdbf29 Author: Stanislaw Gruszka Date: Thu May 26 17:14:22 2011 +0200 iwlagn: use cts-to-self protection on 5000 adapters series This patch fixes 802.11n stability and performance regression we have since 2.6.35. It boost performance on my 5GHz N-only network from about 5MB/s to 8MB/s. Similar percentage boost can be observed on 2.4 GHz. These are test results of 5x downloading of approximately 700MB iso image: vanilla: 5.27 5.22 4.94 4.47 5.31 ; avr 5.0420 std 0.35110 patched: 8.07 7.95 8.06 7.99 7.96 ; avr 8.0060 std 0.055946 This was achieved with NetworkManager configured to do not perform periodical scans, by configuring constant BSSID. With periodical scans, after some time, performance downgrade to unpatched driver level, like in example below: patched: 7.40 7.61 4.28 4.37 4.80 avr 5.6920 std 1.6683 However patch still make better here, since similar test on unpatched driver make link disconnects with below messages after some time: wlan1: authenticate with 00:23:69:35:d1:3f (try 1) wlan1: authenticate with 00:23:69:35:d1:3f (try 2) wlan1: authenticate with 00:23:69:35:d1:3f (try 3) wlan1: authentication with 00:23:69:35:d1:3f timed out On 2.6.35 kernel patch helps against connection hangs with messages: iwlagn 0000:20:00.0: queue 10 stuck 3 time. Fw reload. iwlagn 0000:20:00.0: On demand firmware reload iwlagn 0000:20:00.0: Stopping AGG while state not ON or starting Cc: stable@kernel.org # 2.6.35+ Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit ab6a44ce1da48d35fe7ec95fa068aa617bd7e8dd Author: John W. Linville Date: Mon Jun 6 14:35:27 2011 -0400 Revert "mac80211: Skip tailroom reservation for full HW-crypto devices" This reverts commit aac6af5534fade2b18682a0b9efad1a6c04c34c6. Conflicts: net/mac80211/key.c That commit has a race that causes a warning, as documented in the thread here: http://marc.info/?l=linux-wireless&m=130717684914101&w=2 Signed-off-by: John W. Linville commit fd137e2bba53b7207cbae6a1312e89ef3ae55624 Author: Mark Brown Date: Mon Jun 6 11:26:15 2011 +0100 ASoC: Check for NULL register bank in snd_soc_get_cache_val() Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit c11114717a66455de9fbc3ea69ae00d1aace3c14 Merge: 5fb9fb1 d2ac49f Author: John W. Linville Date: Mon Jun 6 13:58:21 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem commit 243e2dd38e1b322b29a1714034cc60b84d3d5e07 Author: Darren Salt Date: Mon Jun 6 16:58:16 2011 +0000 CIFS ACL support needs CONFIG_KEYS, so depend on it Build fails if CONFIG_KEYS is not selected. Signed-off-by: Darren Salt Reviewed-by: Shirish Pargaonkar Signed-off-by: Steve French commit 27c2127a15d340706c0aa84e311188a14468d841 Author: Joerg Roedel Date: Mon May 30 15:56:24 2011 +0200 x86/amd-iommu: Use only per-device dma_ops Unfortunatly there are systems where the AMD IOMMU does not cover all devices. This breaks with the current driver as it initializes the global dma_ops variable. This patch limits the AMD IOMMU to the devices listed in the IVRS table fixing DMA for devices not covered by the IOMMU. Cc: stable@kernel.org Signed-off-by: Joerg Roedel commit 957df4535d06a8e009101239937ca5e50a6218c6 Author: Vasily Averin Date: Mon Jun 6 11:33:12 2011 +0400 possible memory corruption in cifs_parse_mount_options() error path after mountdata check frees uninitialized mountdata_copy Signed-off-by: Vasily Averin Signed-off-by: Steve French commit 0de66d5b35ee148455e268b2782873204ffdef4b Author: Joerg Roedel Date: Mon Jun 6 16:04:02 2011 +0200 x86/amd-iommu: Fix 3 possible endless loops The driver contains several loops counting on an u16 value where the exit-condition is checked against variables that can have values up to 0xffff. In this case the loops will never exit. This patch fixed 3 such loops. Cc: stable@kernel.org Signed-off-by: Joerg Roedel commit 6c61cfe91be53b444abc1da2dbab14efa77706c0 Author: Martin Schwidefsky Date: Mon Jun 6 14:14:42 2011 +0200 [S390] fix kvm defines for 31 bit compile KVM is not available for 31 bit but the KVM defines cause warnings: arch/s390/include/asm/pgtable.h: In function 'ptep_test_and_clear_user_dirty': arch/s390/include/asm/pgtable.h:817: warning: integer constant is too large for 'unsigned long' type arch/s390/include/asm/pgtable.h:818: warning: integer constant is too large for 'unsigned long' type arch/s390/include/asm/pgtable.h: In function 'ptep_test_and_clear_user_young': arch/s390/include/asm/pgtable.h:837: warning: integer constant is too large for 'unsigned long' type arch/s390/include/asm/pgtable.h:838: warning: integer constant is too large for 'unsigned long' type Add 31 bit versions of the KVM defines to remove the warnings. Signed-off-by: Martin Schwidefsky commit 36409f6353fc2d7b6516e631415f938eadd92ffa Author: Martin Schwidefsky Date: Mon Jun 6 14:14:41 2011 +0200 [S390] use generic RCU page-table freeing code Replace the s390 specific rcu page-table freeing code with the generic variant. This requires to duplicate the definition for the struct mmu_table_batch as s390 does not use the generic tlb flush code. While we are at it remove the restriction that page table fragments can not be reused after a single fragment has been freed with rcu and split out allocation and freeing of page tables with pgstes. Signed-off-by: Martin Schwidefsky commit 3ec90878bade9280dee87c9e27d759f1cee07e70 Author: Jan Glauber Date: Mon Jun 6 14:14:40 2011 +0200 [S390] qdio: Split SBAL entry flags The qdio SBAL entry flag is made-up of four different values that are independent of one another. Some of the bits are reserved by the hardware and should not be changed by qdio. Currently all four values are overwritten since the SBAL entry flag is defined as an u32. Split the SBAL entry flag into four u8's as defined by the hardware and don't touch the reserved bits. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 9950f8be3f379e36be73be958ec5cf6c15eac0b2 Author: Christian Borntraeger Date: Mon Jun 6 14:14:39 2011 +0200 [S390] kvm-s390: fix stfle facilities numbers >=64 Currently KVM masks out the known good facilities only for the first double word, but passed the 2nd double word without filtering. This breaks some code on newer systems: [ 0.593966] ------------[ cut here ]------------ [ 0.594086] WARNING: at arch/s390/oprofile/hwsampler.c:696 [ 0.594213] Modules linked in: [ 0.594321] Modules linked in: [ 0.594439] CPU: 0 Not tainted 3.0.0-rc1 #46 [ 0.594564] Process swapper (pid: 1, task: 00000001effa8038, ksp: 00000001effafab8) [ 0.594735] Krnl PSW : 0704100180000000 00000000004ab89a (hwsampler_setup+0x75a/0x7b8) [ 0.594910] R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:1 PM:0 EA:3 [ 0.595120] Krnl GPRS: ffffffff00000000 00000000ffffffea ffffffffffffffea 00000000004a98f8 [ 0.595351] 00000000004aa002 0000000000000001 000000000080e720 000000000088b9f8 [ 0.595522] 000000000080d3e8 0000000000000000 0000000000000000 000000000080e464 [ 0.595725] 0000000000000000 00000000005db198 00000000004ab3a2 00000001effafd98 [ 0.595901] Krnl Code: 00000000004ab88c: c0e5000673ca brasl %r14,57a020 [ 0.596071] 00000000004ab892: a7f4fc77 brc 15,4ab180 [ 0.596276] 00000000004ab896: a7f40001 brc 15,4ab898 [ 0.596454] >00000000004ab89a: a7c8ffa1 lhi %r12,-95 [ 0.596657] 00000000004ab89e: a7f4fc71 brc 15,4ab180 [ 0.596854] 00000000004ab8a2: a7f40001 brc 15,4ab8a4 [ 0.597029] 00000000004ab8a6: a7f4ff22 brc 15,4ab6ea [ 0.597230] 00000000004ab8aa: c0200011009a larl %r2,6cb9de [ 0.597441] Call Trace: [ 0.597511] ([<00000000004ab3a2>] hwsampler_setup+0x262/0x7b8) [ 0.597676] [<0000000000875812>] oprofile_arch_init+0x32/0xd0 [ 0.597834] [<0000000000875788>] oprofile_init+0x28/0x74 [ 0.597991] [<00000000001001be>] do_one_initcall+0x3a/0x170 [ 0.598151] [<000000000084fa22>] kernel_init+0x142/0x1ec [ 0.598314] [<000000000057db16>] kernel_thread_starter+0x6/0xc [ 0.598468] [<000000000057db10>] kernel_thread_starter+0x0/0xc [ 0.598606] Last Breaking-Event-Address: [ 0.598707] [<00000000004ab896>] hwsampler_setup+0x756/0x7b8 [ 0.598863] ---[ end trace ce3179037f4e3e5b ]--- So lets also mask the 2nd double word. Facilites 66,76,76,77 should be fine. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit a578b37cc2e719447810343089a7cb93efc3812f Author: Christian Borntraeger Date: Mon Jun 6 14:14:38 2011 +0200 [S390] kvm-s390: Fix host crash on misbehaving guests commit 9ff4cfb3fcfd48b49fdd9be7381b3be340853aa4 ([S390] kvm-390: Let kernel exit SIE instruction on work) fixed a problem of commit commit cd3b70f5d4d82f85d1e1d6e822f38ae098cf7c72 ([S390] virtualization aware cpu measurement) but uncovered another one. If a kvm guest accesses guest real memory that doesnt exist, the page fault handler calls the sie hook, which then rewrites the return psw from sie_inst to either sie_exit or sie_reenter. On return, the page fault handler will then detect the wrong access as a kernel fault causing a kernel oops in sie_reenter or sie_exit. We have to add these two addresses to the exception table to allow graceful exits. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 6ac340623c5d2a945030814d900701439772ff57 Author: Mark Brown Date: Fri Jun 3 18:20:50 2011 +0100 ASoC: Add missing break in WM8915 FLL source selection Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 1622ee1822e8adb391b55a09e3cd5144bd9fad47 Author: Mark Brown Date: Fri Jun 3 17:13:57 2011 +0100 ASoC: Only update SYSCLK_ENA when pausing WM8915 SYSCLK Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 05d3962cc921c51059df69488c7f70ab8b6a5d88 Merge: 55922c9 840d8e5 Author: Mark Brown Date: Mon Jun 6 10:38:23 2011 +0100 Merge branch 'for-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-3.0 commit a50d28de8d5085e0f34f96088a45cc156d022021 Author: Bruno Prémont Date: Tue May 24 19:59:17 2011 +0000 video: Fix use-after-free by vga16fb on rmmod Since fb_info is now refcounted and thus may get freed at any time it gets unregistered module unloading will try to unregister framebuffer as stored in platform data on probe though this pointer may be stale. Cleanup platform data on framebuffer release. CC: stable@kernel.org Signed-off-by: Bruno Prémont Signed-off-by: Paul Mundt commit 74b5c5bfff429f464c38dd49af41d75cf0e7dc26 Author: Mike Waychison Date: Fri Jun 3 13:04:53 2011 -0700 KVM: Initialize kvm before registering the mmu notifier It doesn't make sense to ever see a half-initialized kvm structure on mmu notifier callbacks. Previously, 85722cda changed the ordering to ensure that the mmu_lock was initialized before mmu notifier registration, but there is still a race where the mmu notifier could come in and try accessing other portions of struct kvm before they are intialized. Solve this by moving the mmu notifier registration to occur after the structure is completely initialized. Google-Bug-Id: 452199 Signed-off-by: Mike Waychison Signed-off-by: Avi Kivity commit 221192bdff2583834984639121595fc9296120d3 Author: Marcelo Tosatti Date: Mon May 30 15:23:14 2011 -0300 KVM: x86: use proper port value when checking io instruction permission Commit f6511935f42 moved the permission check for io instructions to the ->check_perm callback. It failed to copy the port value from RDX register for string and "in,out ax,dx" instructions. Fix it by reading RDX register at decode stage when appropriate. Fixes FC8.32 installation. Signed-off-by: Marcelo Tosatti commit cd3c18ba2fac14b34d03cae111f215009735ea06 Author: Dmitry Torokhov Date: Tue May 31 14:37:23 2011 -0700 USB: xhci - fix interval calculation for FS isoc endpoints Full-speed isoc endpoints specify interval in exponent based form in frames, not microframes, so we need to adjust accordingly. NEC xHCI host controllers will return an error code of 0x11 if a full speed isochronous endpoint is added with the Interval field set to something less than 3 (2^3 = 8 microframes, or one frame). It is impossible for a full speed device to have an interval smaller than one frame. This was always an issue in the xHCI driver, but commit dfa49c4ad120a784ef1ff0717168aa79f55a483a "USB: xhci - fix math in xhci_get_endpoint_interval()" removed the clamping of the minimum value in the Interval field, which revealed this bug. This needs to be backported to stable kernels back to 2.6.31. Reported-by: Matt Evans Signed-off-by: Dmitry Torokhov Signed-off-by: Sarah Sharp Cc: stable@kernel.org commit 85fadea9ce4b278b959886748b2798a383667c10 Merge: 5fb9fb1 d232b8d Author: David S. Miller Date: Sun Jun 5 17:14:04 2011 -0700 Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6 commit 5fb9fb132c5a83010cd8d4bf6d0ee34fb3b9d488 Author: Grant Likely Date: Fri Jun 3 21:31:27 2011 +0000 net: fix smc91x.c device tree support Fix missing semicolon at end of smc91x.c match tabledevice driver. Also remove unnecessary #ifdef around of_match_table pointer. Signed-off-by: Grant Likely Signed-off-by: David S. Miller commit d232b8dded624af3e346b13807a591c63b601c44 Author: Dave Jones Date: Fri May 27 20:36:51 2011 -0400 netfilter: use unsigned variables for packet lengths in ip[6]_queue. Netlink message lengths can't be negative, so use unsigned variables. Signed-off-by: Dave Jones Signed-off-by: Pablo Neira Ayuso commit 88ed01d17b44bc2bed4ad4835d3b1099bff3dd71 Author: Pablo Neira Ayuso Date: Thu Jun 2 15:08:45 2011 +0200 netfilter: nf_conntrack: fix ct refcount leak in l4proto->error() This patch fixes a refcount leak of ct objects that may occur if l4proto->error() assigns one conntrack object to one skbuff. In that case, we have to skip further processing in nf_conntrack_in(). With this patch, we can also fix wrong return values (-NF_ACCEPT) for special cases in ICMP[v6] that should not bump the invalid/error statistic counters. Reported-by: Zoltan Menyhart Signed-off-by: Pablo Neira Ayuso commit d9be76f38526dccf84062e3ac3ed3a6a97698565 Author: Julian Anastasov Date: Sun May 29 23:42:29 2011 +0300 netfilter: nf_nat: fix crash in nf_nat_csum Fix crash in nf_nat_csum when mangling packets in OUTPUT hook where skb->dev is not defined, it is set later before POSTROUTING. Problem happens for CHECKSUM_NONE. We can check device from rt but using CHECKSUM_PARTIAL should be safe (skb_checksum_help). Signed-off-by: Julian Anastasov Signed-off-by: Pablo Neira Ayuso commit b48e3c5c323fea08c12a340cbb8dcc8ca2431d5b Author: Jozsef Kadlecsik Date: Wed Jun 1 23:35:49 2011 +0200 netfilter: ipset: Use the stored first cidr value instead of '1' The stored cidr values are tried one after anoter. The boolean condition evaluated to '1' instead of the first stored cidr or the default host cidr. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Pablo Neira Ayuso commit fcbf12817100d23890832801507107718a1fa448 Author: Jozsef Kadlecsik Date: Wed Jun 1 23:35:48 2011 +0200 netfilter: ipset: Fix return code for destroy when sets are in use Signed-off-by: Jozsef Kadlecsik Signed-off-by: Pablo Neira Ayuso commit afb523c54718da57ff661950bd3287ec9eeb66bd Author: Julian Anastasov Date: Thu Jun 2 09:09:54 2011 +0900 ipvs: restore support for iptables SNAT Fix the IPVS priority in LOCAL_IN hook, so that SNAT target in POSTROUTING is supported for IPVS traffic as in 2.6.36 where it worked depending on module load order. Before 2.6.37 we used priority 100 in LOCAL_IN to process remote requests. We used the same priority as iptables SNAT and if IPVS handlers are installed before SNAT handlers we supported SNAT in POSTROUTING for the IPVS traffic. If SNAT is installed before IPVS, the netfilter handlers are before IPVS and netfilter checks the NAT table twice for the IPVS requests: once in LOCAL_IN where IPS_SRC_NAT_DONE is set and second time in POSTROUTING where the SNAT rules are ignored because IPS_SRC_NAT_DONE was already set in LOCAL_IN. But in 2.6.37 we changed the IPVS priority for LOCAL_IN with the goal to be unique (101) forgetting the fact that for IPVS traffic we should not walk both LOCAL_IN and POSTROUTING nat tables. So, change the priority for processing remote IPVS requests from 101 to 99, i.e. before NAT_SRC (100) because we prefer to support SNAT in POSTROUTING instead of LOCAL_IN. It also moves the priority for IPVS replies from 99 to 98. Use constants instead of magic numbers at these places. Signed-off-by: Julian Anastasov Signed-off-by: Simon Horman Signed-off-by: Pablo Neira Ayuso commit fb04883371f2cb7867d24783e7d590036dc9b548 Author: Eric Dumazet Date: Thu May 19 15:44:27 2011 +0200 netfilter: add more values to enum ip_conntrack_info Following error is raised (and other similar ones) : net/ipv4/netfilter/nf_nat_standalone.c: In function ‘nf_nat_fn’: net/ipv4/netfilter/nf_nat_standalone.c:119:2: warning: case value ‘4’ not in enumerated type ‘enum ip_conntrack_info’ gcc barfs on adding two enum values and getting a not enumerated result : case IP_CT_RELATED+IP_CT_IS_REPLY: Add missing enum values Signed-off-by: Eric Dumazet CC: David Miller Signed-off-by: Pablo Neira Ayuso commit 374eeb5a9d77ea719c5c46f4d70226623f4528ce Author: Neil Horman Date: Fri Jun 3 10:35:52 2011 +0000 bonding: reset queue mapping prior to transmission to physical device (v5) The bonding driver is multiqueue enabled, in which each queue represents a slave to enable optional steering of output frames to given slaves against the default output policy. However, it needs to reset the skb->queue_mapping prior to queuing to the physical device or the physical slave (if it is multiqueue) could wind up transmitting on an unintended tx queue Change Notes: v2) Based on first pass review, updated the patch to restore the origional queue mapping that was found in bond_select_queue, rather than simply resetting to zero. This preserves the value of queue_mapping when it was set on receive in the forwarding case which is desireable. v3) Fixed spelling an casting error in skb->cb v4) fixed to store raw queue_mapping to avoid double decrement v5) Eric D requested that ->cb access be wrapped in a macro. Signed-off-by: Neil Horman CC: Jay Vosburgh CC: Andy Gospodarek CC: "David S. Miller" Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit 5b446c6a7179513edcb34706088c4ce901b9a039 Author: Sucheta Chakraborty Date: Fri Jun 3 05:52:18 2011 +0000 qlcnic: Avoid double free of skb in tx path buffer->skb should be marked NULL to avoid double free of the skb. Signed-off-by: Sucheta Chakraborty Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 54ff502c283b6cf77c95c05c99dbca40d910b17d Author: Anirban Chakraborty Date: Thu Jun 2 12:42:21 2011 +0000 qlcnic: Fix bug in FW queue dump Due to a change in FW template, a bug was introduced in dump queue entries. This is fixed by reinitializing queue address before looping for each que dump operation. Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit b8f07a063163f8216cd891c5b007e839a56b6d93 Author: Al Viro Date: Sun Jun 5 00:54:03 2011 +0000 fix return values of l2tp_dfs_seq_open() More fallout from struct net lifetime rules review: PTR_ERR() is *already* negative and failing ->open() should return negatives on failure. Signed-off-by: Al Viro Signed-off-by: James Chapman Signed-off-by: David S. Miller commit c316e6a3084cef1a5857cd66bb5429c969f06c93 Author: Al Viro Date: Sun Jun 5 00:37:35 2011 +0000 get_net_ns_by_fd() oopses if proc_ns_fget() returns an error BTW, looking through the code related to struct net lifetime rules has caught something else: struct net *get_net_ns_by_fd(int fd) { ... file = proc_ns_fget(fd); if (!file) goto out; ei = PROC_I(file->f_dentry->d_inode); while in proc_ns_fget() we have two return ERR_PTR(...) and not a single path that would return NULL. The other caller of proc_ns_fget() treats ERR_PTR() correctly... Signed-off-by: Al Viro Signed-off-by: David S. Miller commit f3aeceac61b6e2f3167717ea1793472108e47564 Author: Alex Deucher Date: Fri Jun 3 16:39:06 2011 -0400 drm/radeon/kms/atom: fix PHY init The PHY was not initialized correctly after ac89af1e1010640db072416c786f97391b85790f since the function bailed early as an encoder was not assigned. The encoder isn't necessary for PHY init so just assign to 0 for init so that the table is executed. Reported-by: Ari Savolainen Tested-by: Ari Savolainen Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 6a574b5b9b186e28abd3e571dfd1700c5220b510 Author: Hans de Goede Date: Sat Jun 4 15:39:21 2011 +0200 drm/i915: Add a no lvds quirk for the Asus EeeBox PC EB1007 I found this while figuring out why gnome-shell would not run on my Asus EeeBox PC EB1007. As a standalone "pc" this device cleary does not have an internal panel, yet it claims it does. Add a quirk to fix this. Signed-off-by: Hans de Goede Reviewed-by: Keith Packard cc: stable@kernel.org Signed-off-by: Keith Packard commit 3f43c48d333777e815ae68d66396cb6dfbc2dd79 Author: Chris Wilson Date: Thu May 12 22:17:24 2011 +0100 drm/i915: Share the common force-audio property between connectors Make the audio property creation routine common and share the single property between the connectors. Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit 4bce2da393dbbc6650a1d62683ef60e03594b4c7 Author: Chris Wilson Date: Thu May 12 22:17:21 2011 +0100 drm/i915: Remove unused enum "chip_family" Superseded by the tracking the render generation in the chipset capabiltiies struct. Signed-off-by: Chris Wilson Signed-off-by: Keith Packard commit c8ebc2b076ad9e1833cb4f7f1a6f30b4786a2a09 Author: Daniel Vetter Date: Thu May 12 22:17:20 2011 +0100 drm/915: fix relaxed tiling on gen2: tile height A tile on gen2 has a size of 2kb, stride of 128 bytes and 16 rows. Userspace was broken and assumed 8 rows. Chris Wilson noted that the kernel unfortunately can't reliable check that because libdrm rounds up the size to the next bucket. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson Signed-off-by: Keith Packard commit d3bcb75776a10ee4b67afe6156fd927b9da77d03 Author: Chris Wilson Date: Thu May 12 22:17:15 2011 +0100 drm/i915/crt: Explicitly return false if connected to a digital monitor Rather than proceed on and silently return false by default, mention why we rejected the presence of an EDID as implying the presence of a VGA monitor. (The question arises whether there is a broken EDID which falsely reports a digital connection when attached by VGA.) Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit 9f405100f2b39be7759eea3f4cf910869727429c Author: Chris Wilson Date: Thu May 12 22:17:14 2011 +0100 drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0 The computation of the first-level watermarks for g4x and gen5+ are based on the same algorithm, so we can refactor those code paths to use a single function. Note that g4x_compute_wm0 takes a 'plane' argument while ironlake_compute_wm0 took a 'pipe' argument. Both should have used a 'plane' argument, so this patch fixes that as well (not that it caused a problem; ironlake always uses pipe == plane). Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit bf3301abba31ee71ed8dc87f18fcaebd27dc3b3e Author: Daniel Vetter Date: Thu May 12 22:17:12 2011 +0100 drm/i915: Only print out the actual number of fences for i915_error_state Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit c8cbbb8ba9f9f6d2d63513a715700127598e7f86 Author: Chris Wilson Date: Thu May 12 22:17:11 2011 +0100 drm/i915: s/addr & ~PAGE_MASK/offset_in_page(addr)/ Convert our open coded offset_in_page() to the common macro. Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit 5cbba41d2857477bd9a008f2d82c0622db1a8dee Author: Nicolas Kaiser Date: Mon May 30 12:48:26 2011 +0200 drm: i915: correct return status in intel_hdmi_mode_valid() Signed-off-by: Nicolas Kaiser Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit 95e0ee92d3a605de75a633dd2360700595d5a8ad Author: Jason Stubbs Date: Sat May 28 14:26:48 2011 +1000 drm/i915: fix regression after clock gating init split During the refactoring in revision 6067aaeadb5b3df26f27ac827256b1ef01e674f5, the intel_enable_clock_gating was split up into several functions that are then called indirectly. However, which function to call was not specified for the IS_PINEVIEW() case. This patch specifies the correct gating function. Signed-off-by: Jason Stubbs Reviewed-by: Jesse Barnes Signed-off-by: Keith Packard commit f6b07f45e2df42d63a0292dcd13aaaa18d6c01f7 Author: Dan Carpenter Date: Wed May 25 12:56:56 2011 +0300 drm/i915: fix if statement in ivybridge irq handler The extra semicolon was not intended. Signed-off-by: Dan Carpenter Reviewed-by: Keith Packard Signed-off-by: Keith Packard commit d7ebe75b065a7c2d58ffc12f9d2e00d5ea4e71eb Author: Vince Weaver Date: Fri Jun 3 17:59:51 2011 -0400 perf: Fix comments in include/linux/perf_event.h Fix include/linux/perf_event.h comments to be consistent with the actual #define names. This is trivial, but it can be a bit confusing when first reading through the file. Signed-off-by: Vince Weaver Cc: Peter Zijlstra Cc: paulus@samba.org Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Steven Rostedt Link: http://lkml.kernel.org/r/alpine.DEB.2.00.1106031757090.29381@cl320.eecs.utk.edu Signed-off-by: Ingo Molnar commit aa4a221875873d2a1f9656cb7fd7e545e952b4fa Author: Vince Weaver Date: Fri Jun 3 17:54:40 2011 -0400 perf: Comment /proc/sys/kernel/perf_event_paranoid to be part of user ABI Turns out that distro packages use this file as an indicator of the perf event subsystem - this is easier to check for from scripts than the existence of the system call. This is easy enough to keep around for the kernel, so add a comment to make sure it stays so. Signed-off-by: Vince Weaver Cc: David Ahern Cc: Peter Zijlstra Cc: paulus@samba.org Cc: acme@redhat.com Cc: Linus Torvalds Cc: Andrew Morton Link: http://lkml.kernel.org/r/alpine.DEB.2.00.1106031751170.29381@cl320.eecs.utk.edu Signed-off-by: Ingo Molnar commit 710054ba25c0d1f8f41c22ce13ba336503fb5318 Merge: 74c355f b273fa9 Author: Ingo Molnar Date: Sat Jun 4 12:13:06 2011 +0200 Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent commit 3ece48a746088be3dd75904e8d9bb9b49af0aa95 Author: Sage Weil Date: Tue May 31 09:11:11 2011 -0700 usb: remove bad dput after dentry_unhash Commit 64252c75a removed the useless dget from dentry_unhash but didn't fix up this caller in the usb code. There used to be exactly one dput per dentry_unhash call; now there are none. Tested-by: Sebastian Andrzej Siewior Signed-off-by: Sage Weil Signed-off-by: Al Viro commit 9e1f1de02c2275d7172e18dc4e7c2065777611bf Author: Al Viro Date: Fri Jun 3 18:24:58 2011 -0400 more conservative S_NOSEC handling Caching "we have already removed suid/caps" was overenthusiastic as merged. On network filesystems we might have had suid/caps set on another client, silently picked by this client on revalidate, all of that *without* clearing the S_NOSEC flag. AFAICS, the only reasonably sane way to deal with that is * new superblock flag; unless set, S_NOSEC is not going to be set. * local block filesystems set it in their ->mount() (more accurately, mount_bdev() does, so does btrfs ->mount(), users of mount_bdev() other than local block ones clear it) * if any network filesystem (or a cluster one) wants to use S_NOSEC, it'll need to set MS_NOSEC in sb->s_flags *AND* take care to clear S_NOSEC when inode attribute changes are picked from other clients. It's not an earth-shattering hole (anybody that can set suid on another client will almost certainly be able to write to the file before doing that anyway), but it's a bug that needs fixing. Signed-off-by: Al Viro commit 8b20c8cb89b733f5a73fad1f7ad7cff8325e0034 Author: Govindraj.R Date: Wed Jun 1 11:31:24 2011 +0530 spi/omap2: fix uninitialized variable fixes below compilation warning. The variable doesn't actual ever get used uninitialized, but that's no reason to be sloppy. drivers/spi/omap2_mcspi.c: In function 'omap2_mcspi_txrx_dma': drivers/spi/omap2_mcspi.c:301: warning: 'elements' may be used uninitialized in this function Signed-off-by: Govindraj.R [grant.likely: amended description] Signed-off-by: Grant Likely commit f124c6ae59e193705c9ddac57684d50006d710e6 Author: Dan Carpenter Date: Fri Jun 3 07:45:28 2011 +0300 xen: off by one errors in multicalls.c b->args[] has MC_ARGS elements, so the comparison here should be ">=" instead of ">". Otherwise we read past the end of the array one space. CC: stable@kernel.org Signed-off-by: Dan Carpenter Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Jeremy Fitzhardinge commit d2ac49fe3c7c4730323c1042fb53a2e008643b6a Author: Daniel Drake Date: Fri Jun 3 00:13:26 2011 +0100 libertas_sdio: handle spurious interrupts Commit 06e8935febe687e2a561707d4c7ca4245d261dbe adds an IRQ handling optimization for single-function SDIO cards like this one, but at the same time exposes a small hardware bug. During hardware init, an interrupt is generated with (apparently) no source. Previously, mmc threw this interrupt away, but now (due to the optimization), the mmc layer passes this onto libertas, before it is ready (and before it has enabled interrupts), causing a crash. Work around this hardware bug by registering the IRQ handler later and making it capable of handling interrupts with no cause. The change that makes the IRQ handler registration happen later actually eliminates the spurious interrupt as well. Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit 59e7e7078d6c2c6294caf454c6e3695f9d3e46a2 Author: Thadeu Lima de Souza Cascardo Date: Thu Jun 2 17:28:37 2011 -0300 mac80211: call dev_alloc_name before copying name to sdata This partially reverts 1c5cae815d19ffe02bdfda1260949ef2b1806171, because the netdev name is copied into sdata->name, which is used for debugging messages, for example. Otherwise, we get messages like this: wlan%d: authenticated Signed-off-by: Thadeu Lima de Souza Cascardo Cc: Jiri Pirko Cc: David S. Miller Cc: Johannes Berg Cc: "John W. Linville" Signed-off-by: John W. Linville commit 6f213ff1919fab6f8244ceae55631b5d6ef750a7 Author: Stanislaw Gruszka Date: Thu Jun 2 18:17:15 2011 +0200 iwlagn: fix channel switch locking We use priv->mutex to avoid race conditions between iwl_chswitch_done() and iwlagn_mac_channel_switch(), when marking channel switch in progress. But iwl_chswitch_done() can be called in atomic context from iwl_rx_csa() or with mutex already taken from iwlagn_commit_rxon(). These bugs were introduced by: commit 79d07325502e73508f917475bc1617b60979dd94 Author: Wey-Yi Guy Date: Thu May 6 08:54:11 2010 -0700 iwlwifi: support channel switch offload in driver To fix remove mutex from iwl_chswitch_done() and use atomic bitops for marking channel switch pending. Also remove iwl2030_hw_channel_switch() since 2000 series adapters are 2.4GHz only devices. Cc: stable@kernel.org # 2.6.36+ Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit a99168eece601d2a79ecfcb968ce226f2f30cf98 Author: Nick Kossifidis Date: Thu Jun 2 03:09:48 2011 +0300 ath5k: Disable fast channel switching by default Disable fast channel change by default on AR2413/AR5413 due to some bug reports (it still works for me but it's better to be safe). Add a module parameter "fastchanswitch" in case anyone wants to enable it and play with it. Signed-off-by: Nick Kossifidis Tested-by: Sedat Dilek Signed-off-by: John W. Linville commit bdf492f502ad4f646e9905db1b89e11822826edd Author: Rafał Miłecki Date: Wed Jun 1 11:01:11 2011 +0200 ssb: fix PCI(e) driver regression causing oops on PCI cards We were incorrectly executing PCIe specific workarounds on PCI cards. This resulted in: Machine check in kernel mode. Caused by (from SRR1=149030): Transfer error ack signal Oops: Machine check, sig: 7 [#1] Reported-by: Andreas Schwab Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 5f0b23eeba2d9105944148e5a85b0bfb34a8ecf5 Author: Suresh Jayaraman Date: Fri Jun 3 14:19:01 2011 +0530 cifs: make CIFS depend on CRYPTO_ECB When CONFIG_CRYPTO_ECB is not set, trying to mount a CIFS share with NTLM security resulted in mount failure with the following error: "CIFS VFS: could not allocate des crypto API" Seems like a leftover from commit 43988d7. Signed-off-by: Suresh Jayaraman CC: Shirish Pargaonkar Reviewed-by: Jeff Layton Signed-off-by: Steve French commit c592a7073796de1cd221f957ab693c19d383423f Author: Suresh Jayaraman Date: Fri Jun 3 12:06:19 2011 +0530 cifs: fix the kernel release version in the default security warning message When ntlm security mechanim is used, the message that warns about the upgrade to ntlmv2 got the kernel release version wrong (Blame it on Linus :). Fix it. Signed-off-by: Suresh Jayaraman Reviewed-by: Jeff Layton Signed-off-by: Steve French commit b273fa9716aa1564bee88ceee62f9042981cdc81 Author: Frederic Weisbecker Date: Thu Mar 31 18:27:42 2011 +0200 perf python: Fix argument name list of read_on_cpu() Mandatory arguments need to be present in the argument name list, as well as optional arguments, otherwise python barfs: # ./python/twatch.py Traceback (most recent call last): File "./python/twatch.py", line 41, in main() File "./python/twatch.py", line 32, in main event = evlist.read_on_cpu(cpu) RuntimeError: more argument specifiers than keyword list entries Hence, add cpu to the name list. Cc: David Ahern Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Link: http://lkml.kernel.org/r/1301588863-20210-1-git-send-email-fweisbec@gmail.com Signed-off-by: Frederic Weisbecker Signed-off-by: Arnaldo Carvalho de Melo commit 56722381b8506733852c44dacf6d7bc5f90aedaf Author: Arnaldo Carvalho de Melo Date: Thu Jun 2 11:04:54 2011 -0300 perf evlist: Don't die if sample_{id_all|type} is invalid Fixes two more cases where the python binding would not load: . Not finding die(), which it shouldn't anyway, not good to just stop the world because some particular perf.data file is invalid, just propagate the error to the caller. . Not finding perf_sample_size: fix it by moving it from event.c to evsel, where it belongs, as most cases are moving to operate on an evsel object.o One of the fixed problems: [root@emilia ~]# python >>> import perf Traceback (most recent call last): File "", line 1, in ImportError: /home/acme/git/build/perf/python/perf.so: undefined symbol: perf_sample_size >>> [root@emilia ~]# Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-1hkj7b2cvgbfnoizsekjb6c9@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo commit 9c850d6c4b95bb07fb066eb7f43dd4e3b4842b85 Author: Arnaldo Carvalho de Melo Date: Thu Jun 2 10:55:10 2011 -0300 perf python: Use exception to propagate errors We were using pr_debug to tell the user about not being able to parse a sample where we should really use the python way of reporting errors: exceptions. Fixes this problem: [root@emilia ~]# python >>> import perf Traceback (most recent call last): File "", line 1, in ImportError: /home/acme/git/build/perf/python/perf.so: undefined symbol: eprintf >>> [root@emilia ~] As we want to keep the objects linked in the python binding (and in the future in a shared library) minimal. Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-m9dba9kaluas0kq8r58z191c@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo commit d21cc9f67d689effbfd24bac878bc2c057de8c46 Author: Arnaldo Carvalho de Melo Date: Thu Jun 2 10:39:43 2011 -0300 perf evlist: Remove dependency on debug routines So far we avoided having to link debug.o in the python binding, keep it that way by not using ui__warning() in evlist.c. Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-4wtew8hd3g7ejnlehtspys2t@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo commit 1c3cc11602111d1318c2a5743bd2e88c82813927 Author: Sebastian Andrzej Siewior Date: Sat May 21 12:58:28 2011 +0200 timers: Consider slack value in mod_timer() There is an optimization which does not update the timer if the timer was pending and the expiration time was unchanged. Since commit 3bbb9ec9 ("timers: Introduce the concept of timer slack for legacy timers") this optimization is no longer applied for timers where the expiration time got extended due to the slack value. So we need to check again after the expiration time might have been updated. [ tglx: Made it a single check by applying slack first and sorting out the slack = 0 value (all timeouts < 256 jiffies) early ] Signed-off-by: Sebastian Andrzej Siewior Link: http://lkml.kernel.org/r/20110521105828.GA29442@Chamillionaire.breakpoint.cc Signed-off-by: Thomas Gleixner commit c5182b8867e189e14a8df5dbfcba1c73f286e061 Author: Mark Brown Date: Thu Jun 2 18:55:13 2011 +0100 genirq: Ensure we locate the passed IRQ in irq_alloc_descs() When irq_alloc_descs() is called with no base IRQ specified then it will search for a range of IRQs starting from a specified base address. In the case where an IRQ is specified it still does this search in order to ensure that none of the requested range is already allocated and it still uses the from parameter to specify the base for the search. This means that in the case where a base is specified but from is zero (which is reasonable as any IRQ number is in the range specified by a zero from) the function will get confused and try to allocate the first suitably sized block of free IRQs it finds. Instead use a specified IRQ as the base address for the search, and insist that any from that is specified can support that IRQ. Signed-off-by: Mark Brown Link: http://lkml.kernel.org/r/1307037313-15733-1-git-send-email-broonie@opensource.wolfsonmicro.com Signed-off-by: Thomas Gleixner commit e7fbad300a7a6432238f086e3c9a61538a905858 Author: Linus Walleij Date: Tue May 31 18:14:39 2011 +0200 genirq: Fix descriptor init on non-sparse IRQs The genirq changes are initializing descriptors for sparse IRQs quite differently from how non-sparse (stacked?) IRQs are initialized, with the effect that on my platform all IRQs are default-disabled on sparse IRQs and default-enabled if non-sparse IRQs are used, crashing some GPIO driver. Fix this by refactoring the non-sparse IRQs to use the same descriptor init function as the sparse IRQs. Signed-off: Linus Walleij Link: http://lkml.kernel.org/r/1306858479-16622-1-git-send-email-linus.walleij@stericsson.com Cc: stable@kernel.org # 2.6.39 Signed-off-by: Thomas Gleixner commit 3a43e05f4d0600e906fa09f4a65d749288c44592 Author: Sebastian Andrzej Siewior Date: Tue May 31 08:56:11 2011 +0200 irq: Handle spurios irq detection for threaded irqs The detection of spurios interrupts is currently limited to first level handler. In force-threaded mode we never notice if the threaded irq does not feel responsible. This patch catches the return value of the threaded handler and forwards it to the spurious detector. If the primary handler returns only IRQ_WAKE_THREAD then the spourious detector ignores it because it gets called again from the threaded handler. [ tglx: Report the erroneous return value early and bail out ] Signed-off-by: Sebastian Andrzej Siewior Link: http://lkml.kernel.org/r/1306824972-27067-2-git-send-email-sebastian@breakpoint.cc Signed-off-by: Thomas Gleixner commit ef26f20cd117eb3c185038ed7cbf7b235575751d Author: Sebastian Andrzej Siewior Date: Tue May 31 08:56:10 2011 +0200 genirq: Print threaded handler in spurious debug output In forced threaded mode (or with an explicit threaded handler) we only see the primary handler, but not the threaded handler. Signed-off-by: Sebastian Andrzej Siewior Link: http://lkml.kernel.org/r/1306824972-27067-1-git-send-email-sebastian@breakpoint.cc Signed-off-by: Thomas Gleixner commit 1b054b67d3bfc6dca9f634c104780f3f24ff3eec Author: Thomas Gleixner Date: Fri Jun 3 11:13:33 2011 +0200 clockevents: Handle empty cpumask gracefully For UP it's stupid to request an initialized cpumask for the clock event devices. Though we need the mask set even on UP to avoid a horrible ifdeffery especially in the broadcast code. For SMP we can at least try to survive with a warning and set the cpumask of the cpu we're running on. That gives a decent chance to bring the machine up and retrieve the debug info. Signed-off-by: Thomas Gleixner Cc: Linus Walleij Cc: Russell King - ARM Linux Cc: Stephen Boyd commit 840d8e5e964dc51673d0f26e119b27d2898e8417 Author: Joachim Eastwood Date: Wed Jun 1 23:59:10 2011 +0200 ASoC: atmel_ssc: Don't try to free ssc if request failed We should only call ssc_free() when ssc_request() succeeds or bad things will happen. Signed-off-by: Joachim Eastwood Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 8c47f8d07e16034dfbf736bb4478809aba8a53f1 Author: David S. Miller Date: Thu Jun 2 22:49:11 2011 -0700 sparc: PCIC_PCI needs SPARC32 dependency Reported-by: Stephen Rothwell Signed-off-by: David S. Miller commit 704102a6799ecf7c1b268a43452761dae335f29c Author: Shaohui Xie Date: Fri Jun 3 10:45:11 2011 +0800 powerpc/85xx: fix race bug of calling request_irq after enable elbc interrupts Signed-off-by: Shaohui Xie Signed-off-by: Kumar Gala commit f5182b4155b9d686c5540a6822486400e34ddd98 Author: Sarah Sharp Date: Thu Jun 2 11:33:02 2011 -0700 xhci: Disable MSI for some Fresco Logic hosts. Some Fresco Logic hosts, including those found in the AUAU N533V laptop, advertise MSI, but fail to actually generate MSI interrupts. Add a new xHCI quirk to skip MSI enabling for the Fresco Logic host controllers. Fresco Logic confirms that all chips with PCI vendor ID 0x1b73 and device ID 0x1000, regardless of PCI revision ID, do not support MSI. This should be backported to stable kernels as far back as 2.6.36, which was the first kernel to support MSI on xHCI hosts. Signed-off-by: Sarah Sharp Reported-by: Sergey Galanov Cc: stable@kernel.org commit 001fd3826f4c736ce292315782d015f768399080 Author: Maarten Lankhorst Date: Wed Jun 1 23:27:50 2011 +0200 xhci: Do not issue device reset when device is not setup xHCI controllers respond to a Reset Device command when the Slot is in the Enabled/Disabled state by returning an error. This is fine on other host controllers, but the Etron xHCI host controller returns a vendor-specific error code that the xHCI driver doesn't understand. The xHCI driver then gives up on device enumeration. Instead of issuing a command that will fail, just return. This fixes the issue with the xhci driver not working on ASRock P67 Pro/Extreme boards. This should be backported to stable kernels as far back as 2.6.34. Signed-off-by: Maarten Lankhorst Signed-off-by: Sarah Sharp Cc: stable@kernel.org commit e2b0217715c6d10379d94bdfe5560af96eecbb7c Author: Maarten Lankhorst Date: Wed Jun 1 23:27:49 2011 +0200 xhci: Add defines for hardcoded slot states This needs to be added to the stable trees back to 2.6.34 to support an upcoming bug fix. Signed-off-by: Maarten Lankhorst Signed-off-by: Sarah Sharp Cc: stable@kernel.org commit 2c7d1644406748d7c5da7b9db3c5080296af55bf Author: Geert Uytterhoeven Date: Fri May 27 21:39:56 2011 +0000 sparc: Do not select GENERIC_HARDIRQS_NO_DEPRECATED Config option GENERIC_HARDIRQS_NO_DEPRECATED was removed in commit 78c89825649a9a5ed526c507603196f467d781a5 ("genirq: Remove the now obsolete config options and select statements"), but the select was accidentally reintroduced in commit 6baa9b20a68a88c2fd751cbe8d7652009379351b ("sparc32: genirq support") Signed-off-by: Geert Uytterhoeven Signed-off-by: David S. Miller commit 4819fef5e7cb9a39e1fd59ecd85861b3ffebdcaa Author: Matt Evans Date: Wed Jun 1 13:01:07 2011 +1000 xhci: Bigendian fix for xhci_check_bandwidth() Commit 834cb0fc4712a3b21c6b8c5cb55bd13607191311 "xhci: Fix memory leak bug when dropping endpoints" added a small endian bug. This patch fixes xhci_check_bandwidth() to read add/drop_flags LE. Signed-off-by: Matt Evans Signed-off-by: Sarah Sharp commit 5d07b7869a48aec43ee0de6413a6657457287b63 Author: Daniel Hellstrom Date: Mon May 23 21:04:48 2011 +0000 sparc32,leon: add GRPCI2 PCI Host driver The DMA region must be accessible in order for PCI peripheral drivers to work, the sparc32 has DMA in the normal memory zone which requires the GRPCI2 to PCI target BARs so that all kernel low mem (192MB) can be mapped 1:1 to PCI address space. The GRPCI2 has resizeable target BARs, by default the first is made 256MB and all other BARs are disabled. I/O space are always located on 0x1000-0x10000, but accessed through the GRPCI2 PCI I/O Window memory mapped to virtual address space. Configuration space is accessed through the 64KB GRPCI2 PCI CFG Window using LDA bypassing the MMU. The GRPCI2 has a single PCI Window for prefetchable and non- prefetchable address space, it is up to the AHB master requesting PCI data to determine access type. Memory space is mapped 1:1. The GRPCI2 core can be configured in 4 different IRQ modes, where PCI Interrupt, Error Interrupt and DMA Interrupt are shared on a single IRQ line or at most 5 IRQs are used. The GRPCI2 can mask/unmask PCI interrupts, Err and DMA in the control and check status bits which tells us which IRQ really happended. The GENIRQ layer is used to unmask/mask each individual IRQ source by creating virtual IRQs and implementing a IRQ chip. The optional DMA functionality of the GRPCI2 is not supported by this patch. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 26893c1368aeb96e06e4f9dce61bbde3351d5e9f Author: Daniel Hellstrom Date: Mon May 23 21:04:47 2011 +0000 sparc32,leon: added LEON-common low-level PCI routines The LEON architecture does not have a BIOS or bootloader that initializes PCI for us, instead Linux generic PCI layer is used to set up resources and IRQ. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit cfe3af5dde34a019c1bd2485b1dc0f2d7a326ccd Author: Daniel Hellstrom Date: Mon May 23 21:04:46 2011 +0000 sparc32: added CONFIG_PCIC_PCI Kconfig setting Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit fb9be2349f099d7c68b706e04fd62c478d3c0ed2 Author: Kumar Gala Date: Thu Jun 2 11:26:13 2011 -0500 powerpc/book3e: Fix CPU feature handling on e5500 in 32-bit mode We are missing FPU feature bit that user space may require. In the 64-bit mode this gets set since we pull it in via COMMON_USER_PPC64. We just explicitly set it so user space will be happy again. Signed-off-by: Kumar Gala commit a3623239ad941c7fa5440231f601e8f6de1f2a54 Author: Kumar Gala Date: Thu Jun 2 11:18:53 2011 -0500 powerpc/fsl_rio: Fix compile error when CONFIG_FSL_RIO not set arch/powerpc/kernel/built-in.o: In function `machine_check_e500mc': arch/powerpc/kernel/traps.c:429: undefined reference to `fsl_rio_mcheck_exception' arch/powerpc/kernel/built-in.o: In function `machine_check_e500': arch/powerpc/kernel/traps.c:519: undefined reference to `fsl_rio_mcheck_exception' make: *** [.tmp_vmlinux1] Error 1 Reported-by: Timur Tabi Signed-off-by: Kumar Gala commit 1b86d775dd4c13967e1895df09d0cef198956e81 Author: Joe Perches Date: Sat May 28 11:13:33 2011 -0700 video: Convert vmalloc/memset to vzalloc Signed-off-by: Joe Perches Acked-by: Konrad Rzeszutek Wilk Signed-off-by: Paul Mundt commit bb8b26627267a82c49f47fc52a0785f079a7b063 Author: Andy Lutomirski Date: Thu May 26 10:13:34 2011 -0400 efifb: Disallow manual bind and unbind Both were buggy: bind would happily scribble over a real graphics device and unbind wouldn't destroy the framebuffer. Hotplugging efifb makes no sense anyway, so just disable it. As an added benefit, we save some runtime memory. Signed-off-by: Andy Lutomirski Signed-off-by: Peter Jones Signed-off-by: Paul Mundt commit da0241f12bf785f74e57ad6d67abdf269216f76b Author: Andy Lutomirski Date: Thu May 26 10:13:32 2011 -0400 efifb: Fix mismatched request/release_mem_region Signed-off-by: Andy Lutomirski Signed-off-by: Peter Jones Signed-off-by: Paul Mundt commit 3c004b4f7eab239e726c6dde0f6cfca46a96956b Author: Andy Lutomirski Date: Thu May 26 10:13:31 2011 -0400 efifb: Enable write-combining Running fbcon on an uncached framebuffer is remarkably slow. So try to enable write combining in efifb. Without this patch, it takes 5.8 seconds from efifb probe to i915 probe (default options; no plymouth or quiet mode). With this patch, it only takes 1.7 seconds. That means we wasted over 4 seconds just writing to UC memory. Signed-off-by: Andy Lutomirski Signed-off-by: Peter Jones Signed-off-by: Paul Mundt commit 0057f1809d44b26765ec2374e0107a2f8ab256f5 Author: Julia Lawall Date: Wed Jun 1 17:10:13 2011 +0000 drivers/video/pxa168fb.c: add missing clk_put Add a label for error-handling code in the case where only clk_get has succeeded. Rename the label failed to be consistent with the rest. A simplified version of the semantic match that finds the missing clk_put is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression e1,e2; statement S; @@ e1 = clk_get@p1(...); ... when != e1 = e2 when != clk_put(e1) when any if (...) { ... when != clk_put(e1) when != if (...) { ... clk_put(e1) ... } * return@p3 ...; } else S // Signed-off-by: Julia Lawall Signed-off-by: Paul Mundt commit 609d3bbf044a6766f6505d8a29d4ed48020c014c Author: Julia Lawall Date: Wed Jun 1 17:10:11 2011 +0000 drivers/video/imxfb.c: add missing clk_put Reorder the labels at the end of the function to correspond to the order in which the resources are allocated. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression e1,e2; statement S; @@ e1 = clk_get@p1(...); ... when != e1 = e2 when != clk_put(e1) when any if (...) { ... when != clk_put(e1) when != if (...) { ... clk_put(e1) ... } * return@p3 ...; } else S // Signed-off-by: Julia Lawall Acked-by: Sascha Hauer Signed-off-by: Paul Mundt commit 70f289db31502ac030049450e63d380f3bc30cd2 Author: Steven Miao Date: Mon May 30 03:23:36 2011 +0000 fbdev: bf537-lq035: add missing blacklight properties type Seems this new field was missed, probably due to this driver being merged around the time this new backlight field was being added. At any rate, initial the type field to avoid ugly WARN() dumps. Signed-off-by: Steven Miao Signed-off-by: Mike Frysinger Signed-off-by: Paul Mundt commit 1bae852fb0beca3cc95b8de84efbc7254cae62e1 Author: Tormod Volden Date: Sat May 28 15:06:11 2011 +0000 savagefb: Use panel CVT mode as default If there is no EDID but an LCD panel is detected, generate a CVT mode from the panel resolution (at 60 Hz), and use this as a default mode instead of the hardcoded 800x600x8 mode. Signed-off-by: Tormod Volden Signed-off-by: Paul Mundt commit 554cc1028603587e28ae49e9594b1508df5f29aa Author: Paul Mundt Date: Thu May 26 15:01:22 2011 +0900 fbdev: sh_mobile_lcdcfb: Fix up fallout from MERAM changes. The LCDC driver does no longer compile: CC drivers/video/sh_mobile_meram.o CC drivers/video/sh_mobile_lcdcfb.o drivers/video/sh_mobile_lcdcfb.c: In function 'sh_mobile_lcdc_start': drivers/video/sh_mobile_lcdcfb.c:640:4: error: 'ret' undeclared (first use in this function) drivers/video/sh_mobile_lcdcfb.c:640:4: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [drivers/video/sh_mobile_lcdcfb.o] Error 1 make[1]: *** [drivers/video] Error 2 make: *** [drivers] Error 2 Reported-by: Magnus Damm Signed-off-by: Paul Mundt commit fe6f0bd03d697835e76dd18d232ba476c65b8282 Author: Marek Olšák Date: Sat May 7 01:09:57 2011 +0200 drm/radeon/kms: add missing Evergreen texture formats to the CS parser BC6 and BC7 are described in ARB_texture_compression_bptc. No idea what FMT_32_AS_32_32_32_32 is good for. Signed-off-by: Marek Olšák Signed-off-by: Dave Airlie commit adcfde516e10aad72d66f6fefd36e6d0e6bd7be7 Author: Alex Deucher Date: Fri May 27 10:05:03 2011 -0400 drm/radeon/kms: viewport height has to be even Otherwise, no vblank interrupts. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=37522 Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 8a5617bdc111aa7ba49c81fa694fde63d3474f94 Author: Alex Deucher Date: Thu May 26 14:20:38 2011 -0400 drm/radeon/kms: remove duplicate reg from r600 safe regs It got added twice by accident. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit d5c5a72f2a5821ba3ebdbe02bce03345790458aa Author: Alex Deucher Date: Tue May 31 15:42:48 2011 -0400 drm/radeon/kms: add support for Llano Fusion APUs - add gpu init support - add blit support - add ucode loader Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 3b68a26ec058fda2d6b470cdd8fedc5a3c854916 Author: Alex Deucher Date: Tue May 31 15:42:49 2011 -0400 drm/radeon/kms: add llano pci ids Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 89da5a375ad797ad5e38ad7a9ec64ea40afe8c7a Author: Alex Deucher Date: Tue May 31 15:42:47 2011 -0400 drm/radeon/kms: fill in asic struct for llano Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 4df64e65025dfa493bf75fddf50d83bba069e1eb Author: Alex Deucher Date: Tue May 31 15:42:46 2011 -0400 drm/radeon/kms: add family ids for llano APUs Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 498c555f56a02ec1059bc150cde84411ba0ac010 Author: Dave Airlie Date: Sun May 29 17:48:32 2011 +1000 drm/radeon: fix oops in ttm reserve when pageflipping (v2) We need to take a reference to this object, pinning doesn't take a reference so if userspace deletes the object it can disappear even if pinned. v2: fix error paths to unreference properly also. should fix: https://bugzilla.kernel.org/show_bug.cgi?id=32402 and https://bugzilla.redhat.com/show_bug.cgi?id=680651 Acked-By: Alex Deucher Signed-off-by: Dave Airlie commit f69753140d5c95087a3352710ae5edd541710da6 Author: Matt Evans Date: Wed Jun 1 13:01:01 2011 +1000 xhci: Bigendian fix for skip_isoc_td() Commit 926008c9386dde09b015753b6681c502177baa30 "USB: xhci: simplify logic of skipping missed isoc TDs" added a small endian bug. This patch fixes skip_isoc_td() to read the DMA pointer correctly. Signed-off-by: Matt Evans Signed-off-by: Sarah Sharp commit d364ee4fdb33a329b16cdf9342e9770b4d4ddc83 Author: Mauro Carvalho Chehab Date: Wed Jun 1 15:03:56 2011 -0300 [media] soc_camera: preserve const attribute drivers/media/video/soc_camera.c: In function ‘soc_camera_video_start’: drivers/media/video/soc_camera.c:1515: warning: initialization discards qualifiers from pointer target type Signed-off-by: Mauro Carvalho Chehab commit 76df01eacd5fa41b607426a8cb091fb21ae35554 Author: Mauro Carvalho Chehab Date: Wed Jun 1 14:44:41 2011 -0300 [media] uvc_entity: initialize return value drivers/media/video/uvc/uvc_entity.c: In function ‘uvc_mc_register_entities’: drivers/media/video/uvc/uvc_entity.c:33: warning: ‘ret’ may be used uninitialized in this function Signed-off-by: Mauro Carvalho Chehab commit 8c89ddd536bbe97c1e50424778a139abbf5763c3 Author: Laurent Pinchart Date: Mon May 30 15:45:47 2011 -0300 [media] media: Fix media device minor registration The find_next_zero_bit() is called with the from and to arguments in the wrong order. This results in the function always returning 0, and all media devices being registered with minor 0. Furthermore, mdev->minor is then used before being assigned with the find_next_zero_bit() return value. This really makes sure we'll always use minor 0. Fix this and let the system support more than one media device. Signed-off-by: Laurent Pinchart Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab commit 67e27c741339faedcc8e9c2c613487745d1c4b8b Author: Hans Petter Selasky Date: Mon May 23 08:09:18 2011 -0300 [media] Make nchg variable signed because the code compares this variable against negative values The sonixj driver compares the value for nchg with: if (sd->nchg < -6 || sd->nchg >= 12) { With u8, negative values won't work. Signed-off-by: Hans Petter Selasky Acked-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 6c20c635b8bb110d5c610bf19233462dcfa3b39b Author: Sanjeev Premi Date: Wed May 18 13:06:51 2011 -0300 [media] omap3isp: fix compiler warning This patch fixes this compiler warning: drivers/media/video/omap3isp/isp.c: In function 'isp_isr_dbg': drivers/media/video/omap3isp/isp.c:392:2: warning: zero-length gnu_printf format string Signed-off-by: Sanjeev Premi Acked-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 6e3ea0e711b1c4dca3c4f87ef0ab5c896c940c81 Author: Laurent Pinchart Date: Mon May 2 16:21:03 2011 -0300 [media] v4l: Fix media_entity_to_video_device macro argument name The name 'entity' is used twice in the macro body, once as the macro argument, and once as a structure field name. This breaks compilation if the macro is called with its argument not named 'entity'. Fix this by renaming the macro argument '__e'. This should avoid namespace clashes. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 1fcecf281b99f9ca262ae7fbc3703c421be5c857 Author: Balaji T K Date: Wed Jun 1 16:45:22 2011 +0530 ARM: OMAP4: MMC: increase delay for pbias 4 micro seconds is not enough for PBIAS if MMC regulator is enabled from MMC regulator OFF. Increase the delay for PBIAS to stabilize. Wait for PBIAS and timeout if not. Resolves MMC/SD failure on OMAP4 "Pbias Voltage is not same as LDO" Signed-off-by: Balaji T K Acked-by: Kishore Kadiyala Signed-off-by: Tony Lindgren commit c5874c9245d298c65f81c2f91f89e1da8ea66409 Author: Ian Armstrong Date: Sun May 29 21:33:17 2011 -0300 [media] ivtv: Internally separate encoder & decoder standard setting Internally separates the setting of the broadcast standard for the encoder & decoder. Externally there's no change in functionality. [awalls@md.metrocast.net: Edited to fix a checkpatch gripe about multiple assignment and to remove a now unused DEFINE_WAIT() due to this patch] Signed-off-by: Ian Armstrong Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 6600cc301d0762e3db8bd2b44d2d5fef36a4fd68 Author: Ian Armstrong Date: Sat May 28 22:15:41 2011 -0300 [media] ivtvfb: Add sanity check to ivtvfb_pan_display() Add sanity check to ivtvfb_pan_display() to ensure only valid values are used to pan the display. Invalid values are rejected with -EINVAL Signed-off-by: Ian Armstrong Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 5d9c08dea0c13c09408f97fe61d34c198c4f3277 Author: Laurent Pinchart Date: Wed May 25 06:41:23 2011 -0300 [media] ivtvfb: use display information in info not in var for panning We must not use any information in the passed var besides xoffset, yoffset and vmode as otherwise applications might abuse it. Also use the aligned fix.line_length and not the (possible) unaligned xres_virtual. Signed-off-by: Laurent Pinchart Reviewed-by: Ian Armstrong Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 7700a0d293ad8b1b1759ad06ac868f9a42fd0951 Author: Ian Armstrong Date: Sun May 29 20:09:24 2011 -0300 [media] ivtv: Make two ivtv_msleep_timeout calls uninterruptable Two ivtv_msleep_timeout() calls are incorrectly flagged as interruptable. The first is in the init sequence for a capture and is required for stable hardware setup. The second is at the end of the capture and used to handle the last data transfer. Failure to wait for this last transfer can result in stale data being read at the start of the next capture. Signed-off-by: Ian Armstrong Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 21d2e938d34d201276de3470587a3aa2047c77a1 Author: Antti Palosaari Date: Tue May 24 06:04:08 2011 -0300 [media] anysee: return EOPNOTSUPP for unsupported I2C messages Check I2C messages and return error properly. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit c8ef0a5b70a9821b3d75097aba672f531619231b Author: Jean-François Moine Date: Mon May 23 06:08:49 2011 -0300 [media] gspca - ov519: Set the default frame rate to 15 fps The frame rate variable was not initialized, so, the lowest frame rate was used for most webcams. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 5ff01d54fe218be1b7e50fec30e111eb1bc224ea Author: Jean-François Moine Date: Mon May 23 04:51:10 2011 -0300 [media] gspca - stv06xx: Set a lower default value of gain for hdcs sensors Many users said that the default gain value (128) was giving white images. The value which was in the original qc-usb driver (50) is better. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 0e44173b1246261c8e29fe637017944a19a79869 Author: Jean-François Moine Date: Sun May 22 05:36:33 2011 -0300 [media] gspca: Remove coarse_expo_autogain.h This file is replaced by autogain_functions.h. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 9cf208e844d41441b3ad393d1da4f41fa3426795 Author: Jean-François Moine Date: Sun May 22 05:05:11 2011 -0300 [media] gspca - ov519: Change the ovfx2 bulk transfer size The 'normal' bulk transfer size did not work for 800x600. By git commit c42cedbb658b, this 'normal' size was used for 1600x1200 only. It will now be used back again for all resolutions but 800x600. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 9d2b909544bcdac337340a4b44d8c50d4da62bc1 Author: Jean-François Moine Date: Sun May 22 04:56:32 2011 -0300 [media] gspca - ov519: Fix a regression for ovfx2 webcams By git commit c42cedbb658b, the bulk transfer size was changed to a lower value for resolutions != 1600x1200, but the image extraction routine still worked with the previous value, giving bad truncated images. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 1704bf15deb6de20f8f4272c8d8232b36bbc7484 Author: Igor Grinberg Date: Mon May 30 00:11:45 2011 -0700 arm: omap2plus: move NAND_BLOCK_SIZE out of boards Several boards defining mtd partitions also defined NAND_BLOCK_SIZE as SZ_128K. Move the define to common-board-devices.h This removes multiple defines of NAND_BLOCK_SIZE. Signed-off-by: Igor Grinberg [tony@atomide.com: updated comments] Signed-off-by: Tony Lindgren commit 4998b245732572b027eef6b7221d80da0a3486e9 Author: Shubhrajyoti D Date: Wed May 4 14:57:44 2011 -0700 omap4: hwmod: Enable the keypad Commit 407a6888f7362cb3dabe69ea6d9dcf3c750dc56a (OMAP4: hwmod data: Add AESS, McPDM, bandgap, counter_32k, MMC, KBD, ISS & IPU) added the entry for keypad, but did not enable it. Enable the keypad in the hwmod database so it works. Signed-off-by: Shubhrajyoti D Acked-by: Benoit Cousson [tony@atomide.com: updated comments] Signed-off-by: Tony Lindgren commit 5e2ffc308a3aa44a318452fccae7b23a029eeeb8 Author: Tasslehoff Kjappfot Date: Tue May 31 04:58:56 2011 -0700 omap3: Free Beagle rev gpios when they are read, so others can read them later Free Beagle rev gpios when they are read, so others can read them later Signed-off-by: Tasslehoff Kjappfot [tony@atomide.com: updated comments] Signed-off-by: Tony Lindgren commit e2a346a2a054f702fd76f328ff747b9ad9264a4c Author: Alexander Holler Date: Tue Apr 5 15:40:08 2011 +0200 arm: omap3: beagle: Ensure msecure is mux'd to be able to set the RTC Without msecure beeing high it isn't possible to set (or start) the RTC. Tested with a BeagleBoard C4. Signed-off-by: Alexander Holler Signed-off-by: Tony Lindgren commit c0ad4fac5011c5534c45011ee8dee2b3de256663 Author: Jarkko Nikula Date: Tue May 31 11:27:01 2011 +0300 omap: rx51: Don't power up speaker amplifier at bootup Speaker amplifier is accidentally powered up in early TWL gpio setup. This causes a few mA of needless battery current consumption. Without this patch the amplifier can be shutdown only by having one active audio playback and shutdown cycle to speaker output. Thanks to Kalle Jokiniemi for noticing the issue. Signed-off-by: Jarkko Nikula Cc: Kalle Jokiniemi Signed-off-by: Tony Lindgren commit 2827411e25d7da7913463474606fe624404b2339 Author: Jarkko Nikula Date: Tue May 31 11:27:00 2011 +0300 omap: rx51: Set regulator V28_A always on The V28_A domain in Nokia N900 that supplies VDD voltages to TLV320AIC34 and TPA6130A2 should not be shutdown. This is because otherwise there will be leak from VIO to VDD in TLV320AIC34 and this leak consumes more battery current that is saved from keeping V28_A off. With this patch the battery current consumption is approximately 1.5 mA lower. Thanks to Kalle Jokiniemi for noticing the issue. Signed-off-by: Jarkko Nikula Cc: Kalle Jokiniemi Signed-off-by: Tony Lindgren commit b1c1df7a7d50bf94de89704e963467bc94b1fef9 Author: Balaji T K Date: Mon May 30 19:55:34 2011 +0530 ARM: OMAP4: MMC: no regulator off during probe for eMMC eMMC does not handle power off when not in sleep state, Skip regulator disable during probe when eMMC is not in known state - state left by bootloader. Resolves eMMC failure on OMAP4 mmc0: error -110 whilst initialising MMC card Signed-off-by: Balaji T K Tested-by: Kishore Kadiyala Acked-by: Kishore Kadiyala Signed-off-by: Tony Lindgren commit e68273baf30390e9c907831b47384085c7f664d5 Author: Igor Grinberg Date: Wed May 4 18:04:55 2011 +0300 arm: omap2plus: fix ads7846 pendown gpio request introduced by: 96974a24 (omap: consolidate touch screen initialization among different boards) ads7846 driver can use either gpio_pendown or get_pendown_state() callback. In case of gpio_pendown, it requests the provided gpio_pendown thus resulting in double requesting that gpio: ads7846 spi1.0: failed to request pendown GPIO57 ads7846: probe of spi1.0 failed with error -16 Fix this by restricting the gpio request to the case of get_pendown_state() callback is used. Signed-off-by: Igor Grinberg Tested-by: Thomas Weber Signed-off-by: Tony Lindgren commit 03b562d7859c6d7c640f071b422d521146471d6d Author: Todd Poynor Date: Thu May 26 12:25:53 2011 -0700 ARM: OMAP2: Add missing iounmap in omap4430_phy_init !dev case needs iounmap before return. Signed-off-by: Todd Poynor Signed-off-by: Tony Lindgren commit 21a42c92750446008dc0847a78aba5459e3b6b5a Author: Colin Cross Date: Wed May 4 14:57:57 2011 -0700 ARM: omap4: Pass core and wakeup mux tables to omap4_mux_init OMAP4 contains two separate instances of the padconf registers, one in the core system config and one in the wakeup system config. Pass in two tables to apply the correct values to each instance. Signed-off-by: Colin Cross Signed-off-by: Tony Lindgren commit d4ff6121b44081601206980cafcd6ed3ecb367b6 Author: Colin Cross Date: Tue May 31 12:00:09 2011 -0700 ARM: omap2+: mux: Allow board mux settings to be NULL OMAP4 has two mux instances, and the board may not have settings for one of them. Allow the board file to pass NULL for an instance's mux settings, which will initialize the mux instance but skip writing board settings. Signed-off-by: Colin Cross Signed-off-by: Tony Lindgren commit 1499f2dbafafe844e485ff8945f60cd9f3d5cbd9 Author: Rabin Vincent Date: Sat May 7 22:28:47 2011 +0530 OMAP4: fix return value of omap4_l3_init Don't PTR_ERR() a non-error pointer: initcall omap4_l3_init+0x0/0xdc returned -544980480 after 0 usecs initcall omap4_l3_init+0x0/0xdc returned with error code -544980480 Signed-off-by: Rabin Vincent Signed-off-by: Tony Lindgren commit 50b4860d577b4bef76c71ad38ef83b9f368283c2 Author: Omar Ramirez Luna Date: Fri Mar 25 14:04:31 2011 -0600 OMAP: iovmm: fix SW flags passed by user Commit d038aee24dcd5a2a0d8547f5396f67ae9698ac8e "omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag", changes iovmm to receive flags specified by user, however the upper 16 bits of the flags are wiped by iovmm itself. This fixes IOVMF_DA_FIXED flags from being lost, and lets the user map its desired "device addresses". Signed-off-by: Omar Ramirez Luna Acked-by: Hiroshi DOYU Signed-off-by: Tony Lindgren commit 77f7059a329fc8a514bbcc2f204aaa7c150e8046 Author: Julia Lawall Date: Fri May 13 18:46:10 2011 +0200 arch/arm/mach-omap1/dma.c: Invert calls to platform_device_put and platform_device_del Platform_device_del should be called before platform_device_put, as platform_device_put can delete the structure. Additionally, improve the error handling code for the call to ioremap, so that it calls platform_device_put. The semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @@ expression e1,e2; @@ *platform_device_put(e1); ... when != e1 = e2 *platform_device_del(e1); // Signed-off-by: Julia Lawall Signed-off-by: Tony Lindgren commit 30ebad9d756a0b2c97c6c4ca6c5e6b799e3b64da Author: Govindraj.R Date: Wed Jun 1 11:28:56 2011 +0530 OMAP2+: mux: fix compilation warnings Fix below compilation warnings. arch/arm/mach-omap2/omap_hwmod.c: In function 'omap_hwmod_for_each': arch/arm/mach-omap2/omap_hwmod.c:1631: warning: 'ret' may be used uninitialized in this function arch/arm/mach-omap2/mux.c: In function 'omap_mux_get_gpio': arch/arm/mach-omap2/mux.c:917: warning: 'm' may be used uninitialized in this function Signed-off-by: Govindraj.R Signed-off-by: Tony Lindgren commit e5ac0bda96c495321dbad9b57a4b1a93a5a72e7f Author: Stefano Stabellini Date: Wed May 25 12:33:23 2011 +0100 xen: use the trigger info we already have to choose the irq handler Do not use pirq_needs_eoi to decide which irq handler to use because Xen always returns true if the guest does not support pirq_eoi_map. Use the trigger information we already have from MP-tables and ACPI. Signed-off-by: Stefano Stabellini Reported-by: Thomas Goetz Tested-by: Thomas Goetz Signed-off-by: Konrad Rzeszutek Wilk commit 26a510ba12448d3af26951376eae202bee8cdf65 Author: Santosh Shilimkar Date: Mon Apr 4 14:20:08 2011 +0530 OMAP: SRAM: Fix warning: format '%08lx' expects type 'long unsigned int' Fix below build warning. CC arch/arm/plat-omap/sram.o arch/arm/plat-omap/sram.c: In function 'omap_map_sram': arch/arm/plat-omap/sram.c:224: warning: format '%08lx' expects type 'long unsigned int', but argument 2 has type 'unsigned int' While at this, convert SRAM printk(* "") to pr_*(""). Signed-off-by: Santosh Shilimkar Acked-by: Russell King Signed-off-by: Tony Lindgren commit 026fe79d75c3a7a257ca72250f46b472835784c9 Author: Igor Grinberg Date: Mon May 30 00:11:45 2011 -0700 arm: omap3: cm-t3517: fix section mismatch warning WARNING: arch/arm/mach-omap2/built-in.o(.text+0x11014): Section mismatch in reference from the function cm_t3517_init_usbh() to the (unknown reference) .init.data:(unknown) The function cm_t3517_init_usbh() references the (unknown reference) __initdata (unknown). This is often because cm_t3517_init_usbh lacks a __initdata annotation or the annotation of (unknown) is wrong. Signed-off-by: Igor Grinberg Signed-off-by: Tony Lindgren commit 89c4705ed58a9e6faa7649eb561aead79bb77b3f Author: Santosh Shilimkar Date: Mon May 30 00:11:45 2011 -0700 OMAP2+: Fix 9 section mismatch(es) warnings from mach-omap2/built-in.o The serial*_data should have been marked as __initdata as per it's usage in the board files. Fix the same to remove the section mismatch warnings caused by it. Signed-off-by: Santosh Shilimkar Signed-off-by: Silesh C V [tony@atomide.com: updated with additional fixes from Silesh] Signed-off-by: Tony Lindgren commit f9fa1bb9d7a3c9537d6abd4ad47c58fe27862625 Author: Axel Lin Date: Tue May 31 20:55:44 2011 +0800 ARM: OMAP2: Add missing include of linux/gpio.h I got some build error like below while executing "make omap2plus_defconfig". CC arch/arm/mach-omap2/board-2430sdp.o arch/arm/mach-omap2/board-2430sdp.c: In function 'omap_2430sdp_init': arch/arm/mach-omap2/board-2430sdp.c:247: error: 'GPIOF_OUT_INIT_LOW' undeclared (first use in this function) arch/arm/mach-omap2/board-2430sdp.c:247: error: (Each undeclared identifier is reported only once arch/arm/mach-omap2/board-2430sdp.c:247: error: for each function it appears in.) This patch fixes the build error by include linux/gpio.h instead of mach/gpio.h. Signed-off-by: Axel Lin Cc: Syed Mohammed Khasim Cc: Grazvydas Ignotas Cc: Steve Sakoman Signed-off-by: Tony Lindgren commit 046d886db18260d4435c942985392b7ef872337f Author: Janusz Krzysztofik Date: Tue May 31 00:44:31 2011 +0200 OMAP: fix compilation error Forward-declare platform_device structure in arch/arm/plat-omap/include/plat/flash.h, otherwise compilation may break with: In file included from arch/arm/mach-omap1/flash.c:15: arch/arm/plat-omap/include/plat/flash.h:14: warning: 'struct platform_device' declared inside parameter list arch/arm/plat-omap/include/plat/flash.h:14: warning: its scope is only this definition or declaration, which is probably not what you want arch/arm/mach-omap1/flash.c:16: warning: 'struct platform_device' declared inside parameter list arch/arm/mach-omap1/flash.c:17: error: conflicting types for 'omap1_set_vpp' arch/arm/plat-omap/include/plat/flash.h:14: error: previous declaration of 'omap1_set_vpp' was here Detected and corrected while building for Amstrad Delta, confirmed with omap1_defconfig. Signed-off-by: Janusz Krzysztofik Signed-off-by: Tony Lindgren commit 74c355fbdfedd3820046dba4f537876cea54c207 Author: Peter Zijlstra Date: Mon May 30 16:48:06 2011 +0200 perf, cgroups: Fix up for new API Ben changed the cgroup API in commit f780bdb7c1c (cgroups: add per-thread subsystem callbacks) in an incompatible way, but forgot to convert the perf cgroup bits. Avoid compile warnings and runtime splats and convert perf too ;-) Acked-by: Ben Blum Cc: Stephane Eranian Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/r/1306767651.1200.2990.camel@twins Signed-off-by: Ingo Molnar commit f339b9dc1f03591761d5d930800db24bc0eda1e1 Author: Peter Zijlstra Date: Tue May 31 10:49:20 2011 +0200 sched: Fix schedstat.nr_wakeups_migrate While looking over the code I found that with the ttwu rework the nr_wakeups_migrate test broke since we now switch cpus prior to calling ttwu_stat(), hence the test is always true. Cure this by passing the migration state in wake_flags. Also move the whole test under CONFIG_SMP, its hard to migrate tasks on UP :-) Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/n/tip-pwwxl7gdqs5676f1d4cx6pj7@git.kernel.org Signed-off-by: Ingo Molnar commit f01114cb59d670e9b4f2c335930dd57db96e9360 Author: Peter Zijlstra Date: Tue May 31 12:26:55 2011 +0200 sched: Fix cross-cpu clock sync on remote wakeups Markus reported that commit 317f394160e ("sched: Move the second half of ttwu() to the remote cpu") caused some accounting funnies on his AMD Phenom II X4, such as weird 'top' results. It turns out that this is due to non-synced TSC and the queued remote wakeups stopped coupeling the two relevant cpu clocks, which leads to wakeups seeing time jumps, which in turn lead to skewed runtime stats. Add an explicit call to sched_clock_cpu() to couple the per-cpu clocks to restore the normal flow of time. Reported-and-tested-by: Markus Trippelsdorf Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/r/1306835745.2353.3.camel@twins Signed-off-by: Ingo Molnar commit 1adffbae22332bb558c2a29de19d9aca391869f6 Author: OGAWA Hirofumi Date: Tue May 31 19:38:07 2011 +0900 fat: Fix corrupt inode flags when remove ATTR_SYS flag We are clearly missing '~' in fat_ioctl_set_attributes(). Cc: Reported-by: Dmitry Dmitriev Signed-off-by: OGAWA Hirofumi commit 27721a52d6c8e33327ec3cae9f730204be99d251 Author: Kyungmin Park Date: Mon May 30 10:24:47 2011 +0900 gpio: Fix gpio-exynos4 build fails in mainline After the GPIO driver move, some symbols became selectable when they shouldn't be. Tighten the dependencies. Reported-by: Randy Dunlap Signed-off-by: Grant Likely commit 9e3bb6b6f6a0c535eb053fbf0005a8e79e053374 Author: Heiko Carstens Date: Tue May 24 07:51:27 2011 +0200 KVM: add missing void __user * cast to access_ok() call fa3d315a "KVM: Validate userspace_addr of memslot when registered" introduced this new warning onn s390: kvm_main.c: In function '__kvm_set_memory_region': kvm_main.c:654:7: warning: passing argument 1 of '__access_ok' makes pointer from integer without a cast arch/s390/include/asm/uaccess.h:53:19: note: expected 'const void *' but argument is of type '__u64' Add the missing cast to get rid of it again... Cc: Takuya Yoshikawa Signed-off-by: Heiko Carstens Signed-off-by: Avi Kivity commit 2f2f96d1ea72e6602ae440ac2867a6004edb37a1 Author: Alex Deucher Date: Wed May 25 12:51:44 2011 -0400 drm/radeon/kms: clean up the radeon kms Kconfig - no longer in staging - all radeons supported Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 67b3f823ec78d08aea8835bce2655674237abc1d Author: Alex Deucher Date: Wed May 25 18:45:37 2011 -0400 drm/radeon/kms: fix thermal sensor reading on juniper Uses a different method than other evergreen asics. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 457558eda1545c22163574f6dbb883394705e9dd Author: Alex Deucher Date: Wed May 25 17:49:54 2011 -0400 drm/radeon/kms: add missing case for cayman thermal sensor The rest of the code is already in place. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit cb92d452ba665205ad6bfb424c0ef009cf26587d Author: Alex Deucher Date: Wed May 25 16:39:00 2011 -0400 drm/radeon/kms: add blit support for cayman (v2) Allows us to use the 3D engine for memory management and allows us to use vram beyond the BAR aperture. v2: fix copy paste typo Reported-by: Nils Wallménius Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit f90e5b5b136ede1f0fd15999e95f13124d6b0dbd Author: Bob Peterson Date: Tue May 24 10:44:42 2011 -0400 GFS2: Processes waiting on inode glock that no processes are holding This patch fixes a race in the GFS2 glock state machine that may result in lockups. The symptom is that all nodes but one will hang, waiting for a particular glock. All the holder records will have the "W" (Waiting) bit set. The other node will typically have the glock stuck in Exclusive mode (EX) with no holder records, but the dinode will be cached. In other words, an entry with "I:" will appear in the glock dump for that glock, but nothing else. The race has to do with the glock "Pending Demote" bit, which can be set, then immediately reset, thus losing the fact that another node needs the glock. The sequence of events is: 1. Something schedules the glock workqueue (e.g. glock request from fs) 2. The glock workqueue gets to the point between the test of the reply pending bit and the spin lock: if (test_and_clear_bit(GLF_REPLY_PENDING, &gl->gl_flags)) { finish_xmote(gl, gl->gl_reply); drop_ref = 1; } down_read(&gfs2_umount_flush_sem); <---- i.e. here spin_lock(&gl->gl_spin); 3. In comes (a) the reply to our EX lock request setting GLF_REPLY_PENDING and (b) the demote request which sets GLF_PENDING_DEMOTE 4. The following test is executed: if (test_and_clear_bit(GLF_PENDING_DEMOTE, &gl->gl_flags) && gl->gl_state != LM_ST_UNLOCKED && gl->gl_demote_state != LM_ST_EXCLUSIVE) { This resets the pending demote flag, and gl->gl_demote_state is not equal to exclusive, however because the reply from the dlm arrived after we checked for the GLF_REPLY_PENDING flag, gl->gl_state is still equal to unlocked, so although we reset the GLF_PENDING_DEMOTE flag, we didn't then set the GLF_DEMOTE flag or reinstate the GLF_PENDING_DEMOTE_FLAG. The patch closes the timing window by only transitioning the "Pending demote" bit to the "demote" flag once we know the other conditions (not unlocked and not exclusive) are met. Signed-off-by: Bob Peterson Signed-off-by: Steven Whitehouse commit ac10f81d94f49f1bd9618680263400d275ddf825 Author: Alex Deucher Date: Wed May 25 01:00:45 2011 -0400 drm/radeon/kms/blit: workaround some hw issues on evergreen+ Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie