| commit | eefa9feb7dad40c45259f7bcbed054508564fa7d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 20 11:56:29 2017 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 20 11:56:29 2017 -0800 |
| tree | 2812e40c9c97ba5d8d28a066ccc1c1f039010a24 | |
| parent | f09ff1de63a20bc049af66d2a758a6ded4f7bdf3 [diff] | |
| parent | 210675270caa33253e4c33f3c5e657e7d6060812 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse Pull fuse fixes from Miklos Szeredi: "Fix two regressions, one introduced in 4.9 and a less recent one in 4.2" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: fix time_to_jiffies nsec sanity check fuse: clear FR_PENDING flag when moving requests out of pending queue