diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-11 23:37:45 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-11 23:37:45 +0200 |
| commit | ecdf94da6f91310d08081e05db78a6c997b44e4b (patch) | |
| tree | 0528ddc7e2b34046b3bd98dedf89ca7fee40c1ae /drivers/mtd/ubi/block.c | |
| parent | Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kge... (diff) | |
| parent | Linux 4.1-rc6 (diff) | |
| download | linux-ecdf94da6f91310d08081e05db78a6c997b44e4b.tar.xz linux-ecdf94da6f91310d08081e05db78a6c997b44e4b.zip | |
Merge tag 'v4.1-rc6' into next/dt
Linux 4.1-rc6
Conflicts:
arch/arm/boot/dts/zynq-7000.dtsi
Resolution summary:
Mainline had an earlier version of the commit, resolve in favor of the
newer patch in next/dt branch.
Diffstat (limited to 'drivers/mtd/ubi/block.c')
| -rw-r--r-- | drivers/mtd/ubi/block.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c index db2c05b6fe7f..c9eb78f10a0d 100644 --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c @@ -310,6 +310,8 @@ static void ubiblock_do_work(struct work_struct *work) blk_rq_map_sg(req->q, req, pdu->usgl.sg); ret = ubiblock_read(pdu); + rq_flush_dcache_pages(req); + blk_mq_end_request(req, ret); } |