On Thu, Jan 21, 2021 at 02:27:13PM +1300, Kai Huang wrote: > On Thu, 21 Jan 2021 03:16:19 +0200 Jarkko Sakkinen wrote: > > On Thu, Jan 21, 2021 at 12:52:48PM +1300, Kai Huang wrote: > > > On Thu, 21 Jan 2021 01:43:41 +0200 Jarkko Sakkinen wrote: > > > > On Wed, Jan 20, 2021 at 01:52:32PM +1300, Kai Huang wrote: > > > > > On Tue, 2021-01-19 at 10:23 +0200, Jarkko Sakkinen wrote: > > > > > > Can you send a new version that applies: > > > > > > > > > > > > $ git pw series apply 416463 > > > > > > Applying: x86/cpufeatures: Add SGX1 and SGX2 sub-features > > > > > > Applying: x86/sgx: Remove a warn from sgx_free_epc_page() > > > > > > Applying: x86/sgx: Wipe out EREMOVE from sgx_free_epc_page() > > > > > > Applying: x86/sgx: Add SGX_CHILD_PRESENT hardware error code > > > > > > Applying: x86/sgx: Introduce virtual EPC for use by KVM guests > > > > > > Applying: x86/cpu/intel: Allow SGX virtualization without Launch Control support > > > > > > Applying: x86/sgx: Initialize virtual EPC driver even when SGX driver is disabled > > > > > > error: sha1 information is lacking or useless (arch/x86/kernel/cpu/sgx/main.c). > > > > > > error: could not build fake ancestor > > > > > > hint: Use 'git am --show-current-patch=diff' to see the failed patch > > > > > > Patch failed at 0007 x86/sgx: Initialize virtual EPC driver even when SGX driver is disabled > > > > > > When you have resolved this problem, run "git am --continue". > > > > > > If you prefer to skip this patch, run "git am --skip" instead. > > > > > > To restore the original branch and stop patching, run "git am --abort". > > > > > > > > > > Could you let me know which branch should I rebase to? It appears your linux-sgx tree > > > > > next branch? > > > > > > > > I tried my tree first, which was actually out-of-sync, so I rebase it. > > > > You can find it from MAINTAINERS failed. > > > > > > > > After sending this email I rebased it to tip/x86/sgx, which also failed. > > > > That tree failed with a merge conflict. > > > > > > This series is based on v5.11-rc3, as mentioned in cover letter below: > > > > Please use tip/x86/sgx as base instead. > > When I wrote this series, the tip/x86/sgx was still v5.10-rc4. I felt I should > rebase to some newer code, so I chose upstream v5.11-rc3. > > I just checked the latest tip/x86/sgx, and it has updated to v5.11-rc3, so > yes I will rebase to it for next version. I think we did a good review round anyway, and I've used this time to learn to use Graphene, i.e. no time wasted :-) /Jarkko
