Rebasing optee branch onto kernel 5.5

linaro-swg / linux

Linux kernel source tree

Other

41 stars 79 forks source link

Rebasing optee branch onto kernel 5.5 #71

Closed jforissier closed 4 years ago

jforissier commented 4 years ago

Hi,

I have pushed a new branch called wip/optee-v5.5 which is our current linaro-swg/linux.git branch optee rebased onto upstream kernel 5.5 (and with upstream-tee-subsys-patches.txt updated).

Sanity-tested on QEMU, HiKey and HiKey960. I'd like to replace the tip of the optee branch with this new one soon.

If anyone has any issue with that, please comment here! Thanks.

jbech-linaro commented 4 years ago

I have no issue with it, but still commenting here :)

jenswi-linaro commented 4 years ago

A few of the commits are fixups to earlier commits. For instance:

"OP-TEE Benchmark not for mainline"
"tee: optee: optee_bench.h: remove useless include not for mainline"

and

"tee: new ioctl to a register tee_shm from a dmabuf file descriptor"
"tee: fix unbalanced context refcount in register shm from fd"

and

"tee: support of allocating DMA shared buffers not for mainline"
"tee: support of allocating DMA shared buffers not for mainline"

How about squashing those?

jforissier commented 4 years ago

@jenswi-linaro yup, good idea, will do.

jforissier commented 4 years ago

Commits squashed, forced pushed to wip/optee-v5.5.

jenswi-linaro commented 4 years ago

Looks good to me.

jforissier commented 4 years ago

Force-pushed wip/optee-v5.5 to branch optee. Previous tip of that branch saved as branch-optee-v5.1-20200204.