From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jan 2012 21:21:22 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=98793265b429a3f0b3f1750e74d67cd4d740d162;p=~shefty%2Frdma-dev.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
---

98793265b429a3f0b3f1750e74d67cd4d740d162
diff --cc arch/powerpc/platforms/40x/Kconfig
index baae85584b1,bd69cf8d822..a392d12dd21
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@@ -182,28 -148,3 +158,12 @@@ config IBM405_ERR7
  # All 40x-based cores, up until the 405GPR and 405EP have this errata.
  config IBM405_ERR51
  	bool
 +
- #config BIOS_FIXUP
- #	bool
- #	depends on BUBINGA || EP405 || SYCAMORE || WALNUT
- #	default y
- 
- #config PPC4xx_DMA
- #	bool "PPC4xx DMA controller support"
- #	depends on 4xx
- 
- #config PPC4xx_EDMA
- #	bool
- #	depends on !STB03xxx && PPC4xx_DMA
- #	default y
- #
- 
 +config APM8018X
 +	bool "APM8018X"
 +	depends on 40x
 +	default n
 +	select PPC40x_SIMPLE
 +	help
 +	  This option enables support for the AppliedMicro APM8018X evaluation
 +	  board.
- 
diff --cc fs/namespace.c
index 7e6f2c9dc7c,10a426c6a70..e6081996c9a
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@@ -321,12 -349,10 +321,10 @@@ int mnt_want_write(struct vfsmount *m
  	 * MNT_WRITE_HOLD is cleared.
  	 */
  	smp_rmb();
 -	if (__mnt_is_readonly(mnt)) {
 +	if (mnt_is_readonly(m)) {
  		mnt_dec_writers(mnt);
  		ret = -EROFS;
- 		goto out;
  	}
- out:
  	preempt_enable();
  	return ret;
  }