When cherry-picking patches from v5.4-rc7, I ignored the following patches (either because they are cosmetic changes to license boilerplate etc., or because they depend on upstream features not present in our optee branch):
7c0774f46b6d tee/shm: untag user pointers in tee_shm_register
9c92ab619141 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282
ec8f24b7faaf treewide: Add SPDX license identifier - Makefile/Kconfig
73b0140bf0fe mm/gup: change GUP fast to use flags rather than a write 'bool'
The additional in-flight patches are "tee: optee: Fix dynamic shm pool allocations" and "tee: optee: fix device enumeration error handling".
jenswi-linaro
commented
4 years ago
Synchronize
drivers/teewith upstream kernel v5.4-rc7 + add two patches that are in flight for integration in v5.4 (https://www.spinics.net/lists/arm-kernel/msg769170.html)