update android patch README
A previous commit removed hunks from outstanding patches that touch
android-specific files (files not part of tools/testing/selftests). So
it is no longer necessary to manually ensure these hunks are not
re-applied.
Change-Id: Ifb6ac4cadbff21b37957bd1033ff90a7a413c795
Signed-off-by: Steve Muckle <smuckle@google.com>
diff --git a/android/patches/README b/android/patches/README
index 0cb2c0f..0e58bfb 100644
--- a/android/patches/README
+++ b/android/patches/README
@@ -2,10 +2,6 @@
have been made but not yet submitted upstream and merged back to this
repository are kept here to make future merges easier.
-In cases where a commit touched both kselftest files and Android-specific
-files, the full commit is reproduced here. In rebasing these commits during a
-merge only the changes in the kselftest files should be re-applied.
-
Upstream Merge Procedure:
- Do a git merge of the upstream tag with the "ours" policy, dropping all
upstream changes. Do not commit yet.