From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Mar 2011 17:37:40 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Tag: 2.1b_release~4981
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e16b396ce314b2bcdfe6c173fe075bf8e3432368;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)
---

e16b396ce314b2bcdfe6c173fe075bf8e3432368
diff --cc arch/x86/kernel/apic/io_apic.c
index 4b5ebd2,303be81..795ba31
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@@ -3980,10 -4023,10 +3980,10 @@@ int mp_find_ioapic_pin(int ioapic, u32 
  	return gsi - mp_gsi_routing[ioapic].gsi_base;
  }
  
 -static int bad_ioapic(unsigned long address)
 +static __init int bad_ioapic(unsigned long address)
  {
  	if (nr_ioapics >= MAX_IO_APICS) {
- 		printk(KERN_WARNING "WARING: Max # of I/O APICs (%d) exceeded "
+ 		printk(KERN_WARNING "WARNING: Max # of I/O APICs (%d) exceeded "
  		       "(found %d), skipping\n", MAX_IO_APICS, nr_ioapics);
  		return 1;
  	}
diff --cc fs/eventpoll.c
index 4a09af9,7513066..ff12f7a
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@@ -62,14 -62,7 +62,14 @@@
   * This mutex is acquired by ep_free() during the epoll file
   * cleanup path and it is also acquired by eventpoll_release_file()
   * if a file has been pushed inside an epoll set and it is then
-  * close()d without a previous call toepoll_ctl(EPOLL_CTL_DEL).
+  * close()d without a previous call to epoll_ctl(EPOLL_CTL_DEL).
 + * It is also acquired when inserting an epoll fd onto another epoll
 + * fd. We do this so that we walk the epoll tree and ensure that this
 + * insertion does not create a cycle of epoll file descriptors, which
 + * could lead to deadlock. We need a global mutex to prevent two
 + * simultaneous inserts (A into B and B into A) from racing and
 + * constructing a cycle without either insert observing that it is
 + * going to.
   * It is possible to drop the "ep->mtx" and to use the global
   * mutex "epmutex" (together with "ep->lock") to have it working,
   * but having "ep->mtx" will make the interface more scalable.
diff --cc sound/pci/au88x0/au88x0_core.c
index 16c0bdf,d43252a..4891503
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
@@@ -1249,22 -1249,14 +1249,22 @@@ static void vortex_adbdma_resetup(vorte
  	}
  }
  
- static int inline vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma)
+ static inline int vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma)
  {
  	stream_t *dma = &vortex->dma_adb[adbdma];
 -	int temp;
 +	int temp, page, delta;
  
  	temp = hwread(vortex->mmio, VORTEX_ADBDMA_STAT + (adbdma << 2));
 -	temp = (dma->period_virt * dma->period_bytes) + (temp & (dma->period_bytes - 1));
 -	return temp;
 +	page = (temp & ADB_SUBBUF_MASK) >> ADB_SUBBUF_SHIFT;
 +	if (dma->nr_periods >= 4)
 +		delta = (page - dma->period_real) & 3;
 +	else {
 +		delta = (page - dma->period_real);
 +		if (delta < 0)
 +			delta += dma->nr_periods;
 +	}
 +	return (dma->period_virt + delta) * dma->period_bytes
 +		+ (temp & (dma->period_bytes - 1));
  }
  
  static void vortex_adbdma_startfifo(vortex_t * vortex, int adbdma)