On 08/24/2018 06:49 AM, Anders Roxell wrote:
> 'make kselftest-merge' assumes that the config files for the tests are
> located under the 'main' test dir, like tools/testing/selftests/android/
> and not in a subdir to android.
>
> Signed-off-by: Anders Roxell <anders.rox...@linaro.org>
> ---
> tools/testing/selftests/android/{ion => }/config | 0
> 1 file changed, 0 insertions(+), 0 deletions(-)
> rename tools/testing/selftests/android/{ion => }/config (100%)
>
> diff --git a/tools/testing/selftests/android/ion/config
> b/tools/testing/selftests/android/config
> similarity index 100%
> rename from tools/testing/selftests/android/ion/config
> rename to tools/testing/selftests/android/config
>
Applied to linux-kselftest next for next 4.19-rc2
thanks,
-- Shuah
