diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-06-04 22:47:41 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-06-04 22:47:41 +0400 |
| commit | 0a8de7ae3ed9cfd5d7fc94a077fa9574e71a1688 (patch) | |
| tree | f59a21727a2a2b809b753f6b8a4c07d5dc0f497a | |
| parent | b4ef6ec7985a3c98d916dbb376777912e50fd662 (diff) | |
[HACK] lsk: tweak a solution to fix the ambiguous short SHA1 issueHEADlinux-linaro-lsk
The solutions could not be reused due to the object index having
become too short (some new tree object has the same 7-digit value).
The current-conflict-$(whoami) started using 8-digit short index, and
it no longer matches the saved conflict. Hand-edit the saved conflict
file to make it use the 8-digit index.
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | solutions/f39f86eaa6e8771669e537972f36862a/conflict2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solutions/f39f86eaa6e8771669e537972f36862a/conflict2 b/solutions/f39f86eaa6e8771669e537972f36862a/conflict2 index af93b75..e98917f 100644 --- a/solutions/f39f86eaa6e8771669e537972f36862a/conflict2 +++ b/solutions/f39f86eaa6e8771669e537972f36862a/conflict2 @@ -1,5 +1,5 @@ diff --cc arch/arm/kernel/perf_event_cpu.c -index 0b48a38,b3ae24f..0000000 +index 0b48a38e,b3ae24f..0000000 --- a/arch/arm/kernel/perf_event_cpu.c +++ b/arch/arm/kernel/perf_event_cpu.c @@@ -19,6 -19,7 +19,10 @@@ |