diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-11 12:07:54 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-11 12:07:54 +0000 |
| commit | 3d99c47ffcad87e2d59b8ef6615d36b5d67dd76b (patch) | |
| tree | 33bc36fe6a7cd18e0e7100b00e9bd87fbd1433a4 /Documentation/devicetree | |
| parent | 25100dfc5e6c59f35ca8d3f777c89dec040115b9 (diff) | |
| parent | 42af416d71462a72b02ba6ac632c8dcb9ce729a0 (diff) | |
Merge tag 'v5.4.81' into 5.4-2.3.x-imx
This is the 5.4.81 stable release
Conflicts (manual resolve):
- drivers/tee/optee/call.c:
Drop commit e0238fcd9f3a0 ("MLK-21698: tee:optee: fix shared memory
page attribute checks") from NXP in favor of 0e467f6af99f ("optee:
add writeback to valid memory type") from upstream as including the
WT-marked memory blocks is not compatible with OP-TEE design.
Link:
https://lore.kernel.org/lkml/AM6PR06MB4691D4988AC57DD24424D40CA6F30@AM6PR06MB4691.eurprd06.prod.outlook.com/
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'Documentation/devicetree')
0 files changed, 0 insertions, 0 deletions