From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Jun 2013 23:42:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: v3.10-rc6~20
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/b2cc9c19e48bcf00f10c23fbf9f6abe43f6929d5?hp=-c

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull block layer fixes from Jens Axboe:
 "Outside of bcache (which really isn't super big), these are all
  few-liners.  There are a few important fixes in here:

   - Fix blk pm sleeping when holding the queue lock

   - A small collection of bcache fixes that have been done and tested
     since bcache was included in this merge window.

   - A fix for a raid5 regression introduced with the bio changes.

   - Two important fixes for mtip32xx, fixing an oops and potential data
     corruption (or hang) due to wrong bio iteration on stacked devices."

* 'for-linus' of git://git.kernel.dk/linux-block:
  scatterlist: sg_set_buf() argument must be in linear mapping
  raid5: Initialize bi_vcnt
  pktcdvd: silence static checker warning
  block: remove refs to XD disks from documentation
  blkpm: avoid sleep when holding queue lock
  mtip32xx: Correctly handle bio->bi_idx != 0 conditions
  mtip32xx: Fix NULL pointer dereference during module unload
  bcache: Fix error handling in init code
  bcache: clarify free/available/unused space
  bcache: drop "select CLOSURES"
  bcache: Fix incompatible pointer type warning
---

b2cc9c19e48bcf00f10c23fbf9f6abe43f6929d5
diff --combined Documentation/kernel-parameters.txt
index 6e3b18a8afc6,5469dbf95584..2fe6e767b3d6
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -3005,27 -3005,6 +3005,27 @@@ bytes respectively. Such letter suffixe
  			Force threading of all interrupt handlers except those
  			marked explicitly IRQF_NO_THREAD.
  
 +	tmem		[KNL,XEN]
 +			Enable the Transcendent memory driver if built-in.
 +
 +	tmem.cleancache=0|1 [KNL, XEN]
 +			Default is on (1). Disable the usage of the cleancache
 +			API to send anonymous pages to the hypervisor.
 +
 +	tmem.frontswap=0|1 [KNL, XEN]
 +			Default is on (1). Disable the usage of the frontswap
 +			API to send swap pages to the hypervisor. If disabled
 +			the selfballooning and selfshrinking are force disabled.
 +
 +	tmem.selfballooning=0|1 [KNL, XEN]
 +			Default is on (1). Disable the driving of swap pages
 +			to the hypervisor.
 +
 +	tmem.selfshrinking=0|1 [KNL, XEN]
 +			Default is on (1). Partial swapoff that immediately
 +			transfers pages from Xen hypervisor back to the
 +			kernel based on different criteria.
 +
  	topology=	[S390]
  			Format: {off | on}
  			Specify if the kernel should make use of the cpu
@@@ -3351,9 -3330,6 +3351,6 @@@
  			plus one apbt timer for broadcast timer.
  			x86_mrst_timer=apbt_only | lapic_and_apbt
  
- 	xd=		[HW,XT] Original XT pre-IDE (RLL encoded) disks.
- 	xd_geo=		See header of drivers/block/xd.c.
- 
  	xen_emul_unplug=		[HW,X86,XEN]
  			Unplug Xen emulated devices
  			Format: [unplug0,][unplug1]