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

Browse source

Pull blkcg fix from Jens Axboe:
 "One final fix that should go into 4.3.  It's a simple 2x1 liner,
  fixing a blkcg accounting issue.  It was using the wrong bio member to
  look at the sync and write bits..."

* 'for-linus' of git://git.kernel.dk/linux-block:
  blkcg: fix incorrect read/write sync/async stat accounting

...

This commit is contained in:

Linus Torvalds 2015-10-28 07:22:15 +09:00

parent dc5bc3f1e3 174fd8d369

commit 3d0aa36607

1 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

include/linux/blk-cgroup.h

View file