diff options
| author | Tejun Heo <tj@kernel.org> | 2014-09-24 19:00:21 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-09-24 19:00:21 +0200 |
| commit | d06efebf0c37d438fcf07057be00dd40fcfce08d (patch) | |
| tree | 31a0786d132aadf4cbb9725f3f444ef6e1052128 /arch/arm/boot/dts/ste-snowball.dts | |
| parent | Revert "percpu: free percpu allocation info for uniprocessor system" (diff) | |
| parent | blk-mq, percpu_ref: implement a kludge for SCSI blk-mq stall during probe (diff) | |
| download | linux-d06efebf0c37d438fcf07057be00dd40fcfce08d.tar.xz linux-d06efebf0c37d438fcf07057be00dd40fcfce08d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block into for-3.18
This is to receive 0a30288da1ae ("blk-mq, percpu_ref: implement a
kludge for SCSI blk-mq stall during probe") which implements
__percpu_ref_kill_expedited() to work around SCSI blk-mq stall. The
commit reverted and patches to implement proper fix will be added.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Kent Overstreet <kmo@daterainc.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/arm/boot/dts/ste-snowball.dts')
| -rw-r--r-- | arch/arm/boot/dts/ste-snowball.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index 4a2000c620ad..3e97a669f15e 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -116,7 +116,6 @@ msp2: msp@80117000 { pinctrl-names = "default"; pinctrl-0 = <&msp2_default_mode>; - status = "okay"; }; msp3: msp@80125000 { |