1Some changes to kselftest are required to compile it for Android. Those which 2have been made but not yet submitted upstream and merged back to this 3repository are kept here to make future merges easier. 4 5In cases where a commit touched both kselftest files and Android-specific 6files, the full commit is reproduced here. In rebasing these commits during a 7merge only the changes in the kselftest files should be re-applied. 8 9Upstream Merge Procedure: 10- Do a git merge of the upstream tag with the "ours" policy, dropping all 11 upstream changes. Do not commit yet. 12- Delete tools/testing/selftests and replace it with a copy from the upstream 13 kernel at the same tag as used above. 14- Apply the patches from this directory, making changes as required. 15- Test on all supported kernel versions, ensuring that any tests currently 16 enabled in VTS do not generate new failures. 17- Commit the merge. 18