From: James Morris Date: Thu, 19 Oct 2017 01:28:38 +0000 (+1100) Subject: Merge commit 'tags/keys-fixes-20171018' into fixes-v4.14-rc5 X-Git-Tag: v4.14-rc6~22^2~1 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=494b9ae7abb84e6d88d7587906aff29dd26cf9d0;hp=-c;p=sfrench%2Fcifs-2.6.git Merge commit 'tags/keys-fixes-20171018' into fixes-v4.14-rc5 --- 494b9ae7abb84e6d88d7587906aff29dd26cf9d0