Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2017-02-02 | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net | David S. Miller | 7 | -4/+42 | |
All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> | |||||
2017-02-01 | Merge branch 'for-linus' of ↵ | Linus Torvalds | 3 | -2/+36 | |
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull fscache fixes from Al Viro. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fscache: Fix dead object requeue fscache: Clear outstanding writes when disabling a cookie FS-Cache: Initialise stores_lock in netfs cookie |