diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2022-04-14 20:14:18 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2022-04-14 20:14:18 +0800 |
| commit | 748428d00cbcc1e7929f0aa8a9a024f17627356f (patch) | |
| tree | edc871010127cf4221ab8205eb584d203e03a46d | |
| parent | c6aad473b1698c01baab647a5b14344c4e1e5102 (diff) | |
| download | android-patchsets-748428d00cbcc1e7929f0aa8a9a024f17627356f.tar.gz | |
lkft-mainline-hikey: fix merge conflict for ION
there's a merge conflict on the kconfig file
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: I44d1658663a4a156cd3f29533110a02ce1dd62d9
| -rwxr-xr-x | lkft-mainline-hikey | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lkft-mainline-hikey b/lkft-mainline-hikey index c5166eb..8ff0b9f 100755 --- a/lkft-mainline-hikey +++ b/lkft-mainline-hikey @@ -45,7 +45,7 @@ apply --linaro --local kernel/common/mainline --remote kernel/common 21855/1 ## plist_del/plist_add [drivers/staging/android/ion/heaps/ion.ko] undefined! ## arch_dma_prep_coherent [drivers/staging/android/ion/heaps/ion_buffer.ko] undefined! ## http://android-review.linaro.org/c/kernel/common/+/22096 -apply --linaro --local kernel/common/mainline --remote kernel/common 22096/3 +apply --linaro --local kernel/common/mainline --remote kernel/common 22096/6 ## ion_dma_buf.c: chagne to use iosys_map for ION ## http://android-review.linaro.org/c/kernel/common/+/22739 apply --linaro --local kernel/common/mainline --remote kernel/common 22739/1 |