Merge tag 'writeback-proportions' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull writeback updates from Wu Fengguang:
 "Use time based periods to age the writeback proportions, which can
  adapt equally well to fast/slow devices."

Fix up trivial conflict in comment in fs/sync.c

* tag 'writeback-proportions' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
  writeback: Fix some comment errors
  block: Convert BDI proportion calculations to flexible proportions
  lib: Fix possible deadlock in flexible proportion code
  lib: Proportions with flexible period

diff --cc fs/fs-writeback.c
Simple merge

diff --cc fs/super.c
Simple merge

diff --cc lib/Makefile
Simple merge