On Thu, Nov 12, 2020 at 01:12:01PM -0500, Peter Xu wrote: > On Wed, Nov 11, 2020 at 01:26:26PM +0100, Andrew Jones wrote: > > Add x86_64/tsc_msrs_test and remove clear_dirty_log_test. > > > > Reviewed-by: Ben Gardon <bgardon@xxxxxxxxxx> > > Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx> > > --- > > tools/testing/selftests/kvm/.gitignore | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore > > index 7a2c242b7152..ceff9f4c1781 100644 > > --- a/tools/testing/selftests/kvm/.gitignore > > +++ b/tools/testing/selftests/kvm/.gitignore > > @@ -18,13 +18,13 @@ > > /x86_64/vmx_preemption_timer_test > > /x86_64/svm_vmcall_test > > /x86_64/sync_regs_test > > +/x86_64/tsc_msrs_test > > /x86_64/vmx_apic_access_test > > /x86_64/vmx_close_while_nested_test > > /x86_64/vmx_dirty_log_test > > /x86_64/vmx_set_nested_state_test > > /x86_64/vmx_tsc_adjust_test > > /x86_64/xss_msr_test > > -/clear_dirty_log_test > > /demand_paging_test > > /dirty_log_test > > /dirty_log_perf_test > > This seems to conflict with another patch that are already on kvm/queue, so > this series may need a rebase (and, seems this is not the only conflict)... > It looks like Paolo added "selftests: kvm: keep .gitignore add to date", which does what this patch does plus re-alphabetizes everything. So this patch can be dropped. Thanks, drew
