commit b5ddbf465f3675b19c8f5528b4064cbf278a5c6f Author: Stephen Rothwell Date: Tue Aug 16 09:36:06 2011 +1000 regmap: using module facilities requires module.h Commit b33f9cbd67ba ("regmap: Specify a module license") added a MODULES_LICENSE to this file without adding an include of module.h. module.h should have been included anyway, since this file has EXPORT_SYMBOLs as well. With the pending module.h split up, this would probably have caused build problems. Cc: Stephen Warren Cc: Mark Brown Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 870d3be1249b1397395ed3164987397993a16d91 Merge: edb5811 52884b2 Author: Linus Torvalds Date: Mon Aug 15 19:24:42 2011 -0700 Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs * 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs: Docs: MSI-HOWTO: MSI -> MSIs Docs: MSI-HOWTO: Insert a comma Docs: MSI-HOWTO: can -> could Docs: MSI-HOWTO: Use `unknown ...' rather than `... know about.' Docs: MSI-HOWTO: may -> might Docs: MSI-HOWTO: Insert a comma Docs: MSI-HOWTO: API -> function Docs: MSI-HOWTO: , -> ; Docs: MSI-HOWTO: Move a sentence to another paragraph Docs: MSI-HOWTO: Insert `that' Docs: MSI-HOWTO: Offset modifier with a comma, and insert `yet' for emphasis Docs: MSI-HOWTO: Put the `because' subordinate clause first Docs: MSI-HOWTO: Streamline some wording Docs: MSI-HOWTO: `asked for' -> `requested' Docs: MSI-HOWTO: Use present tense and streamline some wording Docs: MSI-HOWTO: Use the subjunctive, and change `can' to `may' commit edb581110d04c70a4be5723ff8862a0f523657dd Merge: 291b63c 178a296 Author: Linus Torvalds Date: Mon Aug 15 19:16:01 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Set HAVE_C_RECORDMCOUNT sparc32: unbreak arch_write_unlock() sparc64: remove unnecessary macros from spinlock_64.h commit 291b63c86aea8a571ddf913d41ab5156b8314dad Merge: cedf03b 92b79f4 Author: Linus Torvalds Date: Mon Aug 15 19:14:18 2011 -0700 Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6: drm/i915: Cannot set clock gating under UMS drm/i915: Can't do accurate vblank timestamps with UMS Not all systems expose a firmware or platform mechanism for changing the backlight intensity on i915, so add native driver support. drm/i915: split out PCH refclk update code drm/i915: show interrupt info on IVB drm/i915: Remove unused 'reg' argument to dp_pipe_enabled drm/i915: Fix PCH port pipe select in CPT disable paths drm/i915: Leave LVDS registers unlocked drm/i915: Wait for LVDS panel power sequence commit cedf03bd9aa54d1d7a9065dddc9e76505f476b12 Author: Randy Dunlap Date: Mon Aug 15 10:18:46 2011 -0700 x86: fix mm/fault.c build arch/x86/mm/fault.c needs to include asm/vsyscall.h to fix a build error: arch/x86/mm/fault.c: In function '__bad_area_nosemaphore': arch/x86/mm/fault.c:728: error: 'VSYSCALL_START' undeclared (first use in this function) Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 178a29600340bef5b13cd4157053679debe35351 Author: David S. Miller Date: Mon Aug 15 14:45:17 2011 -0700 sparc64: Set HAVE_C_RECORDMCOUNT Signed-off-by: David S. Miller commit 3f6aa0b113846a8628baa649af422cfc6fb1d786 Author: Mikael Pettersson Date: Mon Aug 15 10:11:50 2011 +0000 sparc32: unbreak arch_write_unlock() The sparc32 version of arch_write_unlock() is just a plain assignment. Unfortunately this allows the compiler to schedule side-effects in a protected region to occur after the HW-level unlock, which is broken. E.g., the following trivial test case gets miscompiled: #include rwlock_t lock; int counter; void foo(void) { write_lock(&lock); ++counter; write_unlock(&lock); } Fixed by adding a compiler memory barrier to arch_write_unlock(). The sparc64 version combines the barrier and assignment into a single asm(), and implements the operation as a static inline, so that's what I did too. Compile-tested with sparc32_defconfig + CONFIG_SMP=y. Signed-off-by: Mikael Pettersson Signed-off-by: David S. Miller commit a0fba3eb059e73fed2d376a901f8117734c12f1f Author: Mikael Pettersson Date: Mon Aug 15 10:10:31 2011 +0000 sparc64: remove unnecessary macros from spinlock_64.h The sparc64 spinlock_64.h contains a number of operations defined first as static inline functions, and then as macros with the same names and parameters as the functions. Maybe this was needed at some point in the past, but now nothing seems to depend on these macros (checked with a recursive grep looking for ifdefs on these names). Other archs don't define these identity-macros. So this patch deletes these unnecessary macros. Compile-tested with sparc64_defconfig. Signed-off-by: Mikael Pettersson Signed-off-by: David S. Miller commit 92b79f4322b8a2506bdd862f554a2a81ff0a2dad Author: Keith Packard Date: Fri Aug 12 17:07:18 2011 -0700 drm/i915: Cannot set clock gating under UMS The clock gating functions are only assigned under KMS, so don't try to call them under UMS. Signed-off-by: Keith Packard Tested-by: Justin P. Mattock commit c3613de92ebea302137d21d8938421c3f88d8741 Author: Keith Packard Date: Fri Aug 12 17:05:54 2011 -0700 drm/i915: Can't do accurate vblank timestamps with UMS Disable this feature when KMS is not running by setting the driver->get_vblank_timestamp function pointer to NULL. Signed-off-by: Keith Packard Tested-by: Justin P. Mattock commit aaa6fd2a004147bf32fce05720938236de3361d9 Author: Matthew Garrett Date: Fri Aug 12 12:11:33 2011 +0200 Not all systems expose a firmware or platform mechanism for changing the backlight intensity on i915, so add native driver support. Signed-off-by: Matthew Garrett Cc: Richard Purdie Cc: Chris Wilson Cc: David Airlie Cc: Alex Deucher Cc: Ben Skeggs Cc: Zhang Rui Cc: Len Brown Cc: Jesse Barnes Tested-by: Sedat Dilek Tested-by: Michel Alexandre Salim Tested-by: Kamal Mostafa Signed-off-by: Andrew Morton Signed-off-by: Keith Packard 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 13d83a672e9bbd52ae82c2f611dfd845a957e8b4 Author: Jesse Barnes Date: Wed Aug 3 12:59:20 2011 -0700 drm/i915: split out PCH refclk update code We ought to be calling this from our DPMS routines as well as global state may change and we need to enable/disable clocks. So split out the code in preparation for further changes. Signed-off-by: Jesse Barnes Signed-off-by: Keith Packard commit da64c6fc4aba6f02aa800db72411f459a9f86809 Author: Jesse Barnes Date: Tue Aug 9 09:17:46 2011 -0700 drm/i915: show interrupt info on IVB IVB uses the same interrupt reg layout as SNB, so add an IS_GEN7 to the interrupt debugfs file. Signed-off-by: Jesse Barnes Signed-off-by: Keith Packard commit 4e6343898fe7eed6b3c0c3c809347bc88d5b4a1e Author: Keith Packard Date: Sat Aug 6 10:39:45 2011 -0700 drm/i915: Remove unused 'reg' argument to dp_pipe_enabled Just an extra parameter which isn't actually needed. Signed-off-by: Keith Packard Reviewed-by: Jesse Barnes commit 1519b9956eb4b4180fa3f47c73341463cdcfaa37 Author: Keith Packard Date: Sat Aug 6 10:35:34 2011 -0700 drm/i915: Fix PCH port pipe select in CPT disable paths CPT pipe select is different from previous generations (using two bits instead of one). All of the paths from intel_disable_pch_ports were not making this distinction. Mode setting with pipe A turned off would then also force all outputs on pipe B to get turned off as the disable code would mistakenly decide that all of these outputs were on pipe A and turn them off. This is an extension of the CPT DP disable fix (why didn't I fix this then?) Signed-off-by: Keith Packard Reviewed-by: Jesse Barnes commit ed10fca9c351c83ab89a97f3515089e0d36bdccc Author: Keith Packard Date: Sat Aug 6 10:33:12 2011 -0700 drm/i915: Leave LVDS registers unlocked There's no reason to relock them; it just makes operations more complex. This fixes DPMS where the panel registers were locked making the disable not work. Signed-off-by: Keith Packard Reviewed-by: Jesse Barnes commit de842eff41017721312d2747bcbee89c1beda6d0 Author: Keith Packard Date: Sat Aug 6 10:30:45 2011 -0700 drm/i915: Wait for LVDS panel power sequence During mode setting, check to make sure the panel power sequencing has completed before doing further operations on the device. This uncovered errors with DPMS not turning the device off as it was left locked. Signed-off-by: Keith Packard Reviewed-by: Jesse Barnes commit 52884b2be5aa9a4a8f7a62525051c095718b014f Merge: ed8f373 798c794 Author: Randy Dunlap Date: Wed Aug 3 14:35:47 2011 -0700 Merge branch 'docs/msi-3' of git://github.com/mfwitten/linux-2.6 into docs-move commit 798c794df81e0a1af62c1d7e48b464f4096f3b9a Author: Michael Witten Date: Fri Jul 15 03:29:04 2011 +0000 Docs: MSI-HOWTO: MSI -> MSIs Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit c2b65e181acb9a981c890489c0f9a04d8e1b91f9 Author: Michael Witten Date: Fri Jul 15 03:27:22 2011 +0000 Docs: MSI-HOWTO: Insert a comma Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit 1b8386f61241471c722fbdff48e3d1d97bfca8e6 Author: Michael Witten Date: Fri Jul 15 03:26:37 2011 +0000 Docs: MSI-HOWTO: can -> could Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit e6b85a1f8a56d3c9db0273b7e4aaab802dc07a9b Author: Michael Witten Date: Fri Jul 15 03:25:44 2011 +0000 Docs: MSI-HOWTO: Use `unknown ...' rather than `... know about.' Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit 952df55b5a30913f4a5536b12ad09dd95c66d83f Author: Michael Witten Date: Fri Jul 15 03:15:10 2011 +0000 Docs: MSI-HOWTO: may -> might Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit e14bd7e614b57493e1cbefb8a06d3754bdd04e26 Author: Michael Witten Date: Fri Jul 15 03:12:13 2011 +0000 Docs: MSI-HOWTO: Insert a comma Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit e6ffceb0ded9beeaddd9c246b3fec298c6b1f0c9 Author: Michael Witten Date: Thu Jul 14 23:30:47 2011 +0000 Docs: MSI-HOWTO: API -> function Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit 5a84fc3162e06632ebea42cefe3b964299213d33 Author: Michael Witten Date: Thu Jul 14 21:55:05 2011 +0000 Docs: MSI-HOWTO: , -> ; Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit 6457d9b350b3f4f2098984eee016c6c994b9c096 Author: Michael Witten Date: Thu Jul 14 21:54:18 2011 +0000 Docs: MSI-HOWTO: Move a sentence to another paragraph Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit ed737c1882c652f0b5a888df59895b5dc2d10cd7 Author: Michael Witten Date: Mon Jul 18 16:15:00 2011 +0000 Docs: MSI-HOWTO: Insert `that' ... as per Randy Dunlap's wishes :-P Message-Id: <20110717114023.2b4cce91.rdunlap@xenotime.net> Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit e4439236ef5ac8e51ce97d03df8ef3e6dc5c6d51 Author: Michael Witten Date: Thu Jul 14 21:30:18 2011 +0000 Docs: MSI-HOWTO: Offset modifier with a comma, and insert `yet' for emphasis Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit 263d8d57b3b2e2fbb4e79b7cda7ef3399add4fb7 Author: Michael Witten Date: Thu Jul 14 21:28:00 2011 +0000 Docs: MSI-HOWTO: Put the `because' subordinate clause first Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit 1d15afcc73004028f2870ede7a56d590e1ca8ca8 Author: Michael Witten Date: Thu Jul 14 20:05:01 2011 +0000 Docs: MSI-HOWTO: Streamline some wording Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit a2d4d50128279c67d4cf38061206cddc1fc37e75 Author: Michael Witten Date: Thu Jul 14 20:03:28 2011 +0000 Docs: MSI-HOWTO: `asked for' -> `requested' Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit 4979de6efb5553505a595eadc1cf7c386ca1ddc6 Author: Michael Witten Date: Thu Jul 14 19:52:56 2011 +0000 Docs: MSI-HOWTO: Use present tense and streamline some wording Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap commit 891f692533c36a17f00d25d24e4ac44ef38c9e5c Author: Michael Witten Date: Thu Jul 14 17:53:54 2011 +0000 Docs: MSI-HOWTO: Use the subjunctive, and change `can' to `may' Signed-off-by: Michael Witten Acked-by: Matthew Wilcox Signed-off-by: Randy Dunlap 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