| commit | 450ec63ce926baefb8d409c3229d301726ece0e3 | [log] [tgz] |
|---|---|---|
| author | Blagovest Kolenichev <bkolenichev@codeaurora.org> | Mon Apr 20 05:51:31 2020 -0700 |
| committer | Blagovest Kolenichev <bkolenichev@codeaurora.org> | Fri Apr 24 15:21:22 2020 -0700 |
| tree | 0cecd75e442144e22dbbc0369f46b22c6ca0d078 | |
| parent | 2ceec83a4ffae2b6b862dc90608416ab7724cd75 [diff] | |
| parent | 946995947ee861972e230c0db7dec7290a082c83 [diff] |
Merge crypto changes from android-4.19.79-95 into msm-4.19 Conflicts: block/blk-merge.c drivers/scsi/ufs/ufs-qcom.c drivers/scsi/ufs/ufshcd.c drivers/scsi/ufs/ufshcd.h fs/ext4/inode.c fs/f2fs/data.c include/linux/fscrypt.h Change-Id: Id3b033dbc5886ddb83f235ff80e19755d2b962e2 Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org> Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>