Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Linus Torvalds [Sun, 8 Jan 2012 21:21:22 +0000 (13:21 -0800)]
* '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)

39 files changed:
1  2 
MAINTAINERS
arch/arm/Kconfig
arch/mips/Kconfig
arch/powerpc/mm/numa.c
arch/powerpc/platforms/40x/Kconfig
arch/powerpc/platforms/44x/Kconfig
arch/s390/Kconfig
drivers/gpio/Kconfig
drivers/net/ethernet/chelsio/cxgb4vf/sge.c
drivers/scsi/qla2xxx/qla_nx.c
drivers/scsi/qla4xxx/ql4_fw.h
drivers/spi/Kconfig
drivers/tty/serial/Kconfig
drivers/usb/gadget/Kconfig
drivers/usb/host/hwa-hc.c
drivers/usb/serial/ftdi_sio_ids.h
drivers/usb/storage/isd200.c
drivers/usb/storage/unusual_devs.h
drivers/uwb/i1480/dfu/usb.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/ext4/inode.c
fs/fat/inode.c
fs/namespace.c
fs/ocfs2/file.c
fs/qnx4/inode.c
fs/xfs/xfs_buf.c
fs/xfs/xfs_log_cil.c
include/linux/security.h
include/linux/types.h
include/net/mac80211.h
kernel/events/core.c
kernel/events/ring_buffer.c
kernel/irq/manage.c
lib/Kconfig
mm/page_alloc.c
net/ipv4/Kconfig
net/ipv4/netfilter/nf_nat_core.c
net/netfilter/ipvs/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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.
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/ext4/inode.c
Simple merge
diff --cc fs/fat/inode.c
Simple merge
diff --cc 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;
  }
diff --cc fs/ocfs2/file.c
Simple merge
diff --cc fs/qnx4/inode.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/Kconfig
Simple merge
diff --cc mm/page_alloc.c
Simple merge
Simple merge
Simple merge
Simple merge