From: Linus Torvalds Date: Fri, 20 Jan 2017 19:56:29 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eefa9feb7dad40c45259f7bcbed054508564fa7d;p=linux-beck.git 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 --- eefa9feb7dad40c45259f7bcbed054508564fa7d