commit 2f6a123821a7feaba7cee787ef0f21d2354d1730 Merge: 6f02bfc e22a539 Author: Linus Torvalds Date: Mon Aug 15 08:46:11 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: lguest: allow booting guest with CONFIG_RELOCATABLE=y virtio: Add text copy of spec to Documentation/virtual. commit 6f02bfc404decf5b5046f1413ef941e1870912f7 Merge: a0b3447 a01e836 Author: Linus Torvalds Date: Mon Aug 15 08:40:49 2011 -0700 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: ohci: fix DMA unmapping in an error path firewire: cdev: fix 32 bit userland on 64 bit kernel compat corner cases commit a0b3447fb1d8b32071f473c779a482277816867a Merge: 4cb5aa1 1c8007b Author: Linus Torvalds Date: Mon Aug 15 08:40:24 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: flush journal completely before releasing metadata inodes commit 4cb5aa1d01c9794623df6a2320dcd6398cbe5e8e Merge: aa2b1cf d5811e8 Author: Linus Torvalds Date: Mon Aug 15 08:39:10 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/radeon/kms: don't try to be smart in the hpd handler drm/radeon: re-POST the asic on Apple hardware when booted via EFI drm/radeon: Allow panel preferred EDID to override BIOS native mode drm/radeon/kms: make some watermark messages debug only drm/radeon/kms: fix regression is handling >2 heads on cedar/caicos drm/radeon/kms: don't enable connectors that are off in the hotplug handler commit aa2b1cf5ca44811ab842c1cd8d32f95b8f51e557 Merge: 259a534 e22906c Author: Linus Torvalds Date: Mon Aug 15 08:36:30 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: Do not set cifs/ntfs acl using a file handle (try #4) [CIFS] Cleanup use of CONFIG_CIFS_STATS2 ifdef to make transport routines more readable commit 259a53407d9ae0c109902669c6f2f88a389dd163 Merge: 93ee7a9 b33f9cb Author: Linus Torvalds Date: Mon Aug 15 08:35:54 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: Specify a module license regmap: Fix bulk reads commit d5811e8731213f80c80d89e980505052f16aca1c Author: Alex Deucher Date: Sat Aug 13 13:36:13 2011 -0400 drm/radeon/kms: don't try to be smart in the hpd handler Attempting to try and turn off disconnected display hw in the hotput handler lead to more problems than it helped. For now just register an event and only attempt the do something interesting with DP. Other connectors are just too problematic: - Some systems have an HPD pin assigned to LVDS, but it's rarely if ever connected properly and we don't really care about hpd events on LVDS anyway since it's always connected. - The HPD pin is wired up correctly for eDP, but we don't really have to do anything since the events since it's always connected. - Some HPD pins fire more than once when you connect/disconnect - etc. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=39882 Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit e22a539824e8ddb82c87b4f415165ede82e6ab56 Author: Rusty Russell Date: Mon Aug 15 10:15:10 2011 +0930 lguest: allow booting guest with CONFIG_RELOCATABLE=y The CONFIG_RELOCATABLE code tries to align the unpack destination to the value of 'kernel_alignment' in the setup_hdr. If that's 0, it tries to unpack to address 0, which in fact causes the gunzip code to call 'error("Out of memory while allocating output buffer")'. The bootloader (ie. the lguest Launcher in this case) should be doing setting this field; the normal bzImage is 16M, we can use the same. Reported-by: Stefanos Geraggelos Signed-off-by: Rusty Russell Cc: stable@kernel.org commit c3c53a073247ee7522ca80393319540db9f4dc1e Author: Rusty Russell Date: Mon Aug 15 10:15:10 2011 +0930 virtio: Add text copy of spec to Documentation/virtual. As suggested by Christoph Hellwig. Signed-off-by: Rusty Russell commit a01e836087881dd9d824417190994c9b2b0f1dbb Author: Stefan Richter Date: Thu Aug 11 20:40:42 2011 +0200 firewire: ohci: fix DMA unmapping in an error path If request_irq failed, we would pass wrong arguments to dma_free_coherent. https://bugzilla.redhat.com/show_bug.cgi?id=728185 Reported-by: Mads Kiilerich Signed-off-by: Stefan Richter commit 9c1176b6a28850703ea6e3a0f0c703f6d6c61cd3 Author: Stefan Richter Date: Thu Aug 11 00:06:04 2011 +0200 firewire: cdev: fix 32 bit userland on 64 bit kernel compat corner cases Clemens points out that we need to use compat_ptr() in order to safely cast from u64 to addresses of a 32-bit usermode client. Before, our conversion went wrong - in practice if the client cast from pointer to integer such that sign-extension happened, (libraw1394 and libdc1394 at least were not doing that, IOW were not affected) or - in theory on s390 (which doesn't have FireWire though) and on the tile architecture, regardless of what the client does. The bug would usually be observed as the initial get_info ioctl failing with "Bad address" (EFAULT). Reported-by: Carl Karsten Reported-by: Clemens Ladisch Signed-off-by: Stefan Richter commit bcc65fd8e929a9d9d34d814d6efc1d2793546922 Author: Matthew Garrett Date: Mon Aug 8 16:21:16 2011 +0000 drm/radeon: re-POST the asic on Apple hardware when booted via EFI At least some Apples program the GPU into a state that wedges the engine once userspace starts trying to perform accelerated operations. Executing the Atom init scripts gets the hardware back into a working state. The same hardware works fine when booted via BIOS emulation, so let's just execute the init scripts on Apples when we're using EFI. Signed-off-by: Matthew Garrett Reviewed-by: Alex Deucher Signed-off-by: Dave Airlie commit 13bb9430cd6154d1f088549656c4a3ed10eaf35e Author: Matthew Garrett Date: Mon Aug 8 16:21:15 2011 +0000 drm/radeon: Allow panel preferred EDID to override BIOS native mode We have two sources of information about panel capabilities on mobile radeon - the BIOS, which gives us a native mode, and the panel's preferred mode. In theory these two will always match, but there's some corner cases where the BIOS hasn't been fully initialised and so the native mode in it ends up with default values. However, if we get a panel with reasonable EDID, it's probably the case that the panel's preferred mode does actually represent the panel capabilities. This patch handles that case by replacing the native mode with the panel's preferred mode if the resolutions don't match. Systems without a valid internal panel EDID will still use the BIOS native mode. Signed-off-by: Matthew Garrett Reviewed-by: Alex Deucher Signed-off-by: Dave Airlie commit 92bdfd4a35415dd3741b95df60782a32c586d399 Author: Alex Deucher Date: Thu Aug 4 17:28:40 2011 +0000 drm/radeon/kms: make some watermark messages debug only Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 33ae1827d6c3c79c5957536ec29d5a8780623147 Author: Alex Deucher Date: Thu Aug 11 14:01:03 2011 +0000 drm/radeon/kms: fix regression is handling >2 heads on cedar/caicos Need to add support for 4 crtcs when setting the possible crtcs for the encoders. Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 73104b5cfe3067d68f2c2de3f3d4d4964c55873e Author: Alex Deucher Date: Tue Aug 9 17:09:06 2011 +0000 drm/radeon/kms: don't enable connectors that are off in the hotplug handler If we get a hotplug event on an connector that is off, don't attempt to turn it on or off, it should already be off. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=728228 Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit b33f9cbd67ba1a1c46879ec66467269f09cde8e5 Author: Stephen Warren Date: Thu Aug 11 11:59:10 2011 -0600 regmap: Specify a module license CONFIG_REGMAP_I2C/SPI are set to m when selected by a tristate config option that's set to m. The regmap modules don't specify a license, so fail to link to regmap_init at load time, since that is EXPORT_SYMBOL_GPL. Fix this by specifying a license for the regmap modules. Signed-off-by: Stephen Warren Signed-off-by: Mark Brown commit e22906c564c2f9c73ee4621ef3b93fe374539f00 Author: Shirish Pargaonkar Date: Tue Aug 9 14:30:39 2011 -0500 cifs: Do not set cifs/ntfs acl using a file handle (try #4) Set security descriptor using path name instead of a file handle. We can't be sure that the file handle has adequate permission to set a security descriptor (to modify DACL). Function set_cifs_acl_by_fid() has been removed since we can't be sure how a file was opened for writing, a valid request can fail if the file was not opened with two above mentioned permissions. We could have opted to add on WRITE_DAC and WRITE_OWNER permissions to file opens and then use that file handle but adding addtional permissions such as WRITE_DAC and WRITE_OWNER could cause an any open to fail. And it was incorrect to look for read file handle to set a security descriptor anyway. Signed-off-by: Shirish Pargaonkar Signed-off-by: Steve French commit 789e66612367f9975d704c9e4990025cbbbb45ec Author: Steve French Date: Tue Aug 9 18:44:44 2011 +0000 [CIFS] Cleanup use of CONFIG_CIFS_STATS2 ifdef to make transport routines more readable Christoph had requested that the stats related code (in CONFIG_CIFS_STATS2) be moved into helpers to make code flow more readable. This patch should help. For example the following section from transport.c spin_unlock(&GlobalMid_Lock); atomic_inc(&ses->server->num_waiters); wait_event(ses->server->request_q, atomic_read(&ses->server->inFlight) < cifs_max_pending); atomic_dec(&ses->server->num_waiters); spin_lock(&GlobalMid_Lock); becomes simpler (with the patch below): spin_unlock(&GlobalMid_Lock); cifs_num_waiters_inc(server); wait_event(server->request_q, atomic_read(&server->inFlight) < cifs_max_pending); cifs_num_waiters_dec(server); spin_lock(&GlobalMid_Lock); Reviewed-by: Jeff Layton CC: Christoph Hellwig Signed-off-by: Steve French Reviewed-by: Pavel Shilovsky commit 1c8007b0769d37aa5fcb343b383b0af89ade2f71 Author: Dave Kleikamp Date: Mon Aug 1 12:41:00 2011 -0500 jfs: flush journal completely before releasing metadata inodes This fixes a race during unmount. We need to not only make sure that the journal is completely written, but that the metadata changes make it to disk before releasing ipimap and ipbmap. Signed-off-by: Dave Kleikamp commit 40c5cc263954444f5a76cbf25d408c42da480122 Author: Mark Brown Date: Sun Jul 24 22:39:12 2011 +0100 regmap: Fix bulk reads We should be reading the number of bytes we were asked for, not the size of a single register. Signed-off-by: Mark Brown