| commit | 63da4200cbc27828bb9439b84059aa48cda5adf9 | [log] [tgz] |
|---|---|---|
| author | Hyojun Kim <hyojun@google.com> | Fri Oct 06 17:10:08 2017 -0700 |
| committer | Greg Kroah-Hartman <gregkh@google.com> | Fri Oct 13 11:27:08 2017 +0000 |
| tree | ac0207a65bafb1f55ca84a2200ce181d470878d2 | |
| parent | 05c85a6ddfcf1a39d4c7456279faa395c1ac5b8e [diff] |
f2fs: catch up to v4.14-rc1
Cherry-picked from upstream-f2fs-stable-linux-4.9.y
Changes include:
commit 30da3a4de96733 ("f2fs: hurry up to issue discard after io interruption")
commit d1c363b48398d4 ("f2fs: fix to show correct discard_granularity in sysfs")
...
commit e6b120d4d01ab0 ("f2fs/fscrypt: catch up to v4.12")
commit 4d7931d72758db ("KEYS: Differentiate uses of rcu_dereference_key() and user_key_payload()")
Signed-off-by: Hyojun Kim <hyojun@google.com>