Re: linux-next: manual merge of the kselftest tree with the kvm tree

2018-10-18 Thread Shuah Khan
On 10/18/2018 04:51 AM, Paolo Bonzini wrote: > On 18/10/2018 06:50, Stephen Rothwell wrote: >> Hi Shuah, >> >> Today's linux-next merge of the kselftest tree got a conflict in: >> >> tools/testing/selftests/kvm/dirty_log_test.c >> >> between commit: >> >> fff8dcd7b4a2 ("kvm: selftests: port dir

Re: linux-next: manual merge of the kselftest tree with the kvm tree

2018-10-18 Thread Paolo Bonzini
On 18/10/2018 13:50, Andrea Parri wrote: >> Shuah, I think it's best if in the future the >> tools/testing/selftests/kvm/ changes go through my tree, unless they >> affect many selftests subdirectories. > > Would the patch below make sense ? > > (It wasn't the case of my patch, but you never know

Re: linux-next: manual merge of the kselftest tree with the kvm tree

2018-10-18 Thread Andrea Parri
> Shuah, I think it's best if in the future the > tools/testing/selftests/kvm/ changes go through my tree, unless they > affect many selftests subdirectories. Would the patch below make sense ? (It wasn't the case of my patch, but you never know... ;D) Output of get_maintainer.pl on tools/testin

Re: linux-next: manual merge of the kselftest tree with the kvm tree

2018-10-18 Thread Paolo Bonzini
On 18/10/2018 06:50, Stephen Rothwell wrote: > Hi Shuah, > > Today's linux-next merge of the kselftest tree got a conflict in: > > tools/testing/selftests/kvm/dirty_log_test.c > > between commit: > > fff8dcd7b4a2 ("kvm: selftests: port dirty_log_test to aarch64") > > from the kvm tree and

linux-next: manual merge of the kselftest tree with the kvm tree

2018-10-17 Thread Stephen Rothwell
Hi Shuah, Today's linux-next merge of the kselftest tree got a conflict in: tools/testing/selftests/kvm/dirty_log_test.c between commit: fff8dcd7b4a2 ("kvm: selftests: port dirty_log_test to aarch64") from the kvm tree and commit: cda94d9ffa0e ("selftests: kvm: Fix -Wformat warnings")