From: Jiri Kosina Date: Wed, 31 Jan 2018 15:23:58 +0000 (+0100) Subject: Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus X-Git-Tag: ceph-for-4.16-rc4~196^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c86aa0129c07c8c7f54dc47656de99ab0eb809b3;p=ceph-client.git Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus Pull assorted small fixes queued for merge window. --- c86aa0129c07c8c7f54dc47656de99ab0eb809b3